[CMF-checkins] SVN: CMF/branches/2.0/C - refactored and fixed slots
Yvo Schubbe
y.2006_ at wcm-solutions.de
Sat Mar 25 10:57:09 EST 2006
Log message for revision 66161:
- refactored and fixed slots
Changed:
U CMF/branches/2.0/CHANGES.txt
U CMF/branches/2.0/CMFDefault/browser/templates/document.pt
U CMF/branches/2.0/CMFDefault/browser/templates/document_edit.pt
U CMF/branches/2.0/CMFDefault/browser/templates/folder.pt
U CMF/branches/2.0/CMFDefault/browser/templates/folder_contents.pt
U CMF/branches/2.0/CMFDefault/browser/templates/link.pt
U CMF/branches/2.0/CMFDefault/browser/templates/link_edit.pt
U CMF/branches/2.0/CMFDefault/browser/templates/metadata_edit.pt
U CMF/branches/2.0/CMFDefault/browser/templates/metadata_minimal_edit.pt
U CMF/branches/2.0/CMFDefault/browser/templates/newsitem_edit.pt
U CMF/branches/2.0/CMFDefault/skin/five_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/main_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/zpt_stylesheet.css
-=-
Modified: CMF/branches/2.0/CHANGES.txt
===================================================================
--- CMF/branches/2.0/CHANGES.txt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CHANGES.txt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -2,6 +2,10 @@
Bug Fixes
+ - CMFDefault: Refactored slots in five_template and main_template.
+ main_template has now a new 'body' slot that wraps around 'header' and
+ 'main' slot. main_template's 'header' slot is now empty by default.
+
- PortalFolder: Content IDs starting with '@@' are now disallowed.
These names are reserved for browser views.
Modified: CMF/branches/2.0/CMFDefault/browser/templates/document.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/document.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/browser/templates/document.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -17,7 +17,7 @@
<metal:macro metal:use-macro="context/content_byline/macros/byline" />
</metal:slot>
-<metal:slot metal:fill-slot="body">
+<metal:slot metal:fill-slot="main">
<tal:span tal:replace="structure view/text">Cooked Body</tal:span>
<div class="Discussion" tal:condition="context/viewThreadsAtBottom|nothing">
Modified: CMF/branches/2.0/CMFDefault/browser/templates/document_edit.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/document_edit.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/browser/templates/document_edit.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -6,7 +6,7 @@
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
</metal:slot>
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<div class="Desktop">
<form action="document_edit_form" method="post" enctype="multipart/form-data"
Modified: CMF/branches/2.0/CMFDefault/browser/templates/folder.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/folder.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/browser/templates/folder.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -13,7 +13,7 @@
header goes here.</div></tal:case
></metal:slot>
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<div id="content_well"
style="float: left; top: 0; width: 78%;">
<div tal:condition="not: view/has_local">
Modified: CMF/branches/2.0/CMFDefault/browser/templates/folder_contents.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/folder_contents.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/browser/templates/folder_contents.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -6,7 +6,7 @@
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
</metal:slot>
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<div class="Desktop">
<p tal:define="up_info view/up_info" tal:condition="up_info"
Modified: CMF/branches/2.0/CMFDefault/browser/templates/link.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/link.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/browser/templates/link.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -17,7 +17,7 @@
<metal:macro metal:use-macro="context/content_byline/macros/byline" />
</metal:slot>
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<p i18n:translate="">Link:
<a href="" tal:attributes="href view/url" tal:content="view/url"
i18n:name="link">http://www.zope.org</a></p>
Modified: CMF/branches/2.0/CMFDefault/browser/templates/link_edit.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/link_edit.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/browser/templates/link_edit.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -6,7 +6,7 @@
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
</metal:slot>
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<div class="Desktop">
<form action="link_edit_form" method="post"
Modified: CMF/branches/2.0/CMFDefault/browser/templates/metadata_edit.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/metadata_edit.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/browser/templates/metadata_edit.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -6,7 +6,7 @@
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
</metal:slot>
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<div class="Desktop">
<form action="metadata_edit_form" method="post"
Modified: CMF/branches/2.0/CMFDefault/browser/templates/metadata_minimal_edit.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/metadata_minimal_edit.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/browser/templates/metadata_minimal_edit.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -6,7 +6,7 @@
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
</metal:slot>
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<div class="Desktop">
<form action="folder_edit_form" method="post"
Modified: CMF/branches/2.0/CMFDefault/browser/templates/newsitem_edit.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/newsitem_edit.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/browser/templates/newsitem_edit.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -6,7 +6,7 @@
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
</metal:slot>
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<div class="Desktop">
<form action="newsitem_edit_form" method="post"
Modified: CMF/branches/2.0/CMFDefault/skin/five_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skin/five_template.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/skin/five_template.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -1,15 +1,15 @@
-<metal:block define-macro="page"><metal:block use-macro="here/main_template/macros/master">
- <metal:block fill-slot="base">
- <metal:block define-slot="base" />
- </metal:block>
- <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="body" />
- </metal:block>
-</metal:block>
-</metal:block>
+<metal:macro metal:define-macro="page"
+><html metal:use-macro="context/main_template/macros/master">
+<head>
+<metal:slot metal:fill-slot="base"
+><metal:slot metal:define-slot="base" /></metal:slot>
+<metal:slot metal:fill-slot="style_slot"
+><metal:slot metal:define-slot="style_slot" /></metal:slot>
+</head>
+<body>
+<metal:slot metal:fill-slot="body"
+><metal:slot metal:define-slot="body"
+><metal:slot metal:define-slot="header" />
+ <metal:slot metal:define-slot="main" /></metal:slot></metal:slot>
+</body>
+</html></metal:macro>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/main_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/main_template.pt 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/main_template.pt 2006-03-25 15:57:09 UTC (rev 66161)
@@ -256,8 +256,9 @@
<td width="16px"> </td>
<td id="ForematterCell">
+ <div id="Desktop">
- <p id="Breadcrumbs" style="padding-top: 5px">
+ <p id="Breadcrumbs">
<span tal:repeat="bc context/breadcrumbs"
><a href="."
tal:attributes="href bc/url" tal:content="bc/id"
@@ -270,25 +271,10 @@
tal:content="globals/status_message"
i18n:translate="">Status message.</p>
-<metal:slot metal:define-slot="header">
-<h1 id="DesktopTitle" tal:content="object_title">Page Title</h1>
+<metal:slot metal:define-slot="body"
+><metal:slot metal:define-slot="header" />
+<metal:slot metal:define-slot="main" /></metal:slot>
-<div id="DesktopDescription" tal:content="object_description">Description
- of the resource goes here, perhaps even wrapping lines; this is to make it
- long enough to test.</div>
-</metal:slot>
-<!-- end formatter -->
-
-<div id="Desktop">
-
-<metal:slot metal:define-slot="main">
-<h2>Section Header</h2>
-
-<p>The content of the object is <a href="render">rendered</a> hre. Lorem ipsum
- dolorem. Nihil obstat imprimatur. Semper ubi sub ubi. Non illegitimi
- carborundum. In vino veritas. E pluribus unam.</p>
-</metal:slot>
-
<div id="Permalink"
tal:define="url context/get_permalink | nothing"
tal:condition="url">
@@ -298,9 +284,7 @@
</a>
</div>
- <!-- end Desktop -->
- </div>
-
+ </div>
</td>
</tr>
</table>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/zpt_stylesheet.css
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/zpt_stylesheet.css 2006-03-25 12:59:18 UTC (rev 66160)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/zpt_stylesheet.css 2006-03-25 15:57:09 UTC (rev 66161)
@@ -209,8 +209,7 @@
}
#Desktop {
- margin-left: 0px;
- margin-right: 16px;
+ margin: 16px 16px 16px 0;
}
#Permalink {
More information about the CMF-checkins
mailing list