date:20110310

[Zope-Checkins] SVN: Zope/branches/2.13/src/OFS/dtml/properties.dtml - fixed some HTML issues

2011-03-10 Thread Yvo Schubbe

Log message for revision 120838:
  - fixed some HTML issues
  - related cleanup

Changed:
  UU  Zope/branches/2.13/src/OFS/dtml/properties.dtml

-=-
Modified: Zope/branches/2.13/src/OFS/dtml/properties.dtml
===
--- Zope/branches/2.13/src/OFS/dtml/properties.dtml 2011-03-10 08:49:03 UTC 
(rev 120837)
+++ Zope/branches/2.13/src/OFS/dtml/properties.dtml 2011-03-10 09:49:23 UTC 
(rev 120838)
@@ -56,69 +56,74 @@
 
 dtml-in propertyMap mapping
 dtml-let type=not _.has_key('type') and 'string' or type
-  pdesc=propertyDescription(id)
+  pdesc=propertyDescription(id)
+  charset_tag=REQUEST['management_page_charset_tag']
 tr title=dtml-pdesc;
   td align=left valign=top width=16
   dtml-if 'd' in _['sequence-item'].get('mode', 'awd')
-  input type=checkbox name=_ids:dtml-var 
REQUEST['management_page_charset_tag']string:list value=dtml-id;
-   id=cb-dtml-id;
+  input type=checkbox name=_ids:dtml-charset_tag;string:list
+   value=dtml-id; id=cb-dtml-id; /
   dtml-else
   /dtml-if
   /td
   td align=left valign=top
   div class=form-label
-  label for=cb-dtml-id;dtml-var propertyLabel(id) html_quote/label
+  dtml-if 'd' in _['sequence-item'].get('mode', 'awd')
+  label for=cb-dtml-id;
+  dtml-else
+  label
+  /dtml-if
+  dtml-var propertyLabel(id) html_quote/label
   /div
   /td
   td align=left valign=top
-
   dtml-if 'w' in _['sequence-item'].get('mode', 'awd')
   dtml-if type == 'int'
   input type=text name=dtml-id;:dtml-type;
-   size=35 value=dtml-if hasProperty(id)dtml-var '%s' % 
getProperty(id) html_quote/dtml-if
+   size=35 value=dtml-if hasProperty(id)dtml-var
+'%s' % getProperty(id) html_quote/dtml-if /
   dtml-elif type == 'long'
   input type=text name=dtml-id;:dtml-type; size=35
-   value=dtml-if hasProperty(id)dtml-var ('%s' % getProperty(id)) 
html_quote/dtml-if
+   value=dtml-if hasProperty(id)dtml-var
+('%s' % getProperty(id)) html_quote/dtml-if /
   dtml-elif type in ('float', 'date')
-  input type=text name=dtml-id;:dtml-var 
REQUEST['management_page_charset_tag']dtml-type; size=35
-   value=dtml-var getProperty(id) html_quote
+  input type=text name=dtml-id;:dtml-charset_tag;dtml-type; size=35
+   value=dtml-var getProperty(id) html_quote /
   dtml-elif type in ['string','ustring']
-  input type=text name=dtml-id;:dtml-var 
REQUEST['management_page_charset_tag']dtml-type; size=35
-   value=dtml-var getProperty(id) html_quote
+  input type=text name=dtml-id;:dtml-charset_tag;dtml-type; size=35
+   value=dtml-var getProperty(id) html_quote /
   dtml-elif type=='boolean'
-  input type=checkbox name=dtml-id;:boolean size=35
-   dtml-if getProperty(id)CHECKED/dtml-if
+  input type=checkbox name=dtml-id;:dtml-type; size=35
+   dtml-if getProperty(id)checked=checked/dtml-if /
   dtml-elif type in ['tokens','utokens']
-  input type=text name=dtml-id;:dtml-var 
REQUEST['management_page_charset_tag']dtml-type; size=35
-   value=dtml-in getProperty(id)dtml-sequence-item; /dtml-in
+  input type=text name=dtml-id;:dtml-charset_tag;dtml-type; size=35
+   value=dtml-in getProperty(id)dtml-sequence-item; /dtml-in /
   dtml-elif type in ['text','utext']
-  textarea class=form-element name=dtml-id;:dtml-var
-   REQUEST['management_page_charset_tag']dtml-type;
+  textarea class=form-element name=dtml-id;:dtml-charset_tag;dtml-type;
rows=6 cols=35dtml-var getProperty(id) html_quote/textarea
   dtml-elif type in ['lines','ulines']
-  textarea class=form-element name=dtml-id;:dtml-var
-   REQUEST['management_page_charset_tag']dtml-type; rows=6
-   cols=35dtml-in getProperty(id)dtml-sequence-item;dtml-if
+  textarea class=form-element name=dtml-id;:dtml-charset_tag;dtml-type;
+   rows=6 cols=35dtml-in getProperty(id)dtml-sequence-item;dtml-if
sequence-enddtml-elsedtml-var '\n'/dtml-if/dtml-in/textarea
 
   dtml-elif type=='selection'
 
 dtml-if hasProperty(select_variable)
 div class=form-element
