From 4acc32221af2104ecb8aafd19f6a8d76581e8e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Thu, 16 Nov 2017 11:01:27 +0100 Subject: [PATCH] label on staff program --- cfp/forms.py | 2 +- cfp/migrations/0020_auto_20171116_0940.py | 25 +++++++ cfp/models.py | 3 +- cfp/planning.py | 2 + locale/fr/LC_MESSAGES/django.mo | Bin 23053 -> 23195 bytes locale/fr/LC_MESSAGES/django.po | 80 ++++++++++++---------- 6 files changed, 72 insertions(+), 40 deletions(-) create mode 100644 cfp/migrations/0020_auto_20171116_0940.py diff --git a/cfp/forms.py b/cfp/forms.py index befbf6b..f2e4f1a 100644 --- a/cfp/forms.py +++ b/cfp/forms.py @@ -324,7 +324,7 @@ class RoomForm(OnSiteNamedModelForm): class TagForm(OnSiteNamedModelForm): class Meta: model = Tag - fields = ['name', 'color', 'inverted', 'public'] + fields = ['name', 'color', 'inverted', 'public', 'staff'] class ActivityForm(OnSiteNamedModelForm): diff --git a/cfp/migrations/0020_auto_20171116_0940.py b/cfp/migrations/0020_auto_20171116_0940.py new file mode 100644 index 0000000..b91421a --- /dev/null +++ b/cfp/migrations/0020_auto_20171116_0940.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.1 on 2017-11-16 09:40 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cfp', '0019_tag_public'), + ] + + operations = [ + migrations.AddField( + model_name='tag', + name='staff', + field=models.BooleanField(default=False, verbose_name='Show the tag on the staff program'), + ), + migrations.AlterField( + model_name='tag', + name='public', + field=models.BooleanField(default=False, verbose_name='Show the tag on the public program'), + ), + ] diff --git a/cfp/models.py b/cfp/models.py index b0c5a78..5671003 100644 --- a/cfp/models.py +++ b/cfp/models.py @@ -209,7 +209,8 @@ class Tag(models.Model): slug = AutoSlugField(populate_from='name') color = RGBColorField(default='#ffffff', verbose_name=_("Color")) inverted = models.BooleanField(default=False) - public = models.BooleanField(default=False, verbose_name=_('Show the tag on the program')) + public = models.BooleanField(default=False, verbose_name=_('Show the tag on the public program')) + staff = models.BooleanField(default=False, verbose_name=_('Show the tag on the staff program')) def get_absolute_url(self): return reverse('tag-list') diff --git a/cfp/planning.py b/cfp/planning.py index 4687fbd..8a6bd69 100644 --- a/cfp/planning.py +++ b/cfp/planning.py @@ -142,6 +142,8 @@ class Program: continue options = ' rowspan="%d" bgcolor="%s"' % (event.rowcount, event.talk.category.color) cellcontent = escape(str(event.talk)) + '
' + escape(event.talk.get_speakers_str()) + '' + for tag in event.talk.tags.filter(staff=True): + cellcontent += '
' + tag.label elif (i+1 > len(events) or not events[i+1]) and i+1 < self.cols[room]: colspan += 1 continue diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 907c4257defcd9fe2627be48541a3d8d30a79675..b5333ee7fc398f7848a6423461023d19ec16ed36 100644 GIT binary patch delta 6343 zcmY+{30PKD9>?(mf-lIX-~uA}s>q_Epg{^Q;4X$@Xl8~@+ zY>nSy6Ldv6=fg477>|jj(3BIMoCcGLx-bVra15%WBHKP4gQ!1@VYnFS$gILXxCQ<3 zENa3RF#$uFMKest<~S5vF}^9FpaCkdC3;X#xW=|`L``T1>d9V34R{d!@CbIoqu3R1 zpeB$+I`m-OFdwr}{j5Swd=myTzS%=TPkI2EtT~J>Jd2v?Wz@j8P!n{qPVF%km5FR5 zyCxSkv0~Ky6{rc$v+ave*RMd0w-G%m?4qCn4xpC(EmW#bpq}I+>bfha%-lo`;2Y!I z*94Wp2-Nu)OvN}%#JjK~daxaC!!CF@hWu;u{6vFN6%gxWAPUt{4{HW$z-)Vd80x+v zjKewj4p!oFoYdBs60FB~HuD5G8yS}{x-wEj`gH%n_T*o?_$UorV?IYsymdN&Iy zm074I$+7i()O7{e7>iKnA4FY0%Q_GBWRGDh+<;oTeb@r)P}iSCl3_e&DQH(VN^nvW zikfMJ)oo420kmhJ3+JOcUTR&1+I*W)n{h9ypCjlU5Ow`oTmRlU?=jaY=t&wUI)D{55>XxZ#RqTz>ie)0HQ~2VYk0xx>g=p}5^A7qiAP)9WP-^l}YdYRKACi({&#`MEcsOwgsCb|xl z>CLF?4_ZAxP`HDJB=VyaJ;XmWnJUx_Kf`8t0W~&d+K#@-Z}1P)o54*^j0Q zHSovCs+lvW3enq6}6-vVg#N*-FF!^v8(8(_x}b34g9;efpVIY`cPC#BWyh#b9{`+l(a7;kL*`- z4AtQ+)Ka-_cV5GG7)QMq>ih)MQcp(xwv?;R_+|wKO`sB6;&xO=wW!^E614>N_Pnd7 zb6qTk)1HQU!lBp#??o+9IdY3xi0c0UX5k^LUoZ0CiiSZHWP!B;HPdCN39Ut?ZjW_8 zD)n!mu6qylEB6U%34TPD+gwMIWs=!Ay1xh`aVkEDi!;c-I{Kal&HN^6rp+>)JrIqW zKo?Z|08|ILwq9)OGq5A=kE8nAgKj*C!T3392`-~1@&hV!H!{h;3L(9n_t%Zl)HAJP zF^c*uY>vxNn`$#E#Z{<|Uq^LZXY22xGIQLvpTR8Z7m#gc;`=z8cD#o|0u4*>PTY;! zbf&NKpMO=+v<6K-Yi0?lBie%SR4rZg_Dbx~F z4srfEu0mGXoI=|9`){bT_HNXBo{rj#gE1B-U;xguE=8qwIjZCJ)*beIwLM>J>+hhJ z_!w%BokzV*H!w=?fABD;!+6wEq}uv8)R*c3R0k!f*K95-L(6d@Znf?HIZnq>sDV18 z?#o8)snMuR&OlAvgAt5xo}!>nIs*i3pbz! z-h#aHWhSSgu=b=8CyHQVa0kw8* z^PEkXiF&eus8r@)Q@juLq%%+xoP+vqcu)_t4uf#3ZGQ!|$&cs)t@Sw!zHdt@#;raHz^VpMiPbmf6xC1qT zFHui;3H2o3VLAS6>r+NM?K4r=KVs{PFp&Bas3%*6ZhQJY!4=rL5LzQ$0-H&^Wm z{oSQhMWIp^hg~oQld%B(@JZA_&tOwrkGgLcYK?0!1CL=>48Du~gqf%bZ$#a{9i#RB zze0h}vUwl*TAIMI{5gh0F$>pWcRY={G30J%;8u7W^+a1Qzy#{0s3ll~+B?;#J@yf5 z0>0y%%^8G^8Q=7#;EMxL0}Mu`EDyB=qp>;Oiy=4@)v*V|a04o1yR7?B10F&xWj!jB zH&Oj3-s5~9x}!$}^rN6P8G@>hK&A99RLTpj#h6HaD(d=G=z}`+TK&~qawhu#VhN!`58-xh^mu=rHq!7%ow0{@?pL;(w3-P+3W6 z&xG08EugI9b|Q+1Y5jFX5+wv5DDRI$CF;wkbyp^45oFK&M(Ef?9PyT%6s!0u z!3Wb^RD~mx2=(GK_6#^rb?q0Kjeh~>O? z`g?@-jSg*O9S4cG2!ET2AdDv3)AkAB`4|5*9NM)FM=^!d4Hc`)cCw9n8_K+4=6j+C z(aN4XPdSGOq+X9YjuO4SCFgVfFy*VnZYL@B3_MPJPVBQy6EU9HZ|mD}7r~qAJ+v8h zJVp#5S`#f8_+9Kr3?d#R^tOCQ6c9QN5Wjd!X22#yXUe0A?*MkjNgg$C5;3vqWNf6^Y1DYly88HK>kSYC=`1meH3|sjVFiEvd1W zQemt`8B43QgA}7Wt@4d(K%rkSJ=kIgQx%ZxP?*E*7^S1A9^P0QW z%Y7lN>H@B-AinVY7`r#&|E3*r0 z;wKn@7w!3*7{XBI4u$HR@Q(E~m~hmEi5QIOsE)F1dj|}p-V;M{0Md~u!ZtVweQ+mg z!h10luVW1iVKxz%fYFR^Tog1wcZ|Y9)Dw=j?c-4sa-*JX7HYr}tcokJ0j|Nucmg#6 zFVdk0tA>3r2GvgyYT^^npYcsG1wH9JWRhknR>PgBneImo{3U9F7cmikL}enDbt8!; z88xvS)cxI26D+Xp{ZZFHiyCh{x>cA)K?BS~Eqf^{Rb{9r*^9dFASyE_Q3ISs-FF$4 z!CUtHJ#0e#0j6Q&I!q1=u`W)=M!2*N`Pb$-LW5Fu36+6L)Ifo8j$x<)V^QbpqVCJW zBN*$tVixLrJJj`g)&kU%J%!Qu0&3}IVwtpj~+mm743Q znclMAxB8?S)1LM))Kc_Cbv(#ggxY))QJZlls-G3;84z{-PFp|ZoOhe!6!at)tl!uR zDo_*q1=W#Hnv;PrRO(_-sZ2wiZ;eWQCwsmRDx*V?)iL8x8C-tcJ}{17)Gsz7r~QQ&9uVKn*a*wl6|I>Pt|WS!3OYp7;L@1wGLf z)QxvgYo)J>I*!6;uoh}!Q;=8Rl%m#fJ8G>@qXww3=lvTxuX8dsqP->R`k~kyi_xvZ zZVLL)RHA0;%hh_4Pz=CGR0a~z7aLn$s3pk8DwvO&aBtN0g{b?7TF0RJorId`)JEiA zGb*Ja4|n4z^hC&Oe~^D%>Z5jMresD8>(5BM`` zBHkISzn;jCs|zp`RUeAFpvcz8qSpRpR0mU0Pd*Fz+?&Oy418$YKSJGq6oc_3>b3kD z{qY_uGY{PqwD|%u9n(=M?1@_I0_$_A3Cu(-)jVv0t5Nr#$F`{NuCB{PO|&yA)xA*H zkF+kwZq(hUDJVtB{6o?7L(Om&*1-AL8dqZoevPSEfqVo_OfzRGvXOmf`k@A%hOCa6 zgUY}zRE7@Q^GDE|@y#g;8t^n$$IJGDI~Yp+0dk=UVyEiKLNO4dQEOTcmFn)c-UqdW zlQA5pqwZUXn%FW_hS#FM-v14@VTW}ODy0W({Tg=lGUleF-9;YRr)CPO!!p!TZAZO^ zUtkh`YtIKi=B#xT>TgP2ThB$$`=3W4iW3E>j*3vbc?N0;R@w90tw%A8_N%BT{0a5F z2yE#rQC+0TWTG-V0&{V!bqhvQzl&}af?7EZNvK_!jhav=RO$vhYLNdrMS@gD?R{Vi3+oEzv^MM3$p6x7NBli}kNbLpcq#@TS!_+gXZ4jG#RmwW)fc z-hzIpj)$W<9%Jh-p)xbow$H&_>hqE9V@{zqZ9p66Eo$zj(3^$0?BC9rxO-oF=gAMF zp7bhe_x_A}(zwT+Pi{Ku1M?&j;ZcOOV&e`BmHxSv^yX zYCnK1z1x&i(0hIjwHfbW90qrGp0ttGg-UG>s)H`pzV`eOd%nolC!p4P3Tls)px&mn z7>gfafZqR86jEupNRVC%1{mt#y+-vE2`tesDaL+?yErUsVZHa zOva-o-Wb(i76voE>0vJzh`O;zC(v!%=b|#S7&U?Q=!5%F10F(kcpf!CB?jPcs6FJL z=iHZsb*Q&Oy)A|4)@B<*L7QkIreO)PKg@2_CVPmQP)avvz~)$udRNrIy^&Yl3`0$9 z8T#UC)WpkB*Y81pJctQc-i`dnQ>dUpGp^p<>97`RzzozAv_W;y4@cl&tcRbWCj33} z2hc?2J3qTSq3#=wN%$%%Q){pZ?!gTFA)ox~QyJgGd4fXJn$1H$EJHofc2w$jqdri_ zQBQaoHL)A0O;w3{kiec!ilb2NiKxw;jauR-Q2h^g+Y@6jfri&{D6Yk67~0GE9+Y5X z>g!NTbp|!@+o&~d(A#-yI%93>!)<*!^35?Tu_azY-51-(nSi?&1wCPZ)RPRxu{grk z&sndaW_-)m@1oZ70qV(opKu-^4y#aai<)SARHg=C2oACBW06d`&1?#RoOl}>;R;O0 za;%EKq6YFVa8e(HN^u?38mD1vY>&#&EBG{)p(Y&K*SS9iwX}(-jO1XB-v3Dy$hO&q zxfodJ{37ax8rY51aV9p$Qd=*_RO**dOW@bf86X9lP;ZBtz&Omr$*4?hKyTcJp1=P) zC@5tIP)qPBM&L0F#w)0qS7ImzKj~zwjgXiB5Z23I4 zAPR~4wyl*_=xxa(-qrK(RtrZUF@Tt?3deK@&nxq$EkBLV5L1X9#1}+ULPrmxt*2zn zAMttOIPsQktAe9#d9XD_>)(rbn<%r5Vi+-%;AfoY@F5FxC=DUb5*>&VB9it_c#@b+ z{Dt_9=uTu2tB8LRRk+TZ=t=oS;?be;&8N0jif<4BT=?kFcR|NUBEq(x^R)2af@&ki z5%EMSp-<}(qBG%duaCns)MGG|xJ$W`n5p%@L190k<7Z+S@n_=Ekw)PbF@iWi>?9Tv z!E~e}oCvYyILi9t8^j8jWA!JA{sXo`3m~h!2SI z#4Ci0s7vU0jW|JkOmrn`(Z@=>Km>>>W43dc1EvRJXPnXQXT5C z#4on(J3K|qwe=sd_LlURbzz$uP7A2oJfUf`l44g