From 3fab79dfe24775a501c56476a495b59eb4623fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyrill=20K=C3=BCttel?= Date: Tue, 10 Sep 2024 10:40:33 +0200 Subject: [PATCH] Adds missing delete view (Agenda Items). --- .../locale/de/LC_MESSAGES/privatim.mo | Bin 15186 -> 15368 bytes .../locale/de/LC_MESSAGES/privatim.po | 13 ++++++++++--- .../locale/fr/LC_MESSAGES/privatim.mo | Bin 15688 -> 15879 bytes .../locale/fr/LC_MESSAGES/privatim.po | 13 ++++++++++--- src/privatim/locale/privatim.pot | 8 ++++++-- src/privatim/static/css/custom.css | 2 +- src/privatim/static/js/custom/custom.js | 5 +++-- src/privatim/views/agenda_items.py | 12 +++++++----- src/privatim/views/meetings.py | 16 +++++++++++----- src/privatim/views/templates/meeting.pt | 17 ++++++++++++----- 10 files changed, 60 insertions(+), 26 deletions(-) diff --git a/src/privatim/locale/de/LC_MESSAGES/privatim.mo b/src/privatim/locale/de/LC_MESSAGES/privatim.mo index c87a3230db3e53e48af98116ab40be1ea023cb30..0cce7a5d466aaa162105c164b9c80c836a8fdc50 100644 GIT binary patch delta 5194 zcmYk<30zfG0>|;Au_!8#D2k@OR0t77)I^1Jut+7bOw?*}0p1f(KxGkStT$#UspL+{ zn7fTmPNwL%=ayiLQ@CX5#Ehl3*r(5!O-)l{^ZUPhn2-14|9#K7@7}ZBb02kfR>f>@ zLu4O>#*gWK>ps^h6`jS0t@$UjrThdNq^YG=Ex z??(QaBYZF~bI#T;U?}~Y8x*?m#V@`StOBiSgmLJH15q6g#%Y*}n%OSYj1JiPJLpfn z9(Dai)W93;_cyQ=^;_5uoAA+${!Ijh=GYaPoQXxhts(}jB0IHBBH0w|+ zwi7kre}}?XnoPa@DAbyk_f%P!p;{t=M^6zuKPl*9|xAiT`38^`Ho6Km$+>4@J#vG-}4< zP&3X!H9QA3fd#06Ewkr0+w*UtCUg*W-!as6XCqjD9*4Qc32mNVP%{kd;4E1%_NN|& zkvIYM{e0B*i%=`H+MZu$-HMvn4%B`7aWXcbHsO$t&i5%^3K~E<`j!;6bY&QgOOStN zFCTg|^{6HM#Gd~OwKD#^yXr6qwG!c07iz#UsQVL8_YXupdhZDP#dzx^)RO0*mTDGi zh86bv<<>RG3u87SV=((r4W2^{=n86uuA?5&P1L|{qc&r+PQHnHjf+AeC+`f>(X#dH%O3sH401 z5s;y%8#|$95^2xJpgK&n4n{SUikex5bt0;rT+|AdqS{-Cn%Gj*^{-%nm%=6rTB_|j zfqSfnP%Cl***E3}^3Mdgcx5pP=i(z6gQqbbZ`pdcd!3aSg}QzkM&UBN5BH%rmcrjD zsDYMUooAVdoHAojOIeC)U6n3fG@Fn&+#Iy^ zbKQ9VwKO+4p@wdu-qU|uZ(IH7{VvW2p_Vil)u0Qt=?2*EA4V;G8frk}Q9n=W@7!4fQBy;r1r{ z5~5zu$5{6Sd>VV>OI`{Z=~0}DwHSm6Jb0Z?Ms1o0Q8OEf`n`A(_4>^~t;7P<0M?=2 zhTXPahkAQ1quTuzH{egGP3W!e;WW4f)!-r2Nb9i~eu|pmb=0%_9+{A7#fH&l3_+cb zN49|(j(Sa}q1u^?eprFcu@WosWelW$6Uln%hB(v>gE0uxP#up&y}#M028vND@C>TM zRjBLtAq|=ns7?AV>XBYU{Xl(>{4=3ESM`^Sf%I?E?TN9dXF3Hn^Vz5+orjv~YU^J6 z{RPwj8&Dm6gBsw^R{uEX5r&}7hoc7SLbcx$!|31iqo8Lv95u4ZsDaG1_4%j{R$(jL zjC#hqthLyZ`ekf|U!peO52%i#dO7#^Mh##H>QSemmp^!BG6ijta@33~ZGEG4k3C<9 z+LV`39eswu_)pXd{fc^2UFf|9#-k>ZgcC3wxx~DVYUfhCegCg;LQC=$YO{Q2FZdDF z&}~e_px%x{QJb(FHGsLOi7ZB~kND$Y6X{}-kP=88f$PVdTS|Y zhU5Ar!s5Ld|?PYV#aG{$QH7ZT)jp2j5~C{s%SC;QO7;+zB;-UZ|BFfNC!l z*+X74l7en{3PUju)ls>vzkqG2SD^;F!@3vM@LQ+`PowVpz}7FJuD^o4@N3lXMMQt+ zuU|5D*8A_KFq1FlV+{Tad4-LO9oG}nQJZHDM&TOdSK1u2-+yWAZ3Z~^C8LY)^HA3> zLfya1p0Brlhtc$J!Uj6eIvF*S6x2+H+-&P1I)n3DrTTB8dSBE)lTaN`wCA%>_f1V={q^jpb3y}n7FA!4dITGgKFk@^`@V`iM$*W;M1$1v zJMt=FVN3(jDl{JKZ^KHP4Dt*qAdN?Yp1*dpj^!kiTq4@ZkCInNDbb+;>KIOTku&5R z(eW`^OFF4?$1%f}AHU<=B+A2x9{p*3JVKr&Q^*K%oYay(k@v|bdjb8^1trH6MC^^_+C1k}kfIF~7k#$zRDHqN5$zMplxs zM8^=KcU#9le4oz83s7@My^QimvYq^a%ySljzui=}k`1H>SwrH9j@}MtHr`A0M(Eg0 zo*TlcXikoiPstH7oh&0?khbI{Qb^7c z9hD@PyiQJ%zY!fp5iKTKc&87G@seFTxAvI#E(2j77-75ns_Jk5k+)NAn%ZSRN=Uf{GKF{Q=~ol zGtm)F){#iEgRCGMN#pUkEd*f}xk8qbaikl$Mglbd!4w*gy%dT`FnNu%A#tQT*+O~} zf1=}Ua)DHkKysd>lR+ef=y=P)_xa!*iOZm-$aIWo9qMp5RplFUMPX@M($<*C^0nt^dSO%sQm+)`ZPp~1Y8ocuhGZYlF{ zXQ8WD7iSi^3%H^h@#x&q5_(VK!_5EisE&KX`0>emTpSvyiG*PMTpHj%Mh(#&MVo} zXlmjzwXl}+QcfdlnHrf+n_9?x+*7)_W_!9k?)~|nFVC~{@cF-fzw6 zU>GK1TTDf@mxIyHdG1a-F&5Q80mk5LJ70zo)XT9JSD_v}sJ(L?Fc0~2lljntic#$> zviefw&sFikxZD=2Z^LMw@AgyZ$`>C6PB`}!s)s*f2)5xVdSDdJ!}h3=J&hXCvsT}L zEvdhZx_&#VYu8PGjn1;Pk4NOLLU^X&^ zt{63A9;(ButiB$*P_IS)-1~g!zKf{#ub`&}zoDQG1Sj|xM4(2}4mFh>QQxPaMwW>z zx646olhLRdn}iy`46B#f_vNSuu0hRMjn(%gF#o#opq=;tGpT=udSFPR|9~je$U37& zoQxWAUsS^*QP+<{&Dc~s|EQf`j2ch{>b^?Ub(<5Je`edg&IxUvW2g}}Ad}+GVSl`V zw_}fv{`U`}u73zML(}bip}7Dxuri#6<*3cqWaqD-p8Ic)f_f6x$)CE;m`=S9^5>@T zp*35GnmW(UuSCtrtEdONaHEi0T>+}WMW_xfN6kznYH6xb9oveU(OsxLQjfWM|IbsaqRD1^)<7MoL)03R*g_WrK0n`j!L0uox&Hvr#f!(R+;~iLrx_%pK zKe>|>_;X+Jp$4Lo{RT2n9mz-CI1e>LFQ7)U2{n?fI23o|{rEL%Nd~7l$D8cNqv}Pd znJGuLQ<=j2>%CmX30ZA!!WPuGpr&*?s)2o|&2|b~;6>EbH=;W9Pt*_7x2Ok&GYy#- zhiX3$b^j>TQcg_u{K8C5XoQbr3#>skuoZ)GC#oa6Q4JhMJ?I2xU?XZN+VUf@Bgna7 zsMqpp8tab#!EEf#I;f+Qu@E2eC};{lv@cGhHqGa#ku{-yC~lx$yEbeP%|usJ2Xaww z!M#?WhI(sCQ0*?q8eEOqgnfJX?F~h>=S`rXo)%(jEJcmbL#)VpCDOv5V7#!x(jy1pKHuIJ8B2;)Q}>cQ7g@9ht$1|pbW%|Hj# z12a+A=c5{&g4(1rP;0sbwW+I+KevMqJ@7Q@`oCNK8pi1TzePbKk6{C7N;{%Pnq@wK z`o0*|!G)*?Ekkv1t+^SswzXE@jq2z=)cr?MOLrXAp(c#s`R=BjXr1XdoQS$09reJ0 zs5KsCPQ?i73osIwVBmKE)u98Z4%VYOa2mDNmymzQ+)dOTiOypFHR2QsI+1IRL7gu^ zjc5TzVi`tZ1!{)Yp_b}R49E9SZ^&5(Qv#hWSs!$EB z#aygGZN9S@h38NsxQd#}7TNwL?Sy*Ga!?(cje0-@>bjMfhTBok`xrHY4cW}U8otB{ z-EbY%)BmD+dJ8oZp|q|CcS3#N5B2>JY>Okz38*EQiJJOit1m*mP0t{|O>QG<#^3cQ zs7DQ`8_%LT^rhARg{joPM}D1MQXl8W;BcITRj7_Pp=RzH>TUTBV=<;LqsLU#b$d~7 z%R$sz;+?g^H>iWi62Pb1R&Ovp&3^k=oQSGcm?V0tc>$jq= zuS3nuQNQlF6BGiw6V=0;<}Fmit^4^6#-eUaw0bJ)`V7p%9Mtc_4D5~-r~&N41$Z2L z;;{byPkkX~=>4yzpiOfG)36cMKo~nP1N)%r4i+NTe5V2a_d_t9 z^986Su0YMq^QeKW#=CjG+eBe3UPk@%+kc=xlJS^8y%e?CR-!grHR@lp?Wl%dLpAsY z>L0Iz7=wpVYutd^3)k)Y;6eUUv_elkil?9lcR@X9Flv|Hg?hjoJ70vF@)D~*g_`nZ zs0Y{D`JJfy_M+B)AF2b#tbQIflm8gR{8M)EgZ=mX8OmC#|35BTvze_F z?k02W#FIFI?6>-RW|gU>?WXnDah#kb`Q*3cE|N(!t)G*hkq%@O(eaUwdkw!N?X500 zS@{gUYUM9bkJ?Lil4;~|@*8_TMgRCEXxG0(W|BXUr-_a-qGf76&NUbC1M)koYe`=s zyR2S>zaW1iY_Y(9(Z=CO;`QM}Yd4JO_&u3Rw0_fxj^~IroYwvc@+Q$n)S>;-E>QA6 zo`T`zSv$84rxJc%0>7Y3a1}X0I6U{hUkLnoBvDQyKecnqP&@cDvW~1E)ubosP2M7t ziH`21GEj2vPJD>+QHz@}J^M^&-oL41S!nT#d89D)Bl)}oH{WCM9Y z6^gBJV6y;cS$PMh zTX`vdN)}ta9#4`;Qb+a?9YZz#pHs*oKOrxZfusj%B2&n2@*znj?~=ce=HrhPJ|PFl zXtI{XlKJF5qT^%ot3b)Q2k=F5m~0`3G;hfieoY=FI^xMG@;r$q;iQo~ObSUUX+FAG zp`Y0mOX>>ZqFSz5l8_%df7Yy$xy5tp>Jx4R)m`Y=J)|zSYjV_@(V0_1$ImT!@(I4$ TkhvhZZg}?FA$3vxzH9YA7H;FF diff --git a/src/privatim/locale/de/LC_MESSAGES/privatim.po b/src/privatim/locale/de/LC_MESSAGES/privatim.po index 277cf03..05c343b 100644 --- a/src/privatim/locale/de/LC_MESSAGES/privatim.po +++ b/src/privatim/locale/de/LC_MESSAGES/privatim.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2024-08-31 19:01+0200\n" +"POT-Creation-Date: 2024-09-10 10:36+0200\n" "PO-Revision-Date: 2024-05-21 21:20+0200\n" "Last-Translator: cyrill \n" "Language-Team: German \n" @@ -184,8 +184,8 @@ msgid "Edit Agenda Item" msgstr "Traktandum bearbeiten" #: src/privatim/views/meetings.py -msgid "Delete meeting" -msgstr "Sitzung löschen" +msgid "Delete Agenda Item" +msgstr "Traktandum löschen" #: src/privatim/views/meetings.py src/privatim/forms/working_group_forms.py msgid "Members" @@ -501,6 +501,10 @@ msgstr "Datum / Zeit:" msgid "Agenda Items" msgstr "Traktanden" +#: src/privatim/views/templates/meeting.pt +msgid "Reorder item" +msgstr "Element verschieben" + #: src/privatim/views/templates/meeting.pt #: src/privatim/forms/agenda_item_form.py msgid "Add Agenda Item" @@ -1022,6 +1026,9 @@ msgstr "Gremium:" msgid "Attendees:" msgstr "Teilnehmende:" +#~ msgid "Delete meeting" +#~ msgstr "Sitzung löschen" + #~ msgid "Choose a canton..." #~ msgstr "Kanton auswählen..." diff --git a/src/privatim/locale/fr/LC_MESSAGES/privatim.mo b/src/privatim/locale/fr/LC_MESSAGES/privatim.mo index 000adf933cd8bf1552139bcf32f50b1ff21e989a..e666d44044a4559017476e56bc879d4a2d282cf6 100644 GIT binary patch delta 5180 zcmYk<3shBA0><$Tfgl*ZQSo(3xjX_o$Y|L>kntF!KRe|ztH&pvzav(H73 z&09P_aIsa`YQu4jbRy#-j7bkMW@(ICjhWWkm}s1i9xTU1T!&5YFnaMMMq;lvZu>x_ zE0cv$I0BpFI8=XLY++2ml-P!as1BB4OI%~ytFamNU096=Q5P;~YfLQ8LSAMGZ@SQW zR6jMg{togo@AJmI%voFi1Y2-@bAv)xKKLovz$(zIMwp6WH~@9Q3@pSP)Xd&S&FDQ_ zKaSzl&!E144mI$L_VXKfC-nwwhatR0a(&Z*LQ}jOnVd;MotTBKa5Q=_AJxGU)Bx5X zOK8@kR%{1qzz1#p2zH_VDe^Ku@}~2ew|Dz*hXHlioq`6?8})@jsF`G=mU5*1d@O2a zlTicnBDdYlL2Z{8P%Br3n#dMg--nveQPhfkZ0lFsv;I2a2ix#7rc#gU;0~xis^g)k znLUh}@p#mXr=mKZi<-dmsDUlF?VD};PSk|Js6LZQJ*hDeZK;=LaS~2dg~jgiETrjw+Hj^B5D&3>F9o*6`-I2jKbiOqLywB zCgM`$W!~jYx8@9L3D4X1>!_6p=h@W-qfjdmYjscqPDY*I3w8bg)U6MUupdmYK8{-Q zsi>uzjhf*S`}qp%E64+5HX>s%yHOpUMGfdOYK6W*-J%~*1G|mdjFFv#6Ac)LLOKn7 zQ8O+=U2qNR#Me+Ovki6cKfq;p8a1TE(qfkp4gX+*hZMy#U^ZQXtKN2;d38){a zT-0^^n2PgI*QxFva68yegYM;i>j~5hFQ6_Q!9%PLqA?U(qXrU-8bBiILjCX_9ErLW zvvF()zl5mA^A_u`0W@L#d6_-|-qrDAI0?NN+~ueloW=+|huR~TkeB(6H~nt3VuNT& zlTZT~ifSK^dTNSneF18MFXIW^g4%=ue-b;L!hCBLYDRl75|7yWN2q)M1u`LX6LsNR zsK>808_2;#)P+W%W;_wY(TfpSfQ!)YejYIYp`d#i%DU-wRtz&_QR+js(NJ7=37*MExErD`upFNfcruw0TiH4n1$(B zg$~x+&l^x3-Lgiex&w%{c0tYDgH18T+RvJa@m$}Gq`==DQ-T_41!_e$pq6%z^%Ux! zer47I~=x`+KyU&yre zVaUro#9KBlzz{r)8rV_Pt-FXCnCa#2jgFW>H3v12XHorDq0Zabi}lxuduRy53wS49 zLaoU67=xj`-A&dK^?4W6CQL!ys!Y_tC!%JaXFs2gEvP?(x)qhE@2$0N2vAT5)yO_F z2T+gW_oyG9Xx1wVo1+F4hw2~=`PDV)$OB|1;ShWd8M8Tzn(2?&3~!@uX>=cVC6e)9 z)B~9mG^3t<-FuXQ8qh@4Z+{7@qh;6}UqTPQj#`-$)(fa5y^b2F{@J7%w?&=b6{FFE znm})C%k|Ab3c6=wPy;DME!kZ63#J0~4~z|{ne0amByW&E%neCsv^T>g`4C zshh~34-?1L9UOu>KM(nHU@9xltx&`u_lKvAH4e2Y9n_vm!Z=LD0KbN2I0f#7DYIXwz}D0&Q3Kk9I-v%&T#&=4Mp`g3^kC^gIWKM6ds|WD;8r*tVBHx8<15rr!WLx zB4fx%@;9PY((yF;6VZ1s677%1gN<*vb7mZQh7^&;qnGZ#mQu$Gl20xW&Hf>>mXs46 ztz67-e4CsiXKmZ3xQ=wT^+rl;;gQA$e4Gp;y7kBO_5k@kd6JAE2gwn#m7FB!$+P4H zSxvNJeF+;oc>I?4uWUIN|48=Oy0~h~6RbO|B2dMfo=fd;9XX_Hu*9z#?j(OFyNHf< zq?)WEj}je2h&G;%FN5#y+jCI+tNI+u50V=4Dp}|*0{@_-@&?&JlE^D0jp*p>bqdZJ?)nMU3sb>wrR!%sdWZ>nOC-{EPJP5wa~65Irn@FS8)UMBmAjsl{`B$O;7 z9}peA$KdAxauj>+UW>7)ur0$D)r zBZo8UiY-Lp6mproNXC7g~Sgl_m!5FI*FrvMN@qKQYYWrr+!HJJUJ6wz^AB%&Lw(I<2~r5~zJDH9s`1c=q(Nx*9rq&{ygd(U~7hXBL+^ z`2{n}gCCXT`yFpx4PDaXxwL}t*zCHRk{S6=&}(_IQ&%&iuBOOWTvnUeH!|}72_X_M delta 5006 zcmYk;3sjc%0mtz_0$xB~K_r1hUWK@X#17jrpchYQr)1 z&fC3r zrc4+HVHEbkcvO4o7;22ijIk#sqZ%l|Fr01AS7LAK)wmDqP&XbGVa#2ahy0i#e(6RP zsCJgw`YPndtmhZwGP`Vj4~BAobCg0XAH457Va#<@4?8gcdvO=t(1qm~fg0IL)QHyE z`W6hNUXQwdFRJ4Q?dL}^g!;SKAJ1Y>?r*M9=!LhD!I>XWUku}_zBmvQa5$=gB2))v zBU5N9P&4L1b-2#fH{w9*`;Z@Vl3)7XB~<%Y(W3_cO+g*#7U^8j8#R)CsHu!beIADz zSt_#JCLOg+CZJ~Q5!3)mZN1WdUX8k;7d2x$ZM`Xy`PUcUvL{YsD)moMHw=h!Zs0YPsj7*C8 z0yFS7-h;`}&gYX**H1&u&`f)NzV&I;z$$SDR--oG6?^_F>c0Q-P*6{T?sldw29v0d zKz>XyzqDpcQB&u!=W9_jasYLsCe#cZv$moJat8JNbExlMLM{1Cd*0J&3xPcRTFVgB z6b(R)>^@Wjnbut7!7$^IubL86gUe7IT7#OI8r0HkLUn96YDN#D_DCyc>iIuUK_d>2 zac-D{zBNV7%oNm`m*IL`f*M%>TU!kUqZ)Q2O_`CX4i}2JL=EsIdwvV{*7Lug zg1+z?Y6NflKHxb;-xONUp&Gb|8qp2wcc>2g@eGBjaA)4 zVWR!uVbn|%Biq7MBR^&bzvA&YR^iupFV1uuGZbr3^<$_RxQecc>c$ zGYzR2j%q&-_5Javr7Vp1IE7i9&_9C=A6^nu z{fx;)J(k`Crvp1sOYi}z-T&Zp?DSC3?k?if?l=#1!BeQItweszYJTa3aR4=?Cr}+Y zZ_nREJuThYK)NmpHNs)ohPkLs7@W*o6eFyjGzuEgWbBEL+xlG8+Al!{Wa>~i_M#rU z26ST!>PBCoMtlo3)t%S_{n=@&F&OoEEov#ZI(3g}rl64@M|GeT)uDFh0&@X1(rZYY zrW3X1i7Czv(vf{@a!}_VL%pENkwKf4sPro9hT3<(v{5bZ)_pI&K&yhbPrUTW%PVCS9O?av^r76}is0#{FYg%s4 zudwI67|i+o*2AdH*Mhq7E!2{HkDAe-`}ot1;ix6dL@i+fdbC-}DDV<9RrZ6esPj#z zk)K5Eg%7RQFoAjich%-iLER_^)$x4PNQ*HI7o*zQkD9S2)b&S(GXFZ!VlOytFF1qa zIR6>?Vazb6L$Ro}&Omjj2(>2`;b`2B>cE$%8{S3@lKdggHEUsI9K z2^UVs-Z;-*umrXFs!_XkGx|n=z7g2ZTQHQ*KS3?Q-%;0nYyB_k`(}jmo{2;~hWQ=} zdf}8}5Y9n$=owT4Ymm38sYN!vIfS`*0cq33FuxkQJcx}3~ zG#gPJ@-$JZw6{p&Ovp25k}y1sHLhy zb)W$?Q*UB~{{FX7&>x}8s1bCcIuMlMG!%`x!C=%3CEI$s{X82-asEMc;|kP_?Lgkb z<^*oTf1n2R0?)SgN`p_<{~HSW!o4G%%{0-v6xlbX9+U7R)L*&pQJX0%%lRu=jBe`B zqc&qb>c(xTCA)(qh@FV>P1s% zEk=+mG>W8bz)8x+MlC3<1e<0 z9xJ{5UL!?BMdBZ@DMpcCX;M3jO-&i z&XX-|7Jo-t$S(4>=4~*A=gE^qM}Kmb{E~!{VA4Sz zBlF1;(sc~9h5N0s_-u1YxGT`RBC?>z!m_ew=T*#UZjHR{*L*QLF`&6`>{yp~dFo>C Xrqq7TH&RQxHLn~tH}FtKkDmVrZJFY= diff --git a/src/privatim/locale/fr/LC_MESSAGES/privatim.po b/src/privatim/locale/fr/LC_MESSAGES/privatim.po index 0525ff9..88d90af 100644 --- a/src/privatim/locale/fr/LC_MESSAGES/privatim.po +++ b/src/privatim/locale/fr/LC_MESSAGES/privatim.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2024-08-31 19:01+0200\n" +"POT-Creation-Date: 2024-09-10 10:36+0200\n" "PO-Revision-Date: 2024-04-11 15:53+0200\n" "Last-Translator: cyrill \n" "Language-Team: French \n" @@ -181,8 +181,8 @@ msgid "Edit Agenda Item" msgstr "Traiter un point de l'ordre du jour" #: src/privatim/views/meetings.py -msgid "Delete meeting" -msgstr "Supprimer la réunion" +msgid "Delete Agenda Item" +msgstr "Supprimer un point de l'ordre du jour" #: src/privatim/views/meetings.py src/privatim/forms/working_group_forms.py msgid "Members" @@ -500,6 +500,10 @@ msgstr "Date / Heure:" msgid "Agenda Items" msgstr "ordres du jour" +#: src/privatim/views/templates/meeting.pt +msgid "Reorder item" +msgstr "Déplacer un élément" + #: src/privatim/views/templates/meeting.pt #: src/privatim/forms/agenda_item_form.py msgid "Add Agenda Item" @@ -1018,6 +1022,9 @@ msgstr "Comité:" msgid "Attendees:" msgstr "Participants:" +#~ msgid "Delete meeting" +#~ msgstr "Supprimer la réunion" + #~ msgid "Choose a canton..." #~ msgstr "Choisissez un canton..." diff --git a/src/privatim/locale/privatim.pot b/src/privatim/locale/privatim.pot index 4129a32..e81b5c8 100644 --- a/src/privatim/locale/privatim.pot +++ b/src/privatim/locale/privatim.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2024-08-31 19:01+0200\n" +"POT-Creation-Date: 2024-09-10 10:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -181,7 +181,7 @@ msgid "Edit Agenda Item" msgstr "" #: ./src/privatim/views/meetings.py -msgid "Delete meeting" +msgid "Delete Agenda Item" msgstr "" #: ./src/privatim/views/meetings.py ./src/privatim/forms/working_group_forms.py @@ -489,6 +489,10 @@ msgstr "" msgid "Agenda Items" msgstr "" +#: ./src/privatim/views/templates/meeting.pt +msgid "Reorder item" +msgstr "" + #: ./src/privatim/views/templates/meeting.pt #: ./src/privatim/forms/agenda_item_form.py msgid "Add Agenda Item" diff --git a/src/privatim/static/css/custom.css b/src/privatim/static/css/custom.css index 73d5f81..169ba02 100644 --- a/src/privatim/static/css/custom.css +++ b/src/privatim/static/css/custom.css @@ -722,5 +722,5 @@ input[type="color"]:focus, /* Fix distance of
  • items in list generated by editor. */ .consultation-main-text ul li p { - margin:0; + margin: 0; } diff --git a/src/privatim/static/js/custom/custom.js b/src/privatim/static/js/custom/custom.js index bffdb4b..60e1a47 100644 --- a/src/privatim/static/js/custom/custom.js +++ b/src/privatim/static/js/custom/custom.js @@ -6,14 +6,14 @@ document.addEventListener('DOMContentLoaded', function () { addEditorForCommentsEdit(); makeConsultationsInActivitiesClickable(); setupAgendaItemGlobalToggle(); - setupDeleteModalForPersonInPeople(); + setupDeleteModalListeners(); autoHideSuccessMessages(); addTestSystemBadge(); fixCSSonProfilePage(); }); -function setupDeleteModalForPersonInPeople() { +function setupDeleteModalListeners() { var active_popover = null; var popover_timeout = null; @@ -269,6 +269,7 @@ function setupCommentAnswerField() { } } +// Expand / collapse all Agenda Items function setupAgendaItemGlobalToggle() { if (!window.location.href.includes('/meeting')) { return; diff --git a/src/privatim/views/agenda_items.py b/src/privatim/views/agenda_items.py index 05ca083..6ee6bcf 100644 --- a/src/privatim/views/agenda_items.py +++ b/src/privatim/views/agenda_items.py @@ -108,7 +108,6 @@ def delete_agenda_item_view( assert isinstance(context, AgendaItem) title = context.title - meeting = context.meeting session = request.dbsession session.delete(context) @@ -119,13 +118,16 @@ def delete_agenda_item_view( mapping={'name': title} ) + target_url = request.route_url('meeting', id=context.meeting.id) if request.is_xhr: - return {'success': translate(message, request.locale_name)} + return { + 'success': translate(message, request.locale_name), + 'name': 'test', + 'redirect_url': target_url + } request.messages.add(message, 'success') - return HTTPFound( - location=request.route_url('meeting', id=meeting.id), - ) + return HTTPFound(location=target_url) def copy_agenda_item_view( diff --git a/src/privatim/views/meetings.py b/src/privatim/views/meetings.py index 4ae4fda..0f1e2a3 100644 --- a/src/privatim/views/meetings.py +++ b/src/privatim/views/meetings.py @@ -45,18 +45,17 @@ def meeting_view( request: 'IRequest' ) -> 'RenderData': """ Displays a single meeting. """ - assert isinstance(context, Meeting) formatted_time = datetime_format(context.time) - request.add_action_menu_entries(meeting_buttons(context, request)) - agenda_items = [] for indx, item in enumerate(context.agenda_items, start=1): agenda_items.append( { 'title': Markup( - '{}. {}'.format(indx, item.title) + '{}. {}'.format( + indx, Markup.escape(item.title) + ) ), 'description': Markup(item.description), 'id': item.id, @@ -66,6 +65,13 @@ def meeting_view( icon='edit', description=_('Edit Agenda Item'), ), + 'delete_btn': Button( + url=request.route_url('delete_agenda_item', id=item.id), + icon='trash', + description=_('Delete Agenda Item'), + modal='#delete-xhr', + data_item_title=item.title, + ), } ) data_sortable_url = request.route_url( @@ -76,7 +82,7 @@ def meeting_view( target_id='{target_id}', ) return { - 'delete_title': _('Delete meeting'), + 'delete_title': _('Delete'), 'time': formatted_time, 'meeting': context, 'meeting_attendees': user_list( diff --git a/src/privatim/views/templates/meeting.pt b/src/privatim/views/templates/meeting.pt index e22ace0..c63016a 100644 --- a/src/privatim/views/templates/meeting.pt +++ b/src/privatim/views/templates/meeting.pt @@ -42,13 +42,20 @@
    -
    -

    - + +