[CMF-checkins] SVN: CMF/trunk/CMFDefault/skins/zpt_generic/ - some minor stylistic changes

[Yvo Schubbe]

Log message for revision 41723:
  - some minor stylistic changes

Changed:
  U   CMF/trunk/CMFDefault/skins/zpt_generic/batch_widgets.pt
  U   CMF/trunk/CMFDefault/skins/zpt_generic/folder_contents_template.pt
  U   CMF/trunk/CMFDefault/skins/zpt_generic/form_widgets.pt

-=-
Modified: CMF/trunk/CMFDefault/skins/zpt_generic/batch_widgets.pt
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/batch_widgets.pt	2006-02-21 09:44:13 UTC (rev 41722)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/batch_widgets.pt	2006-02-21 12:21:26 UTC (rev 41723)
@@ -8,17 +8,17 @@
                                        'match': 'foo'};
                       global batch python: {'summary': summary}" />
 
- <metal:block metal:define-macro="summary"
+ <metal:macro metal:define-macro="summary"
  ><p class="BatchSummary" tal:condition="batch/summary/length"
      i18n:translate="">Found <span tal:replace="batch/summary/length"
-      i18n:name="count">n</span> <span i18n:name="type"><span tal:omit-tag=""
-       tal:content="batch/summary/type" i18n:translate="">items</span></span
-  ><tal:case tal:condition="python: path('batch/summary/match') is not None"
+      i18n:name="count">N</span> <span i18n:name="type"><span tal:omit-tag=""
+       tal:content="batch/summary/type" i18n:translate="">ITEMS</span></span
+  ><tal:case tal:condition="python: batch['summary']['match'] is not None"
    > matching '<span tal:replace="batch/summary/match" i18n:name="text"
-    >search term</span>'</tal:case>.</p
+    >SEARCH TERM</span>'</tal:case>.</p
  ><p class="BatchSummary" tal:condition="not:batch/summary/length"
      i18n:translate="">There are no items matching your specified criteria.</p
-></metal:block>
+></metal:macro>
 
 
 <tal:test tal:define="items python: ( {'description': 'Description',
@@ -37,13 +37,13 @@
       i18n:attributes="alt; title" /></a
  ><tal:case tal:condition="item_info/title">&nbsp;
   <a href="" tal:attributes="href item_info/url"
-     tal:content="item_info/title">Title</a></tal:case
+     tal:content="item_info/title">TITLE</a></tal:case
  ><tal:case tal:condition="item_info/description">
   <br /><tal:span tal:content="item_info/description"
- >Description</tal:span></tal:case
+ >DESCRIPTION</tal:span></tal:case
  ><tal:case tal:condition="item_info/format">
   <br /><span><tal:span tal:content="item_info/format" i18n:translate=""
-  >format</tal:span><tal:case tal:condition="item_info/size"
+  >FORMAT</tal:span><tal:case tal:condition="item_info/size"
   >, <tal:span tal:content="item_info/size">99.9 KB</tal:span></tal:case
  ></span></tal:case></p
 ></metal:macro>
@@ -56,32 +56,32 @@
                       navigation python: {'previous': previous, 'next': next};
                       global batch python: {'navigation': navigation}" />
 
- <metal:block metal:define-macro="navigation"
-              tal:define="p batch/navigation/previous/url;
-                          n batch/navigation/next/url"
+ <metal:macro metal:define-macro="navigation"
+    tal:define="p batch/navigation/previous/url;
+                n batch/navigation/next/url"
  ><p class="BatchNavigation" tal:condition="python: p or n"
   ><tal:case tal:condition="p">
   <a href="" tal:attributes="href p" i18n:translate=""
   ><tal:span tal:content="batch/navigation/previous/text"
-   >Previous</tal:span
+   >PREVIOUS</tal:span
   > <tal:case tal:condition="batch/navigation/previous/length"
    ><span tal:replace="batch/navigation/previous/length"
-      i18n:name="count">n</span></tal:case
+      i18n:name="count">N</span></tal:case
   > <tal:span tal:content="batch/navigation/previous/type"
-   >items</tal:span></a></tal:case
- ><tal:case tal:condition="python:p and n">
+   >ITEMS</tal:span></a></tal:case
+ ><tal:case tal:condition="python: p and n">
   &nbsp;&nbsp;</tal:case
  ><tal:case tal:condition="n">
   <a href="" tal:attributes="href n" i18n:translate=""
   ><tal:span tal:content="batch/navigation/next/text"
-   >Next</tal:span
+   >NEXT</tal:span
   > <tal:case tal:condition="batch/navigation/next/length"
    ><span tal:replace="batch/navigation/next/length"
-      i18n:name="count">n</span></tal:case
+      i18n:name="count">N</span></tal:case
   > <tal:span tal:content="batch/navigation/next/type"
-   >items</tal:span></a></tal:case
+   >ITEMS</tal:span></a></tal:case
  ></p
-></metal:block>
+></metal:macro>
 
 </body>
 </html>

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/folder_contents_template.pt
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/folder_contents_template.pt	2006-02-21 09:44:13 UTC (rev 41722)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/folder_contents_template.pt	2006-02-21 12:21:26 UTC (rev 41723)
@@ -8,11 +8,10 @@
 
 <metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
    tal:define="batch options/batch;
-               form options/form;
-               up_info options/up_info">
+               form options/form">
 <div class="Desktop">
 
-<p tal:condition="up_info"
+<p tal:define="up_info options/up_info" tal:condition="up_info"
 ><tal:case tal:condition="up_info/url"
  ><a href="" tal:attributes="href up_info/url"
   ><img src="" alt="[Link]" border="0" tal:attributes="src up_info/icon"
@@ -33,7 +32,7 @@
     <th width="80" tal:repeat="column_info batch/listColumnInfos"
        tal:attributes="width column_info/width; colspan column_info/colspan"
     ><a href="" tal:attributes="href column_info/url"
-        tal:content="column_info/title" i18n:translate="">Type</a></th>
+        tal:content="column_info/title">COLUMN TITLE</a></th>
    </tr>
   </thead>
   <tbody tal:repeat="item_info batch/listItemInfos">

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/form_widgets.pt
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/form_widgets.pt	2006-02-21 09:44:13 UTC (rev 41722)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/form_widgets.pt	2006-02-21 12:21:26 UTC (rev 41723)
@@ -6,23 +6,23 @@
                       global form python: {'listHiddenVarInfos': hidden_vars}
                       " />
 
-<metal:block metal:define-macro="hidden_vars">
+<metal:macro metal:define-macro="hidden_vars">
  <tal:loop tal:repeat="hidden_var form/listHiddenVarInfos"
  ><input type="hidden" name="HiddenVarName" value=""
      tal:attributes="name hidden_var/name; value hidden_var/value" /></tal:loop
-></metal:block>
+></metal:macro>
 
 <tal:test tal:define="buttons python: ( {'name': 'delete_items',
                                          'value': 'Delete'}, );
                       global form python: {'listButtonInfos': buttons}" />
 
- <metal:block metal:define-macro="buttons"
+ <metal:macro metal:define-macro="buttons"
 ><div class="FormButtons">
   <tal:loop tal:repeat="button form/listButtonInfos"
   ><input type="submit" name="ButtonName" value="ButtonValue"
       tal:attributes="name button/name; value button/value"
       i18n:attributes="value" /></tal:loop></div
-></metal:block>
+></metal:macro>
 
 </body>
 </html>