-select name=dtml-id;:dtml-var 
REQUEST['management_page_charset_tag']text
+select name=dtml-id;:dtml-charset_tag;text
   dtml-in getProperty(select_variable)
  option
-  dtml-if _['sequence-item']==getProperty(id)SELECTED/dtml-if
+  dtml-if 
_['sequence-item']==getProperty(id)selected=selected/dtml-if
   dtml-sequence-item;/option
   /dtml-in
 /select
 /div
 dtml-elif _.has_key(select_variable)
 div class=form-element
-select name=dtml-id;:dtml-var 
REQUEST['management_page_charset_tag']text
+select name=dtml-id;:dtml-charset_tag;text
   dtml-in _[select_variable]
  option
-  dtml-if _['sequence-item']==getProperty(id)SELECTED/dtml-if
+  dtml-if 
_['sequence-item']==getProperty(id)selected=selected/dtml-if
   dtml-sequence-item;/option
   /dtml-in
 /select
@@ -133,24 +138,24 @@
 
 dtml-if hasProperty(select_variable)
 div class=form-element
-select name=dtml-id;:dtml-var

[Zope-Checkins] SVN: Zope/trunk/src/OFS/dtml/properties.dtml - fixed some HTML issues

2011-03-10 Thread Yvo Schubbe

Log message for revision 120839:
  - fixed some HTML issues
  - related cleanup

Changed:
  UU  Zope/trunk/src/OFS/dtml/properties.dtml

-=-
Modified: Zope/trunk/src/OFS/dtml/properties.dtml
===
--- Zope/trunk/src/OFS/dtml/properties.dtml 2011-03-10 09:49:23 UTC (rev 
120838)
+++ Zope/trunk/src/OFS/dtml/properties.dtml 2011-03-10 09:49:42 UTC (rev 
120839)
@@ -56,69 +56,74 @@
 
 dtml-in propertyMap mapping
 dtml-let type=not _.has_key('type') and 'string' or type
-  pdesc=propertyDescription(id)
+  pdesc=propertyDescription(id)
+  charset_tag=REQUEST['management_page_charset_tag']
 tr title=dtml-pdesc;
   td align=left valign=top width=16
   dtml-if 'd' in _['sequence-item'].get('mode', 'awd')
-  input type=checkbox name=_ids:dtml-var 
REQUEST['management_page_charset_tag']string:list value=dtml-id;
-   id=cb-dtml-id;
+  input type=checkbox name=_ids:dtml-charset_tag;string:list
+   value=dtml-id; id=cb-dtml-id; /
   dtml-else
   /dtml-if
   /td
   td align=left valign=top
   div class=form-label
-  label for=cb-dtml-id;dtml-var propertyLabel(id) html_quote/label
+  dtml-if 'd' in _['sequence-item'].get('mode', 'awd')
+  label for=cb-dtml-id;
+  dtml-else
+  label
+  /dtml-if
+  dtml-var propertyLabel(id) html_quote/label
   /div
   /td
   td align=left valign=top
-
   dtml-if 'w' in _['sequence-item'].get('mode', 'awd')
   dtml-if type == 'int'
   input type=text name=dtml-id;:dtml-type;
-   size=35 value=dtml-if hasProperty(id)dtml-var '%s' % 
getProperty(id) html_quote/dtml-if
+   size=35 value=dtml-if hasProperty(id)dtml-var
+'%s' % getProperty(id) html_quote/dtml-if /
   dtml-elif type == 'long'
   input type=text name=dtml-id;:dtml-type; size=35
-   value=dtml-if hasProperty(id)dtml-var ('%s' % getProperty(id)) 
html_quote/dtml-if
+   value=dtml-if hasProperty(id)dtml-var
+('%s' % getProperty(id)) html_quote/dtml-if /
   dtml-elif type in ('float', 'date')
-  input type=text name=dtml-id;:dtml-var 
REQUEST['management_page_charset_tag']dtml-type; size=35
-   value=dtml-var getProperty(id) html_quote
+  input type=text name=dtml-id;:dtml-charset_tag;dtml-type; size=35
+   value=dtml-var getProperty(id) html_quote /
   dtml-elif type in ['string','ustring']
-  input type=text name=dtml-id;:dtml-var 
REQUEST['management_page_charset_tag']dtml-type; size=35
-   value=dtml-var getProperty(id) html_quote
+  input type=text name=dtml-id;:dtml-charset_tag;dtml-type; size=35
+   value=dtml-var getProperty(id) html_quote /
   dtml-elif type=='boolean'
