From 2975836c96acdc0463fb81d16484ed72a457ad97 Mon Sep 17 00:00:00 2001 From: numahell Date: Mon, 8 Aug 2016 00:08:54 +0200 Subject: [PATCH 1/3] Improve topic list --- locale/fr/LC_MESSAGES/django.mo | Bin 5225 -> 5194 bytes locale/fr/LC_MESSAGES/django.po | 65 ++++++++++-------- proposals/templates/proposals/topic_list.html | 43 ++++++------ 3 files changed, 58 insertions(+), 50 deletions(-) diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 1bf79228735b85e9a7a93b8697b0151d88c1cea9..8b9363b95f8b82de8c0389343b5a376d80055abf 100644 GIT binary patch delta 1798 zcmX}tOKeP09LMp$nkm&$lzP-qRgY3dr*x{c9@U{9)l?IYNIWOrIx-8Al51hpM34v( zX@o=~qpVs%f{hBrMr1OM(3v)1Mm{}$kA(t$Qqp%7yu+ClIiX%DS>FyuJY|c-k-oJ=h zW}daW3vC$U#sdssC-So{4(sqOs>AT`ehY9a=W~&t)pF2#4XAduIQOBRJC0-VA}Y6A zm_h$`$FG=m;0SI!MP=HBYVb3v!EWSdeH`@MZ&X7;(pILKsF|3AWM*@)9LrJ9A4es0 z%H2PU!|C5HQBeo2s1c@+pFQEA0lYvp_y#qA56I8DIjF&2)XezXv)J(gC2~aGFXa-hM29uRh+lctDfscbsS(?G|=&=jHV!Cu?TA5 zm8eZugA;HoPQe7yrJc`W{;AtFcOiw!>^`c2XU^BSjq`V?4vSf6X4w{DAy%Op+>d%M ziE5`AHLw;e!t1CRdWGa<-5wQC^kdha`Gfd5c?%}eJkjU*S<@oZGbrSAG>)C;>%Q+WWjM9rvypLORKP|saO z{T;dC&Yz&#d+z*-dOt{G%$#RgR3co6qB1#zn&Jei!4s&d_D~JApfXIMW~39x<2%%I z-;m_&2dbSQY0kwED#0i&!)mP8_kV`UMlQTXHI&DK>A^D809GM;(BHB83W^AQ*CoV! zLW9=8)W%{$8+V{+W>uCD1;lEC750|`Y$g5s)1?!YQlge9Bb23zvYe(0MH#6?2n}*Q zq3mLW2D^b!5(|kMLPdZ5RP-qhlsQ!NMR{vER1^BFmJ^!71;jvMQv6S51=bOjgf^s# z)?d3>Wp+PSj4ZLgSJvSSVkS{ftRdzRDzo}&u%-Q#!Q=G7n%O4m`fjyeD*SKqi#8CO z$KTmnYyAz;XI4ezw|`7O8oX2&+8>CNR4i_P6gn3il4_4-htkG1#FL4pW69lnj>Ii~ KGSQTLma_kUh>9}+ delta 1850 zcmXxlUuczO9KiA4bX!i3Q&;AnGS8gZn%X?`r0J~GrRJ(_I;>Vf9PxyR?F_fn3*}st zg)r#CWEUEEp|J9<4WSUiYy=^QU_lb;APO(Sz>5gH==(iAdpN)M^FHr+-{;TodERq= zY`)uE{;i?3t1oLrc(^Hldlw zAv23D_#F12_n$;3^jZ4;EY6_+xX6hejH4sGf_&m94i4Zp+Tic#0PZ87c)-C1YiZrg z)Z-$Yk3QFmk6}L9gAVv0K7xm^oa5w^^u^c7Z_x%P&XaFkKfNC{~I~^mkXvmPa39UC;C7aI+Hi>Kvl#$xRv@3^zQvL zNs9x>q62P2XSM+uV|1Yt=tDPO0T7x98@QeP6Z@#& zLp$8bg1Zzw*o<$X&wq$M_bJ-W2s*F}xDvlXGxkTB6DC#3t0SIGesv+*P!lf2Rx~r+ zNZ-+mHoQ002hfz4(TtqH#W;eE_!X|lo9J^HZgPO-#hke5mZ1Y#hj!e7cHEt=m(T}} zp{e``U7`_mz~@r^B6{CA`g?LY)qg?Tn@m>G2+x#lvWWr_fZN zK^wY&&TsEXgzd=39X8)|34_%V## z=mUGuffSIvSSdbd=cd%Mj@VALT1mxcEi@ZD3EQ@;AvV!}bQ4*^_1#8T9J$5anj^Ll zO@vF-PAn(Pf+@DFCj7CnyiBYhob5`YlkoMm_&PpM>>_-V%DzT!4A;`)uAC~XIC&~n z*r%0ro63%K?FC$$&V7wtwq-d&IPH&2lD z${*2-Xz_Q!ebZ(o6@TY96TaI|6R#5P1(%I|$LRV>A7uBHvi+r@?Eb>xVs`9S?VB~z z3;p{}\n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,9 @@ msgstr "" #: accounts/forms.py:19 msgid "" "For example, you need to be back on saturday evening, you cannot eat meat." -msgstr "Par exemple, vous devez rentrer le samedi soir, vous ne pouvez pas manger de viande, etc." +msgstr "" +"Par exemple, vous devez rentrer le samedi soir, vous ne pouvez pas manger de " +"viande, etc." #: accounts/models.py:17 proposals/templates/proposals/user_details.html:12 msgid "Biography" @@ -55,11 +57,11 @@ msgstr "Licence vidéo" msgid "Notes" msgstr "Notes" -#: accounts/signals.py:30 +#: accounts/signals.py:31 msgid "Welcome!" msgstr "Bienvenue !" -#: accounts/signals.py:35 +#: accounts/signals.py:36 msgid "Goodbye!" msgstr "Au revoir !" @@ -223,11 +225,12 @@ msgstr "Accueil" msgid "Talks" msgstr "Exposés" -#: ponyconf/templates/base.html:48 proposals/models.py:48 +#: ponyconf/templates/base.html:48 proposals/models.py:58 +#: proposals/templates/proposals/topic_list.html:9 msgid "Topics" msgstr "Thèmes" -#: ponyconf/templates/base.html:50 proposals/models.py:44 +#: ponyconf/templates/base.html:50 proposals/models.py:54 msgid "Speakers" msgstr "Orateurs" @@ -239,23 +242,23 @@ msgstr "S’inscrire" msgid "Powered by" msgstr "Propulsé par" -#: proposals/models.py:22 +#: proposals/models.py:31 msgid "Name" msgstr "Nom" -#: proposals/models.py:25 -msgid "Reviewers" -msgstr "Responsables" - -#: proposals/models.py:45 -msgid "Title" -msgstr "Titre" - -#: proposals/models.py:47 +#: proposals/models.py:33 proposals/models.py:57 msgid "Description" msgstr "Description" -#: proposals/models.py:49 +#: proposals/models.py:35 +msgid "Reviewers" +msgstr "Responsables" + +#: proposals/models.py:55 +msgid "Title" +msgstr "Titre" + +#: proposals/models.py:59 msgid "Format" msgstr "Format" @@ -274,7 +277,8 @@ msgid "Speakers:" msgstr "Orateurs :" #: proposals/templates/proposals/speaker_list.html:15 -#: proposals/templates/proposals/topic_list.html:18 +#: proposals/templates/proposals/topic_list.html:23 +#: proposals/templates/proposals/topic_list.html:25 msgid "talk" msgstr "exposé" @@ -288,7 +292,6 @@ msgid "Description:" msgstr "Description :" #: proposals/templates/proposals/talk_detail.html:31 -#: proposals/templates/proposals/topic_list.html:9 msgid "Topics:" msgstr "Thèmes :" @@ -329,22 +332,18 @@ msgstr "Autres exposés :" msgid "Topic" msgstr "Thème" -#: proposals/templates/proposals/topic_list.html:16 +#: proposals/templates/proposals/topic_list.html:12 +msgid "Add a topic" +msgstr "Ajouter un thème" + +#: proposals/templates/proposals/topic_list.html:21 msgid "reviewer" msgstr "Responsable" -#: proposals/templates/proposals/topic_list.html:17 -msgid "and" -msgstr "et" - -#: proposals/templates/proposals/topic_list.html:24 +#: proposals/templates/proposals/topic_list.html:29 msgid "No topics." msgstr "Aucun thèmes." -#: proposals/templates/proposals/topic_list.html:29 -msgid "Add a topic" -msgstr "Ajouter un thème" - #: proposals/templates/proposals/user_details.html:21 msgid "Edit" msgstr "Éditer" @@ -352,7 +351,7 @@ msgstr "Éditer" #: proposals/views.py:38 #, python-format msgid "Talks related to %s:" -msgstr "Exposés portant sur la thèmatique %s :" +msgstr "Exposés portant sur la thématique %s :" #: proposals/views.py:57 msgid "Talk modified successfully!" @@ -369,3 +368,9 @@ msgstr "A voté !" #: proposals/views.py:131 msgid "Vote successfully updated" msgstr "Vote mis à jour" + +#~ msgid "see details" +#~ msgstr "voir en détail" + +#~ msgid "and" +#~ msgstr "et" diff --git a/proposals/templates/proposals/topic_list.html b/proposals/templates/proposals/topic_list.html index d6dcf61..efea94c 100644 --- a/proposals/templates/proposals/topic_list.html +++ b/proposals/templates/proposals/topic_list.html @@ -1,32 +1,35 @@ {% extends 'base.html' %} -{% load accounts_tags i18n %} +{% load bootstrap3 accounts_tags i18n %} {% block topictab %} class="active"{% endblock %} {% block content %} -

{% trans "Topics:" %}

- - +

{% trans "Topics" %}

{% if request|orga %} -{% trans "Add a topic" %} +

{% trans "Add a topic" %}

{% endif %} +

+ {% for topic in topic_list %} +
+

{{ topic }}

+

{{ topic.description }}

+ {% if request|staff %} + {{ topic.reviewers.count }} {% trans "reviewer" %}{{ topic.reviewers.count|pluralize }} + | + {{ topic.talk_set.count }} {% trans "talk" %}{{ topic.talk_set.count|pluralize }} + | + {% bootstrap_icon "pencil" %} + {% else %} + {% trans "talk" %}{{ topic.talk_set.count|pluralize }} + {% endif %} +
+ {% empty %} +
{% trans "No topics." %}
+ {% endfor %} +
+ {% endblock %} From f978c0e943f0e39c60510069388823ccef064907 Mon Sep 17 00:00:00 2001 From: numahell Date: Mon, 8 Aug 2016 00:14:02 +0200 Subject: [PATCH 2/3] Fix cleafix --- proposals/templates/proposals/topic_list.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/proposals/templates/proposals/topic_list.html b/proposals/templates/proposals/topic_list.html index efea94c..e6ec302 100644 --- a/proposals/templates/proposals/topic_list.html +++ b/proposals/templates/proposals/topic_list.html @@ -26,9 +26,11 @@ {% else %} {% trans "talk" %}{{ topic.talk_set.count|pluralize }} {% endif %} -
+ + {% cycle '' '
' %} + {% cycle '' '' '' %} {% empty %} -
{% trans "No topics." %}
+
{% trans "No topics." %}
{% endfor %} From ec5f6190e51ed3c1eaed953fcbd7ea1f02e31e4e Mon Sep 17 00:00:00 2001 From: numahell Date: Mon, 8 Aug 2016 00:38:52 +0200 Subject: [PATCH 3/3] Add number of talks for non admin (minor) --- proposals/templates/proposals/topic_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/templates/proposals/topic_list.html b/proposals/templates/proposals/topic_list.html index e6ec302..e387cd5 100644 --- a/proposals/templates/proposals/topic_list.html +++ b/proposals/templates/proposals/topic_list.html @@ -24,7 +24,7 @@ | {% bootstrap_icon "pencil" %} {% else %} - {% trans "talk" %}{{ topic.talk_set.count|pluralize }} + {{ topic.talk_set.count }} {% trans "talk" %}{{ topic.talk_set.count|pluralize }} {% endif %} {% cycle '' '
' %}