[CMF-checkins] CVS: CMF/CMFDefault/skins/content - document_edit.py:1.5 document_edit_form.dtml:1.7

[Yvo Schubbe]

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

Modified Files:
	document_edit.py document_edit_form.dtml 
Log Message:
Merged yuppie-collector122-branch:
- Added i18n attributes. (Collector #122)
- Made scripts independent of submit button values.
- Added transition_form.

=== CMF/CMFDefault/skins/content/document_edit.py 1.4 => 1.5 ===
--- CMF/CMFDefault/skins/content/document_edit.py:1.4	Sun Jul 21 20:01:56 2002
+++ CMF/CMFDefault/skins/content/document_edit.py	Thu Mar  6 05:51:03 2003
@@ -1,5 +1,5 @@
 ## Script (Python) "document_edit"
-##parameters=text_format, text, file='', SafetyBelt='', choice=' Change '
+##parameters=text_format, text, file='', SafetyBelt='', change_and_view=''
 ##title=Edit a document
 try:
     from Products.CMFDefault.utils import scrubHTML
@@ -11,7 +11,7 @@
                 )
     qst='portal_status_message=Document+changed.'
 
-    if choice == ' Change and View ':
+    if change_and_view:
         target_action = context.getTypeInfo().getActionById( 'view' )
     else:
         target_action = context.getTypeInfo().getActionById( 'edit' )


=== CMF/CMFDefault/skins/content/document_edit_form.dtml 1.6 => 1.7 ===
--- CMF/CMFDefault/skins/content/document_edit_form.dtml:1.6	Mon Apr  1 06:22:30 2002
+++ CMF/CMFDefault/skins/content/document_edit_form.dtml	Thu Mar  6 05:51:03 2003
@@ -45,12 +45,12 @@
           <label for="cb_structuredtext">structured-text</label>
    <input type="radio" name="text_format" value="plain"
           <dtml-if "text_format=='plain'">checked</dtml-if>
-	  id="cb_html" />
-	  <label for="cb_html">plain text</label>
+          id="cb_html" />
+          <label for="cb_html">plain text</label>
    <input type="radio" name="text_format" value="html"
           <dtml-if "text_format=='html'">checked</dtml-if>
-	  id="cb_html" />
-	  <label for="cb_html">html</label>
+          id="cb_html" />
+          <label for="cb_html">html</label>
   </td>
  </tr>
 
@@ -72,8 +72,8 @@
  <tr>
   <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 ">
+   <input type="submit" name="change_and_view" value=" Change and View ">
   </td>
  </tr>
 </table>