[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - content_byline.pt:1.3 discussion_reply_form.pt:1.5

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

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

Modified Files:
	content_byline.pt discussion_reply_form.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/content_byline.pt 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/zpt_generic/content_byline.pt:1.2	Thu Dec  6 17:43:43 2001
+++ CMF/CMFDefault/skins/zpt_generic/content_byline.pt	Thu Mar  6 05:26:23 2003
@@ -3,10 +3,12 @@
      tal:define="creator here/Creator;
                  home_url python: here.portal_membership.getHomeUrl(creator);
                 "
+     i18n:domain="cmf_default"
 >
 
 <p>
-   Created by <span tal:condition="home_url"
+   <span tal:omit-tag="" i18n:translate="">Created by</span>
+   <span tal:condition="home_url"
      ><a href="." title="Here"
          tal:attributes="href home_url;
                          title creator;
@@ -14,7 +16,8 @@
          tal:content="creator">Creator</a>
     </span><span tal:condition="not: home_url"
                  tal:content="creator">Creator</span
-    >.  Last modified <span tal:content="here/ModificationDate"
+    >. <span tal:omit-tag="" i18n:translate="">Last modified</span>
+    <span tal:content="here/ModificationDate"
     >Today</span>.
 </p>
 


=== CMF/CMFDefault/skins/zpt_generic/discussion_reply_form.pt 1.4 => 1.5 ===
--- CMF/CMFDefault/skins/zpt_generic/discussion_reply_form.pt:1.4	Sat Jun 29 17:00:39 2002
+++ CMF/CMFDefault/skins/zpt_generic/discussion_reply_form.pt	Thu Mar  6 05:26:23 2003
@@ -2,26 +2,26 @@
       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">
 <tal:block define="dummy python:here.portal_discussion.getDiscussionFor(here)" />
 
-<form method="POST" action="talkback"
+<form method="post" action="talkback"
       tal:attributes="action string:${here/absolute_url}/talkback">
-<input type="hidden" name=":default_method" value="discussion_reply">
+<input type="hidden" name=":default_method" value="discussion_reply" />
 
 <input type="hidden" name="Creator" value=""
-       tal:attributes="value here/portal_membership/getAuthenticatedMember">
+       tal:attributes="value here/portal_membership/getAuthenticatedMember" />
 
 <table class="FormLayout">
  <tr>
-  <th align="left">Subject (Title)</th>
+  <th align="left" i18n:translate="">Subject (Title)</th>
   <td><input name="title" value=""
-             tal:attributes="value request/form/title|here/title">
+             tal:attributes="value request/form/title|here/title" />
   </td>
  </tr>
  <tr>
   <td colspan="2">
-   <b>Reply body</b><br>
+   <b i18n:translate="">Reply body</b><br />
    <textarea name="text" cols="70" rows="10" wrap="soft" style="width: 100%"
              tal:content="request/form/text|nothing"></textarea>
   </td>
@@ -30,9 +30,11 @@
   <td></td>
   <td>
    <input type="submit" value="Preview" name=""
-          tal:attributes="name string:${here/getId}/discussion_reply_preview:method">
+          tal:attributes="name string:${here/getId}/discussion_reply_preview:method"
+          i18n:attributes="value" />
    <input type="submit" value="Reply" name=""
-          tal:attributes="name string:discussion_reply:method">
+          tal:attributes="name string:discussion_reply:method"
+          i18n:attributes="value" />
   </td>
  </tr>
 </table>