[CMF-checkins] SVN: CMF/branches/2.0/C - removed again the CMF specific slots from five_template (they were added in CMF 2.0.0-alpha, so we don't need to provide BBB)

Yvo Schubbe y.2006_ at wcm-solutions.de
Tue Mar 28 14:16:48 EST 2006 

Log message for revision 66248:
  - removed again the CMF specific slots from five_template (they were added in CMF 2.0.0-alpha, so we don't need to provide BBB)
  - updated browser view templates and cmf_default.pot

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/locales/cmf_default.pot
  U   CMF/branches/2.0/CMFDefault/skin/five_template.pt

-=-
Modified: CMF/branches/2.0/CHANGES.txt
===================================================================
--- CMF/branches/2.0/CHANGES.txt	2006-03-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CHANGES.txt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -5,6 +5,8 @@
     - 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.
+      The CMF specific slots added in CMF 2.0.0-alpha have been removed again
+      from the five_template.
 
     - 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-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/browser/templates/document.pt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -1,23 +1,21 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <head>
 
-<metal:slot fill-slot="base">
+<metal:slot fill-slot="style_slot">
 <tal:span tal:replace="structure context/getBaseTag" />
 </metal:slot>
 
 </head>
 <body>
 
-<metal:slot metal:fill-slot="header">
+<metal:slot metal:fill-slot="body">
 <h1 id="DesktopTitle" tal:content="view/title">Document Title</h1>
 
 <div id="DesktopDescription" tal:content="view/description">Document
  Description goes here.</div>
 
 <metal:macro metal:use-macro="context/content_byline/macros/byline" />
-</metal:slot>
 
-<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-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/browser/templates/document_edit.pt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -1,12 +1,10 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <body>
 
-<metal:slot metal:fill-slot="header" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
 <h1 i18n:translate="">Edit: <tal:span
     tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-</metal:slot>
 
-<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-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/browser/templates/folder.pt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -1,7 +1,7 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <body>
 
-<metal:slot metal:fill-slot="header" i18n:domain="cmf_default"
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default"
 ><tal:case tal:condition="not: view/has_local"
 ><h1 id="DesktopTitle" tal:content="view/title">Page Title</h1>
 
@@ -10,10 +10,8 @@
  long enough to test.</div></tal:case
 ><tal:case tal:condition="view/has_local"
 ><div metal:use-macro="context/local_pt/macros/header | default">'local_pt'
- header goes here.</div></tal:case
-></metal:slot>
+ header goes here.</div></tal:case>
 
-<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-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/browser/templates/folder_contents.pt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -1,12 +1,10 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <body>
 
-<metal:slot metal:fill-slot="header" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
 <h1 i18n:translate="">Folder Contents: <tal:span
     tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-</metal:slot>
 
-<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-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/browser/templates/link.pt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -1,23 +1,21 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <head>
 
-<metal:slot fill-slot="base">
+<metal:slot fill-slot="style_slot">
 <tal:span tal:replace="structure context/getBaseTag" />
 </metal:slot>
 
 </head>
 <body>
 
-<metal:slot metal:fill-slot="header">
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
 <h1 id="DesktopTitle" tal:content="view/title">Document Title</h1>
 
 <div id="DesktopDescription" tal:content="view/description">Document
  Description goes here.</div>
 
 <metal:macro metal:use-macro="context/content_byline/macros/byline" />
-</metal:slot>
 
-<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-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/browser/templates/link_edit.pt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -1,12 +1,10 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <body>
 
-<metal:slot metal:fill-slot="header" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
 <h1 i18n:translate="">Edit: <tal:span
     tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-</metal:slot>
 
-<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-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/browser/templates/metadata_edit.pt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -1,12 +1,10 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <body>
 
-<metal:slot metal:fill-slot="header" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
 <h1 i18n:translate="">Resource Metadata: <tal:span
     tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-</metal:slot>
 
-<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-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/browser/templates/metadata_minimal_edit.pt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -1,12 +1,10 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <body>
 
-<metal:slot metal:fill-slot="header" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
 <h1 i18n:translate="">Edit: <tal:span
     tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-</metal:slot>
 
-<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-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/browser/templates/newsitem_edit.pt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -1,12 +1,10 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <body>
 
-<metal:slot metal:fill-slot="header" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
 <h1 i18n:translate="">Edit: <tal:span
     tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-</metal:slot>
 
-<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/locales/cmf_default.pot
===================================================================
--- CMF/branches/2.0/CMFDefault/locales/cmf_default.pot	2006-03-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/locales/cmf_default.pot	2006-03-28 19:16:48 UTC (rev 66248)
@@ -331,11 +331,11 @@
 msgid "News Item changed."
 msgstr ""
 
-#: CMFDefault/browser/templates/document_edit.pt:17
-#: CMFDefault/browser/templates/link_edit.pt:16
-#: CMFDefault/browser/templates/metadata_edit.pt:38
-#: CMFDefault/browser/templates/metadata_minimal_edit.pt:16
-#: CMFDefault/browser/templates/newsitem_edit.pt:16
+#: CMFDefault/browser/templates/document_edit.pt:15
+#: CMFDefault/browser/templates/link_edit.pt:14
+#: CMFDefault/browser/templates/metadata_edit.pt:36
+#: CMFDefault/browser/templates/metadata_minimal_edit.pt:14
+#: CMFDefault/browser/templates/newsitem_edit.pt:14
 #: CMFDefault/skins/zpt_content/document_edit_template.pt:18
 #: CMFDefault/skins/zpt_content/file_edit_template.pt:17
 #: CMFDefault/skins/zpt_content/folder_edit_template.pt:17
@@ -351,9 +351,9 @@
 msgid "Title"
 msgstr ""
 
-#: CMFDefault/browser/templates/document_edit.pt:21
-#: CMFDefault/browser/templates/metadata_edit.pt:45
-#: CMFDefault/browser/templates/metadata_minimal_edit.pt:23
+#: CMFDefault/browser/templates/document_edit.pt:19
+#: CMFDefault/browser/templates/metadata_edit.pt:43
+#: CMFDefault/browser/templates/metadata_minimal_edit.pt:21
 #: CMFDefault/skins/zpt_content/document_edit_template.pt:22
 #: CMFDefault/skins/zpt_content/file_edit_template.pt:21
 #: CMFDefault/skins/zpt_content/folder_edit_template.pt:24
@@ -365,9 +365,9 @@
 msgid "Description"
 msgstr ""
 
-#: CMFDefault/browser/templates/document_edit.pt:25
-#: CMFDefault/browser/templates/metadata_edit.pt:91
-#: CMFDefault/browser/templates/newsitem_edit.pt:20
+#: CMFDefault/browser/templates/document_edit.pt:23
+#: CMFDefault/browser/templates/metadata_edit.pt:89
+#: CMFDefault/browser/templates/newsitem_edit.pt:18
 #: CMFDefault/skins/zpt_content/document_edit_template.pt:26
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:92
 #: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:21
@@ -375,28 +375,28 @@
 msgid "Format"
 msgstr ""
 
-#: CMFDefault/browser/templates/document_edit.pt:29
-#: CMFDefault/browser/templates/newsitem_edit.pt:24
+#: CMFDefault/browser/templates/document_edit.pt:27
+#: CMFDefault/browser/templates/newsitem_edit.pt:22
 #: CMFDefault/skins/zpt_content/document_edit_template.pt:30
 #: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:25
 msgid "structured-text"
 msgstr ""
 
-#: CMFDefault/browser/templates/document_edit.pt:32
-#: CMFDefault/browser/templates/newsitem_edit.pt:27
+#: CMFDefault/browser/templates/document_edit.pt:30
+#: CMFDefault/browser/templates/newsitem_edit.pt:25
 #: CMFDefault/skins/zpt_content/document_edit_template.pt:33
 #: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:28
 msgid "plain text"
 msgstr ""
 
-#: CMFDefault/browser/templates/document_edit.pt:35
-#: CMFDefault/browser/templates/newsitem_edit.pt:30
+#: CMFDefault/browser/templates/document_edit.pt:33
+#: CMFDefault/browser/templates/newsitem_edit.pt:28
 #: CMFDefault/skins/zpt_content/document_edit_template.pt:36
 #: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:31
 msgid "html"
 msgstr ""
 
-#: CMFDefault/browser/templates/document_edit.pt:39
+#: CMFDefault/browser/templates/document_edit.pt:37
 #: CMFDefault/skins/zpt_content/document_edit_template.pt:40
 msgid "Upload"
 msgstr ""
@@ -415,22 +415,22 @@
 msgid "Edit: ${obj_title}"
 msgstr ""
 
-#: CMFDefault/browser/templates/folder_contents.pt:15
+#: CMFDefault/browser/templates/folder_contents.pt:13
 #: CMFDefault/skins/zpt_generic/folder_contents_template.pt:17
 msgid "[Link]"
 msgstr ""
 
-#: CMFDefault/browser/templates/folder_contents.pt:17
+#: CMFDefault/browser/templates/folder_contents.pt:15
 #: CMFDefault/skins/zpt_generic/folder_contents_template.pt:19
 msgid "Up to"
 msgstr ""
 
-#: CMFDefault/browser/templates/folder_contents.pt:21
+#: CMFDefault/browser/templates/folder_contents.pt:19
 #: CMFDefault/skins/zpt_generic/folder_contents_template.pt:23
 msgid "Root"
 msgstr ""
 
-#: CMFDefault/browser/templates/folder_contents.pt:46
+#: CMFDefault/browser/templates/folder_contents.pt:44
 #: CMFDefault/skins/zpt_content/content_status_history.pt:27
 #: CMFDefault/skins/zpt_content/content_status_history.pt:34
 #: CMFDefault/skins/zpt_content/transition_form.pt:28
@@ -455,7 +455,7 @@
 #: CMFDefault/skins/zpt_generic/main_template.pt:207
 #: CMFDefault/skins/zpt_generic/main_template.pt:221
 #: CMFDefault/skins/zpt_generic/main_template.pt:235
-#: CMFDefault/skins/zpt_generic/main_template.pt:268
+#: CMFDefault/skins/zpt_generic/main_template.pt:269
 #: CMFDefault/skins/zpt_generic/review.pt:59
 #: CMFDefault/skins/zpt_generic/roster.pt:46
 #: CMFDefault/skins/zpt_generic/search_results_template.pt:37
@@ -468,68 +468,68 @@
 msgid "Folder Contents: ${obj_title}"
 msgstr ""
 
-#: CMFDefault/browser/templates/folder_contents.pt:67
+#: CMFDefault/browser/templates/folder_contents.pt:65
 #: CMFDefault/skins/zpt_generic/folder_contents_template.pt:69
 msgid "Up"
 msgstr ""
 
-#: CMFDefault/browser/templates/folder_contents.pt:70
+#: CMFDefault/browser/templates/folder_contents.pt:68
 #: CMFDefault/skins/zpt_generic/folder_contents_template.pt:72
 msgid "Down"
 msgstr ""
 
-#: CMFDefault/browser/templates/folder_contents.pt:80
+#: CMFDefault/browser/templates/folder_contents.pt:78
 #: CMFDefault/skins/zpt_generic/folder_contents_template.pt:82
 msgid "Top"
 msgstr ""
 
-#: CMFDefault/browser/templates/folder_contents.pt:82
+#: CMFDefault/browser/templates/folder_contents.pt:80
 #: CMFDefault/skins/zpt_generic/folder_contents_template.pt:84
 msgid "Bottom"
 msgstr ""
 
-#: CMFDefault/browser/templates/folder_contents.pt:85
+#: CMFDefault/browser/templates/folder_contents.pt:83
 #: CMFDefault/skins/zpt_generic/folder_contents_template.pt:87
 msgid "Set Sorting as Default"
 msgstr ""
 
-#: CMFDefault/browser/templates/link.pt:22
+#: CMFDefault/browser/templates/link.pt:20
 #: CMFDefault/skins/zpt_content/link_view_template.pt:22
 msgid "Link: ${link}"
 msgstr ""
 
-#: CMFDefault/browser/templates/link_edit.pt:20
+#: CMFDefault/browser/templates/link_edit.pt:18
 #: CMFDefault/skins/zpt_content/link_edit_template.pt:21
 msgid "URL"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:105
+#: CMFDefault/browser/templates/metadata_edit.pt:103
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:106
 #: CMFDefault/skins/zpt_generic/metadata_help.pt:203
 msgid "Rights"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:16
+#: CMFDefault/browser/templates/metadata_edit.pt:14
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:17
 msgid "Enable Discussion?"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:19
+#: CMFDefault/browser/templates/metadata_edit.pt:17
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:20
 msgid "Default"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:22
+#: CMFDefault/browser/templates/metadata_edit.pt:20
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:23
 msgid "Off"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:25
+#: CMFDefault/browser/templates/metadata_edit.pt:23
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:26
 msgid "On"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:32
+#: CMFDefault/browser/templates/metadata_edit.pt:30
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:33
 #: CMFDefault/skins/zpt_generic/metadata_help.pt:140
 msgid "Identifier"
@@ -540,50 +540,50 @@
 msgid "Resource Metadata: ${obj_title}"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:52
+#: CMFDefault/browser/templates/metadata_edit.pt:50
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:53
 #: CMFDefault/skins/zpt_generic/metadata_help.pt:43
 #: CMFDefault/skins/zpt_generic/search_form_template.pt:55
 msgid "Subject"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:66
+#: CMFDefault/browser/templates/metadata_edit.pt:64
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:67
 msgid "Contributors"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:73
+#: CMFDefault/browser/templates/metadata_edit.pt:71
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:74
 msgid "Creation Date"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:75
+#: CMFDefault/browser/templates/metadata_edit.pt:73
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:76
 msgid "Last Modified Date"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:79
+#: CMFDefault/browser/templates/metadata_edit.pt:77
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:80
 msgid "Effective Date"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:84
+#: CMFDefault/browser/templates/metadata_edit.pt:82
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:85
 msgid "Expiration Date"
 msgstr ""
 
-#: CMFDefault/browser/templates/metadata_edit.pt:98
+#: CMFDefault/browser/templates/metadata_edit.pt:96
 #: CMFDefault/skins/zpt_content/metadata_edit_template.pt:99
 #: CMFDefault/skins/zpt_generic/metadata_help.pt:153
 msgid "Language"
 msgstr ""
 
-#: CMFDefault/browser/templates/newsitem_edit.pt:34
+#: CMFDefault/browser/templates/newsitem_edit.pt:32
 #: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:35
 msgid "Lead-in"
 msgstr ""
 
-#: CMFDefault/browser/templates/newsitem_edit.pt:41
+#: CMFDefault/browser/templates/newsitem_edit.pt:39
 #: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:42
 msgid "Body"
 msgstr ""
@@ -1086,7 +1086,7 @@
 msgstr ""
 
 #: CMFDefault/skins/zpt_generic/discussion_reply_form.py:41
-#: CMFDefault/browser/templates/document_edit.pt:45
+#: CMFDefault/browser/templates/document_edit.pt:43
 #: CMFDefault/skins/zpt_content/document_edit_template.pt:46
 msgid "Edit"
 msgstr ""
@@ -1372,7 +1372,7 @@
 msgid "Status:"
 msgstr ""
 
-#: CMFDefault/skins/zpt_generic/main_template.pt:295
+#: CMFDefault/skins/zpt_generic/main_template.pt:281
 msgid "Permanent Link:"
 msgstr ""
 

Modified: CMF/branches/2.0/CMFDefault/skin/five_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skin/five_template.pt	2006-03-28 17:13:47 UTC (rev 66247)
+++ CMF/branches/2.0/CMFDefault/skin/five_template.pt	2006-03-28 19:16:48 UTC (rev 66248)
@@ -1,15 +1,11 @@
 <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>
+><metal:slot metal:define-slot="body"/></metal:slot>
 </body>
 </html></metal:macro>

More information about the CMF-checkins mailing list