[Zope3-checkins] CVS: Zope3/src/zope/app/browser/form - metadirectives.py:1.6 metaconfigure.py:1.2

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/browser/form
In directory cvs.zope.org:/tmp/cvs-serv23462

Modified Files:
	metadirectives.py metaconfigure.py 
Log Message:
1. Added missing title attribute to form wizard directives. Thanks to Stuart
   Bishop for reporting.

2. Fixed up the subedit form directive and added some primitive comments.
   They don't seem to be used currently so it's not that easy figuring out
   what their parameters are for...


=== Zope3/src/zope/app/browser/form/metadirectives.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/browser/form/metadirectives.py:1.5	Mon Aug  4 10:54:19 2003
+++ Zope3/src/zope/app/browser/form/metadirectives.py	Tue Aug  5 11:23:17 2003
@@ -85,12 +85,6 @@
     Common information for browser forms
     """
 
-    title = MessageID(
-        title=u"Title",
-        description=u"The browser menu label for the form.",
-        required=False
-        )
-
     label = MessageID(
         title=u"Label",
         description=u"A label to be used as the heading for the form.",
@@ -106,6 +100,12 @@
         required=False
         )
 
+    title = MessageID(
+        title=u"Menu title",
+        description=u"The browser menu label for the form.",
+        required=False
+        )
+
     fields = Tokens(
         title=u"Fields",
         description=u"""
@@ -130,7 +130,13 @@
         required=False
         )
 
-    description = Text(
+    title = MessageID(
+        title=u"Menu title",
+        description=u"The browser menu label for the form.",
+        required=False
+        )
+
+    description = MessageID(
         title=u"A longer description of the add form.",
         description=u"""
         A UI may display this with the item or display it when the
@@ -248,7 +254,6 @@
     an object based on a schema.
     """
 
-#XXX this is sooo not used
 class ISubeditFormDirective(ICommonInformation):
     """
     Define a subedit form
@@ -260,11 +265,15 @@
         required=False
         )
 
-    #XXX what's this?
-    fulledit = Text()
+    fulledit_path = TextLine(
+        title=u"Path (relative URL) to the full edit form",
+        required=False
+        )
 
-    #XXX what's this?
-    fulledit_label = Text()
+    fulledit_label = MessageID(
+        title=u"Label of the full edit form",
+        required=False
+        )
 
 class IAddFormDirective(ICommonFormInformation, ICommonAddInformation):
     """


=== Zope3/src/zope/app/browser/form/metaconfigure.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/form/metaconfigure.py:1.1	Mon Aug  4 10:52:45 2003
+++ Zope3/src/zope/app/browser/form/metaconfigure.py	Tue Aug  5 11:23:17 2003
@@ -235,14 +235,14 @@
     default_template = 'subedit.pt'
 
     # default subedit form directive
-    fulledit = None
+    fulledit_path = None
     fulledit_label = None
 
     def __call__(self):
         self._context.action(
             discriminator = self._discriminator(),
             callable = EditViewFactory,
-            args = self._args()+(self.fulledit, self.fulledit_label),
+            args = self._args()+(self.fulledit_path, self.fulledit_label),
             )
 
 class AddWizardDirective(BaseWizardDirective, AddFormDirective):