[CMF-checkins] CVS: CMF/CMFDefault/skins/content - newsitem_edit.py:1.4.20.1 newsitem_edit_form.dtml:1.5.28.1

[Yvo Schubbe]

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

Modified Files:
      Tag: yuppie-collector122-branch
	newsitem_edit.py newsitem_edit_form.dtml 
Log Message:
- made scripts independent of submit button values
- removed tabs

=== CMF/CMFDefault/skins/content/newsitem_edit.py 1.4 => 1.4.20.1 ===
--- CMF/CMFDefault/skins/content/newsitem_edit.py:1.4	Sun Jul 21 20:01:56 2002
+++ CMF/CMFDefault/skins/content/newsitem_edit.py	Wed Feb 26 11:18:49 2003
@@ -1,5 +1,5 @@
 ## Script (Python) "newsitem_edit"
-##parameters=text, description, text_format=None, choice=' Change '
+##parameters=text, description, text_format=None, change_and_view=''
 ##title=Edit a news item
 try:
     from Products.CMFDefault.utils import scrubHTML
@@ -10,7 +10,7 @@
 
     qst='portal_status_message=News+Item+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/newsitem_edit_form.dtml 1.5 => 1.5.28.1 ===
--- CMF/CMFDefault/skins/content/newsitem_edit_form.dtml:1.5	Mon Apr  1 13:17:10 2002
+++ CMF/CMFDefault/skins/content/newsitem_edit_form.dtml	Wed Feb 26 11:18:49 2003
@@ -30,12 +30,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>
 
@@ -58,8 +58,8 @@
  <tr>
   <th> <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>