From a608a9b43fefc3f8383c72c96ef03617f952e4ef Mon Sep 17 00:00:00 2001 From: Gaetan Delannay Date: Thu, 24 Mar 2011 16:21:57 +0100 Subject: [PATCH] appy.gen: minor improvements and IE fixes in the GUI. --- doc/version.txt | 2 +- gen/__init__.py | 6 +++- gen/plone25/model.py | 2 +- gen/plone25/skin/page.pt | 14 +++++----- gen/plone25/skin/required.gif | Bin 0 -> 53 bytes gen/plone25/skin/required.png | Bin 423 -> 0 bytes gen/plone25/skin/space.gif | Bin 43 -> 43 bytes gen/plone25/skin/warning.png | Bin 400 -> 290 bytes gen/plone25/skin/warning_no.gif | Bin 0 -> 823 bytes gen/plone25/skin/warning_no.png | Bin 319 -> 0 bytes gen/plone25/skin/widgets/show.pt | 38 ++++++-------------------- gen/plone25/templates/Styles.css.dtml | 2 +- 12 files changed, 23 insertions(+), 41 deletions(-) create mode 100644 gen/plone25/skin/required.gif delete mode 100644 gen/plone25/skin/required.png create mode 100644 gen/plone25/skin/warning_no.gif delete mode 100644 gen/plone25/skin/warning_no.png diff --git a/doc/version.txt b/doc/version.txt index d2b13eb..ef5e445 100644 --- a/doc/version.txt +++ b/doc/version.txt @@ -1 +1 @@ -0.6.4 +0.6.5 diff --git a/gen/__init__.py b/gen/__init__.py index 6f33242..a2cbf81 100644 --- a/gen/__init__.py +++ b/gen/__init__.py @@ -95,7 +95,7 @@ class Group: hasLabel=True, hasDescr=False, hasHelp=False, hasHeaders=False, group=None, colspan=1, align='center', valign='top', css_class='', master=None, masterValue=None, - cellpadding=1, cellspacing=1): + cellpadding=1, cellspacing=1, cellgap='0.6em'): self.name = name # In its simpler form, field "columns" below can hold a list or tuple # of column widths expressed as strings, that will be given as is in @@ -134,6 +134,10 @@ class Group: self.valign = valign self.cellpadding = cellpadding self.cellspacing = cellspacing + # Beyond standard cellpadding and cellspacing, cellgap can define an + # additional horizontal gap between cells in a row. So this value does + # not add space before the first cell or after the last one. + self.cellgap = cellgap if style == 'tabs': # Group content will be rendered as tabs. In this case, some # param combinations have no sense. diff --git a/gen/plone25/model.py b/gen/plone25/model.py index 7f77615..3e6d66d 100644 --- a/gen/plone25/model.py +++ b/gen/plone25/model.py @@ -93,7 +93,7 @@ class User(ModelClass): 'password2', 'roles'] # All methods defined below are fake. Real versions are in the wrapper. title = String(show=False, indexed=True) - gm = {'group': 'main', 'multiplicity': (1,1)} + gm = {'group': 'main', 'multiplicity': (1,1), 'width': 25} name = String(**gm) firstName = String(**gm) def showLogin(self): pass diff --git a/gen/plone25/skin/page.pt b/gen/plone25/skin/page.pt index 7c64493..099c7a0 100644 --- a/gen/plone25/skin/page.pt +++ b/gen/plone25/skin/page.pt @@ -518,12 +518,12 @@ - + Input field allowing to enter a comment before triggering a transitionButtons for triggering transitions @@ -558,7 +558,7 @@ Information that is common to all tabs (object title, state, etc)
- +
- + Title and state + tal:condition="descrLabel/strip" align="left"> Content type description - + Object history - + Workflow-related information and actions - +
@@ -567,11 +567,11 @@
Creator and last modification date Plus/minus icon for accessing history @@ -598,7 +598,7 @@
@@ -611,7 +611,7 @@
diff --git a/gen/plone25/skin/required.gif b/gen/plone25/skin/required.gif new file mode 100644 index 0000000000000000000000000000000000000000..c54b8117457bbe64a13b77b17b8126bf233452ae GIT binary patch literal 53 zcmZ?wbhEHbWM$xCXkcXc&%pHm|9{1wEQ|~cj0`#qKmd|qVB+yfSi!zKebJmPQNauh F)&N-b4Eq28 literal 0 HcmV?d00001 diff --git a/gen/plone25/skin/required.png b/gen/plone25/skin/required.png deleted file mode 100644 index ac8daa383996ba3e3d28dda65b96378bd06f2705..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 423 zcmV;Y0a*TtP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02d4Z02d4aiUN*i00007bV*G`2igV| z3ML1~+f=mx00AdSL_t&-({<22OT$0_hw=Zt_0rNdSXx3cVg{Fvc99euMa99*&F`Q% z_zm0~M069uMK=)#L4;Niq(c_LxkW@VzQkayr}pk#T>DJF`61R?42uImqtPI(c6)9B z(Cr{-o_O8>fT5`nJ^)UwU2?45yeOCDO1C?{5XU3L0uPGPgFa)uoYwP?Ql9%tE#EuN z4tW-0Ca?8c#+YdkLVpN}BiG$Ot5mKy112m`_@y)fAbOl9%-X;)ro%R@J$#b#^e&sd z%^Kr1OQp-HG@bpX^o48%!RS%7DvqOQx2W~xV!ggz&|1E8{>su?4bqs*m{R?lVzC{$ zZk!15IiU1|gkk6a$N_Kx{XE)7O>#HnRk;9OK!2_rC#!7J0fjhDcm4 z?K#VLFhPJJeLvgMj(R8kc?Ya(`0te$OxnRYX_sfl}TeJj=Z{579^Q(3Llj!V1 z*-1y%J^y-)q2czl?3Bj42Y+!_>Yu(gpK*;FV}bw5+XYI;_p;97D&Wk$K57(~X*Tq14%V@rCQVPxv9Tk~GAyLPR3wMBUmPt_CiO-*jIHPmWW gtk9}A`173Az%I&f@rlDnfv#onboFyt=akR{0RMn(TL1t6 delta 391 zcmWlU-7i9M9LAsYvP2t0Q;J-;;3``ex^wEJ8k!}n3r1wKVOmUXWNgM={sQLO-1-O1 zX7VyeuUna%(jke=TUvg$@Av!cv*+S@zWWt^zHfWLYLZG65&%+*nYIzFB3muyle@8e zbU=jXv6=KZyijrkb_e?G#-Ac$F_cR9{6e9CrzgC;AeTcliqbDaA!IVR3F6}ecX!C= zae9jL0In{ubd0;5a-yAomQ0K{ktI5*L?vf5+P^ z!V#oXxKBc%fKrL3CNwugrGi`zwHhrgq#ep-GUbl`Jo8_C(PkY)cRDit56)f_jV+mnl&GslD?2`sX{Vi=Zh=nf*qfzh zY7Ih**yMK%jp!Q#GS)T0F!e5hTM&$-v{O3o+AOu&Hs3zCWNf7<5jDKx>gxOsj- XwFdCAqVus%!#)Xu#b~7u_2cV*cV3X@ diff --git a/gen/plone25/skin/warning_no.gif b/gen/plone25/skin/warning_no.gif new file mode 100644 index 0000000000000000000000000000000000000000..dda79043e51464ac6e60693d523c9d3103d7d5a2 GIT binary patch literal 823 zcmV-71IYYGNk%w1VF>^X0Ovsf000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW3IP8AEC2ui00{sL000OS0RIUbNU)&6g9sBUT*$DY!+`+-06Sh| Bj5PoN literal 0 HcmV?d00001 diff --git a/gen/plone25/skin/warning_no.png b/gen/plone25/skin/warning_no.png deleted file mode 100644 index 9edbbb79a5fc7c6c0eef15f4f9e65d11785b3040..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 319 zcmWlUJ4=Fb6vlrNrI`*9fq7s004>cWujor9Vh#ljQq&w8wAWJ5&>TTuAY2>z1W{>p z@dg@RQeQPS6}y<(UpUWs&hMF?bL{oF^jf19(93SgCwxLkrx_9ZaR2I3m@4FRIS5D0 zihv96vfr6X(eLy5MZ3*Uk7|`hgL<80lKwBT809k0FLb+PvoxFB+;D%#LzF^+?{6|0 zGOyg;p_HjqDCFt&czh(CMo}o0sK4{{M6E_HM
- - - - - - - - - + style python: test(repeat['cell'].end, '', 'padding-right: 0.4em')">
@@ -138,6 +129,7 @@ It is exclusively called by macro "group" above.
+ style python: test(repeat['widget'].number() != len(widgetRow), 'padding-right: %s'%cellgap, '')"> @@ -183,31 +175,17 @@
Displays a field label. - - - + Displays a field description. - - + Displays a field help. - - - - - + Displays validation-error-related info about a field. - - - - - - + Displays the fact that a field is required. - + diff --git a/gen/plone25/templates/Styles.css.dtml b/gen/plone25/templates/Styles.css.dtml index e196927..0491dab 100644 --- a/gen/plone25/templates/Styles.css.dtml +++ b/gen/plone25/templates/Styles.css.dtml @@ -6,7 +6,7 @@ textarea { width: 99%; } #portal-breadcrumbs { display: none; } #importedElem { color: grey; font-style: italic; } -label { font-weight: bold; font-style: italic; line-height: 1.4em;} +label { font-weight: bold; font-style: italic; line-height: 1.4em; font-size: 92%;} .discreet { font-size: 94%; } .appyList { line-height: 1.1em; margin: 0 0 0.5em 1.2em; padding: 0; } .appyBullet { margin: 0; }