use new plone4 slots line content-core, content-title etc.

collective · Aug 19, 2011 · 75f391d · 75f391d
1 parent a70c575
commit 75f391d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 38 deletions.
diff --git a/Products/Ploneboard/browser/templates/board.pt b/Products/Ploneboard/browser/templates/board.pt
@@ -5,22 +5,20 @@
       metal:use-macro="here/main_template/macros/master"
       i18n:domain="ploneboard">
 
-<body>
-  <div metal:fill-slot="main"
-       tal:define="categories here/getCategories|nothing;
-                   keyedforums view/getKeyedForums;
-                   portal context/@@plone_portal_state/portal | nocall:portal;
-                   mtool context/@@plone_tools/membership">
-
-    <div tal:replace="structure provider:plone.abovecontenttitle" />
-
+  <metal:css fill-slot="css_slot">
+    <style type="text/css" media="all"
+           tal:content="string: @import url($portal_url/ploneboard.css);"></style>
+  </metal:css>
+
+  <div metal:fill-slot="content-title">
     <h1 class="documentFirstHeading">
       <img src="" tal:replace="structure here/ploneboard_icon.gif" />
       <span tal:replace="here/Title">Board title</span>
     </h1>
-
-    <div tal:replace="structure provider:plone.belowcontenttitle" />
+  </div>
 
+  <div metal:fill-slot="content-description"
+       tal:define="portal context/@@plone_portal_state/portal | nocall:portal">
     <ul class="visualNoMarker discreet"
         style="float:right; margin: 0 0 1em 1em;">
         <li>
@@ -57,15 +55,19 @@
       Board Description
     </p>
 
-    <div tal:replace="structure provider:plone.abovecontentbody" />
-
     <div class="visualClear"></div>
+  </div>
 
+ <div metal:fill-slot="content-core"
+       tal:define="categories here/getCategories|nothing;
+                   keyedforums view/getKeyedForums;
+                   portal context/@@plone_portal_state/portal | nocall:portal;
+                   mtool context/@@plone_tools/membership">
+
     <div class="discreet"
          tal:condition="not: keyedforums" i18n:translate="not_forums">
       No forums exist in this board yet, use the add menu to add forums.
     </div>
-
 
     <tal:categories repeat="category categories">
       <tal:category define="forums keyedforums/?category|nothing"
@@ -154,8 +156,6 @@
       Board footer
     </metal:footer>
 
-    <div tal:replace="structure provider:plone.belowcontentbody" />
 
   </div>
-</body>
 </html>
diff --git a/Products/Ploneboard/browser/templates/forum.pt b/Products/Ploneboard/browser/templates/forum.pt
@@ -5,34 +5,21 @@
       metal:use-macro="here/main_template/macros/master"
       i18n:domain="ploneboard">
 
-<head>
    <metal:top fill-slot="top_slot">
       <tal:block condition="python:not user.has_permission('Ploneboard: Add Forum', here) and not user.has_permission('Ploneboard: Moderate Forum', here)">
         <tal:border define="dummy python:request.set('disable_border', True)" />
       </tal:block>
    </metal:top>
-</head>
-
-<body>
-
-    <div metal:fill-slot="main"
-         tal:define="numConversations view/getNumberOfConversations;
-                     pss modules/Products/PythonScripts/standard;
-                     DateTime nocall:modules/DateTime/DateTime;
-                     last_login view/last_login;
-                     isAnon context/@@plone_portal_state/anonymous;
-                     portal context/@@plone_portal_state/portal | nocall:portal;
-                     mtool context/@@plone_tools/membership;">
-
-        <div tal:replace="structure provider:plone.abovecontenttitle" />
 
+  <div metal:fill-slot="content-title"
+         tal:define="portal context/@@plone_portal_state/portal | nocall:portal;">
         <h1 class="documentFirstHeading">
         <img src="" tal:replace="structure portal/ploneboard_forum_icon.gif" />
         <span tal:replace="here/Title">Forum title</span>
         </h1>
+  </div>
 
-        <div tal:replace="structure provider:plone.belowcontenttitle" />
-
+  <div metal:fill-slot="content-description">
         <ul class="visualNoMarker discreet"
             style="float:right; margin: 0 0 1em 1em;">
             <li>
@@ -58,10 +45,18 @@
         Forum Description
         </div>
 
-        <div tal:replace="structure provider:plone.abovecontentbody" />
-
         <div class="visualClear"></div>
+  </div>
 
+ <div metal:fill-slot="content-core"
+         tal:define="numConversations view/getNumberOfConversations;
+                     pss modules/Products/PythonScripts/standard;
+                     DateTime nocall:modules/DateTime/DateTime;
+                     last_login view/last_login;
+                     isAnon context/@@plone_portal_state/anonymous;
+                     portal context/@@plone_portal_state/portal | nocall:portal;
+                     mtool context/@@plone_tools/membership;">
+
         <p class="discreet"
              i18n:translate="not_conversations"
              tal:condition="python:numConversations == 0">
@@ -207,9 +202,6 @@
 
         <metal:footer use-macro="here/board_footer/macros/footer">Board footer</metal:footer>
 
-        <div tal:replace="structure provider:plone.belowcontentbody" />
-
     </div>
 
-</body>
 </html>