From 812e2ef0f4887fcba30b57e7adbc12022618be72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Mon, 9 Oct 2017 20:31:45 +0200 Subject: [PATCH] split staff area in half (orga + admin) --- cfp/templates/cfp/admin/base.html | 20 ++++ .../cfp/{staff => admin}/conference.html | 2 +- cfp/templates/cfp/staff/base.html | 29 +++--- cfp/urls.py | 3 +- cfp/views.py | 7 +- locale/fr/LC_MESSAGES/django.mo | Bin 16056 -> 16144 bytes locale/fr/LC_MESSAGES/django.po | 97 +++++++++--------- ponyconf/templates/base.html | 3 +- ponyconf/urls.py | 2 +- 9 files changed, 95 insertions(+), 68 deletions(-) create mode 100644 cfp/templates/cfp/admin/base.html rename cfp/templates/cfp/{staff => admin}/conference.html (93%) diff --git a/cfp/templates/cfp/admin/base.html b/cfp/templates/cfp/admin/base.html new file mode 100644 index 0000000..c6f4449 --- /dev/null +++ b/cfp/templates/cfp/admin/base.html @@ -0,0 +1,20 @@ +{% extends 'base.html' %} +{% load staticfiles i18n %} + +{% block admintab %} class="active"{% endblock %} + +{% block navbar %} + {{ block.super }} +
+ +
+{% endblock %} + +{% block content %} +{% trans "Please select a category." %} +{% endblock %} diff --git a/cfp/templates/cfp/staff/conference.html b/cfp/templates/cfp/admin/conference.html similarity index 93% rename from cfp/templates/cfp/staff/conference.html rename to cfp/templates/cfp/admin/conference.html index 852c44c..d983a60 100644 --- a/cfp/templates/cfp/staff/conference.html +++ b/cfp/templates/cfp/admin/conference.html @@ -1,4 +1,4 @@ -{% extends 'cfp/staff/base.html' %} +{% extends 'cfp/admin/base.html' %} {% load i18n crispy_forms_tags %} {% block conferencetab %} class="active"{% endblock %} diff --git a/cfp/templates/cfp/staff/base.html b/cfp/templates/cfp/staff/base.html index ad76467..d04c05d 100644 --- a/cfp/templates/cfp/staff/base.html +++ b/cfp/templates/cfp/staff/base.html @@ -5,23 +5,18 @@ {% block navbar %} {{ block.super }} - +
+ +
{% endblock %} {% block content %} diff --git a/cfp/urls.py b/cfp/urls.py index bfe7e8b..71c354f 100644 --- a/cfp/urls.py +++ b/cfp/urls.py @@ -15,7 +15,6 @@ urlpatterns = [ url(r'^volunteer/(?P[\w\-]+)/join/(?P[\w\-]+)/$', views.volunteer_activity, {'join': True}, name='volunteer-join'), url(r'^volunteer/(?P[\w\-]+)/quit/(?P[\w\-]+)/$', views.volunteer_activity, {'join': False}, name='volunteer-quit'), url(r'^staff/$', views.staff, name='staff'), - url(r'^staff/conference/$', views.conference, name='conference'), url(r'^staff/talks/$', views.talk_list, name='talk-list'), url(r'^staff/talks/(?P[\w\-]+)/$', views.talk_details, name='talk-details'), url(r'^staff/talks/(?P[\w\-]+)/vote/(?P[-+0-2]+)/$', views.talk_vote, name='talk-vote'), @@ -37,6 +36,8 @@ urlpatterns = [ url(r'^staff/add-user/$', views.create_user, name='create-user'), url(r'^staff/schedule/((?P[\w]+)/)?$', views.staff_schedule, name='staff-schedule'), url(r'^staff/select2/$', views.Select2View.as_view(), name='django_select2-json'), + url(r'^admin/$', views.admin, name='admin'), + url(r'^admin/conference/$', views.conference, name='conference'), url(r'^schedule/((?P[\w]+)/)?$', views.public_schedule, name='public-schedule'), #url(r'^markdown/$', views.markdown_preview, name='markdown'), ] diff --git a/cfp/views.py b/cfp/views.py index 4ff68fb..4bb0817 100644 --- a/cfp/views.py +++ b/cfp/views.py @@ -223,6 +223,11 @@ def staff(request): return render(request, 'cfp/staff/base.html') +@staff_required +def admin(request): + return render(request, 'cfp/admin/base.html') + + @staff_required def talk_list(request): talks = Talk.objects.filter(site=request.conference.site) @@ -494,7 +499,7 @@ You can now: messages.success(request, _('Modifications successfully saved.')) return redirect(reverse('conference')) - return render(request, 'cfp/staff/conference.html', { + return render(request, 'cfp/admin/conference.html', { 'form': form, }) diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index ed545038933fc17a5b438762da14e718e81dc450..da07eea1c67e28a57871cc9b12d27e3541c7133b 100644 GIT binary patch delta 4721 zcmY+|2~bt_0>|+`n}Tc?L{TBUh%6eJLf#N16)6l&4YJMLp70RMYa(jla(wbqQ?nE? zElX`Ptu)fy%Oz9W^gZ%DTP7RHrZHx!DV&_CwD0epKh1Q;-~Ig0|K4-{>p42^TkzCE z=X`u#(3k6$-q>M!r|Bv$6`2EVF#?X=L;}~^Ch;v0V6oy zjFGqfmRn5jSH$ zyo6bpL~qiu2vczyX5&g^lFWW|JQO~mpb?!%-RO$-8mhr|%=1)?K@WRlE@~>5F)ZEa z3Dn-$f?nK#DR>6g;}19hm(s{0Jc=4afqDppg!;UyMRc%{bKBSE5Ef z7klC|)D7N1jo<)kvzV13H4!@pEK#OtDuw#!R6==Z#~14tsHa z5Y^LfQ8)ep)v;FVZ>aiUT2p;EYN}&V*CnEs){E>rlVi{CKwUQxqiNq%P|#yE3pM3S zQ6pQ8THB4*!>Ac(Mosy5)*ybQhLcb)q%`zl9`eV`;A1eZLH(`?)xj^&(GS0&AiJfx z9k~-na$bSz&|8>~hcE|!#Z2tolg6+VHKlW~H?F}O@Er`n7F2^jVlZB@=fCx2{#6m0 z?vAWIs)tdi-I{<}3NMCXi9H{Knz35c?^mH3Scjpw$@&tO1n~w%ZN}CNcji**y*BB< zOy*w~mQkT8e*iV&O4Od1iCV)ak(Z&_f@*jl>INU9-su;yAO3*^g}f?2-{q>>3}I;sor0ji`psq8_sr)Ii#? z1NB&XP#sOgm(h#G?1>ZDUeABbjqdL4jCy=>kPT{zk+#i4xCz(eK+NlF%zIdaQ95Vg z`{1ppr=$i|zZ10thfqu0guLU-_oxm<@F<1TzKN%x8Aw81n1Ruls~_M{`+bQ$AB(#2 z1dPKP)carw>OPw>5?@2j*k06Q_%%+#Z%~hGQ7-eZHJL;~4bMO|JReoR+@5c+=UXwB z`aP(bI)U1ZUt&kRfV$6RR7ZkYKP^c#>i1cwr>X$8WaDmP{jnpw&&%@rKS#bzk{fb9!GWP zL#xwd3tymq*lf>RP*eE}CgLCH#ZGK-EtwBB!qKR`a<{FoK#g=EYNU^2HZ~wnoH>Si zMgN4{-!YddXv(gkF7)t>b;Bg2%J@)^*G!y@n^7GN9^`f~68U2~@o@{5VluAAF}MRY zkZZ_xG7$ytUt+glrk?+q6f~6^FbVgf*8Ee{UI^o^!RSNXXaMSQ8iv}W#i*xZENWyG zsF6>z&OzO8F=`2Rqh{m)M(O$gj)K;t6*Z;5+w+jY?hPX`i2A+c2+@&2W(G>`MtYL6 zW<}ROOXib1$r|z~d6%pu8_7J<2Q-}_2q>qW#T{AS4>>@hO z63xOWop6kBF&l88Eep0!VEWst=2G~#ni)soUXtGS4elhLlG|M#hulL8$BJJ3Q9U&CEJPKi8_{%m_W(>*av#{9wBT-vySX0E6Kme z4x;0E;t7=8k7QfU#c8CH>>)!)toFzO3Vp~kWHreq#bg^fLv(BT^RCzSS+T9QCsR&D(ePq=fCvtHyeqC>COFmhBU9EZt=d~nD@Y27BTtc1ay_Xc$H?78$46ufsV47{vD&8ZP|%U+68N0MXN^7ohcy&mtiK%h zZglzdDu30in(E0lRWtm%8sq&DQKPFXCsQ}MRy8Tf&qRdg<>&UTKa`#pmeV&sx8JUd a>Boa&hW`D^t(hTFe_a{4*S6f)$UgxPD$?u# delta 4634 zcmX}u3w(}M0LSsO*GM%Z^!vZhne*{~zvn#fb2+!?owC_Ak2{SK0gDW!fpj3d zuP`Rb&zRy69i>DVlMH^?3R5u>bFc+ok1cV8Z5LuF?J4&7!x%(+4hCZ>w#UWT*%-%E zQ|ZrvA21L*a(6v25mPW9!|_3EgHK`%zKXhWHAZ7C(sy&%9{&c_!DASJr&0Gmi(&XT zj^z0!h`VY8h1eR4P&b~5nuK|%8FUVD5msso4cN<4uYX>gP=Z7~KlBbnG7 zb5R`{tm8c245Ok8#vqem?m~5B7ODfKs0%Al9a)L$;2PA3y_kiYF%?f?5=POhPS_W( z!a`)wrW7>;%hAz@)>F}q_F3yu5Bw5~@OunnPYhw+)$`jJmTq(hYEMi@4?5TpS7HTj z$KE)ahs?o+sDVbt8WWH4vCO|VT`mW7qp_&9z8kexC8(axMU8kNY6h0t_G;95>rn&P zXuq$u-`80WqV~+!s2TkOnIv;5R_jkCiY=)<5RaO&bksjb)S73YM%)(@aTw}>(@;I1joM@j(6@A` z2kf)oe}P)MA5r%`i5kc`)Pw)EZNE6Tqs|pnG_uyH5v8I!(hW65gHSgZjgznt_28YT znL2`++KYG^H6!a#9oU5Ga4j+*$Lyh^wQH~*!Dh67LOu8w)W}bvEI0UY0-$oi{?^&HS{{R*`d$52xi zn&h_IpgKALb^Zv{18zs%Xri?Uhx)PZsLfcD?9SYA)F!=zx-N#%XvRG$%)dsQ!2xZG z9Ml?)M1J(lWYmKnL*1YZv+!-~iQk~Ek4QCUAa<}8qRwA#-DLd?_28dT_y5D8(ws^Q zhAqQTC$z;tOt8n(P`f${r{Yl5jBP}{raLeQzeN3h97TP97WJTusOzKB-SfJj+Diy5Bq92R}NGHt>WLC|uI07SCNH(gOf_l)isMl*H2H_UeYg&hT&;eYH4LF#+P{Phs z$9HvcH|>7(y)~%)XD(3TS*BB0V^-h|*cVUZE=UW?o>PDk57{{Y# ztQhtBy^Q0r0`<%H4~Ak?clW`Gs2`#%bo528J#ZtcJr?yh;2zXem7q3b8Ajq_R0r0g zmSQ97yn57IbR4x*%~)6MiC7$j-H|uY%s_QuSvK>p5ms?PYqSF+aUbe|-=Ws_C;RD3d${lO{n(p!C2H-C zqB?RC+u-jQhJn2N>R2@DL2;;#B%zih6SY+RFa`@S0`EiJcP@Ic)S)t&N)_^_*@XAv z)x$2RsjNnArh3%(XKcF_z2p*;fx6*DR7ZPWu1pQuhh27Q8VehMkR*IYV_b% zY>SPk5&nhR6Bq6A5VpQXnv5E07V@T<{;0nJQ&B(36{rU+L(Nzv>be??#a+lh$29WU zg#+z)=O*9~R8QBUZs5g!xD^NBdDKkw=HSg(fI6=d*$!p{vf<6on1b#4yEAz;wx>M~ zwd5t3srP>!6@LyiqHc5)^&0((+NEbuZ^M76k%iC;jXc8I5p~0K)DnzE&B&do_xwfF zk}O5d=qlT;!T`PhUMhaLk!&L>N#uTC&0UV?scTkrgC*oeqS2R;M@TJMNM0q6l8&UQ z?4hDxP`v@_*uCU&awpOAeg7%=1ho%h$w0D!sC-T~lN;2a40SQDAS-vdurCd-{pIp7 zwRz-rax394`sK2Y+95K;KHn^+v684PBV&9u_hU48iKbE|p5&9=YETA|v1BLtf~b_Z z_?AW0k+!Y@l&5Oe6=@u;ngmrgafsPpU{);!m_s zno40)1=o;SWExXo?ja3i7kQT~AnnL_GMVUyr>WdQr4zZ4Xj8pL9wP(F4~0cKlc=e@ zMcyX*$x(TVg!pRi$0p!?HZusj+PqAvNh#5ec!#JgC9Qom_oKb7cf-5M6!JdFC86q6 z4VBKMf~aJW>qsT}l&GvGSNm%2|2m(f?jcjjTB33-$4LY0Jw1 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index cfeab02..bcb3016 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-09 17:54+0000\n" -"PO-Revision-Date: 2017-10-09 19:54+0200\n" +"POT-Creation-Date: 2017-10-09 18:30+0000\n" +"PO-Revision-Date: 2017-10-09 20:31+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr\n" @@ -274,7 +274,7 @@ msgstr "Couleur sur le programme" msgid "Label on program" msgstr "Label dans le xml du programme" -#: cfp/models.py:297 cfp/templates/cfp/staff/base.html:17 +#: cfp/models.py:297 cfp/templates/cfp/staff/base.html:15 #: cfp/templates/cfp/staff/participant_list.html:8 #: cfp/templates/cfp/staff/talk_details.html:68 #: cfp/templates/cfp/staff/talk_list.html:45 @@ -378,6 +378,26 @@ msgstr "[%(prefix)s] Conversation avec %(dest)s" msgid "[%(prefix)s] Talk: %(talk)s" msgstr "[%(prefix)s] Talk: %(talk)s" +#: cfp/templates/cfp/admin/base.html:10 +#: cfp/templates/cfp/admin/conference.html:8 +msgid "Conference" +msgstr "Conférence" + +#: cfp/templates/cfp/admin/base.html:19 cfp/templates/cfp/staff/base.html:24 +msgid "Please select a category." +msgstr "Veuillez sélectionner une catégorie." + +#: cfp/templates/cfp/admin/conference.html:13 +#: cfp/templates/cfp/staff/create_user.html:8 +msgid "Add a new user" +msgstr "Ajouter un nouvel utilisateur" + +#: cfp/templates/cfp/admin/conference.html:14 cfp/templates/cfp/propose.html:22 +#: cfp/templates/cfp/speaker.html:21 +#: cfp/templates/cfp/staff/create_user.html:13 +msgid "Save" +msgstr "Envoyer" + #: cfp/templates/cfp/closed.html:9 cfp/templates/cfp/propose.html:11 #: cfp/templates/cfp/speaker.html:11 msgid "Participate" @@ -415,47 +435,27 @@ msgstr "Éditer votre profil :" msgid "An email has been sent to you with those URLs" msgstr "Un mail vous a été envoyé avec toutes les URLs" -#: cfp/templates/cfp/propose.html:22 cfp/templates/cfp/speaker.html:21 -#: cfp/templates/cfp/staff/conference.html:14 -#: cfp/templates/cfp/staff/create_user.html:13 -msgid "Save" -msgstr "Envoyer" - -#: cfp/templates/cfp/schedule.html:9 cfp/templates/cfp/staff/base.html:20 +#: cfp/templates/cfp/schedule.html:9 cfp/templates/cfp/staff/base.html:18 #: cfp/templates/cfp/staff/schedule.html:9 ponyconf/templates/base.html:25 msgid "Schedule" msgstr "Programme" -#: cfp/templates/cfp/staff/base.html:16 +#: cfp/templates/cfp/staff/base.html:14 #: cfp/templates/cfp/staff/participant_details.html:33 #: cfp/templates/cfp/staff/talk_list.html:8 msgid "Talks" msgstr "Exposés" -#: cfp/templates/cfp/staff/base.html:18 +#: cfp/templates/cfp/staff/base.html:16 #: cfp/templates/cfp/staff/track_list.html:9 msgid "Tracks" msgstr "Sessions" -#: cfp/templates/cfp/staff/base.html:19 +#: cfp/templates/cfp/staff/base.html:17 #: cfp/templates/cfp/staff/room_list.html:9 msgid "Rooms" msgstr "Salles" -#: cfp/templates/cfp/staff/base.html:21 -#: cfp/templates/cfp/staff/conference.html:8 -msgid "Conference" -msgstr "Conférence" - -#: cfp/templates/cfp/staff/base.html:29 -msgid "Please select a category." -msgstr "Veuillez sélectionner une catégorie." - -#: cfp/templates/cfp/staff/conference.html:13 -#: cfp/templates/cfp/staff/create_user.html:8 -msgid "Add a new user" -msgstr "Ajouter un nouvel utilisateur" - #: cfp/templates/cfp/staff/create_user.html:14 #: cfp/templates/cfp/staff/talk_decide.html:22 ponyconf/templates/_form.html:16 msgid "Cancel" @@ -879,35 +879,35 @@ msgstr "Vous avez déjà confirmé votre participation à cet exposé." msgid "You already cancelled your participation to this talk." msgstr "Vous avez déjà annulé votre participation à cet exposé." -#: cfp/views.py:285 cfp/views.py:382 +#: cfp/views.py:290 cfp/views.py:387 msgid "The talk has been accepted." msgstr "L’exposé a été accepté." -#: cfp/views.py:287 cfp/views.py:384 +#: cfp/views.py:292 cfp/views.py:389 msgid "The talk has been declined." msgstr "L’exposé a été décliné." -#: cfp/views.py:352 cfp/views.py:444 +#: cfp/views.py:357 cfp/views.py:449 msgid "Message sent!" msgstr "Message envoyé !" -#: cfp/views.py:365 +#: cfp/views.py:370 msgid "Vote successfully created" msgstr "A voté !" -#: cfp/views.py:365 +#: cfp/views.py:370 msgid "Vote successfully updated" msgstr "Vote mis à jour" -#: cfp/views.py:386 +#: cfp/views.py:391 msgid "Decision taken in account" msgstr "Décision enregistrée" -#: cfp/views.py:472 +#: cfp/views.py:477 msgid "[{}] You have been added to the staff team" msgstr "[{}] Vous avez été ajouté aux membres du staff" -#: cfp/views.py:473 +#: cfp/views.py:478 msgid "" "Hi {},\n" "\n" @@ -931,15 +931,15 @@ msgstr "" "{}\n" "\n" -#: cfp/views.py:494 +#: cfp/views.py:499 msgid "Modifications successfully saved." msgstr "Modification enregistrée avec succès." -#: cfp/views.py:571 +#: cfp/views.py:576 msgid "User created successfully." msgstr "Utilisateur créé avec succès." -#: cfp/views.py:592 +#: cfp/views.py:597 #, python-format msgid "Format '%s' not available" msgstr "Format '%s' non disponible" @@ -981,15 +981,23 @@ msgstr "Appel à participation" msgid "Volunteers" msgstr "Bénévoles" -#: ponyconf/templates/base.html:42 ponyconf/templates/base.html:53 -msgid "Staff" -msgstr "Staff" +#: ponyconf/templates/base.html:42 +msgid "Organisazion" +msgstr "Organisation" -#: ponyconf/templates/base.html:51 +#: ponyconf/templates/base.html:43 +msgid "Administration" +msgstr "Administration" + +#: ponyconf/templates/base.html:52 msgid "Logout" msgstr "Déconnection" -#: ponyconf/templates/base.html:70 +#: ponyconf/templates/base.html:54 +msgid "Staff" +msgstr "Staff" + +#: ponyconf/templates/base.html:71 msgid "Powered by" msgstr "Propulsé par" @@ -1300,9 +1308,6 @@ msgstr "Adresse e-mail" #~ msgid "No assigned yet." #~ msgstr "Pas encore assigné." -#~ msgid "Registrations" -#~ msgstr "Inscriptions" - #~ msgid "required but unlimited" #~ msgstr "requis mais non limité" diff --git a/ponyconf/templates/base.html b/ponyconf/templates/base.html index 6c6c0a6..cb5ca09 100644 --- a/ponyconf/templates/base.html +++ b/ponyconf/templates/base.html @@ -38,7 +38,8 @@
    {% if request.user.is_authenticated %} {% if request|staff %} -  {% trans "Staff" %} +  {% trans "Organisazion" %} +  {% trans "Administration" %} {% endif %} {% comment %}  {% trans "Talks" %} diff --git a/ponyconf/urls.py b/ponyconf/urls.py index e590fc7..0402eb7 100644 --- a/ponyconf/urls.py +++ b/ponyconf/urls.py @@ -32,7 +32,7 @@ class EmailLoginView(LoginView): urlpatterns = [ - url(r'^admin/', admin.site.urls), + url(r'^admin/django/', admin.site.urls), url(r'accounts/login/', EmailLoginView.as_view()), url(r'accounts/', include('django.contrib.auth.urls')), url(r'^', include('cfp.urls')),