[Zope-CVS] CVS: Products/CompositePage/www - addCompositeForm.zpt:1.5 sample_template.zpt:1.2 metal_template.zpt:NONE

[Shane Hathaway]

Update of /cvs-repository/Products/CompositePage/www
In directory cvs.zope.org:/tmp/cvs-serv1892/www

Modified Files:
	addCompositeForm.zpt sample_template.zpt 
Removed Files:
	metal_template.zpt 
Log Message:
Removed support for METAL-based slot definition syntax.

It broke in too many ways.  It has been replaced by a new TAL
expression type, "slot:".  See www/sample_template.zpt for an example.



=== Products/CompositePage/www/addCompositeForm.zpt 1.4 => 1.5 ===
--- Products/CompositePage/www/addCompositeForm.zpt:1.4	Sat Oct  4 14:21:10 2003
+++ Products/CompositePage/www/addCompositeForm.zpt	Tue Apr 13 15:12:05 2004
@@ -33,16 +33,11 @@
   <tr>
     <td align="left" valign="top">
     <div class="form-optional">
-    Create sample template:
+    Create a sample template
     </div>
     </td>
     <td align="left" valign="top">
-    <input type="radio" name="create_sample"
-      value="metal_template.zpt" checked="checked" />
-      METAL (uses METAL macros and slots)<br />
-    <input type="radio" name="create_sample" value="sample_template.zpt" />
-      Basic (uses "here/slots/name/multiple" TAL expressions)<br />
-    <input type="radio" name="create_sample" value="" /> None
+    <input type="checkbox" name="create_sample" checked="checked" />
     </td>
   </tr>
   <tr>


=== Products/CompositePage/www/sample_template.zpt 1.1 => 1.2 ===
--- Products/CompositePage/www/sample_template.zpt:1.1	Fri Sep 26 17:21:06 2003
+++ Products/CompositePage/www/sample_template.zpt	Tue Apr 13 15:12:05 2004
@@ -8,44 +8,36 @@
 <tr>
 <th colspan="3">
 <h2>
-Composite Page Example
+CompositePage Example Template
 </h2>
 </th>
 </tr>
 <tr>
 
 <td width="25%" valign="top">
-Left column
-<div class="column-element" tal:repeat="element here/slots/left/multiple|nothing"
-     tal:content="structure element">
-Element here...
+<div tal:replace="structure slot: left 'Left column'">
+Left column elements here
 </div>
 </td>
 
 <td width="50%" valign="top">
-Middle column
-<div class="main-element" tal:repeat="element here/slots/middle/multiple|nothing"
-     tal:content="structure element">
-Element here...
+<div tal:replace="structure slot: middle 'Middle column'">
+Middle column elements here
 </div>
 </td>
 
 <td width="50%" valign="top">
 
-Small ad
-
 <table border="1" width="100%">
 <tr>
-<td tal:content="structure here/slots/small_ad/single|default">
-&nbsp;
+<td tal:content="structure slot: small_ad 'Small ad'">
+Small ad here
 </td>
 </tr>
 </table>
 
-Right column
-<div class="column-element" tal:repeat="element here/slots/right/multiple|nothing"
-     tal:content="structure element">
-Element here...
+<div tal:replace="structure slot: right 'Right column'">
+Right column here
 </div>
 </td>
 
@@ -56,11 +48,11 @@
 <br />
 
 <div align="center">
-Copyrights and trademarks
-<div tal:content="structure here/slots/bottom/single|default">
+<div tal:replace="structure slot: notices 'Attribution and legal notices'">
+Attribution and legal notices
 </div>
+
 </div>
 
   </body>
 </html>
-

=== Removed File Products/CompositePage/www/metal_template.zpt ===