[z3-checkins] r10817 - z3/CMFonFive/trunk

Mon Apr 18 17:59:58 MEST 2005

Author: regebro
Date: Mon Apr 18 17:59:58 2005
New Revision: 10817

Modified:
   z3/CMFonFive/trunk/five_template.pt
Log:
Sync with trunk

Modified: z3/CMFonFive/trunk/five_template.pt
==============================================================================

--- z3/CMFonFive/trunk/five_template.pt	(original)
+++ z3/CMFonFive/trunk/five_template.pt	Mon Apr 18 17:59:58 2005
@@ -1,4 +1,4 @@
-<html metal:define-macro="master">
+<html metal:define-macro="page">
 <span metal:use-macro="here/main_template/macros/master">
  <metal:block fill-slot="base">
    <metal:block define-slot="base" />
@@ -6,8 +6,11 @@
  <metal:block fill-slot="header">
    <metal:block define-slot="header" />
  </metal:block>
+ <metal:block fill-slot="css_slot">
+   <metal:block define-slot="style_slot" />
+ </metal:block>
  <metal:block fill-slot="main">
-   <metal:block define-slot="main" />
+   <metal:block define-slot="body" />
  </metal:block>
 </span>
 </html>
