[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - main_template.pt:1.10 metadata_help.pt:1.3

Yvo Schubbe schubbe@web.de
Thu, 6 Mar 2003 05:32:19 -0500


Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv10860/CMFDefault/skins/zpt_generic

Modified Files:
	main_template.pt metadata_help.pt 
Log Message:
Merged yuppie-collector122-branch:
- Added i18n attributes. (Collector #122)
- Made scripts independent of submit button values.
- Added transition_form.

=== CMF/CMFDefault/skins/zpt_generic/main_template.pt 1.9 => 1.10 ===
--- CMF/CMFDefault/skins/zpt_generic/main_template.pt:1.9	Fri Feb 21 06:39:28 2003
+++ CMF/CMFDefault/skins/zpt_generic/main_template.pt	Thu Mar  6 05:32:18 2003
@@ -23,10 +23,10 @@
 <head>
  <title tal:content="here/expanded_title"> Title goes here </title>
 
- <metal:block define-slot="base" /> 
+ <metal:block define-slot="base" />
 
  <link rel="stylesheet" href="zpt_stylesheet.css" type="text/css"
-       tal:attributes="href here/zpt_stylesheet.css/absolute_url">
+       tal:attributes="href here/zpt_stylesheet.css/absolute_url" />
 
 </head>
 
@@ -44,41 +44,42 @@
         width="100%" cellpadding="0" cellspacing="0" border="0">
 
   <tr>
-
-  <form action="search" method="GET"
-        tal:attributes="action string:${portal_url}/search">
-
    <td id="PortalLogo">
     <a href="." tal:attributes="href string:${portal_url}/"
     ><img src="Zope_logo.gif" alt="Zope Logo"
           border="0" width="87" height="38"
-          tal:attributes="src string:${portal_url}/Zope_logo.gif"></a> 
+          tal:attributes="src string:${portal_url}/Zope_logo.gif" /></a>
    </td>
 
    <td id="PortalTitle">
     <span tal:content="string:${portal_title}">Site Title</span>
    </td>
 
-   <td id="NavBar">
-    <a href="." tal:attributes="href string:${portal_url}/">home</a>&nbsp;
+   <td id="NavBar" i18n:domain="cmf_default">
+   <form action="search" method="get"
+         tal:attributes="action string:${portal_url}/search">
+    <a href="."
+       tal:attributes="href string:${portal_url}/"
+       i18n:translate="">home</a>&nbsp;
     <span tal:condition="membersfolder" tal:omit-tag="">
     <a href="roster"
        tal:attributes="href python: membersfolder.absolute_url()"
-       tal:content="python: membersfolder.getId().lower()">members</a>&nbsp;
+       tal:content="python: membersfolder.getId().lower()"
+       i18n:translate="">members</a>&nbsp;
     </span>
     <a href="recent_news"
-       tal:attributes="href string:${portal_url}/recent_news">news</a>&nbsp;
+       tal:attributes="href string:${portal_url}/recent_news"
+       i18n:translate="">news</a>&nbsp;
     <a href="search_form"
-       tal:attributes="href string:${portal_url}/search_form">search</a> 
+       tal:attributes="href string:${portal_url}/search_form"
+       i18n:translate="">search</a>
 
-    <input name="SearchableText" size="16">
-    <input border="0" type="image" name="go" value="go" src="go.gif"
-           align="middle" width="20" height="20"
-           tal:attributes="src string:${portal_url}/go.gif"> &nbsp;
+    <input name="SearchableText" size="16" />
+    <input type="image" name="go" value="go" src="go.gif"
+           align="middle"
+           tal:attributes="src string:${portal_url}/go.gif" /> &nbsp;
+   </form>
    </td>
-
-  </form>
-
   </tr>
 
  </table>
@@ -96,13 +97,14 @@
      tal:define="uname python: isAnon and 'Guest' or member.getUserName()" >
 
  <!-- hack around netscape 4.x to ensure table is solid -->
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0"
+        i18n:domain="cmf_default">
  <tr>
  <td>
 
  <!-- user_menu_bar -->
  <table id="MemberActionsBox"
-        width="100%" border="0" cellpadding="0" cellspacing="0" >
+        width="100%" border="0" cellpadding="0" cellspacing="0">
 
   <tr>
 
@@ -111,10 +113,11 @@
     <td class="ActionLink" align="right">
       <span tal:repeat="action user_actions">
        <a href="" tal:attributes="href action/url"
-                  tal:content="action/name">Login</a
+                  tal:content="action/name" i18n:translate="">Login</a
        ><span tal:condition="not: repeat/action/end">&nbsp;|&nbsp;</span>
       </span>
-      <span tal:condition="nothing"><a href="join_form">Join</a></span>
+      <span tal:condition="nothing"><a href="join_form"
+                                       i18n:translate="">Join</a></span>
     </td>
 
    </tr>
@@ -137,12 +140,13 @@
         width="100%" border="0" cellpadding="0" cellspacing="0" >
  <tr>
  <td width="20%">
-  
+
   <!-- actions box -->
   <table class="ContextActionsBox"
          width="100%"
          style="float: left;"
-         metal:define-macro="actions_box">
+         metal:define-macro="actions_box"
+         i18n:domain="cmf_default">
 
    <!-- object actions -->
    <tr class="ContextActionsRow">
@@ -157,7 +161,8 @@
           height="16" width="16"
           tal:condition="icon"
           tal:attributes="src string:${portal_url}/${icon};
-                          alt typ; " /> &nbsp;
+                          alt typ; "
+          i18n:attributes="alt" /> &nbsp;
 
      <span tal:replace="structure objID">ID</span>
     </td>
@@ -172,15 +177,16 @@
      <span tal:repeat="action object_actions">
       <a href=""
          tal:attributes="href action/url"
-         tal:content="action/name">View</a><br>
+         tal:content="action/name"
+         i18n:translate="">View</a><br />
      </span>
 
      <span tal:condition="nothing">
-      <a href="">Edit</a><br>
+      <a href="">Edit</a><br />
      </span>
 
      <span tal:condition="nothing">
-      <a href="">Metadata</a><br>
+      <a href="">Metadata</a><br />
      </span>
 
     </td>
@@ -190,16 +196,21 @@
    <tr class="ContextActionsRow"
        tal:condition="workflow_actions" >
 
-    <td class="ActionLink"> 
+    <td class="ActionLink">
 
       <span class="ObjectStatus">
-        Status:  <span tal:replace="wf_state">Private</span><br>
+       <span tal:omit-tag=""
+             i18n:translate="">Status:</span>
+       <span tal:omit-tag=""
+             tal:content="wf_state"
+             i18n:translate="">Private</span><br />
       </span>
 
       <span tal:repeat="action workflow_actions">
        <a href="content_submit_form"
           tal:attributes="href action/url"
-          tal:content="action/name">Submit</a><br>
+          tal:content="action/name"
+          i18n:translate="">Submit</a><br />
       </span>
     </td>
    </tr>
@@ -208,11 +219,12 @@
    <tr class="ContextActionsRow"
        tal:condition="folder_actions"
    >
-    <td class="ActionLink"> 
+    <td class="ActionLink">
       <span tal:repeat="action folder_actions">
        <a href="../folder_contents"
           tal:attributes="href action/url"
-          tal:content="action/name">Folder contents</a><br>
+          tal:content="action/name"
+          i18n:translate="">Folder contents</a><br />
       </span>
     </td>
    </tr>
@@ -225,7 +237,8 @@
      <span tal:repeat="action global_actions">
       <a href="undo_form"
          tal:attributes="href action/url"
-         tal:content="action/name">Undo</a><br>
+         tal:content="action/name"
+         i18n:translate="">Undo</a><br />
      </span>
     </td>
    </tr>
@@ -244,7 +257,7 @@
  </td>
 
  <td width="2%">
- <br>
+  <br />
  </td>
 
  <td id="ForematterCell" width="78%">


=== CMF/CMFDefault/skins/zpt_generic/metadata_help.pt 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/zpt_generic/metadata_help.pt:1.2	Thu Dec  6 17:43:43 2001
+++ CMF/CMFDefault/skins/zpt_generic/metadata_help.pt	Thu Mar  6 05:32:18 2003
@@ -2,33 +2,36 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
+<div metal:fill-slot="main" i18n:domain="cmf_default">
 
 <div class="Desktop">
 
-<h2> Dublin Core Metadata </h2>
+<h2 i18n:translate="">Dublin Core Metadata</h2>
 
 <table>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Title"> Title </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Title" i18n:translate="">Title</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> the standard Zope 'title' attribute; we should look
-    at making it mandatory for all PortalContent derivatives.
+  <td class="ListDefinition" i18n:translate="">the standard Zope 'title'
+    attribute; we should look at making it mandatory for all PortalContent
+    derivatives.
   </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Creator"> Creator </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Creator" i18n:translate="">Creator</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> where possible, this should be one or more full
-    names, of either persons or organizations.  The current
+  <td class="ListDefinition" i18n:translate="">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.
@@ -36,159 +39,175 @@
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Subject"> Subject </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Subject" i18n:translate="">Subject</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> 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)
-  </td>.
+  <td class="ListDefinition" i18n:translate="">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).
+  </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Description"> Description </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Description" i18n:translate="">Description</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> a short summary, an abstract, or a
-    table-of-contents are all considered acceptable.  We might
+  <td class="ListDefinition" i18n:translate="">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.
   </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Publisher"> Publisher </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Publisher" i18n:translate="">Publisher</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> a site-wide property, should be done through
