[Archetypes-checkins] r10182 - in Products.Archetypes/branches/1.5/Products/Archetypes: skins/archetypes skins/archetypes_kss tests

[Lucie L. <svn...@pl...>]

Author: lucie
Date: Fri Oct 24 19:19:26 2008
New Revision: 10182

Modified:
   Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/content_edit_impl.py
   Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/edit_macros.pt
   Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes_kss/at_experimental.kss
   Products.Archetypes/branches/1.5/Products/Archetypes/tests/editing.txt
Log:
 * updated the name of the buttons on the edit form,
 * updated all the places that are using this buttons, refs #7559

Modified: Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/content_edit_impl.py
==============================================================================
--- Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/content_edit_impl.py	(original)
+++ Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/content_edit_impl.py	Fri Oct 24 19:19:26 2008
@@ -30,8 +30,8 @@
 portal_status_message = _(u'Changes saved.')
 
 # handle navigation for multi-page edit forms
-next = not REQUEST.get('form_next', None) is None
-previous = not REQUEST.get('form_previous', None) is None
+next = not REQUEST.get('form.button.next', None) is None
+previous = not REQUEST.get('form.button.previous', None) is None
 fieldset = REQUEST.get('fieldset', None)
 schemata = new_context.Schemata()
 

Modified: Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/edit_macros.pt
==============================================================================
--- Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/edit_macros.pt	(original)
+++ Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes/edit_macros.pt	Fri Oct 24 19:19:26 2008
@@ -209,7 +209,7 @@
                 <input tal:condition="python:fieldset_index &gt; 0"
                        class="context"
                        type="submit"
-                       name="form_previous"
+                       name="form.button.previous"
                        value="Previous"
                        i18n:attributes="value label_previous;"
                        tal:attributes="disabled python:test(isLocked, 'disabled', None);"
@@ -217,14 +217,14 @@
                 <input tal:condition="python:not allow_tabbing and (fieldset_index &lt; n_fieldsets - 1)"
                        class="context"
                        type="submit"
-                       name="form_next"
+                       name="form.button.next"
                        value="Next"
                        i18n:attributes="value label_next;"
                        tal:attributes="disabled python:test(isLocked, 'disabled', None);"
                        />
                 <input class="context"
                        type="submit"
-                       name="form_submit"
+                       name="form.button.save"
                        value="Save"
                        i18n:attributes="value label_save;"
                        tal:attributes="disabled python:test(isLocked, 'disabled', None);"

Modified: Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes_kss/at_experimental.kss
==============================================================================
--- Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes_kss/at_experimental.kss	(original)
+++ Products.Archetypes/branches/1.5/Products/Archetypes/skins/archetypes_kss/at_experimental.kss	Fri Oct 24 19:19:26 2008
@@ -3,7 +3,7 @@
  * It comes disabled by default.
  */
 
-input[name="form_submit"]:click {
+input[name="form.button.save"]:click {
     evt-click-preventdefault:     true;
     action-server:                kssValidateForm;
     kssValidateForm-data:         currentForm();

Modified: Products.Archetypes/branches/1.5/Products/Archetypes/tests/editing.txt
==============================================================================
--- Products.Archetypes/branches/1.5/Products/Archetypes/tests/editing.txt	(original)
+++ Products.Archetypes/branches/1.5/Products/Archetypes/tests/editing.txt	Fri Oct 24 19:19:26 2008
@@ -57,5 +57,50 @@
 
   >>> schema['title'].schemata = previous_schemata
 
+
+Buttons name verification
+----------------
+
+Let's verify that the buttons have the correct name:
+  
+  >>> browser.open(url+'/edit')
+  >>> browser.getControl('Save').name
+  'form.button.save'
+  
+  >>> browser.getControl('Cancel').name
+  'form.button.cancel'
+  
+Now to see the previous and next buttons, we need to make the
+document provide Products.Archetypes.interfaces.IMultiPageSchema
+and change the schemata of one of its fields
+
+  >>> from Products.Archetypes.interfaces import IMultiPageSchema
+  >>> from Products.Five.utilities import marker
+  >>> from zope import interface
+  >>> IMultiPageSchema.providedBy(document)
+  False
+  >>> interface.alsoProvides(document, IMultiPageSchema)
+
+  >>> schema = document.__class__.schema
+  >>> previous_schemata = schema['text'].schemata
+  >>> schema['text'].schemata = 'someschemata'
+
+  >>> document.Schema().getField('text').schemata
+  'someschemata'
+  
+  >>> browser.open(url+'/edit')
+  >>> browser.getControl('Next').name
+  'form.button.next'
+  
+  >>> browser.getLink('someschemata').click()
+  >>> browser.getControl('Previous').name
+  'form.button.previous'
+
+  >>> marker.erase(document, IMultiPageSchema)
+  >>> IMultiPageSchema.providedBy(document)
+  False
+  >>> schema['text'].schemata = previous_schemata
+  
+
   
 TODO: Add more general editing testing!