-  input type=checkbox name=dtml-id;:boolean size=35
-   dtml-if getProperty(id)CHECKED/dtml-if
+  input type=checkbox name=dtml-id;:dtml-type; size=35
+   dtml-if getProperty(id)checked=checked/dtml-if /
   dtml-elif type in ['tokens','utokens']
-  input type=text name=dtml-id;:dtml-var 
REQUEST['management_page_charset_tag']dtml-type; size=35
-   value=dtml-in getProperty(id)dtml-sequence-item; /dtml-in
+  input type=text name=dtml-id;:dtml-charset_tag;dtml-type; size=35
+   value=dtml-in getProperty(id)dtml-sequence-item; /dtml-in /
   dtml-elif type in ['text','utext']
-  textarea class=form-element name=dtml-id;:dtml-var
-   REQUEST['management_page_charset_tag']dtml-type;
+  textarea class=form-element name=dtml-id;:dtml-charset_tag;dtml-type;
rows=6 cols=35dtml-var getProperty(id) html_quote/textarea
   dtml-elif type in ['lines','ulines']
-  textarea class=form-element name=dtml-id;:dtml-var
-   REQUEST['management_page_charset_tag']dtml-type; rows=6
-   cols=35dtml-in getProperty(id)dtml-sequence-item;dtml-if
+  textarea class=form-element name=dtml-id;:dtml-charset_tag;dtml-type;
+   rows=6 cols=35dtml-in getProperty(id)dtml-sequence-item;dtml-if
sequence-enddtml-elsedtml-var '\n'/dtml-if/dtml-in/textarea
 
   dtml-elif type=='selection'
 
 dtml-if hasProperty(select_variable)
 div class=form-element
-select name=dtml-id;:dtml-var 
REQUEST['management_page_charset_tag']text
+select name=dtml-id;:dtml-charset_tag;text
   dtml-in getProperty(select_variable)
  option
-  dtml-if _['sequence-item']==getProperty(id)SELECTED/dtml-if
+  dtml-if 
_['sequence-item']==getProperty(id)selected=selected/dtml-if
   dtml-sequence-item;/option
   /dtml-in
 /select
 /div
 dtml-elif _.has_key(select_variable)
 div class=form-element
-select name=dtml-id;:dtml-var 
REQUEST['management_page_charset_tag']text
+select name=dtml-id;:dtml-charset_tag;text
   dtml-in _[select_variable]
  option
-  dtml-if _['sequence-item']==getProperty(id)SELECTED/dtml-if
+  dtml-if 
_['sequence-item']==getProperty(id)selected=selected/dtml-if
   dtml-sequence-item;/option
   /dtml-in
 /select
@@ -133,24 +138,24 @@
 
 dtml-if hasProperty(select_variable)
 div class=form-element
-select name=dtml-id;:dtml-var

[Zope-Checkins] SVN: Zope/trunk/src/OFS/dtml/properties.dtml - Fixed editing offset-naive 'date' properties in the ZMI.

2011-03-10 Thread Yvo Schubbe

Log message for revision 120841:
  - Fixed editing offset-naive 'date' properties in the ZMI.

Changed:
  U   Zope/trunk/src/OFS/dtml/properties.dtml

-=-
Modified: Zope/trunk/src/OFS/dtml/properties.dtml
===
--- Zope/trunk/src/OFS/dtml/properties.dtml 2011-03-10 11:09:15 UTC (rev 
120840)
+++ Zope/trunk/src/OFS/dtml/properties.dtml 2011-03-10 11:09:36 UTC (rev 
120841)
@@ -86,10 +86,11 @@
   input type=text name=dtml-id;:dtml-type; size=35
value=dtml-if hasProperty(id)dtml-var
 ('%s' % getProperty(id)) html_quote/dtml-if /
-  dtml-elif type in ('float', 'date')
+  dtml-elif type == 'date' and not _.same_type(getProperty(id), '')
+  and getProperty(id).timezoneNaive()
   input type=text name=dtml-id;:dtml-charset_tag;dtml-type; size=35
-   value=dtml-var getProperty(id) html_quote /
-  dtml-elif type in ['string','ustring']
+   value=dtml-var str(getProperty(id)).rsplit(' ', 1)[0] html_quote /
+  dtml-elif type in ['date', 'float', 'string', 'ustring']
   input type=text name=dtml-id;:dtml-charset_tag;dtml-type; size=35
value=dtml-var getProperty(id) html_quote /
   dtml-elif type=='boolean'

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.13/src/OFS/dtml/properties.dtml - fixed some HTML issues

[Zope-Checkins] SVN: Zope/trunk/src/OFS/dtml/properties.dtml - fixed some HTML issues

[Zope-Checkins] SVN: Zope/trunk/src/OFS/dtml/properties.dtml - Fixed editing offset-naive 'date' properties in the ZMI.

3 matches

Site Navigation

Mail list logo

Footer information