[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_content - image_edit_form.pt:1.4 link_edit_form.pt:1.4

Thu, 6 Mar 2003 05:41:42 -0500

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

Modified Files:
	image_edit_form.pt link_edit_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_content/image_edit_form.pt 1.3 => 1.4 ===

--- CMF/CMFDefault/skins/zpt_content/image_edit_form.pt:1.3	Tue Apr  2 19:10:34 2002
+++ CMF/CMFDefault/skins/zpt_content/image_edit_form.pt	Thu Mar  6 05:41:39 2003
@@ -2,15 +2,16 @@
       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">
 
 
 <span tal:replace="request/message"
-   tal:condition="request/message|nothing"><hr></span>
+   tal:condition="request/message|nothing"><hr /></span>
 <div class="Image">
 
-<h2>Edit <span tal:replace="here/getId">My ID</span></h2>
+<h2 i18n:translate="">Edit <span
+    tal:replace="here/getId" i18n:name="objectid">My ID</span></h2>
 
 <form action="image_edit" method="post" enctype="multipart/form-data"
       tal:attributes="action string:${here/absolute_url}/image_edit"
@@ -18,31 +19,35 @@
 <table class="FormLayout">
 
  <tr>
-  <th> Title </th>
+  <th i18n:translate="">Title</th>
   <td> <span tal:replace="here/Title">My Title</span> </td>
  </tr>
 
  <tr>
-  <th> Description </th>
+  <th i18n:translate="">Description</th>
   <td> <span tal:replace="here/Description">My Description</span> </td>
  </tr>
 
  <tr>
-  <th> Content type </th>
+  <th i18n:translate="">Content type</th>
   <td> <span tal:replace="here/Format">text/html</span> </td>
  </tr>
 
  <tr>
-  <th> Upload image </th>
-  <td> <input type="file" name="file" size="25"> </td>
+  <th i18n:translate="">Upload image</th>
+  <td> <input type="file" name="file" size="25" /> </td>
  </tr>
 
  <tr>
-  <td> <br> </td>
-  <td><input type="submit" name="choice" value=" Change ">
-      <input type="submit" name="choice" value=" Change and View ">
+  <td> <br /> </td>
+  <td>
+   <input type="submit" name="change" value=" Change "
+          i18n:attributes="value" />
+   <input type="submit" name="change_and_view" value=" Change and View "
+          i18n:attributes="value" />
   </td>
  </tr>
+
 </table>
 </form>
 


=== CMF/CMFDefault/skins/zpt_content/link_edit_form.pt 1.3 => 1.4 ===
--- CMF/CMFDefault/skins/zpt_content/link_edit_form.pt:1.3	Tue Apr  2 19:10:34 2002
+++ CMF/CMFDefault/skins/zpt_content/link_edit_form.pt	Thu Mar  6 05:41:39 2003
@@ -2,40 +2,39 @@
       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">
 
 
 <span tal:replace="request/message"
-   tal:condition="request/message|nothing"><hr></span>
+   tal:condition="request/message|nothing"><hr /></span>
 
 <div class="Link">
 
-<h2>Edit <span tal:replace="here/getId">My ID</span></h2>
+<h2 i18n:translate="">Edit <span
+    tal:replace="here/getId" i18n:name="objectid">My ID</span></h2>
 
 <form action="link_edit" method="post"
       tal:attributes="action string:${here/absolute_url}/link_edit"
 >
 <table class="FormLayout">
  <tr>
-  <th>
-   Title
-  </th>
+  <th i18n:translate="">Title</th>
   <td> <span tal:replace="here/Title">My Title</span> </td>
  </tr>
  <tr>
-  <th>
-   URL
-  </th>
+  <th i18n:translate="">URL</th>
   <td>
-   <input type="text" name="remote_url" value="" tal:attributes="value here/remote_url">
+   <input type="text" name="remote_url" value="" tal:attributes="value here/remote_url" />
   </td>
  </tr>
  <tr>
-  <td> <br> </td>
+  <td> <br /> </td>
   <td>
-   <input type="submit" name="choice" value=" Change ">
-   <input type="submit" name="choice" value=" Change and View ">
+   <input type="submit" name="change" value=" Change "
+          i18n:attributes="value" />
+   <input type="submit" name="change_and_view" value=" Change and View "
+          i18n:attributes="value" />
   </td>
  </tr>
 </table>



