[CMF-checkins] SVN: CMF/branches/2.0/C - removed randomly used
class="Desktop" boilerplate
Yvo Schubbe
y.2006_ at wcm-solutions.de
Mon Apr 10 05:47:26 EDT 2006
Log message for revision 66764:
- removed randomly used class="Desktop" boilerplate
- some related template cleanup
- updated .pot files
Changed:
U CMF/branches/2.0/CHANGES.txt
U CMF/branches/2.0/CMFCalendar/locales/cmf_calendar.pot
U CMF/branches/2.0/CMFCalendar/skins/zpt_calendar/event_edit_template.pt
U CMF/branches/2.0/CMFCalendar/skins/zpt_calendar/event_view_template.pt
U CMF/branches/2.0/CMFCore/FSSTXMethod.py
U CMF/branches/2.0/CMFDefault/browser/templates/document_edit.pt
U CMF/branches/2.0/CMFDefault/browser/templates/folder_contents.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/skins/zpt_content/content_status_history.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_content/document_edit_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_content/file_edit_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_content/folder_edit_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_content/image_edit_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_content/link_edit_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_content/metadata_edit_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_content/newsitem_edit_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_content/transition_form.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_control/finish_portal_construction.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_contents_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_factories_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_localrole_form.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_rename_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/join_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/login_form.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/mail_password_form.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/members_delete_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/members_manage_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/metadata_help.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/personalize_form.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/reconfig_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/review.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/roster.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/rssDisabled.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/search_results_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/standard_error_message.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/stxmethod_view.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt
U CMF/branches/2.0/CMFDefault/skins/zpt_generic/undo_form.pt
U CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_criteria_form.pt
U CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_edit_template.pt
U CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_view_template.pt
-=-
Modified: CMF/branches/2.0/CHANGES.txt
===================================================================
--- CMF/branches/2.0/CHANGES.txt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CHANGES.txt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -24,7 +24,10 @@
- CalendarTool: Slightly modified the behavior of getUseSession.
This method now explicitly returns a boolean value.
+ - Skins, views and FSSTXMethod: Removed 'Desktop' class div tags.
+ There is still the 'Desktop' ID div tag in main_template.
+
CMF 2.0.0-beta2 (2006/03/26)
Bug Fixes
Modified: CMF/branches/2.0/CMFCalendar/locales/cmf_calendar.pot
===================================================================
--- CMF/branches/2.0/CMFCalendar/locales/cmf_calendar.pot 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFCalendar/locales/cmf_calendar.pot 2006-04-10 09:47:24 UTC (rev 66764)
@@ -19,131 +19,168 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: CMFCalendar/profiles/default/types/Event.xml:5
-msgid "Event"
+#: CMFCalendar/browser/event.py:316
+#: CMFCalendar/skins/zpt_calendar/event_edit_control.py:11
+msgid "Event changed."
msgstr ""
-#: CMFCalendar/profiles/default/types/Event.xml:6
-msgid "Events are objects for use in Calendar topical queries on the catalog."
+#: CMFCalendar/browser/event.py:93
+#: CMFCalendar/skins/zpt_calendar/event_edit_form.py:50
+msgid "Change"
msgstr ""
-#: CMFCalendar/setuphandlers.py:42
-msgid "Appointment"
+#: CMFCalendar/browser/event.py:97
+#: CMFCalendar/skins/zpt_calendar/event_edit_form.py:51
+msgid "Change and View"
msgstr ""
-#: CMFCalendar/setuphandlers.py:43
-msgid "Convention"
+#: CMFCalendar/browser/templates/calendar_widgets.pt:13
+#: CMFCalendar/skins/zpt_calendar/calendarBox.pt:12
+msgid "CMF Calendar"
msgstr ""
-#: CMFCalendar/setuphandlers.py:44
-msgid "Meeting"
+#: CMFCalendar/browser/templates/calendar_widgets.pt:29
+#: CMFCalendar/browser/templates/calendar_widgets.pt:42
+#: CMFCalendar/browser/templates/event.pt:32
+#: CMFCalendar/browser/templates/event_edit.pt:46
+#: CMFCalendar/skins/zpt_calendar/calendarBox.pt:28
+#: CMFCalendar/skins/zpt_calendar/calendarBox.pt:41
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:49
+#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:31
+msgid "${DYNAMIC_CONTENT}"
msgstr ""
-#: CMFCalendar/setuphandlers.py:45
-msgid "Social Event"
+#: CMFCalendar/browser/templates/event.pt:15
+#: CMFCalendar/browser/templates/event_edit.pt:12
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:15
+#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:14
+msgid "Event Name"
msgstr ""
-#: CMFCalendar/setuphandlers.py:46
-msgid "Work"
+#: CMFCalendar/browser/templates/event.pt:17
+#: CMFCalendar/browser/templates/event_edit.pt:18
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:21
+#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:16
+msgid "Contact Name"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/calendarBox.pt:12
-msgid "CMF Calendar"
+#: CMFCalendar/browser/templates/event.pt:21
+#: CMFCalendar/browser/templates/event_edit.pt:26
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:29
+#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:20
+msgid "Location"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/calendarBox.pt:28
-#: CMFCalendar/skins/zpt_calendar/calendarBox.pt:41
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:51
-#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:31
-msgid "${DYNAMIC_CONTENT}"
+#: CMFCalendar/browser/templates/event.pt:23
+#: CMFCalendar/browser/templates/event_edit.pt:32
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:35
+#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:22
+msgid "Contact Email"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_control.py:11
-msgid "Event changed."
+#: CMFCalendar/browser/templates/event.pt:30
+#: CMFCalendar/browser/templates/event_edit.pt:40
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:43
+#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:29
+msgid "Event type"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_form.py:50
-msgid "Change"
+#: CMFCalendar/browser/templates/event.pt:34
+#: CMFCalendar/browser/templates/event_edit.pt:53
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:56
+#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:33
+msgid "Contact Phone"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_form.py:51
-msgid "Change and View"
+#: CMFCalendar/browser/templates/event.pt:38
+#: CMFCalendar/browser/templates/event_edit.pt:61
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:64
+#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:37
+msgid "Event URL"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:100
+#: CMFCalendar/browser/templates/event.pt:47
+#: CMFCalendar/browser/templates/event_edit.pt:69
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:72
+#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:46
+msgid "Start Date"
+msgstr ""
+
+#: CMFCalendar/browser/templates/event.pt:49
+#: CMFCalendar/browser/templates/event_edit.pt:95
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:98
#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:48
msgid "Stop Date"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:128
+#: CMFCalendar/browser/templates/event.pt:53
+#: CMFCalendar/browser/templates/event_edit.pt:123
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:126
#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:52
msgid "Start Time"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:139
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:155
-msgid "am"
-msgstr ""
-
+#: CMFCalendar/browser/templates/event.pt:55
+#: CMFCalendar/browser/templates/event_edit.pt:139
#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:142
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:158
-msgid "pm"
-msgstr ""
-
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:144
#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:54
msgid "Stop Time"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:162
+#: CMFCalendar/browser/templates/event.pt:62
+#: CMFCalendar/browser/templates/event_edit.pt:157
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:160
#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:61
msgid "Description"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:17
-#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:14
-msgid "Event Name"
+#: CMFCalendar/browser/templates/event_edit.pt:134
+#: CMFCalendar/browser/templates/event_edit.pt:150
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:137
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:153
+msgid "am"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:23
-#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:16
-msgid "Contact Name"
+#: CMFCalendar/browser/templates/event_edit.pt:137
+#: CMFCalendar/browser/templates/event_edit.pt:153
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:140
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:156
+msgid "pm"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:31
-#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:20
-msgid "Location"
+#: CMFCalendar/browser/templates/event_edit.pt:5
+#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:5
+msgid "Edit: ${obj_title}"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:37
-#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:22
-msgid "Contact Email"
+#: CMFCalendar/profiles/default/types/Event.xml:5
+msgid "Event"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:45
-#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:29
-msgid "Event type"
+#: CMFCalendar/profiles/default/types/Event.xml:6
+msgid "Events are objects for use in Calendar topical queries on the catalog."
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:5
-msgid "Edit: ${obj_title}"
+#: CMFCalendar/setuphandlers.py:42
+msgid "Appointment"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:58
-#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:33
-msgid "Contact Phone"
+#: CMFCalendar/setuphandlers.py:43
+msgid "Convention"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:66
-#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:37
-msgid "Event URL"
+#: CMFCalendar/setuphandlers.py:44
+msgid "Meeting"
msgstr ""
-#: CMFCalendar/skins/zpt_calendar/event_edit_template.pt:74
-#: CMFCalendar/skins/zpt_calendar/event_view_template.pt:46
-msgid "Start Date"
+#: CMFCalendar/setuphandlers.py:45
+msgid "Social Event"
msgstr ""
+#: CMFCalendar/setuphandlers.py:46
+msgid "Work"
+msgstr ""
+
msgid "Su"
msgstr ""
Modified: CMF/branches/2.0/CMFCalendar/skins/zpt_calendar/event_edit_template.pt
===================================================================
--- CMF/branches/2.0/CMFCalendar/skins/zpt_calendar/event_edit_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFCalendar/skins/zpt_calendar/event_edit_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_calendar"
tal:define="form options/form">
-<div class="Desktop">
-
<form action="event_edit_form" method="post"
tal:attributes="action form/action">
<table class="FormLayout">
@@ -173,8 +171,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFCalendar/skins/zpt_calendar/event_view_template.pt
===================================================================
--- CMF/branches/2.0/CMFCalendar/skins/zpt_calendar/event_view_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFCalendar/skins/zpt_calendar/event_view_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,14 +1,14 @@
<html metal:use-macro="context/main_template/macros/master">
<head>
- <metal:slot fill-slot="base"
- ><tal:span tal:replace="structure context/getBaseTag"
-/></metal:slot>
+
+<metal:slot fill-slot="base">
+<tal:span tal:replace="structure context/getBaseTag" />
+</metal:slot>
+
</head>
<body>
<metal:slot metal:fill-slot="main" i18n:domain="cmf_calendar">
-<div class="Desktop">
-
<table class="Event" border="0" cellpadding="5" width="100%" cellspacing="3">
<tr>
<th width="10%" i18n:translate="">Event Name</th>
@@ -66,8 +66,6 @@
<td colspan="4"> </td>
</tr>
</table>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFCore/FSSTXMethod.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSSTXMethod.py 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFCore/FSSTXMethod.py 2006-04-10 09:47:24 UTC (rev 66764)
@@ -103,9 +103,7 @@
_default_template = Globals.HTML( """\
<dtml-var standard_html_header>
-<div class="Desktop">
<dtml-var cooked>
-</div>
<dtml-var standard_html_footer>""" )
def __call__( self, REQUEST={}, RESPONSE=None, **kw ):
Modified: CMF/branches/2.0/CMFDefault/browser/templates/document_edit.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/document_edit.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/browser/templates/document_edit.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -5,8 +5,6 @@
<h1 i18n:translate="">Edit: <tal:span
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-<div class="Desktop">
-
<form action="document_edit_form" method="post" enctype="multipart/form-data"
tal:attributes="action view/form_action"
><metal:macro metal:use-macro="context/@@form_widget/hidden_vars" />
@@ -54,8 +52,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/browser/templates/folder_contents.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/folder_contents.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/browser/templates/folder_contents.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -5,8 +5,6 @@
<h1 i18n:translate="">Folder Contents: <tal:span
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-<div class="Desktop">
-
<p tal:define="up_info view/up_info" tal:condition="up_info"
><tal:case tal:condition="up_info/url"
><a href="" tal:attributes="href up_info/url"
@@ -86,8 +84,6 @@
</tal:case></form>
<div tal:replace="structure context/folder_filter_form">Filter Form Here</div>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/browser/templates/link_edit.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/link_edit.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/browser/templates/link_edit.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -5,8 +5,6 @@
<h1 i18n:translate="">Edit: <tal:span
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-<div class="Desktop">
-
<form action="link_edit_form" method="post"
tal:attributes="action view/form_action">
<table class="FormLayout">
@@ -29,8 +27,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/browser/templates/metadata_edit.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/metadata_edit.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/browser/templates/metadata_edit.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -5,8 +5,6 @@
<h1 i18n:translate="">Resource Metadata: <tal:span
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-<div class="Desktop">
-
<form action="metadata_edit_form" method="post"
tal:attributes="action view/form_action">
<table class="FormLayout">
@@ -114,8 +112,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/browser/templates/metadata_minimal_edit.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/metadata_minimal_edit.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/browser/templates/metadata_minimal_edit.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -5,8 +5,6 @@
<h1 i18n:translate="">Edit: <tal:span
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-<div class="Desktop">
-
<form action="folder_edit_form" method="post"
tal:attributes="action view/form_action">
<table class="FormLayout">
@@ -32,8 +30,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/browser/templates/newsitem_edit.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/templates/newsitem_edit.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/browser/templates/newsitem_edit.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -5,8 +5,6 @@
<h1 i18n:translate="">Edit: <tal:span
tal:content="view/title" i18n:name="obj_title">Title</tal:span></h1>
-<div class="Desktop">
-
<form action="newsitem_edit_form" method="post"
tal:attributes="action view/form_action">
<table class="FormLayout">
@@ -50,8 +48,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/locales/cmf_default.pot
===================================================================
--- CMF/branches/2.0/CMFDefault/locales/cmf_default.pot 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/locales/cmf_default.pot 2006-04-10 09:47:24 UTC (rev 66764)
@@ -108,7 +108,7 @@
#: CMFDefault/skins/zpt_generic/password_form.py:37
#: CMFDefault/skins/zpt_generic/reconfig_form.py:22
#: CMFTopic/skins/zpt_topic/topic_edit_form.py:26
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:92
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:83
msgid "Change"
msgstr ""
@@ -129,9 +129,9 @@
#: CMFDefault/browser/folder.py:187
#: CMFDefault/skins/zpt_generic/folder_contents.py:113
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:114
-#: CMFDefault/skins/zpt_generic/review.pt:29
-#: CMFDefault/skins/zpt_generic/search_results_template.pt:18
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:110
+#: CMFDefault/skins/zpt_generic/review.pt:25
+#: CMFDefault/skins/zpt_generic/search_results_template.pt:16
msgid "Type"
msgstr ""
@@ -305,7 +305,7 @@
#: CMFDefault/browser/folder.py:98
#: CMFDefault/skins/zpt_generic/folder_contents.py:182
#: CMFDefault/skins/zpt_generic/members_delete_form.py:28
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:201
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:196
msgid "Delete"
msgstr ""
@@ -331,73 +331,73 @@
msgid "News Item changed."
msgstr ""
-#: 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
-#: CMFDefault/skins/zpt_content/image_edit_template.pt:17
-#: CMFDefault/skins/zpt_content/link_edit_template.pt:17
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:39
-#: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:17
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:15
-#: CMFDefault/skins/zpt_generic/review.pt:28
+#: CMFDefault/browser/templates/document_edit.pt:13
+#: CMFDefault/browser/templates/link_edit.pt:12
+#: CMFDefault/browser/templates/metadata_edit.pt:34
+#: CMFDefault/browser/templates/metadata_minimal_edit.pt:12
+#: CMFDefault/browser/templates/newsitem_edit.pt:12
+#: CMFDefault/skins/zpt_content/document_edit_template.pt:16
+#: CMFDefault/skins/zpt_content/file_edit_template.pt:15
+#: CMFDefault/skins/zpt_content/folder_edit_template.pt:15
+#: CMFDefault/skins/zpt_content/image_edit_template.pt:15
+#: CMFDefault/skins/zpt_content/link_edit_template.pt:15
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:37
+#: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:15
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:11
+#: CMFDefault/skins/zpt_generic/review.pt:24
#: CMFDefault/skins/zpt_generic/search_form_template.pt:48
-#: CMFDefault/skins/zpt_generic/search_results_template.pt:17
-#: CMFTopic/skins/zpt_topic/topic_edit_template.pt:17
+#: CMFDefault/skins/zpt_generic/search_results_template.pt:15
+#: CMFTopic/skins/zpt_topic/topic_edit_template.pt:15
msgid "Title"
msgstr ""
-#: 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
-#: CMFDefault/skins/zpt_content/image_edit_template.pt:21
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:46
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:56
+#: CMFDefault/browser/templates/document_edit.pt:17
+#: CMFDefault/browser/templates/metadata_edit.pt:41
+#: CMFDefault/browser/templates/metadata_minimal_edit.pt:19
+#: CMFDefault/skins/zpt_content/document_edit_template.pt:20
+#: CMFDefault/skins/zpt_content/file_edit_template.pt:19
+#: CMFDefault/skins/zpt_content/folder_edit_template.pt:22
+#: CMFDefault/skins/zpt_content/image_edit_template.pt:19
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:44
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:52
#: CMFDefault/skins/zpt_generic/search_form_template.pt:67
-#: CMFTopic/skins/zpt_topic/topic_edit_template.pt:24
+#: CMFTopic/skins/zpt_topic/topic_edit_template.pt:22
msgid "Description"
msgstr ""
-#: 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
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:128
+#: CMFDefault/browser/templates/document_edit.pt:21
+#: CMFDefault/browser/templates/metadata_edit.pt:87
+#: CMFDefault/browser/templates/newsitem_edit.pt:16
+#: CMFDefault/skins/zpt_content/document_edit_template.pt:24
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:90
+#: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:19
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:124
msgid "Format"
msgstr ""
-#: 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
+#: CMFDefault/browser/templates/document_edit.pt:25
+#: CMFDefault/browser/templates/newsitem_edit.pt:20
+#: CMFDefault/skins/zpt_content/document_edit_template.pt:28
+#: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:23
msgid "structured-text"
msgstr ""
-#: 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
+#: CMFDefault/browser/templates/document_edit.pt:28
+#: CMFDefault/browser/templates/newsitem_edit.pt:23
+#: CMFDefault/skins/zpt_content/document_edit_template.pt:31
+#: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:26
msgid "plain text"
msgstr ""
-#: 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
+#: CMFDefault/browser/templates/document_edit.pt:31
+#: CMFDefault/browser/templates/newsitem_edit.pt:26
+#: CMFDefault/skins/zpt_content/document_edit_template.pt:34
+#: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:29
msgid "html"
msgstr ""
-#: CMFDefault/browser/templates/document_edit.pt:37
-#: CMFDefault/skins/zpt_content/document_edit_template.pt:40
+#: CMFDefault/browser/templates/document_edit.pt:35
+#: CMFDefault/skins/zpt_content/document_edit_template.pt:38
msgid "Upload"
msgstr ""
@@ -415,31 +415,31 @@
msgid "Edit: ${obj_title}"
msgstr ""
-#: CMFDefault/browser/templates/folder_contents.pt:13
-#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:17
+#: CMFDefault/browser/templates/folder_contents.pt:11
+#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:15
msgid "[Link]"
msgstr ""
-#: CMFDefault/browser/templates/folder_contents.pt:15
-#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:19
+#: CMFDefault/browser/templates/folder_contents.pt:13
+#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:17
msgid "Up to"
msgstr ""
-#: CMFDefault/browser/templates/folder_contents.pt:19
-#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:23
+#: CMFDefault/browser/templates/folder_contents.pt:17
+#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:21
msgid "Root"
msgstr ""
-#: 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
-#: CMFDefault/skins/zpt_content/transition_form.pt:58
-#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:48
-#: CMFDefault/skins/zpt_generic/folder_factories_template.pt:23
-#: CMFDefault/skins/zpt_generic/folder_factories_template.pt:28
+#: CMFDefault/browser/templates/folder_contents.pt:42
+#: CMFDefault/skins/zpt_content/content_status_history.pt:25
+#: CMFDefault/skins/zpt_content/content_status_history.pt:32
+#: CMFDefault/skins/zpt_content/transition_form.pt:26
+#: CMFDefault/skins/zpt_content/transition_form.pt:56
+#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:46
+#: CMFDefault/skins/zpt_generic/folder_factories_template.pt:21
+#: CMFDefault/skins/zpt_generic/folder_factories_template.pt:26
#: CMFDefault/skins/zpt_generic/folder_filter_form.pt:51
-#: CMFDefault/skins/zpt_generic/folder_rename_template.pt:19
+#: CMFDefault/skins/zpt_generic/folder_rename_template.pt:17
#: CMFDefault/skins/zpt_generic/index_html_utils.html:32
#: CMFDefault/skins/zpt_generic/index_html_utils.html:32
#: CMFDefault/skins/zpt_generic/index_html_utils.html:70
@@ -456,10 +456,10 @@
#: CMFDefault/skins/zpt_generic/main_template.pt:221
#: CMFDefault/skins/zpt_generic/main_template.pt:235
#: 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
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:68
+#: CMFDefault/skins/zpt_generic/review.pt:55
+#: CMFDefault/skins/zpt_generic/roster.pt:43
+#: CMFDefault/skins/zpt_generic/search_results_template.pt:35
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:66
msgid "${DYNAMIC_CONTENT}"
msgstr ""
@@ -468,28 +468,28 @@
msgid "Folder Contents: ${obj_title}"
msgstr ""
-#: CMFDefault/browser/templates/folder_contents.pt:65
-#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:69
+#: CMFDefault/browser/templates/folder_contents.pt:63
+#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:67
msgid "Up"
msgstr ""
-#: CMFDefault/browser/templates/folder_contents.pt:68
-#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:72
+#: CMFDefault/browser/templates/folder_contents.pt:66
+#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:70
msgid "Down"
msgstr ""
-#: CMFDefault/browser/templates/folder_contents.pt:78
-#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:82
+#: CMFDefault/browser/templates/folder_contents.pt:76
+#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:80
msgid "Top"
msgstr ""
-#: CMFDefault/browser/templates/folder_contents.pt:80
-#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:84
+#: CMFDefault/browser/templates/folder_contents.pt:78
+#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:82
msgid "Bottom"
msgstr ""
-#: CMFDefault/browser/templates/folder_contents.pt:83
-#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:87
+#: CMFDefault/browser/templates/folder_contents.pt:81
+#: CMFDefault/skins/zpt_generic/folder_contents_template.pt:85
msgid "Set Sorting as Default"
msgstr ""
@@ -498,126 +498,126 @@
msgid "Link: ${link}"
msgstr ""
-#: CMFDefault/browser/templates/link_edit.pt:18
-#: CMFDefault/skins/zpt_content/link_edit_template.pt:21
+#: CMFDefault/browser/templates/link_edit.pt:16
+#: CMFDefault/skins/zpt_content/link_edit_template.pt:19
msgid "URL"
msgstr ""
-#: CMFDefault/browser/templates/metadata_edit.pt:103
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:106
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:203
+#: CMFDefault/browser/templates/metadata_edit.pt:101
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:104
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:199
msgid "Rights"
msgstr ""
-#: CMFDefault/browser/templates/metadata_edit.pt:14
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:17
+#: CMFDefault/browser/templates/metadata_edit.pt:12
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:15
msgid "Enable Discussion?"
msgstr ""
-#: CMFDefault/browser/templates/metadata_edit.pt:17
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:20
+#: CMFDefault/browser/templates/metadata_edit.pt:15
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:18
msgid "Default"
msgstr ""
-#: CMFDefault/browser/templates/metadata_edit.pt:20
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:23
+#: CMFDefault/browser/templates/metadata_edit.pt:18
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:21
msgid "Off"
msgstr ""
-#: CMFDefault/browser/templates/metadata_edit.pt:23
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:26
+#: CMFDefault/browser/templates/metadata_edit.pt:21
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:24
msgid "On"
msgstr ""
-#: CMFDefault/browser/templates/metadata_edit.pt:30
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:33
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:140
+#: CMFDefault/browser/templates/metadata_edit.pt:28
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:31
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:136
msgid "Identifier"
msgstr ""
+#: CMFDefault/browser/templates/metadata_edit.pt:48
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:51
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:39
+#: CMFDefault/skins/zpt_generic/search_form_template.pt:55
+msgid "Subject"
+msgstr ""
+
#: CMFDefault/browser/templates/metadata_edit.pt:5
#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:5
msgid "Resource Metadata: ${obj_title}"
msgstr ""
-#: 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"
+#: CMFDefault/browser/templates/metadata_edit.pt:62
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:65
+msgid "Contributors"
msgstr ""
-#: CMFDefault/browser/templates/metadata_edit.pt:64
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:67
-msgid "Contributors"
+#: CMFDefault/browser/templates/metadata_edit.pt:69
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:72
+msgid "Creation Date"
msgstr ""
#: 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:73
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:76
msgid "Last Modified Date"
msgstr ""
-#: CMFDefault/browser/templates/metadata_edit.pt:77
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:80
+#: CMFDefault/browser/templates/metadata_edit.pt:75
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:78
msgid "Effective Date"
msgstr ""
-#: CMFDefault/browser/templates/metadata_edit.pt:82
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:85
+#: CMFDefault/browser/templates/metadata_edit.pt:80
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:83
msgid "Expiration Date"
msgstr ""
-#: CMFDefault/browser/templates/metadata_edit.pt:96
-#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:99
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:153
+#: CMFDefault/browser/templates/metadata_edit.pt:94
+#: CMFDefault/skins/zpt_content/metadata_edit_template.pt:97
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:149
msgid "Language"
msgstr ""
-#: CMFDefault/browser/templates/newsitem_edit.pt:32
-#: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:35
+#: CMFDefault/browser/templates/newsitem_edit.pt:30
+#: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:33
msgid "Lead-in"
msgstr ""
-#: CMFDefault/browser/templates/newsitem_edit.pt:39
-#: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:42
+#: CMFDefault/browser/templates/newsitem_edit.pt:37
+#: CMFDefault/skins/zpt_content/newsitem_edit_template.pt:40
msgid "Body"
msgstr ""
-#: CMFDefault/browser/utils.py:242
+#: CMFDefault/browser/utils.py:265
msgid "Previous item"
msgstr ""
-#: CMFDefault/browser/utils.py:244
+#: CMFDefault/browser/utils.py:267
# Default: ""
msgid "Previous ${count} items"
msgstr ""
-#: CMFDefault/browser/utils.py:256
+#: CMFDefault/browser/utils.py:279
msgid "Next item"
msgstr ""
-#: CMFDefault/browser/utils.py:258
+#: CMFDefault/browser/utils.py:281
# Default: ""
msgid "Next ${count} items"
msgstr ""
-#: CMFDefault/browser/utils.py:269
+#: CMFDefault/browser/utils.py:292
#: CMFDefault/skins/zpt_generic/search.py:47
msgid "item"
msgstr ""
-#: CMFDefault/browser/utils.py:269
+#: CMFDefault/browser/utils.py:292
#: CMFDefault/skins/zpt_generic/search.py:47
msgid "items"
msgstr ""
#: CMFDefault/profiles/default/actions.xml:10
-#: CMFDefault/skins/zpt_generic/login_form.pt:46
+#: CMFDefault/skins/zpt_generic/login_form.pt:44
msgid "Login"
msgstr ""
@@ -658,8 +658,8 @@
msgstr ""
#: CMFDefault/profiles/default/actions.xml:183
-#: CMFDefault/skins/zpt_generic/undo_form.pt:47
-#: CMFDefault/skins/zpt_generic/undo_form.pt:103
+#: CMFDefault/skins/zpt_generic/undo_form.pt:44
+#: CMFDefault/skins/zpt_generic/undo_form.pt:100
msgid "Undo"
msgstr ""
@@ -821,7 +821,7 @@
#: CMFDefault/skins/zpt_content/content_publish_form.pt:13
#: CMFDefault/skins/zpt_content/content_show_form.pt:13
-#: CMFDefault/skins/zpt_content/content_status_history.pt:21
+#: CMFDefault/skins/zpt_content/content_status_history.pt:19
#: CMFDefault/skins/zpt_content/content_submit_form.pt:15
msgid "Another way to control the visibility of an item is with its <b>effective date</b>. An item is not publicly available before its effective date, <em>even if its status is <b>published</b></em>."
msgstr ""
@@ -871,40 +871,40 @@
msgstr ""
#: CMFDefault/skins/zpt_content/content_status_history.pt:11
-msgid "Content Item status history"
-msgstr ""
-
-#: CMFDefault/skins/zpt_content/content_status_history.pt:13
msgid "An item's status (also called its review state) determines who can see it. A <b>private</b> item can only be viewed by its Owner and by the site management. Only <b>published</b> items are available to the general member base and anonymous visitors. To make an item published, it has to be reviewed by one of the site's Reviewers. You can request that an item be reviewed by setting its status to <b>pending</b>."
msgstr ""
-#: CMFDefault/skins/zpt_content/content_status_history.pt:25
+#: CMFDefault/skins/zpt_content/content_status_history.pt:23
msgid "Current state"
msgstr ""
-#: CMFDefault/skins/zpt_content/content_status_history.pt:27
+#: CMFDefault/skins/zpt_content/content_status_history.pt:25
msgid "This item is in ${status} state."
msgstr ""
-#: CMFDefault/skins/zpt_content/content_status_history.pt:31
-#: CMFDefault/skins/zpt_content/transition_form.pt:54
+#: CMFDefault/skins/zpt_content/content_status_history.pt:29
+#: CMFDefault/skins/zpt_content/transition_form.pt:52
msgid "Reviewing history"
msgstr ""
-#: CMFDefault/skins/zpt_content/content_status_history.pt:36
-#: CMFDefault/skins/zpt_content/transition_form.pt:60
+#: CMFDefault/skins/zpt_content/content_status_history.pt:34
+#: CMFDefault/skins/zpt_content/transition_form.pt:58
msgid "(effective: ${eff_date})"
msgstr ""
-#: CMFDefault/skins/zpt_content/content_status_history.pt:39
-#: CMFDefault/skins/zpt_content/transition_form.pt:63
+#: CMFDefault/skins/zpt_content/content_status_history.pt:37
+#: CMFDefault/skins/zpt_content/transition_form.pt:61
msgid "by ${actor}"
msgstr ""
-#: CMFDefault/skins/zpt_content/content_status_history.pt:45
+#: CMFDefault/skins/zpt_content/content_status_history.pt:43
msgid "This item has not had any status changes."
msgstr ""
+#: CMFDefault/skins/zpt_content/content_status_history.pt:9
+msgid "Content Item status history"
+msgstr ""
+
#: CMFDefault/skins/zpt_content/content_submit_form.pt:10
msgid "To make an item published, it has to be reviewed by one of the site's reviewers. A <b>published</b> item is available to the general member base and anonymous visitors."
msgstr ""
@@ -921,12 +921,12 @@
msgid "File changed."
msgstr ""
-#: CMFDefault/skins/zpt_content/file_edit_template.pt:25
-#: CMFDefault/skins/zpt_content/image_edit_template.pt:25
+#: CMFDefault/skins/zpt_content/file_edit_template.pt:23
+#: CMFDefault/skins/zpt_content/image_edit_template.pt:23
msgid "Content type"
msgstr ""
-#: CMFDefault/skins/zpt_content/file_edit_template.pt:29
+#: CMFDefault/skins/zpt_content/file_edit_template.pt:27
msgid "Upload file"
msgstr ""
@@ -954,31 +954,31 @@
msgid "Image changed."
msgstr ""
-#: CMFDefault/skins/zpt_content/image_edit_template.pt:29
+#: CMFDefault/skins/zpt_content/image_edit_template.pt:27
msgid "Upload image"
msgstr ""
-#: CMFDefault/skins/zpt_content/transition_form.pt:13
+#: CMFDefault/skins/zpt_content/transition_form.pt:11
msgid "Transition of ${objectid}."
msgstr ""
-#: CMFDefault/skins/zpt_content/transition_form.pt:16
+#: CMFDefault/skins/zpt_content/transition_form.pt:14
msgid "Transition description."
msgstr ""
-#: CMFDefault/skins/zpt_content/transition_form.pt:24
+#: CMFDefault/skins/zpt_content/transition_form.pt:22
msgid "Status"
msgstr ""
-#: CMFDefault/skins/zpt_content/transition_form.pt:28
+#: CMFDefault/skins/zpt_content/transition_form.pt:26
msgid "This item is currently in ${status} status."
msgstr ""
-#: CMFDefault/skins/zpt_content/transition_form.pt:35
+#: CMFDefault/skins/zpt_content/transition_form.pt:33
msgid "Comments"
msgstr ""
-#: CMFDefault/skins/zpt_content/transition_form.pt:45
+#: CMFDefault/skins/zpt_content/transition_form.pt:43
msgid "Transition"
msgstr ""
@@ -986,23 +986,23 @@
msgid "Password changed."
msgstr ""
-#: CMFDefault/skins/zpt_control/finish_portal_construction.pt:12
+#: CMFDefault/skins/zpt_control/finish_portal_construction.pt:10
msgid "The first thing you should do is visit the ${reconfig_link}."
msgstr ""
-#: CMFDefault/skins/zpt_control/finish_portal_construction.pt:12
+#: CMFDefault/skins/zpt_control/finish_portal_construction.pt:10
msgid "basic configuration form"
msgstr ""
-#: CMFDefault/skins/zpt_control/finish_portal_construction.pt:16
+#: CMFDefault/skins/zpt_control/finish_portal_construction.pt:14
msgid "management interface"
msgstr ""
-#: CMFDefault/skins/zpt_control/finish_portal_construction.pt:19
+#: CMFDefault/skins/zpt_control/finish_portal_construction.pt:17
msgid "home page"
msgstr ""
-#: CMFDefault/skins/zpt_control/finish_portal_construction.pt:19
+#: CMFDefault/skins/zpt_control/finish_portal_construction.pt:17
msgid "Then visit the ${manage_link} and the ${home_link}."
msgstr ""
@@ -1081,13 +1081,13 @@
msgstr ""
#: CMFDefault/skins/zpt_generic/discussion_reply_form.py:39
-#: CMFDefault/skins/zpt_generic/folder_factories_template.pt:36
+#: CMFDefault/skins/zpt_generic/folder_factories_template.pt:34
msgid "Add"
msgstr ""
#: CMFDefault/skins/zpt_generic/discussion_reply_form.py:41
-#: CMFDefault/browser/templates/document_edit.pt:43
-#: CMFDefault/skins/zpt_content/document_edit_template.pt:46
+#: CMFDefault/browser/templates/document_edit.pt:41
+#: CMFDefault/skins/zpt_content/document_edit_template.pt:44
msgid "Edit"
msgstr ""
@@ -1103,7 +1103,7 @@
msgid "Reply body"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_factories_template.pt:33
+#: CMFDefault/skins/zpt_generic/folder_factories_template.pt:31
msgid "ID:"
msgstr ""
@@ -1139,70 +1139,70 @@
msgid "Set View Filter"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:102
-msgid "Role to assign:"
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:11
+msgid "Assign local roles: Search Members"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:121
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:117
msgid "Assign Roles"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:131
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:126
msgid "Sorry, no members matched your search."
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:139
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:134
msgid "Currently assigned local roles"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:141
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:136
msgid "These users currently have local roles assigned in this folder:"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:15
-msgid "Assign local roles: Search Members"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:154
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:149
msgid "Role(s)"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:23
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:19
msgid "Search by"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:26
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:22
msgid "User Name"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:27
-#: CMFDefault/skins/zpt_generic/join_template.pt:66
-#: CMFDefault/skins/zpt_generic/members_manage_template.pt:21
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:23
+#: CMFDefault/skins/zpt_generic/join_template.pt:64
+#: CMFDefault/skins/zpt_generic/members_manage_template.pt:20
msgid "Email Address"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:32
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:28
msgid "Search Term"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:60
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:56
msgid "Assign local roles: Search Results"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:64
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:60
msgid "Select Member(s) and a role to assign:"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:75
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:153
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:71
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:148
msgid "User"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:76
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:41
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:72
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:32
msgid "Email address"
msgstr ""
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:98
+msgid "Role to assign:"
+msgstr ""
+
#: CMFDefault/skins/zpt_generic/folder_rename_form.py:43
msgid "Rename"
msgstr ""
@@ -1214,7 +1214,7 @@
msgid "Cancel"
msgstr ""
-#: CMFDefault/skins/zpt_generic/folder_rename_template.pt:27
+#: CMFDefault/skins/zpt_generic/folder_rename_template.pt:25
msgid "to"
msgstr ""
@@ -1251,56 +1251,56 @@
msgid "Register"
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:13
+#: CMFDefault/skins/zpt_generic/join_template.pt:11
msgid "You are already a member. You may use the <a href=\"personalize_form\">personalization form</a> to change your membership information."
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:19
+#: CMFDefault/skins/zpt_generic/join_template.pt:17
msgid "You have been registered as a member."
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:21
+#: CMFDefault/skins/zpt_generic/join_template.pt:19
msgid "You will receive an email shortly containing your password and instructions on how to activate your membership."
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:37
+#: CMFDefault/skins/zpt_generic/join_template.pt:35
msgid "Return to homepage"
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:42
+#: CMFDefault/skins/zpt_generic/join_template.pt:40
msgid "Becoming a member gives you the ability to personalize the site and participate in the community."
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:45
+#: CMFDefault/skins/zpt_generic/join_template.pt:43
msgid "It does not cost any money to become a member and your email and other personal information will remain private."
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:48
+#: CMFDefault/skins/zpt_generic/join_template.pt:46
msgid "You must submit a valid email address. This address will be used to send you a randomly-generated password. Once you have logged in with this password, you may change it to anything you like."
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:59
-#: CMFDefault/skins/zpt_generic/login_form.pt:24
+#: CMFDefault/skins/zpt_generic/join_template.pt:57
+#: CMFDefault/skins/zpt_generic/login_form.pt:22
#: CMFDefault/skins/zpt_generic/password_form_template.pt:26
#: CMFDefault/skins/zpt_generic/registered_email_template.pt:27
msgid "Member ID"
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:73
-#: CMFDefault/skins/zpt_generic/login_form.pt:31
+#: CMFDefault/skins/zpt_generic/join_template.pt:71
+#: CMFDefault/skins/zpt_generic/login_form.pt:29
#: CMFDefault/skins/zpt_generic/registered_email_template.pt:29
msgid "Password"
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:79
+#: CMFDefault/skins/zpt_generic/join_template.pt:77
msgid "Password (confirm)"
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:85
+#: CMFDefault/skins/zpt_generic/join_template.pt:83
msgid "Mail Password?"
msgstr ""
-#: CMFDefault/skins/zpt_generic/join_template.pt:89
+#: CMFDefault/skins/zpt_generic/join_template.pt:87
msgid "Check this box to have the password mailed."
msgstr ""
@@ -1328,40 +1328,40 @@
msgid "You are logged in outside the portal. You may need to <a href=\"/manage_zmi_logout\">log out of the Zope management interface</a>."
msgstr ""
-#: CMFDefault/skins/zpt_generic/login_form.pt:40
+#: CMFDefault/skins/zpt_generic/login_form.pt:38
msgid "Remember my ID."
msgstr ""
-#: CMFDefault/skins/zpt_generic/login_form.pt:53
+#: CMFDefault/skins/zpt_generic/login_form.pt:51
msgid "I forgot my password!"
msgstr ""
-#: CMFDefault/skins/zpt_generic/login_form.pt:58
+#: CMFDefault/skins/zpt_generic/login_form.pt:56
msgid "Having trouble logging in? Make sure to enable cookies in your web browser."
msgstr ""
-#: CMFDefault/skins/zpt_generic/login_form.pt:61
+#: CMFDefault/skins/zpt_generic/login_form.pt:59
msgid "Don't forget to logout or exit your browser when you're done."
msgstr ""
-#: CMFDefault/skins/zpt_generic/login_form.pt:64
+#: CMFDefault/skins/zpt_generic/login_form.pt:62
msgid "Setting the 'Remember my ID' option will set a cookie with your member ID, so that when you next log in, your member ID will already be filled in for you."
msgstr ""
-#: CMFDefault/skins/zpt_generic/mail_password_form.pt:11
-msgid "Don't panic!"
+#: CMFDefault/skins/zpt_generic/mail_password_form.pt:14
+msgid "If this will not work for you (for example, if you forget your member ID or didn't enter your email address) send email to ${admin_email}."
msgstr ""
-#: CMFDefault/skins/zpt_generic/mail_password_form.pt:13
-msgid "Just enter your username below, click <em>Send</em>, and your password will be mailed to you if you gave a valid email address when you signed on."
+#: CMFDefault/skins/zpt_generic/mail_password_form.pt:22
+msgid "Send"
msgstr ""
-#: CMFDefault/skins/zpt_generic/mail_password_form.pt:19
-msgid "If this will not work for you (for example, if you forget your member name or didn't enter your email address) send email to ${admin_email}."
+#: CMFDefault/skins/zpt_generic/mail_password_form.pt:6
+msgid "Don't panic!"
msgstr ""
-#: CMFDefault/skins/zpt_generic/mail_password_form.pt:28
-msgid "Send"
+#: CMFDefault/skins/zpt_generic/mail_password_form.pt:8
+msgid "Just enter your member ID below, click <em>Send</em>, and your password will be mailed to you if you gave a valid email address when you signed on."
msgstr ""
#: CMFDefault/skins/zpt_generic/mail_password_response.pt:6
@@ -1388,7 +1388,7 @@
msgid "search"
msgstr ""
-#: CMFDefault/skins/zpt_generic/members_delete_template.pt:15
+#: CMFDefault/skins/zpt_generic/members_delete_template.pt:13
msgid "The following members - including all their data, home folders and roles - are selected for deletion:"
msgstr ""
@@ -1400,16 +1400,16 @@
msgid "Delete..."
msgstr ""
-#: CMFDefault/skins/zpt_generic/members_manage_template.pt:20
-#: CMFDefault/skins/zpt_generic/roster.pt:24
+#: CMFDefault/skins/zpt_generic/members_manage_template.pt:19
+#: CMFDefault/skins/zpt_generic/roster.pt:21
msgid "Member"
msgstr ""
-#: CMFDefault/skins/zpt_generic/members_manage_template.pt:22
+#: CMFDefault/skins/zpt_generic/members_manage_template.pt:21
msgid "Last Login"
msgstr ""
-#: CMFDefault/skins/zpt_generic/members_manage_template.pt:45
+#: CMFDefault/skins/zpt_generic/members_manage_template.pt:44
msgid "Currently there are no members registered."
msgstr ""
@@ -1417,99 +1417,99 @@
msgid "Manage Members"
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:101
-msgid "this one has modifiers, of which the approved set is: 'Created', 'Valid', 'Available', 'Issued', and 'Modified'. I propose extending the interface to include CreationDate(), EffectiveDate(), ExpirationDate(), and ModificationDate(). The current Date() could just return the CreationDate(), while the DCI 'Valid' and 'Available' would be ranges derived from EffectiveDate() and ExpirationDate()."
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:119
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:115
msgid "like the Zope 'meta_type', this is the main conceptual classification; 'meta_type' is often spelled identically to the class, which makes it less appropriate for the DCI usage."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:133
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:129
msgid "the kind of physical representation, e.g., 'text/html'."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:145
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:141
msgid "should be the fully-qualified URL of the document (the current implementation returns the object's id, which is only required to be unique within its container)."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:158
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:154
msgid "'en-us', 'pt-br', 'de', etc. Should be set at creation, with an appropriate default (and a picklist of values)."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:166
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:16
+msgid "the standard Zope 'title' attribute; we should look at making it mandatory for all PortalContent derivatives."
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:162
msgid "Source"
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:171
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:167
msgid "the original from which a piece of content is derived. I'd like to ignore this one."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:178
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:174
msgid "Relation"
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:183
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:179
msgid "more relationships to other documents. Again, I'd like to ignore it (ZopeStudio and other such tools need this, however, to build site maps)."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:191
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:187
msgid "Coverage"
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:196
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:192
msgid "geographic/chronological/jurisdictional scope. Again, ignore."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:20
-msgid "the standard Zope 'title' attribute; we should look at making it mandatory for all PortalContent derivatives."
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:208
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:204
msgid "copyright and other IP information related to the document. Most portals should care about this: witness the brouhaha on Slashdot over the compilation of the Hellmouth postings into a book."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:28
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:24
#: CMFDefault/skins/zpt_generic/search_form_template.pt:115
msgid "Creator"
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:33
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:29
msgid "where possible, this should be one or more full names, of either persons or organizations. The current implementation finds the first user in the list returned by 'get_local_roles' who has the 'Owner' role; userids are not considered appropriate for this field by the DCI."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:48
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:44
msgid "this is supposed to be drawn from a controlled list of keywords (e.g., selected from a multi-select list used across the whole site)."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:61
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:5
+msgid "Dublin Core Metadata"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:57
msgid "a short summary, an abstract, or a table-of-contents are all considered acceptable. We might look at making this required, as well, at least for some kinds of content."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:70
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:66
msgid "Publisher"
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:75
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:71
msgid "a site-wide property, should be done through acquisition (do I smell a 'portal_metadata' tool about to appear?) Again, this is supposed to be a formal name."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:83
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:79
msgid "Contributor"
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:88
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:84
msgid "used to convey others besides the Creator who have contributed to the document (the current implementation aliases 'Creator', which is not what DCI intends)."
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:9
-msgid "Dublin Core Metadata"
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:92
+#: CMFDefault/skins/zpt_generic/review.pt:26
+#: CMFDefault/skins/zpt_generic/search_results_template.pt:17
+msgid "Date"
msgstr ""
-#: CMFDefault/skins/zpt_generic/metadata_help.pt:96
-#: CMFDefault/skins/zpt_generic/review.pt:30
-#: CMFDefault/skins/zpt_generic/search_results_template.pt:19
-msgid "Date"
+#: CMFDefault/skins/zpt_generic/metadata_help.pt:97
+msgid "this one has modifiers, of which the approved set is: 'Created', 'Valid', 'Available', 'Issued', and 'Modified'. I propose extending the interface to include CreationDate(), EffectiveDate(), ExpirationDate(), and ModificationDate(). The current Date() could just return the CreationDate(), while the DCI 'Valid' and 'Available' would be ranges derived from EffectiveDate() and ExpirationDate()."
msgstr ""
#: CMFDefault/skins/zpt_generic/news_box_template.pt:19
@@ -1568,39 +1568,39 @@
msgid "If you do not know what this field is for, leave it blank."
msgstr ""
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:25
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:16
msgid "Member Preferences"
msgstr ""
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:31
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:22
msgid "${link} to change your password."
msgstr ""
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:31
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:22
msgid "Click here"
msgstr ""
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:48
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:39
msgid "Listed status"
msgstr ""
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:53
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:44
msgid "Listed"
msgstr ""
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:56
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:47
msgid "You will show up on the public membership roster."
msgstr ""
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:64
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:55
msgid "Unlisted"
msgstr ""
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:66
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:57
msgid "You will <i>not</i> show up on the public membership roster. Your Member folder will still be publicly accessible unless you change its security settings."
msgstr ""
-#: CMFDefault/skins/zpt_generic/personalize_form.pt:74
+#: CMFDefault/skins/zpt_generic/personalize_form.pt:65
msgid "Skin"
msgstr ""
@@ -1616,31 +1616,31 @@
msgid "${count} more recent articles"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:12
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:10
msgid "This form is used to set the portal configuration options."
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:19
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:17
msgid "Portal 'From' name"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:24
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:22
msgid "When the portal generates mail, it uses this name as its (apparent) sender."
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:30
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:28
msgid "Portal 'From' address"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:35
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:33
msgid "When the portal generates mail, it uses this address as its (apparent) return address."
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:41
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:39
msgid "SMTP server"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:46
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:44
msgid "This is the address of your local SMTP (out-going mail) server."
msgstr ""
@@ -1648,39 +1648,39 @@
msgid "Configure the Portal"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:52
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:50
msgid "Portal title"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:57
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:55
msgid "This is the title which appears at the top of every portal page."
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:63
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:61
msgid "Portal description"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:68
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:66
msgid "This description is made available via syndicated content and elsewhere. It should be fairly brief."
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:74
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:72
msgid "Password policy"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:78
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:76
msgid "Generate and email members' initial password"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:83
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:81
msgid "Allow members to select their initial password"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:88
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:86
msgid "Portal default encoding"
msgstr ""
-#: CMFDefault/skins/zpt_generic/reconfig_template.pt:93
+#: CMFDefault/skins/zpt_generic/reconfig_template.pt:91
msgid "Charset used to decode portal content strings. If empty, 'ascii' is used."
msgstr ""
@@ -1712,31 +1712,31 @@
msgid "Be aware that this URL might wrap over two lines. If your browser shows an error message when you try to access the URL please make sure that you put in the complete string."
msgstr ""
-#: CMFDefault/skins/zpt_generic/review.pt:106
+#: CMFDefault/skins/zpt_generic/review.pt:100
msgid "There are no items matching your specified criteria."
msgstr ""
-#: CMFDefault/skins/zpt_generic/review.pt:18
+#: CMFDefault/skins/zpt_generic/review.pt:14
msgid "Items pending review"
msgstr ""
-#: CMFDefault/skins/zpt_generic/review.pt:83
+#: CMFDefault/skins/zpt_generic/review.pt:79
msgid "Comment:"
msgstr ""
-#: CMFDefault/skins/zpt_generic/review.pt:91
+#: CMFDefault/skins/zpt_generic/review.pt:87
msgid "Publish"
msgstr ""
-#: CMFDefault/skins/zpt_generic/review.pt:93
+#: CMFDefault/skins/zpt_generic/review.pt:89
msgid "Reject"
msgstr ""
-#: CMFDefault/skins/zpt_generic/roster.pt:15
+#: CMFDefault/skins/zpt_generic/roster.pt:12
msgid "Portal Members"
msgstr ""
-#: CMFDefault/skins/zpt_generic/roster.pt:25
+#: CMFDefault/skins/zpt_generic/roster.pt:22
msgid "Listed?"
msgstr ""
@@ -1761,7 +1761,7 @@
msgstr ""
#: CMFDefault/skins/zpt_generic/search_form.py:37
-#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:38
+#: CMFDefault/skins/zpt_generic/folder_localrole_form.pt:34
msgid "Search"
msgstr ""
@@ -1827,11 +1827,11 @@
msgid "Item type"
msgstr ""
-#: CMFDefault/skins/zpt_generic/search_results_template.pt:35
+#: CMFDefault/skins/zpt_generic/search_results_template.pt:33
msgid "(No title)"
msgstr ""
-#: CMFDefault/skins/zpt_generic/search_results_template.pt:45
+#: CMFDefault/skins/zpt_generic/search_results_template.pt:43
msgid "(No description)"
msgstr ""
@@ -1839,151 +1839,151 @@
msgid "Search Results"
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:13
-msgid "Site Error"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:15
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:11
msgid "An error was encountered while publishing this resource."
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:20
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:16
msgid "Error Type: ${error_type}"
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:24
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:20
msgid "Error Value: ${error_value}"
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:31
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:27
msgid "Troubleshooting Suggestions"
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:38
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:34
msgid "This resource may be trying to reference a nonexistent object or variable <strong>${error_value}</strong>."
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:41
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:37
msgid "The URL may be incorrect."
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:42
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:38
msgid "The parameters passed to this resource may be incorrect."
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:44
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:40
msgid "A resource that this resource relies on may be encountering an error."
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:48
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:44
msgid "For more detailed information about the error, please refer to the HTML source for this page."
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:52
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:48
msgid "If the error persists please contact the site maintainer. Thank you for your patience."
msgstr ""
-#: CMFDefault/skins/zpt_generic/standard_error_message.pt:60
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:56
msgid "Show Error Log Entry"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:102
+#: CMFDefault/skins/zpt_generic/standard_error_message.pt:9
+msgid "Site Error"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:100
msgid "Save"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:120
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:118
msgid "Disable Syndication"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:129
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:127
msgid "Enable Syndication"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:134
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:132
msgid "Syndication is Disabled"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:16
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:14
msgid "Channel Properties"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:27
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:25
msgid "Channel Title:"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:33
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:31
msgid "Channel Description:"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:51
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:49
msgid "Syndication Module Properties"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:61
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:59
msgid "Element"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:62
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:6
+msgid "Default Syndication Properties"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:60
msgid "Default Value"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:65
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:63
msgid "UpdatePeriod"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:8
-msgid "Default Syndication Properties"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:80
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:78
msgid "UpdateFrequency"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:88
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:86
msgid "UpdateBase"
msgstr ""
-#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:95
+#: CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt:93
msgid "Max Syndicated Items"
msgstr ""
-#: CMFDefault/skins/zpt_generic/undo_form.pt:110
+#: CMFDefault/skins/zpt_generic/undo_form.pt:107
msgid "There are no transactions that can be undone."
msgstr ""
-#: CMFDefault/skins/zpt_generic/undo_form.pt:33
+#: CMFDefault/skins/zpt_generic/undo_form.pt:30
msgid "This application's transactional feature allows you to easily undo changes made to the application's settings or data. You can revert the application to a "snapshot" of its state at a previous point in time."
msgstr ""
-#: CMFDefault/skins/zpt_generic/undo_form.pt:38
+#: CMFDefault/skins/zpt_generic/undo_form.pt:35
msgid "Select one or more transactions below and then click on the "Undo" button to undo the transactions. Note that even though a transaction is shown below, you will not be able to undo it if later transactions modified objects that were modified by the transaction."
msgstr ""
-#: CMFDefault/skins/zpt_generic/undo_form.pt:56
+#: CMFDefault/skins/zpt_generic/undo_form.pt:5
+msgid "Undo Transactions"
+msgstr ""
+
+#: CMFDefault/skins/zpt_generic/undo_form.pt:53
msgid "Later Transactions"
msgstr ""
-#: CMFDefault/skins/zpt_generic/undo_form.pt:70
+#: CMFDefault/skins/zpt_generic/undo_form.pt:67
msgid "by"
msgstr ""
-#: CMFDefault/skins/zpt_generic/undo_form.pt:76
+#: CMFDefault/skins/zpt_generic/undo_form.pt:73
msgid "Zope"
msgstr ""
-#: CMFDefault/skins/zpt_generic/undo_form.pt:79
+#: CMFDefault/skins/zpt_generic/undo_form.pt:76
msgid "on"
msgstr ""
-#: CMFDefault/skins/zpt_generic/undo_form.pt:8
-msgid "Undo Transactions"
-msgstr ""
-
-#: CMFDefault/skins/zpt_generic/undo_form.pt:82
+#: CMFDefault/skins/zpt_generic/undo_form.pt:79
msgid "at"
msgstr ""
-#: CMFDefault/skins/zpt_generic/undo_form.pt:90
+#: CMFDefault/skins/zpt_generic/undo_form.pt:87
msgid "Earlier Transactions"
msgstr ""
@@ -2003,19 +2003,19 @@
msgid "Topic changed."
msgstr ""
-#: CMFTopic/skins/zpt_topic/topic_edit_template.pt:31
+#: CMFTopic/skins/zpt_topic/topic_edit_template.pt:29
msgid "Acquire Criteria from Parent"
msgstr ""
-#: CMFTopic/skins/zpt_topic/topic_view_template.pt:16
+#: CMFTopic/skins/zpt_topic/topic_view_template.pt:14
msgid "Subtopics:"
msgstr ""
-#: CMFTopic/skins/zpt_topic/topic_view_template.pt:23
+#: CMFTopic/skins/zpt_topic/topic_view_template.pt:21
msgid "Topic Matches:"
msgstr ""
-#: CMFTopic/skins/zpt_topic/topic_view_template.pt:33
+#: CMFTopic/skins/zpt_topic/topic_view_template.pt:31
msgid "Query Parameters:"
msgstr ""
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_content/content_status_history.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_content/content_status_history.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_content/content_status_history.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -6,8 +6,6 @@
review_state python: wtool.getInfoFor(context, 'review_state');
review_history python: wtool.getInfoFor(context,
'review_history')">
-<div class="Desktop">
-
<h1 i18n:translate="">Content Item status history</h1>
<p i18n:translate="">An item's status (also called its review state)
@@ -44,8 +42,6 @@
</div>
<div tal:condition="python: not(review_history)"
i18n:translate="">This item has not had any status changes.</div>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_content/document_edit_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_content/document_edit_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_content/document_edit_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<form action="document_edit_form" method="post" enctype="multipart/form-data"
tal:attributes="action form/action"
><metal:macro metal:use-macro="context/form_widgets/macros/hidden_vars" />
@@ -57,8 +55,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_content/file_edit_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_content/file_edit_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_content/file_edit_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<form action="file_edit_form" method="post" enctype="multipart/form-data"
tal:attributes="action form/action">
<table class="FormLayout">
@@ -37,8 +35,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_content/folder_edit_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_content/folder_edit_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_content/folder_edit_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<form action="folder_edit_form" method="post"
tal:attributes="action form/action">
<table class="FormLayout">
@@ -35,8 +33,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_content/image_edit_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_content/image_edit_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_content/image_edit_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<form action="image_edit_form" method="post" enctype="multipart/form-data"
tal:attributes="action form/action">
<table class="FormLayout">
@@ -37,8 +35,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_content/link_edit_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_content/link_edit_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_content/link_edit_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<form action="link_edit_form" method="post"
tal:attributes="action form/action">
<table class="FormLayout">
@@ -32,8 +30,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_content/metadata_edit_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_content/metadata_edit_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_content/metadata_edit_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<form action="metadata_edit_form" method="post"
tal:attributes="action form/action">
<table class="FormLayout">
@@ -117,8 +115,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_content/newsitem_edit_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_content/newsitem_edit_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_content/newsitem_edit_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<form action="newsitem_edit_form" method="post"
tal:attributes="action form/action">
<table class="FormLayout">
@@ -53,8 +51,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_content/transition_form.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_content/transition_form.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_content/transition_form.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -7,8 +7,6 @@
review_state python: wtool.getInfoFor(context, 'review_state');
review_history python: wtool.getInfoFor(context,
'review_history')">
-<div class="Desktop">
-
<div metal:define-slot="main" i18n:domain="cmf_default">
<h1 i18n:translate="">Transition of <span tal:replace="context/getId"
i18n:name="objectid">Item</span>.</h1>
@@ -66,8 +64,6 @@
tal:replace="rhComments">Comments</span>
</tal:loop>
</tal:case>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_control/finish_portal_construction.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_control/finish_portal_construction.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_control/finish_portal_construction.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -6,8 +6,6 @@
</metal:slot>
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
-<div class="Desktop">
-
<p i18n:translate="">The first thing you should do is visit the
<i18n:span i18n:name="reconfig_link"><a href="http://cmf.zope.org"
tal:attributes="href string:${context/portal_url}/reconfig_form"
@@ -19,8 +17,6 @@
<i18n:span i18n:name="home_link"><a href="/"
tal:attributes="href string:${context/portal_url}"
i18n:translate="">home page</a></i18n:span>.</p>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_contents_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_contents_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_contents_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -9,8 +9,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="batch options/batch;
form options/form">
-<div class="Desktop">
-
<p tal:define="up_info options/up_info" tal:condition="up_info"
><tal:case tal:condition="up_info/url"
><a href="" tal:attributes="href up_info/url"
@@ -90,8 +88,6 @@
</tal:case></form>
<div tal:replace="structure context/folder_filter_form">Filter Form Here</div>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_factories_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_factories_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_factories_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="batch options/batch;
form options/form">
-<div class="Desktop">
-
<form action="folder_factories" method="post"
tal:attributes="action form/action">
<table class="FormLayout"
@@ -36,8 +34,6 @@
<input type="submit" name="add" value="Add"
i18n:attributes="value" /></div>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_localrole_form.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_localrole_form.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_localrole_form.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,21 +1,17 @@
-<html metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div class="Desktop"
- metal:fill-slot="main"
- tal:define="searching python: request.get('role_submit', None );
- mtool here/portal_membership;
- "
- i18n:domain="cmf_default"
->
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
+ tal:define="searching python: request.get('role_submit', None);
+ mtool context/portal_membership">
-<div tal:condition="python: not searching">
+<tal:case tal:condition="python: not searching">
<!-- Search -->
<h2 i18n:translate="">Assign local roles: Search Members</h2>
<form method="post" action="folder_localrole_form"
- tal:attributes="action string:${here/absolute_url}/folder_localrole_form"
+ tal:attributes="action string:${context/absolute_url}/folder_localrole_form"
>
<table class="FormLayout">
@@ -45,9 +41,9 @@
<!-- End search -->
-</div>
+</tal:case>
-<div tal:condition="searching"
+<tal:case tal:condition="searching"
tal:define="search_param python: request.get( 'search_param', '' );
search_term python: request.get( 'search_term', '' );
found python:mtool.searchMembers( search_param=search_param
@@ -59,12 +55,12 @@
<h2 i18n:translate="">Assign local roles: Search Results</h2>
-<div tal:condition="found">
+<tal:case tal:condition="found">
<p i18n:translate="">Select Member(s) and a role to assign:</p>
<form method="post" action="folder_localrole_edit"
- tal:attributes="action string:${here/absolute_url}/folder_localrole_edit"
+ tal:attributes="action string:${context/absolute_url}/folder_localrole_edit"
>
<input type="hidden" name="change_type" value="add" />
@@ -102,7 +98,7 @@
<th colspan="2" i18n:translate="">Role to assign:</th>
<td>
<select name="member_role"
- tal:define="roles python: mtool.getCandidateLocalRoles( here )">
+ tal:define="roles python: mtool.getCandidateLocalRoles(context)">
<option tal:repeat="role roles"
tal:content="role"> Role1 </option>
<option tal:condition="nothing"> Role2 </option>
@@ -124,15 +120,14 @@
</table>
</form>
+</tal:case>
-</div>
-
-<div tal:condition="python: not found">
+<tal:case tal:condition="python: not found">
<p i18n:translate="">Sorry, no members matched your search.</p>
-</div>
+</tal:case>
<!-- End assignment -->
-</div>
+</tal:case>
<hr />
@@ -142,12 +137,12 @@
folder:</p>
<form method="post" action="folder_localrole_edit"
- tal:attributes="action string:${here/absolute_url}/folder_localrole_edit"
+ tal:attributes="action string:${context/absolute_url}/folder_localrole_edit"
>
<input type="hidden" name="change_type" value="delete" />
<input type="hidden" name="member_role" value="" />
- <table class="FormLayout" tal:define="lroles here/get_local_roles">
+ <table class="FormLayout" tal:define="lroles context/get_local_roles">
<tr>
<td width="16"><br /></td>
<th style="text-align:left;" i18n:translate="">User</th>
@@ -204,8 +199,7 @@
</table>
</form>
+</metal:slot>
-</div>
-
</body>
</html>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_rename_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_rename_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/folder_rename_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="batch options/batch;
form options/form">
-<div class="Desktop">
-
<form action="members_manage" method="post"
tal:attributes="action form/action"
><metal:macro metal:use-macro="context/form_widgets/macros/hidden_vars" />
@@ -32,7 +30,6 @@
</table>
<metal:macro metal:use-macro="context/form_widgets/macros/buttons" />
</form>
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/join_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/join_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/join_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -7,8 +7,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<tal:case tal:condition="options/isOrdinaryMember">
<p i18n:translate=""> You are already a member. You may use the
<a href="personalize_form">personalization form</a>
@@ -99,8 +97,6 @@
</table>
</form>
</tal:case>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/login_form.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/login_form.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/login_form.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -6,8 +6,6 @@
</metal:slot>
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
-<div class="Desktop">
-
<form action="" method="post"
tal:attributes="action python: atool.getActionInfo(
'user/logged_in')['url']">
@@ -64,8 +62,6 @@
<p i18n:translate="">Setting the 'Remember my ID' option will set a cookie
with your member ID, so that when you next log in, your member ID will
already be filled in for you.</p>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/mail_password_form.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/mail_password_form.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/mail_password_form.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,37 +1,27 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
+ tal:define="ptool context/portal_properties">
+<h1 i18n:translate="">Don't panic!</h1>
- <div class="Desktop"
- tal:define="ptool here/portal_properties">
+<p i18n:translate="">Just enter your member ID below, click <em>Send</em>, and
+ your password will be mailed to you if you gave a valid email address when
+ you signed on.</p>
- <h1 i18n:translate="">Don't panic!</h1>
+<p i18n:translate="">If this will not work for you (for example, if you forget
+ your member ID or didn't enter your email address) send email to
+ <a href="mailto:me at example.org"
+ tal:attributes="href string:mailto:${ptool/email_from_address}"
+ tal:content="ptool/email_from_address"
+ i18n:name="admin_email">me at example.org</a>.</p>
- <p i18n:translate="">Just enter your username below, click <em>Send</em>,
- and your password will be mailed to you if you gave a valid email address
- when you signed on.</p>
+<form action="mail_password"
+ tal:attributes="action string:${context/portal_url}/mail_password">
+ <input name="userid" />
+ <input type="submit" value="Send" i18n:attributes="value" />
+</form>
+</metal:slot>
- <p i18n:translate="">If this will not work for you (for example, if you
- forget your member name or didn't enter your email address) send email to
- <a tal:attributes="href string:mailto:${ptool/email_from_address}"
- tal:content="ptool/email_from_address"
- href="mailto:me at here.com"
- i18n:name="admin_email">me at here.com</a>.</p>
-
- <form action="mail_password"
- tal:attributes="action string:${here/portal_url}/mail_password"
- >
- <input name="userid" />
- <input type="submit" value="Send" i18n:attributes="value" />
- </form>
-
- </div><!-- class="Desktop" -->
-
-</div><!-- metal:fill-slot="main" -->
-
</body>
</html>
-
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/members_delete_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/members_delete_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/members_delete_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -7,8 +7,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<form action="members_delete" method="post"
tal:attributes="action form/action"
><metal:macro metal:use-macro="context/form_widgets/macros/hidden_vars" />
@@ -17,8 +15,6 @@
<p><strong tal:content="form/members">MEMBERS</strong></p>
<metal:macro metal:use-macro="context/form_widgets/macros/buttons" />
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/members_manage_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/members_manage_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/members_manage_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,7 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="batch options/batch;
form options/form">
-<div class="Desktop">
<form action="members_manage" method="post"
tal:attributes="action form/action"
><metal:macro metal:use-macro="context/form_widgets/macros/hidden_vars" />
@@ -47,7 +46,6 @@
<metal:macro metal:use-macro="context/batch_widgets/macros/navigation" />
<metal:macro metal:use-macro="context/form_widgets/macros/buttons" />
</form>
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/metadata_help.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/metadata_help.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/metadata_help.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,11 +1,7 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
-<div class="Desktop">
-
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<h2 i18n:translate="">Dublin Core Metadata</h2>
<table>
@@ -213,9 +209,7 @@
</tr>
</table>
+</metal:slot>
-</div>
-</div>
</body>
</html>
-
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/personalize_form.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/personalize_form.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/personalize_form.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,29 +1,20 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
-
- <div tal:define="purl here/portal_url;
- mtool here/portal_membership;
- member mtool/getAuthenticatedMember;
- ">
-
- <div tal:condition="python: not( mtool.checkPermission( 'Set own properties'
- , here ) )">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
+ tal:define="purl context/portal_url;
+ mtool context/portal_membership;
+ member mtool/getAuthenticatedMember">
+<tal:case tal:condition="python: not(mtool.checkPermission('Set own properties', context))">
<span id="dummy_for_redirect"
- tal:define="aurl here/absolute_url;
+ tal:define="aurl context/absolute_url;
rurl string:${purl}/login_form?came_from=${aurl};
response request/RESPONSE;
redirect python:response.redirect( rurl )" />
+</tal:case>
- </div><!-- not Set own properties -->
+<h1 i18n:translate="">Member Preferences</h1>
- <div class="Desktop">
-
- <h1 i18n:translate="">Member Preferences</h1>
-
<span tal:replace="request/msg"
tal:condition="request/msg|nothing" />
@@ -70,9 +61,9 @@
</td>
</tr>
- <tr tal:condition="here/portal_skins|nothing">
+ <tr tal:condition="context/portal_skins|nothing">
<th i18n:translate="">Skin</th>
- <td tal:define="s_tool here/portal_skins;
+ <td tal:define="s_tool context/portal_skins;
current request/portal_skin|nothing;
">
<select name="portal_skin">
@@ -94,13 +85,7 @@
</tr>
</table>
</form>
+</metal:slot>
- </div><!-- class="Desktop" -->
-
- </div><!-- tal:define="mtool" -->
-
-</div><!-- metal:fill-slot="main" -->
-
</body>
</html>
-
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/reconfig_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/reconfig_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/reconfig_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -7,8 +7,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<p i18n:translate="">This form is used to set the portal configuration
options.</p>
@@ -103,8 +101,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/review.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/review.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/review.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,20 +1,16 @@
-<html metal:use-macro="here/main_template/macros/master">
-
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
-
-<div class="Desktop"
- tal:define="results python: here.portal_catalog( review_state='pending' );
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
+ tal:define="results python: context.portal_catalog(review_state='pending');
Batch nocall: modules/ZTUtils/Batch;
def_start string:0;
bstart request/b_start | def_start;
batch python: Batch( results, 25, int( bstart ), orphan=0 );
- purl here/portal_url;
+ purl context/portal_url;
">
-<div tal:condition="results">
-
+<tal:case tal:condition="results">
<h1 i18n:translate="">Items pending review</h1>
<form action="/" method="get"
@@ -63,7 +59,7 @@
</td>
</tr>
- <tr tal:define="desc item/Description">
+ <tr tal:define="desc item/Description">
<td> </td>
<td colspan="3"
tal:define="xdesc python: desc or '(No description)'"
@@ -98,17 +94,12 @@
</table>
</form>
+</tal:case>
-</div>
-
-
-<div tal:condition="python: not results">
+<tal:case tal:condition="python: not results">
<p i18n:translate="">There are no items matching your specified criteria.</p>
-</div>
+</tal:case>
+</metal:slot>
-</div>
-
-</div>
-
</body>
</html>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/roster.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/roster.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/roster.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,21 +1,18 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div metal:fill-slot="main">
+<metal:slot metal:fill-slot="main">
<div tal:condition="python:not(request.has_key('bs'))"
tal:define="dummy python:request.set('bs', '25')"></div>
-<div class="Desktop"
- metal:define-macro="roster"
+<div metal:define-macro="roster"
i18n:domain="cmf_default"
>
<h2 i18n:translate="">Portal Members</h2>
<table class="SearchResults"
- tal:define="mtool here/portal_membership;
+ tal:define="mtool context/portal_membership;
isUserManager python: mtool.checkPermission( 'Manage users',
mtool.getMembersFolder() )">
<thead>
@@ -34,7 +31,7 @@
<td> <br /> </td>
<td tal:define="id members/id;
homeUrl python: mtool.getHomeUrl(id, verifyPermission=1)">
- <a href="www.here.com"
+ <a href="www.example.org"
tal:condition="homeUrl"
tal:attributes="href homeUrl"
tal:content="id">ID</a>
@@ -51,11 +48,12 @@
<tal:span tal:define="target python: mtool.getMembersFolder().absolute_url();
batch python: {'navigation':
- here.getBatchNavigation(batch, target, 'member', 'members') }">
- <metal:block metal:use-macro="here/batch_widgets/macros/navigation" />
+ context.getBatchNavigation(batch, target, 'member', 'members') }">
+ <metal:macro metal:use-macro="context/batch_widgets/macros/navigation" />
</tal:span>
</div>
-</div>
+</metal:slot>
+
</body>
</html>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/rssDisabled.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/rssDisabled.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/rssDisabled.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,12 +1,12 @@
-<html metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div metal:fill-slot="main">
-<div class="Desktop">
-<h2 tal:content="here/getId">Document Title</h2>
+
+<metal:slot metal:fill-slot="main">
+<h2 tal:content="context/getId">Document Title</h2>
<div tal:condition="request/portal_status_message | nothing"
tal:content="request/portal_status_message"
class="error"></div>
-</div>
-</div>
+</metal:slot>
+
</body>
</html>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/search_results_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/search_results_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/search_results_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -7,8 +7,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="batch options/batch">
-<div class="Desktop">
-
<metal:macro metal:use-macro="context/batch_widgets/macros/summary" />
<table class="SearchResults" tal:condition="batch/listItemInfos">
<thead>
@@ -48,8 +46,6 @@
</tbody>
</table>
<metal:macro metal:use-macro="context/batch_widgets/macros/navigation" />
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/standard_error_message.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/standard_error_message.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/standard_error_message.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,11 +1,7 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
-<div class="Desktop">
-
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<div tal:condition="options/error_message"
tal:content="structure options/error_message" />
@@ -62,7 +58,7 @@
Show Error Log Entry
</a>
</div>
-</div>
-</div>
+</metal:slot>
+
</body>
</html>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/stxmethod_view.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/stxmethod_view.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/stxmethod_view.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,18 +1,9 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div metal:fill-slot="main">
-<div class="Desktop">
+<metal:slot metal:fill-slot="main">
+<p tal:replace="structure options/cooked">STX goes here.</p>
+</metal:slot>
-<p tal:replace="structure options/cooked">
- STX goes here.
-</p>
-
-</div>
-
-</div>
</body>
</html>
-
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/synPropertiesForm_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -3,8 +3,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="s_tool options/s_tool">
-<div class="Desktop">
-
<h2 i18n:translate="">Default Syndication Properties</h2>
<tal:case tal:condition="options/s_allowed"
@@ -133,8 +131,6 @@
<tal:case tal:condition="not: options/s_allowed"
><h4 i18n:translate="">Syndication is Disabled</h4>
</tal:case>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFDefault/skins/zpt_generic/undo_form.pt
===================================================================
--- CMF/branches/2.0/CMFDefault/skins/zpt_generic/undo_form.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFDefault/skins/zpt_generic/undo_form.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,14 +1,11 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="here/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div metal:fill-slot="main" i18n:domain="cmf_default">
-<div class="Desktop">
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
<h1 i18n:translate="">Undo Transactions</h1>
-<div tal:define="utool here/portal_undo;
- url here/portal_url;
- transactions python:utool.listUndoableTransactionsFor(here)">
+<div tal:define="utool context/portal_undo;
+ url context/portal_url;
+ transactions python:utool.listUndoableTransactionsFor(context)">
<div
tal:condition="transactions"
@@ -27,7 +24,7 @@
">
<form action="undo" method="post"
- tal:attributes="action string:${here/absolute_url}/undo"
+ tal:attributes="action string:${context/absolute_url}/undo"
>
<p i18n:translate="">This application's transactional feature allows you to
@@ -112,8 +109,7 @@
</div>
</div>
+</metal:slot>
-</div><!-- class="Desktop" -->
-</div><!-- metal:fill-slot="main" -->
</body>
</html>
Modified: CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_criteria_form.pt
===================================================================
--- CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_criteria_form.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_criteria_form.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -1,17 +1,11 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="container/main_template/macros/master">
+<html metal:use-macro="context/main_template/macros/master">
<body>
-<div metal:fill-slot="main">
-<div class="Desktop">
+<metal:slot metal:fill-slot="main">
+<h2>Topic Criteria: <span tal:replace="context/getId" /></h2>
-<div class="Topic">
-
-<h2> Topic Criteria: <span tal:replace="here/getId" /> </h2>
-
-<form action="" method="post" tal:attributes="action here/absolute_url">
-<span tal:define="criteria here/listCriteria">
+<form action="" method="post" tal:attributes="action context/absolute_url">
+<span tal:define="criteria context/listCriteria">
<span tal:repeat="criterion criteria">
<span tal:define="editform string:criterion/${criterion/getEditForm}"
tal:replace="structure python:path(editform)" />
@@ -24,14 +18,13 @@
<input type="hidden" name=":default_action" value="editCriteria">
</form>
-
-<form action="" method="post" tal:attributes="action string:${here/absolute_url}/topic_addCriterion">
+<form action="" method="post" tal:attributes="action string:${context/absolute_url}/topic_addCriterion">
<h2> Add New Topic Criteria: </h2>
<table class="FormLayout">
<tr valign="top">
<th align="right"> Field id: </th>
<td>
- <select name="field" tal:define="fields here/listAvailableFields">
+ <select name="field" tal:define="fields context/listAvailableFields">
<option value="" tal:repeat="field fields" tal:attributes="value field" tal:content="field">Field</option>
</select>
</td>
@@ -39,7 +32,7 @@
<tr valign="top">
<th align="left"> Criteria type: </th>
<td>
- <select name="criterion_type" tal:define="types here/listCriteriaTypes">
+ <select name="criterion_type" tal:define="types context/listCriteriaTypes">
<option value="" tal:repeat="type types" tal:attributes="value type/name" tal:content="type/name">Type</option>
</select>
</td>
@@ -50,11 +43,7 @@
</tr>
</table>
</form>
+</metal:slot>
-</div>
-
-</div>
-
-</div>
</body>
</html>
Modified: CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_edit_template.pt
===================================================================
--- CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_edit_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_edit_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -8,8 +8,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="form options/form">
-<div class="Desktop">
-
<form action="topic_edit_form" method="post"
tal:attributes="action form/action">
<table class="FormLayout">
@@ -42,8 +40,6 @@
</tr>
</table>
</form>
-
-</div>
</metal:slot>
</body>
Modified: CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_view_template.pt
===================================================================
--- CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_view_template.pt 2006-04-10 09:47:07 UTC (rev 66763)
+++ CMF/branches/2.0/CMFTopic/skins/zpt_topic/topic_view_template.pt 2006-04-10 09:47:24 UTC (rev 66764)
@@ -10,8 +10,6 @@
<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
tal:define="batch options/batch">
-<div class="Desktop">
-
<tal:case tal:condition="options/listSubtopicInfos"
><h4 i18n:translate="">Subtopics:</h4>
<div tal:repeat="item_info options/listSubtopicInfos">
@@ -35,8 +33,6 @@
<ul tal:condition="options/listQueries">
<li tal:repeat="item options/listQueries" tal:content="item">item</li>
</ul>
-
-</div>
</metal:slot>
</body>
More information about the CMF-checkins
mailing list