-    acquisition (do I smell a 'portal_metadata' tool about to
+  <td class="ListDefinition" i18n:translate="">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.
   </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Contributor"> Contributor </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Contributor" i18n:translate="">Contributor</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> used to convey others besides the Creator who
-    have contributed to the document (the current implementation
-    aliases 'Creator', which is not what DCI intends)
-  </td>.
+  <td class="ListDefinition" i18n:translate="">used to convey others besides
+    the Creator who have contributed to the document (the current
+    implementation aliases 'Creator', which is not what DCI intends).
+  </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Date"> Date </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Date" i18n:translate="">Date</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> this one has modifiers, of which the approved set is:
+  <td class="ListDefinition" i18n:translate="">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(
-  </td>).
+    EffectiveDate() and ExpirationDate().
+  </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Type"> Type </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Type" i18n:translate="">Type</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> 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.
+  <td class="ListDefinition" i18n:translate="">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.
   </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Format"> Format </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Format" i18n:translate="">Format</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> the kind of physical representation, e.g., 'text/html'
-  </td>.
+  <td class="ListDefinition" i18n:translate="">the kind of physical
+    representation, e.g., 'text/html'.
+  </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Identifier"> Identifier </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Identifier" i18n:translate="">Identifier</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> 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)
-  </td>.
+  <td class="ListDefinition" i18n:translate="">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).
+  </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Language"> Language </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Language" i18n:translate="">Language</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> 'en-us', 'pt-br', 'de', etc.  Should be set at
-    creation, with an appropriate default (and a picklist of
-    values)
-  </td>.
+  <td class="ListDefinition" i18n:translate="">'en-us', 'pt-br', 'de', etc.
+    Should be set at creation, with an appropriate default (and a picklist of
+    values).
+  </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Source"> Source </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Source" i18n:translate="">Source</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> the original from which a piece of content is
-    derived.  I'd like to ignore this one.
+  <td class="ListDefinition" i18n:translate="">the original from which a piece
+    of content is derived. I'd like to ignore this one.
   </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Relation"> Relation </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Relation"i18n:translate="">Relation</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> more relationships to other documents.  Again,
-    I'd like to ignore it (ZopeStudio and other such tools need
-    this, however, to build site maps)
-  </td>.
+  <td class="ListDefinition" i18n:translate=""> more relationships to other
+    documents.  Again, I'd like to ignore it (ZopeStudio and other such tools
+    need this, however, to build site maps).
+  </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Coverage"> Coverage </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Coverage" i18n:translate="">Coverage</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> geographic/chronological/jurisdictional scope.
-    Again, ignore.
+  <td class="ListDefinition" i18n:translate="">
+    geographic/chronological/jurisdictional scope. Again, ignore.
   </td>
  </tr>
 
  <tr>
-  <td colspan="2" class="ListName"> <strong> <a name="Rights"> Rights </a>
-      </strong> </td>
+  <td colspan="2" class="ListName">
+   <strong><a name="Rights" i18n:translate="">Rights</a></strong>
+  </td>
  </tr>
  <tr>
   <td>&nbsp;  </td>
-  <td class="ListDefinition"> 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
+  <td class="ListDefinition" i18n:translate="">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.
   </td>
  </tr>