[Zope3-checkins] CVS: Zope3/src/zope/app/browser/form - add.pt:1.23 display.pt:1.2 edit.pt:1.16 editwizard.pt:1.4 subedit.pt:1.5

Garrett Smith garrett at mojave-corp.com
Fri Mar 5 23:01:45 EST 2004


Update of /cvs-repository/Zope3/src/zope/app/browser/form
In directory cvs.zope.org:/tmp/cvs-serv12986/src/zope/app/browser/form

Modified Files:
	add.pt display.pt edit.pt editwizard.pt subedit.pt 
Log Message:
Modified templates to use widget 'label', '__call__', and 'error' to render a 
row instead of widget 'row'.


=== Zope3/src/zope/app/browser/form/add.pt 1.22 => 1.23 ===
--- Zope3/src/zope/app/browser/form/add.pt:1.22	Tue Feb  3 17:07:07 2004
+++ Zope3/src/zope/app/browser/form/add.pt	Fri Mar  5 23:01:44 2004
@@ -30,19 +30,29 @@
             <div class="label">Extra top</div>
             <div class="label"><input type="text" style="width:100%" /></div>
         </div>
-        <div class="row"
-            metal:define-macro="widget_rows" tal:repeat="widget view/widgets"
-            tal:content="structure widget/row">
-          <div class="label">Name</div>
-          <div class="field"><input type="text" style="width:100%"/></div>
-         </div>
+        
+        <div class="row" 
+          metal:define-macro="widget_rows" tal:repeat="widget view/widgets">
+          <div class="label" tal:content="structure widget/label">Name</div>
+          <div class="field" tal:content="structure widget">
+            <input type="text" style="width:100%"/>
+          </div>
+          <div class="error" tal:define="error widget/error"
+            tal:condition="error" tal:content="structure error">
+            The Error
+          </div>
+        </div>
+        
         <div class="separator"></div>
+        
         <div class="row"
             metal:define-slot="extra_bottom" tal:replace="nothing">
           <div class="label">Extra bottom</div>
           <div class="field"><input type="text" style="width:100%" /></div>
         </div>
+        
         <div class="separator"></div>
+        
       </div>
       <br/><br/>
       <div class="row">


=== Zope3/src/zope/app/browser/form/display.pt 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/form/display.pt:1.1	Wed Apr 16 17:56:03 2003
+++ Zope3/src/zope/app/browser/form/display.pt	Fri Mar  5 23:01:44 2004
@@ -18,11 +18,16 @@
         <div class="label">Extra top</div>
         <div class="field"><input type="text" style="width:100%" /></div>
     </div>
-    <div class="row"
-         metal:define-macro="widget_rows" tal:repeat="widget view/widgets"
-         tal:content="structure widget/row">
-        <div class="label">Name</div>
-        <div class="field"><input type="text" style="width:100%" /></div>
+        <div class="row" metal:define-macro="widget_rows" 
+	    		         tal:repeat="widget view/widgets">
+             <div class="label" tal:content="structure widget/label">Name</div>
+             <div class="field" tal:content="structure widget">
+                    <input type="text" style="width:100%"/>
+             </div>
+             <div class="error" tal:define="error widget/error"
+			 	tal:condition="error" tal:content="structure error">
+				The Error
+             </div>
     </div>
     <div class="row"
          metal:define-slot="extra_bottom" tal:replace="nothing">


=== Zope3/src/zope/app/browser/form/edit.pt 1.15 => 1.16 ===
--- Zope3/src/zope/app/browser/form/edit.pt:1.15	Mon Jan 12 13:56:08 2004
+++ Zope3/src/zope/app/browser/form/edit.pt	Fri Mar  5 23:01:44 2004
@@ -32,11 +32,16 @@
             <div class="label">Extra top</div>
             <div class="field"><input type="text" style="width:100%" /></div>
         </div>
-        <div class="row"
-             metal:define-macro="widget_rows" tal:repeat="widget view/widgets"
-             tal:content="structure widget/row">
-            <div class="label">Name</div>
-            <div class="field"><input type="text" style="width:100%" /></div>
+        <div class="row" metal:define-macro="widget_rows" 
+	    		         tal:repeat="widget view/widgets">
+             <div class="label" tal:content="structure widget/label">Name</div>
+             <div class="field" tal:content="structure widget">
+                    <input type="text" style="width:100%"/>
+             </div>
+             <div class="error" tal:define="error widget/error"
+			 	tal:condition="error" tal:content="structure error">
+				The Error
+             </div>
         </div>
         <div class="separator"></div>
         <div class="row"


=== Zope3/src/zope/app/browser/form/editwizard.pt 1.3 => 1.4 ===
--- Zope3/src/zope/app/browser/form/editwizard.pt:1.3	Mon Jul 14 11:28:23 2003
+++ Zope3/src/zope/app/browser/form/editwizard.pt	Fri Mar  5 23:01:44 2004
@@ -25,11 +25,16 @@
             <div class="label">Extra top</div>
             <div class="field"><input type="text" style="width:100%" /></div>
         </div>
-        <div class="row"
-             metal:define-macro="widget_rows" tal:repeat="widget view/widgets"
-             tal:content="structure widget/row">
-            <div class="label">Name</div>
-            <div class="field"><input type="text" style="width:100%" /></div>
+        <div class="row" metal:define-macro="widget_rows" 
+	    		         tal:repeat="widget view/widgets">
+             <div class="label" tal:content="structure widget/label">Name</div>
+             <div class="field" tal:content="structure widget">
+                    <input type="text" style="width:100%"/>
+             </div>
+             <div class="error" tal:define="error widget/error"
+			 	tal:condition="error" tal:content="structure error">
+				The Error
+             </div>
         </div>
         <div tal:replace="structure view/renderHidden">
           <!-- type=hidden input controls for passing state without session -->


=== Zope3/src/zope/app/browser/form/subedit.pt 1.4 => 1.5 ===
--- Zope3/src/zope/app/browser/form/subedit.pt:1.4	Fri Feb 21 04:45:21 2003
+++ Zope3/src/zope/app/browser/form/subedit.pt	Fri Mar  5 23:01:44 2004
@@ -32,11 +32,16 @@
       <div class="label">Extra top</div>
       <div class="field"><input type="text" style="width:100%" /></div>
   </div>
-  <div class="row"
-       metal:define-macro="widget_rows" tal:repeat="widget view/widgets"
-       tal:content="structure widget/row">
-      <div class="label">Name</div>
-      <div class="field"><input type="text" style="width:100%" /></div>
+    <div class="row" metal:define-macro="widget_rows" 
+                     tal:repeat="widget view/widgets">
+         <div class="label" tal:content="structure widget/label">Name</div>
+         <div class="field" tal:content="structure widget">
+                <input type="text" style="width:100%"/>
+         </div>
+		 <div class="error" tal:define="error widget/error"
+			tal:condition="error" tal:content="structure error">
+			The Error
+		 </div>
   </div>
   <div class="row"
        metal:define-slot="extra_bottom" tal:replace="nothing">




More information about the Zope3-Checkins mailing list