From fa4e4eed89dd1c3c75cea49bea10b8dc7439e787 Mon Sep 17 00:00:00 2001 From: helmutm Date: Mon, 12 Oct 2009 11:40:36 +0000 Subject: [PATCH] provide actions for creating/editing institutions; toggle checkboxes in listings git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3576 fd906abe-77d9-0310-91a1-e0d9ade77398 --- browser/concept_related.pt | 9 ++++++--- browser/loops.js | 6 ++++++ browser/relation_macros.pt | 21 ++++++++++++++++----- expert/concept.py | 2 +- locales/de/LC_MESSAGES/loops.mo | Bin 10153 -> 10693 bytes locales/de/LC_MESSAGES/loops.po | 26 +++++++++++++++++++++++++- organize/browser/party.py | 17 +++++++++++++++++ query.py | 2 +- 8 files changed, 72 insertions(+), 11 deletions(-) diff --git a/browser/concept_related.pt b/browser/concept_related.pt index 5efb49a..401891c 100644 --- a/browser/concept_related.pt +++ b/browser/concept_related.pt @@ -13,7 +13,8 @@ summary string:Currently assigned objects; legend string:Parent Concepts; showPredicate string:yes; - buttonText string:Remove Parents;" + buttonText string:Remove Parents; + formName string:parents;" style="float:left; padding-right:20px"> @@ -25,7 +26,8 @@ summary string:Currently assigned objects; legend string:Child Concepts; showPredicate string:yes; - buttonText string:Remove Children;" + buttonText string:Remove Children; + formName string:children;" style="clear:left"> @@ -41,7 +43,8 @@ summary string:Assignment candidates; legend string:Search; showPredicate nothing; - buttonText string:Assign;"> + buttonText string:Assign; + formName string:search;"> diff --git a/browser/loops.js b/browser/loops.js index 134a00a..2162f2a 100644 --- a/browser/loops.js +++ b/browser/loops.js @@ -13,6 +13,12 @@ function focusOpener() { } } +function toggleCheckBoxes(toggle, fieldName) { + var w = toggle.form[fieldName]; + if (w[0] == null) w = [w]; + for (i in w) w[i].checked=toggle.checked; +} + function validate(nodeName, required) { // (work in progress) - may be used for onBlur event handler var w = dojo.byId(nodeName); diff --git a/browser/relation_macros.pt b/browser/relation_macros.pt index 97a3925..b750396 100644 --- a/browser/relation_macros.pt +++ b/browser/relation_macros.pt @@ -2,14 +2,23 @@ +
Listing
@@ -21,7 +30,9 @@ tal:attributes="summary summary"> -   + + Title Type @@ -35,12 +46,12 @@ - Title diff --git a/expert/concept.py b/expert/concept.py index 4f29799..2063cd5 100644 --- a/expert/concept.py +++ b/expert/concept.py @@ -193,7 +193,7 @@ class IQueryConcept(ILoopsAdapter): 'to be used for the query and for presenting ' 'the results'), default=u'', - required=True) + required=False) options = schema.List( title=_(u'Options'), diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index b714402504eba81077b778828ca7985898603618..a62e9ebd73bffc1c055870873a9cc730c67bff2a 100644 GIT binary patch delta 4445 zcmZ9N3vgA{6^3`nTiywmLNK{E2}Tk~OdX%p zAnBDNq=XhKVl34XK`D<4Lw$9q4jnt-R2+wqPJ`t=tdNm;9N|Mb6@n;sB@PGI(IkxD;y1{4RQ__R|^wi6O4r| zP*YaJAlwM~bNhHC!(*@?d>6|9BZ$A}&f1I5VSpEZgF|7`VCVY7Ak+f+P#cdo-eJ5G z5}TV170_Zh4_3h>_@?o=y?-C3GJYDSu)n*2p$)D<_I9x;exyU77RZF!I1kFN2;%BW zq5SWHTCf5tka`6cFolN} zm=Cq!a;SN0pf=h9hrf3&q4+K56GWO###Mz=xM?&7;$hWREBe)&S)XjnJ$K^ zz%nSmI;hGt8e439EmXi8pb}_<+NcBS?2kZI>^&&IkB3lyId(CiOs+v?*pG)I&4QXx z0u|T{>(7Onw*;zUkJ`8gwb5o9-vMu+|BCewLM3t%D#70dsJ}A#fPr{;1}fuoP#bnZ zW&C%jiPzv*s2i&OI4Hl{p#mv`T5rCM-w$;utD!1U2bKA1>$iFs%49cG#`~@RHdG)V zK`s0l90o5zZJfjfPzD2`{8FI;4H`#6RU#MO1WTYQxfm*-6-KWKLlL*YLbw)cgEyc` zcg)_u2Q~3DjGi4-#k!ypxC|BOe<4M3{fSoVWWf zQaFNsJ=8**paR(aSPPO+n^TQ1-YMYFI4G|+W2wfJ5Wb>3aa#z=ax7qt?P^Fv!$H2KT2voBs_J$bbyz9)M|3m#`VC0_&kN zjX)h;8JohlHStShY_^}-FsOwK zp)xFkx*LnE{}5Cn9@JO1&iE`$(D&bpp@m<7x*YqUGCUM@aPHS|68*QK7K-B>besD@ z1r~s@a3s{F9cAx}p)PMJR3&CXB~}47?=d)({oPs&Wx4~(@l~i&pMWImK7=}}D^MH# z3+jme12wPjO@6@XPzz_n(XbfmGFCtZ+ypgmmGw73Zw>>`V<@xpP!V5*s>F4ujT3Y1 zETQ}|p)Osnjn9BOf<;gjcm(RsG(-76W#b!R0{yK}>$m4ne?{EEfFe8uwa^Ku10SckH=$A-sIx0o8Pz`zx%|mL_eDplyuu_mW(uNw~ zt7hwB+-3Gd@E)`8hS}(w=*OrX?Lun0yjdtw9c$xZ9^z-jeIKdm^PPn5MKAfMiADRK zkLWG_Hnu)XwPz9kOQNli=g-m0=uOm!f+!8Wh~m-1=m^s1sy4=lyA>v*pQ1<6LNs6J zpM%lec6S@ScocgaT83)TAk^I^U_`8QAAG>Cz^v^M?=vFq}J*q`kc*kaj*VC?EX*ixC5;~^_}?x7xcMd zYE@NzxS^q-pdivb_=&zVYa1GC8k-tx>S`lhgP%*R^j}AorGiH7<#)ZO)~9al zJ+<>{>OC<@Hn$)$J&@aba%WYbEN1E}`{|^%e B(ewZS delta 4010 zcmYk;3vAWZ0mt!EXsN5Vj+O#~*dowXDy*eYRuIO3PEZjXWfj3nZp>i@Aux*%zyg3pL72A-19%L z+xGWUUz?oxC_i&o;5tffCMUB(Xvg{2^TJhrV+d2Q0?Tk6cELlKjYqLF9z#EJ9E9k!tZ+KW^1 zWxNjm6V2$Fem@5bxSx;tJU^6B@B!6G+b|9tP%YX)1Nz{3XuHK|yVYn%+t2~D#QSez zH|oc+2cC=f|A9TJ{}=PICoj1?Ka^3(!)mmn324XnqaDmge!>P`?D+ZU>)40-aiq_1 z5&c|ytY=ZViFyyr#0qo*Rp=Is!GwD@o`N%+f;Ox}XFfAJJKkT24s;F{135y4jt%4^g*AX z6S#!-^Leay;pFzFo{#o37;QfsZ8sVR`u(3o!9%hF?RYCXvYqG*cE|dDyp8%RXh&zz z_J2XQ;sOrBE9is!u--nn8trc^vb$jdy7UjG?z8_5vB6`=!3+z~rC*CK*$(tUyU~?- zF~0v6cB1~9`2KOU{d?%Z|A-FY!}$Kk=t_Quw_`gN`Tf6zFR3FMjdm~=?cgqSg}+1( zVK08IxdNr=Oe@j78;Q1`g0`C(@6SV5CK26;er`M3&n|RgEy$vTchEC)wh!xX;ji3q zCZ8j#7xHdN-!Db$BhUfVqAM^r`XoA&CUgZ_us^y0BzUhgSp#6pzsj9&X%*AD|DuidmRh!f!9kK?iyVdjD>;-F@g5%#80ZL?^Na zJL5*=cUIVfu52s1LT{t(ep|x&`^Nj+aL+%C4L(Ch+#VZV#VYEZzL8$~YIJ4l&~}fY z4}2UQU}JO{W>a4sU5^fUEBg87`4loJc+Dl>Cob7kGML!tF|waHVpnM!nNRK_kC59* zGx;Xr>z?}BeHRZB7BaOp5MEBU=M^Lz-fXK}e1%fiE4*@w!(y_WY$xN1o4uPfkW%8> z{esLRZ;-EEFHspn?j#GyQR4AmMEpK`vD6-T{)J7wre9jWQr=3rlGKu7(s6l6IxaV~ z;~GX`BxxgC;>{)4LNdwgWDt3lyhf_y^HYDgsi%H5jmAU74W2;QlJE?9n%qq$60e_= z1F2F7PvJE3gIJe+WDa?fyh^gkeZLp- zk9gIk3HRVk@;I47){zy&@37a8(}acCkE|q#HN0?|!(rlI2Co;%Kr)6jk*>t+hoq5g zB;O$qkX+&7 zlcG1^E;1t4S7QbFQLOjJpOP{%ifkfB$p5e8wY)AhPf)KRt4KLnM%I(*q~jVM3q5cx z=}f*&#*v4~Lv5FDoYpB>o4+)9A%8=1dBK?EnSytdE!{S?jVzp$k$ju-@ml2xqoTa{{SkGZcG3G diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index 41ed74c..2d907e1 100644 --- a/locales/de/LC_MESSAGES/loops.po +++ b/locales/de/LC_MESSAGES/loops.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: $Id$\n" "POT-Creation-Date: 2007-05-22 12:00 CET\n" -"PO-Revision-Date: 2009-10-11 12:00 CET\n" +"PO-Revision-Date: 2009-10-12 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -110,6 +110,30 @@ msgstr "Person bearbeiten..." msgid "Modify person." msgstr "Person bearbeiten" +msgid "Create Institution..." +msgstr "Institution anlegen..." + +msgid "Create a new institution." +msgstr "Eine neue Institution anlegen" + +msgid "Edit Institution..." +msgstr "Institution bearbeiten..." + +msgid "Modify institution." +msgstr "Institution bearbeiten" + +msgid "Create Address..." +msgstr "Adresse anlegen..." + +msgid "Create a new address." +msgstr "Eine neue Adresse anlegen" + +msgid "Edit Address..." +msgstr "Adresse bearbeiten..." + +msgid "Modify address." +msgstr "Adresse bearbeiten" + msgid "Create Resource, Type = " msgstr "Ressource anlegen, Typ = " diff --git a/organize/browser/party.py b/organize/browser/party.py index 9e3fba1..1e3bd79 100644 --- a/organize/browser/party.py +++ b/organize/browser/party.py @@ -78,6 +78,23 @@ actions.register('editAddress', 'portlet', DialogAction, dialogName='editAddress', ) +actions.register('createInstitution', 'portlet', DialogAction, + title=_(u'Create Institution...'), + description=_(u'Create a new institution.'), + viewName='create_concept.html', + dialogName='createInstitution', + typeToken='.loops/concepts/institution', + fixedType=True, + innerForm='inner_concept_form.html', +) + +actions.register('editInstitution', 'portlet', DialogAction, + title=_(u'Edit Institution...'), + description=_(u'Modify institution.'), + viewName='edit_concept.html', + dialogName='editInstitution', +) + actions.register('send_email', 'object', DialogAction, description=_(u'Send a link to this object by email.'), viewName='object_send_email.html', diff --git a/query.py b/query.py index 6ab2c95..487c1d0 100644 --- a/query.py +++ b/query.py @@ -192,7 +192,7 @@ class IQueryConcept(IConceptSchema): 'to be used for the query and for presenting ' 'the results'), default=u'', - required=True) + required=False) options = schema.List( title=_(u'Options'),