[Zapp-cvs-commit] ZApp/skins/zapp_generic zapp_cmf_object_edit.py,1.7,1.8 zapp_cmf_object_edit_form.pt,1.6,1.7 zapp_image_view.pt,1.2,1.3

[<ssp...@us...>]

Update of /cvsroot/zapp/ZApp/skins/zapp_generic
In directory sc8-pr-cvs1:/tmp/cvs-serv29258/skins/zapp_generic

Modified Files:
	zapp_cmf_object_edit.py zapp_cmf_object_edit_form.pt 
	zapp_image_view.pt 
Log Message:
more edit/image fixes.. 

Index: zapp_cmf_object_edit.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_edit.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** zapp_cmf_object_edit.py	12 Jan 2004 14:25:16 -0000	1.7
--- zapp_cmf_object_edit.py	21 Jan 2004 12:26:48 -0000	1.8
***************
*** 39,43 ****
  submitValue = dict.get('submit','')
  
! for key in ['submit', 'zapp_dataType', 'zapp_misc_data_clear']:
      if dict.has_key(key):
          del dict[key]
--- 39,43 ----
  submitValue = dict.get('submit','')
  
! for key in ['submit', 'zapp_dataType', 'zapp_misc_data_clear', 'redirect_url']:
      if dict.has_key(key):
          del dict[key]

Index: zapp_cmf_object_edit_form.pt
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_edit_form.pt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** zapp_cmf_object_edit_form.pt	8 Jan 2004 11:20:26 -0000	1.6
--- zapp_cmf_object_edit_form.pt	21 Jan 2004 12:26:48 -0000	1.7
***************
*** 50,57 ****
                    propValue python:myProperties.get(propName,'')">
  
!    <table tal:condition="python:propType in ['float','int','long','string','date']">
       <tr><td tal:content="string:${propName}(${propType})"/><td><input tal:attributes="name string:${propName}:${propType}; value propValue"></td></tr>
     </table>
  
     <table tal:condition="python:propType in ['text']">
       <tr><td tal:content="string:${propName}(${propType})"/><td><textarea tal:content="propValue" tal:attributes="name string:${propName}" rows="5" cols="40"/></td></tr>
--- 50,61 ----
                    propValue python:myProperties.get(propName,'')">
  
!    <table tal:condition="python:propType in ['float','int','long','string']">
       <tr><td tal:content="string:${propName}(${propType})"/><td><input tal:attributes="name string:${propName}:${propType}; value propValue"></td></tr>
     </table>
  
+    <table tal:condition="python:propType in ['date']">
+      <tr><td tal:content="string:${propName}(${propType})"/><td><input tal:attributes="name string:${propName}:${propType}; value python:propValue or DateTime().strftime('%m/%d/%Y')"></td></tr>
+    </table>
+ 
     <table tal:condition="python:propType in ['text']">
       <tr><td tal:content="string:${propName}(${propType})"/><td><textarea tal:content="propValue" tal:attributes="name string:${propName}" rows="5" cols="40"/></td></tr>
***************
*** 77,83 ****
                                 propValue python:propValue and propValue.get(subPropName,'')">
         <td tal:content="string:${subPropName}(${propType})"/>
!        <td><input tal:condition="python:propType not in ['boolean','text']" tal:attributes="name string:${propName}.${subPropName}:${propType}:record; value propValue">
!            <textarea tal:condition="python:propType in ['text']" tal:content="propValue" tal:attributes="name string:${propName}.${subPropName}:record;" rows="5" cols="40"/>
!            <input tal:condition="python:propType in ['boolean']" type="checkbox" value="1" tal:attributes="name string:${propName}.${subPropName}:int:record; checked propValue">
         </td>
         </tal:block>
--- 81,89 ----
                                 propValue python:propValue and propValue.get(subPropName,'')">
         <td tal:content="string:${subPropName}(${propType})"/>
!        <td>
!             <input tal:condition="python:propType in ['float','int','long','string']" tal:attributes="name string:${propName}.${subPropName}:${propType}:record; value propValue">
!             <input tal:condition="python:propType in ['date']" tal:attributes="name string:${propName}.${subPropName}:${propType}:record; value python:propValue or DateTime().strftime('%m/%d/%Y')">       
!             <textarea tal:condition="python:propType in ['text']" tal:content="propValue" tal:attributes="name string:${propName}.${subPropName}:record;" rows="5" cols="40"/>
!             <input tal:condition="python:propType in ['boolean']" type="checkbox" value="1" tal:attributes="name string:${propName}.${subPropName}:int:record; checked propValue">
         </td>
         </tal:block>
***************
*** 95,99 ****
                                                                             subpropType propDef/type;
                                                                             currVal python:currItem.get(subPropName,'')">                                                                           
!          <input tal:condition="python:subpropType in ['float','int','long','string','date']" tal:attributes="name string:${propName}.${subPropName}:records; value currVal">
           <input tal:condition="python:subpropType in ['boolean']" type="checkbox" value="1" tal:attributes="name string:${propName}.${subPropName}:int:records; checked currVal">
           <textarea tal:condition="python:subpropType in ['text']" tal:content="currVal" tal:attributes="name string:${propName}.${subPropName}:records;" rows="5" cols="40"/>
--- 101,106 ----
                                                                             subpropType propDef/type;
                                                                             currVal python:currItem.get(subPropName,'')">                                                                           
!          <input tal:condition="python:subpropType in ['float','int','long','string']" tal:attributes="name string:${propName}.${subPropName}:records; value currVal">
!          <input tal:condition="python:subpropType in ['date']" tal:attributes="name string:${propName}.${subPropName}:records; value python:currVal or DateTime().strftime('%m/%d/%Y')">
           <input tal:condition="python:subpropType in ['boolean']" type="checkbox" value="1" tal:attributes="name string:${propName}.${subPropName}:int:records; checked currVal">
           <textarea tal:condition="python:subpropType in ['text']" tal:content="currVal" tal:attributes="name string:${propName}.${subPropName}:records;" rows="5" cols="40"/>
***************
*** 115,117 ****
  
  </body>
! </html>
\ No newline at end of file
--- 122,124 ----
  
  </body>
! </html>

Index: zapp_image_view.pt
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_image_view.pt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** zapp_image_view.pt	16 Jan 2004 09:55:34 -0000	1.2
--- zapp_image_view.pt	21 Jan 2004 12:26:48 -0000	1.3
***************
*** 25,32 ****
  
   <div tal:condition="python:here.Format() != 'application/x-shockwave-flash'">
!  <img tal:attributes="src python:here.zapp_get_fileObj().absolute_url()"/>
   </div>
  </div>
  
  </body>
! </html>
\ No newline at end of file
--- 25,33 ----
  
   <div tal:condition="python:here.Format() != 'application/x-shockwave-flash'">
!  <img tal:attributes="src python:here.zapp_get_fileObj().absolute_url();
!                       width zapp_image_width | 400"/>
   </div>
  </div>
  
  </body>
! </html>