From 1d8d03b2f5dea5fa50690a3f7c7ec112dd2ab943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Sat, 17 Sep 2016 16:43:11 +0200 Subject: [PATCH] new page 'participate' --- locale/fr/LC_MESSAGES/django.mo | Bin 8591 -> 8827 bytes locale/fr/LC_MESSAGES/django.po | 77 ++++++++++++------ ponyconf/templates/base.html | 3 +- proposals/templates/proposals/_talk_list.html | 10 +-- .../templates/proposals/participate.html | 24 ++++++ proposals/urls.py | 1 + proposals/views.py | 21 +++-- 7 files changed, 97 insertions(+), 39 deletions(-) create mode 100644 proposals/templates/proposals/participate.html diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index ba6fbbac57d37296927f819a2ac8d09378187262..14160dca1c6f6cc6d7373f612f563b472b77b0e7 100644 GIT binary patch delta 3170 zcmX}uS!`5Q9LMofS_&<+3{VgXg(*;47THPxM?sddRVW22Wi3q0EiElG!<}hMu{x~9 z2h_?0gMo-^0s&2A3I>#;Ao$e-!pl8py&Bz}N}co9|Z zcTC5>uos%1iF%^OLqz$+PU}$|$o*%S zgBMZt-$Ir98GD+jF%QTvXp=&#swf@HFx%d*LUquOL$Dq-qJ5}xov0Z(h*V{cVsAWY z@6VyiT|#yIE>6LxxP$gh3Eduwr%_9A4OPLP*cH1n4YCKSq2AU(s1X&QMmWJfpNs0) z5~K}NX{|wxJcRt2b}mt6_H)r1AHe~53f0gh)QGO4Mtld=;IF6-Jw(mS-{`?qE@Vv( z4#E+r=QFveo~71mR7V;;%)bh>@_@mbeW;4x!D)B|)!NMj~ z&r4BLxCFH~s!$!SMgB|+7cJeJsNYZ8`>*W%HO$cYze7eHxMzKWv~4mu3OWt>T(pUN zsESHaOH_gCK()0FS8*Re&Co?uxhq(NH&Er%SU;8XphxF_02x&{3iTbBiW+GZj=?76 z&m7`1A5Y&4`x|P?i`c1*!OTFNh83t8tF;DD9cja;zD#?`Xa+t;ZHhRm zf-jLe&9|sydKdXKkGYJ-{(P-8Q?pRdSE3q>pz7O+8d#_GJ=7jLiJE~^gPH#VGG}>E zh_`VRc4y&K;UrYU<*16QQ6p(Yb*u$-dfrA=9LK462G#H%)_+iYD2vf@5KIoLT+tBb zUlo_}KvPnMT7p{C^WCVPcA_@dAykJ?pw{>bszX26`=3zn-$%w`9-`{&%S9G*QMu)) zJ+U@QWjSeoxW2lNAqP`PZ!;%$xP=T{ z5YG`|Vkyx^DESC2M+NO0FTt#uorID$&Q@X@F^=d$tRn z!x21;ljw;CWnc^V_YgjCqyNkyL6X))1}4WTJq0iO|N< zCRXCaB{twptS5>IrHzF4nbLCg_eC<}6Sw?l65EMAgf`W1Vir+CDCunPAZiFDZ6s|@ zrS3!;F-13|K$8EjMdZ5LyIR~uOh^pFKAeW@h|$CtVg#Y2U9B{VSeVEqFO|UYPNdz| z*Q`2<=A&DgX&H;#yb*s>W7rqJnLRWm!;Li5HiY~UC-$h<8^bHyU?>=NHYQ*3)&*T} zFjDWhVQ)C(_#4Ui;(I*hso8;z#^2(&{!Nb0)U?IE?>n-8L%<~7HLlar;IulfQ9H4L zId$EpdM8fy6_><2a@x|f7dv6EvyEoX9}jzd@u#_GQZg(2$$mI)?DXJx{@nk54kh}d z7em2j*V`QMMj9NKQuTQkQaw(@YzekGfq>)nnULR&mE@1<5em8ye<0!wH@mU*`Gc}r Nf)U3sz9tHqe*uedKSuxn delta 2971 zcmXxkX>3$g7{>9p7Fx@`vbx)}{_ zV1p5j5|J3e7-Z%HHikxn31ET=M86mpL=z+70|W)D3HX0zPEY2&zjN=MdzSZ{d;eSf z#-ixYqXrx>N;@&0m^8rbQ!Kfg1Le{nvn>1-b?Fvn=*D2P(J%=4SuTfRI29-3JS@Z- z)N?Om8t%v8_%_l`)IN4MVo2N8gG2Fa)E_V6D7@_M|BdR{h9o=A#B@&cQ3EJ)mf={= zD=-slQ0;F+ny@w;LjU$E6((&5Q4PJ1OYtLjejPRPKFmdpPBY3wJy(Rv$TZ|HR)!;S zu{*CuJ+}ch@DB9hTi8bbcAiQeu4MRHf&i+4S8yP{=ll@W(NSj{HKS9g8JU^%LTb*PzaK+Uun)ln;IKwYSe?8OndANko~4&yN9 zu78Va=NIQyx7>i|$ApdG`46V$?TvSJEQ6sKHElB|NKm;|Q7f}trj!NmfsDU3x zWuOQ3|6ZJc=TXmHL;bH0)o$uY@~@c;Cf_+Y3N?cn&gG~9ZbqdzfcIl3mSPNb|94b7 zSKRq^cYX`i(QUjB)7Z)MZAGXhnir*_kyg43)yRKsBWm|XocmB69Yf9JGpxWKoQ+C@ zHtihrV;gE|zd-%}0;=5~kVot)s=eqP_lJQ@PpKP*n#pK)o{efC54WT+a#X|J9CZCC zYRO`FFP=hm^gU`~e_%P@be7$d{QnN5pQv?Gp-tQCZX80T>==Th0(RBasUHS}RryS;+LRIEd#=rz>!BOKJx zm#9>pN6qL*=M~f@`Uf@h+gN~Ue8mc}1gGF?BduKlKvx+E3WuP9F z;&#;L*@sHi2dE`EfqL+)yMGbY@NcM@U%~l!6CcA_`DP2T3s>M7R6ALuIk9;2cL zR3gM4VjA%%QBCk-B+5#sX1IjdMm$V-#4h4V;z2^0(=u!(+6gV8vQ$j$BxVpH!cQbi z)NHz|PR1Rs-jCLL3!zl$mFzEzU4?Cv*qF+g%0om0F@<=RC?`}NA)Y7d2p>^M>?ZX6 zNt8KGy{Fm-D*1_Ha;Lj$0(}eS5*vvMLK|^CF^|yut}=_*PH1zh=##9{n8ccJHW3ZG z3y{_c*<$=Sj1W-nwRFVf&`rxLDh zYP4_={N25o_36I+QlGzcM!YzyH7y<=_jyWpBqtVMntM7mV{5S03k1A;e|OG=;_0>9 o!XeM9yq4x*pry91$un<9bFk&~(PV4+ev1Udp4EoErUv@?A1n_QQUCw| diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 1f67d81..7758859 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-16 16:10+0000\n" +"POT-Creation-Date: 2016-09-17 14:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -184,7 +184,7 @@ msgid "Delete These" msgstr "" #: accounts/templates/registration/login.html:11 -#: ponyconf/templates/base.html:79 +#: ponyconf/templates/base.html:80 msgid "Login" msgstr "Se connecter" @@ -261,42 +261,47 @@ msgstr "Français" msgid "Home" msgstr "Accueil" -#: ponyconf/templates/base.html:47 proposals/templates/proposals/talks.html:9 -#: proposals/templates/proposals/user_details.html:22 -msgid "Talks" -msgstr "Exposés" +#: ponyconf/templates/base.html:47 +#: proposals/templates/proposals/participate.html:9 +msgid "Participate" +msgstr "Participer" #: ponyconf/templates/base.html:48 proposals/models.py:70 #: proposals/templates/proposals/topic_list.html:9 msgid "Topics" msgstr "Thèmes" -#: ponyconf/templates/base.html:50 proposals/models.py:65 +#: ponyconf/templates/base.html:50 proposals/templates/proposals/talks.html:9 +#: proposals/templates/proposals/user_details.html:22 +msgid "Talks" +msgstr "Exposés" + +#: ponyconf/templates/base.html:51 proposals/models.py:65 #: proposals/templates/proposals/speaker_list.html:9 msgid "Speakers" msgstr "Orateurs" -#: ponyconf/templates/base.html:59 +#: ponyconf/templates/base.html:60 msgid "Administration" msgstr "Administration" -#: ponyconf/templates/base.html:66 +#: ponyconf/templates/base.html:67 msgid "Conference" msgstr "Conférence" -#: ponyconf/templates/base.html:68 +#: ponyconf/templates/base.html:69 msgid "Participants" msgstr "Participants" -#: ponyconf/templates/base.html:69 +#: ponyconf/templates/base.html:70 msgid "Correspondence" msgstr "Correspondance" -#: ponyconf/templates/base.html:78 +#: ponyconf/templates/base.html:79 msgid "Register" msgstr "S’inscrire" -#: ponyconf/templates/base.html:104 +#: ponyconf/templates/base.html:105 msgid "Powered by" msgstr "Propulsé par" @@ -352,9 +357,18 @@ msgstr "" msgid "other" msgstr "autre" -#: proposals/templates/proposals/_talk_list.html:4 -msgid "total:" -msgstr "total :" +#: proposals/templates/proposals/_talk_list.html:8 +msgid "by" +msgstr "par" + +#: proposals/templates/proposals/_talk_list.html:11 +#: proposals/templates/proposals/_talk_list.html:17 +msgid "and" +msgstr "et" + +#: proposals/templates/proposals/_talk_list.html:14 +msgid "in" +msgstr "portant sur" #: proposals/templates/proposals/_talk_list.html:23 msgid "No talks" @@ -368,6 +382,20 @@ msgstr "Paramètres de la conférence" msgid "Home page" msgstr "Page d’accueil" +#: proposals/templates/proposals/participate.html:12 +msgid "My talks:" +msgstr "Mes exposés :" + +#: proposals/templates/proposals/participate.html:17 +msgid "Proposed talks for others speakers:" +msgstr "Exposés proposés pour un tier :" + +#: proposals/templates/proposals/participate.html:22 +#: proposals/templates/proposals/talk_edit.html:9 +#: proposals/templates/proposals/talks.html:11 +msgid "Propose a talk" +msgstr "Proposer un exposé" + #: proposals/templates/proposals/speaker_list.html:15 #: proposals/templates/proposals/topic_list.html:23 msgid "talk" @@ -493,11 +521,6 @@ msgstr "Messages :" msgid "These messages are for organization team only." msgstr "Ces messages sont à destination de la team d’organisation seulement." -#: proposals/templates/proposals/talk_edit.html:9 -#: proposals/templates/proposals/talks.html:11 -msgid "Propose a talk" -msgstr "Proposer un exposé" - #: proposals/templates/proposals/talks.html:14 msgid "My participing talks" msgstr "Exposés auxquels je participe" @@ -566,27 +589,27 @@ msgstr "Accepte d’être enregistré en vidéo :" msgid "Video licence:" msgstr "Licence vidéo :" -#: proposals/views.py:65 +#: proposals/views.py:73 #, python-format msgid "Talks related to %s:" msgstr "Exposés portant sur la thématique %s :" -#: proposals/views.py:84 +#: proposals/views.py:92 msgid "Talk modified successfully!" msgstr "Exposé modifié avec succès !" -#: proposals/views.py:90 +#: proposals/views.py:98 msgid "Talk proposed successfully!" msgstr "Exposé proposé avec succès !" -#: proposals/views.py:158 +#: proposals/views.py:166 msgid "Vote successfully created" msgstr "A voté !" -#: proposals/views.py:158 +#: proposals/views.py:166 msgid "Vote successfully updated" msgstr "Vote mis à jour" -#: proposals/views.py:184 +#: proposals/views.py:192 msgid "Decision taken in account" msgstr "Décision enregistrée" diff --git a/ponyconf/templates/base.html b/ponyconf/templates/base.html index a531880..49025eb 100644 --- a/ponyconf/templates/base.html +++ b/ponyconf/templates/base.html @@ -43,9 +43,10 @@
    {% trans "Home" %} {% if request.user.is_authenticated %} - {% trans "Talks" %} + {% trans "Participate" %} {% trans "Topics" %} {% if request|staff %} + {% trans "Talks" %} {% trans "Speakers" %} {% endif %} {% endif %} diff --git a/proposals/templates/proposals/_talk_list.html b/proposals/templates/proposals/_talk_list.html index 9831ea4..8520ca7 100644 --- a/proposals/templates/proposals/_talk_list.html +++ b/proposals/templates/proposals/_talk_list.html @@ -1,20 +1,20 @@ {% load i18n %} {% regroup talk_list by event as event_list %} {% for event in event_list %} -

    {{ event.list.0.event }} ({% trans "total:" %} {{ event.list|length }})

    +

    {{ event.list.0.event }}

      {% for talk in event.list %}
    • {{ talk.get_link }} - by + {% trans "by" %} {% for speaker in talk.speakers.all %} {{ speaker }} - {% if forloop.revcounter == 2 %} and {% elif not forloop.last %}, {% endif %} + {% if forloop.revcounter == 2 %} {% trans "and" %} {% elif not forloop.last %}, {% endif %} {% endfor %} {% if talk.topics.exists %} - in + {% trans "in" %} {% for topic in talk.topics.all %} {{ topic }} - {% if forloop.revcounter == 2 %} and {% elif not forloop.last %}, {% endif %} + {% if forloop.revcounter == 2 %} {% trans "and" %} {% elif not forloop.last %}, {% endif %} {% endfor %} {% endif %}
      • diff --git a/proposals/templates/proposals/participate.html b/proposals/templates/proposals/participate.html new file mode 100644 index 0000000..d715b15 --- /dev/null +++ b/proposals/templates/proposals/participate.html @@ -0,0 +1,24 @@ +{% extends 'base.html' %} + +{% load i18n %} + +{% block participatetab %} class="active"{% endblock %} + +{% block content %} + +

      {% trans "Participate" %}

      + +{% if my_talks %} +

      {% trans "My talks:" %}

      +{% include "proposals/_talk_list.html" with talk_list=my_talks %} +{% endif %} + +{% if proposed_talks %} +

      {% trans "Proposed talks for others speakers:" %}

      +{% include "proposals/_talk_list.html" with talk_list=proposed_talks %} +{% endif %} + +
      +{% trans "Propose a talk" %} + +{% endblock %} diff --git a/proposals/urls.py b/proposals/urls.py index 36c9890..85c2bfa 100644 --- a/proposals/urls.py +++ b/proposals/urls.py @@ -6,6 +6,7 @@ urlpatterns = [ url(r'^markdown/$', views.markdown_preview, name='markdown'), url(r'^$', views.home, name='home'), url(r'^conference/$', views.conference, name='conference'), + url(r'^participate/$', views.participate, name='participate'), url(r'^talk/$', views.talk_list, name='list-talks'), url(r'^talk/add/$', views.talk_edit, name='add-talk'), url(r'^talk/edit/(?P[-\w]+)$', views.talk_edit, name='edit-talk'), diff --git a/proposals/views.py b/proposals/views.py index 26e1565..29be02e 100644 --- a/proposals/views.py +++ b/proposals/views.py @@ -14,7 +14,7 @@ from django.http import HttpResponse from accounts.models import Participation from accounts.mixins import OrgaRequiredMixin, StaffRequiredMixin -from accounts.decorators import orga_required +from accounts.decorators import orga_required, staff_required from conversations.models import ConversationWithParticipant, ConversationAboutTalk, Message @@ -48,13 +48,22 @@ def conference(request): 'form': form, }) - @login_required +def participate(request): + talks = Talk.objects.filter(site=get_current_site(request))#.filter(Q(speakers=request.user) | Q(proposer=request.user)).distinct() + my_talks = talks.filter(speakers=request.user) + proposed_talks = talks.exclude(speakers=request.user).filter(proposer=request.user) + return render(request, 'proposals/participate.html', { + 'my_talks': my_talks, + 'proposed_talks': proposed_talks, + }) + +@staff_required def talk_list(request): - talks = Talk.objects.filter(site=get_current_site(request)) - return render(request, 'proposals/talks.html', { - 'my_talks': talks.filter(Q(speakers=request.user) | Q(proposer=request.user)).distinct(), - 'other_talks': allowed_talks(talks.exclude(Q(speakers=request.user) | Q(proposer=request.user)), request) + talks = allowed_talks(Talk.objects.filter(site=get_current_site(request)), request) + return render(request, 'proposals/talk_list.html', { + 'title': _('Talks') + ' (%d)' % len(talks), + 'talk_list': talks, })