[Checkins] SVN: megrok.z3cform.base/trunk/src/megrok/z3cform/base/ Updated by removing the old layout structure and removing it from the default form layer zcml

[Souheil CHELFOUH]

Log message for revision 103993:
  Updated by removing the old layout structure and removing it from the default form layer zcml
  

Changed:
  U   megrok.z3cform.base/trunk/src/megrok/z3cform/base/__init__.py
  U   megrok.z3cform.base/trunk/src/megrok/z3cform/base/default_form_layer.zcml
  U   megrok.z3cform.base/trunk/src/megrok/z3cform/base/directives.py
  D   megrok.z3cform.base/trunk/src/megrok/z3cform/base/ftesting.zcml
  D   megrok.z3cform.base/trunk/src/megrok/z3cform/base/layout/

-=-
Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/__init__.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/__init__.py	2009-09-15 08:05:49 UTC (rev 103992)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/__init__.py	2009-09-15 08:10:00 UTC (rev 103993)
@@ -8,11 +8,8 @@
 from z3c.form.interfaces import DISPLAY_MODE, INPUT_MODE
 
 # Public interface
-from directives import field
 from utils import apply_data_event
 from interfaces import IGrokForm
-from components import WidgetTemplate
-from components import Form, AddForm, EditForm, DisplayForm
+from directives import field, cancellable
+from components import Form, AddForm, EditForm, DisplayForm, WidgetTemplate
 from components import PageForm, PageAddForm, PageEditForm, PageDisplayForm
-
-

Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/default_form_layer.zcml
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/default_form_layer.zcml	2009-09-15 08:05:49 UTC (rev 103992)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/default_form_layer.zcml	2009-09-15 08:10:00 UTC (rev 103993)
@@ -6,7 +6,5 @@
     <implements interface="z3c.form.interfaces.IFormLayer" />
   </class>
 
-  <grok:grok package=".layout" />
-
 </configure>
 

Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/directives.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/directives.py	2009-09-15 08:05:49 UTC (rev 103992)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/directives.py	2009-09-15 08:10:00 UTC (rev 103993)
@@ -7,17 +7,27 @@
     scope = martian.CLASS
     store = martian.ONCE
     default = None
-    # validate = validateInterfaceOrClass
+    validate = validateInterfaceOrClass
 
 
 class mode(martian.Directive):
     scope = martian.CLASS
     store = martian.ONCE
     default = interfaces.INPUT_MODE
-    # validate = validateInterfaceOrClass
+    validate = validateText
 
 
 class widget(martian.Directive):
     scope = martian.CLASS
     store = martian.ONCE
     default = None
+    validate = validateInterfaceOrClass
+
+
+class cancellable(martian.Directive):
+    """This directive allows to include/exlude the button cancel.
+    The value must be anything that can be evaluated to True or False.
+    """
+    scope = martian.CLASS
+    store = martian.ONCE
+    default = False

Deleted: megrok.z3cform.base/trunk/src/megrok/z3cform/base/ftesting.zcml
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/ftesting.zcml	2009-09-15 08:05:49 UTC (rev 103992)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/ftesting.zcml	2009-09-15 08:10:00 UTC (rev 103993)
@@ -1,42 +0,0 @@
-<configure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:grok="http://namespaces.zope.org/grok"
-   >
-
-  <include package="grok" />
-  <include package="grok" file="meta.zcml" />
-  <include package="megrok.pagetemplate" file="meta.zcml" />
-   
-
-  <include package="megrok.z3cform.base" file="meta.zcml" />
-  <include package="megrok.z3cform.base" />
-  <include package="megrok.z3cform.base" file="default_form_layer.zcml" />
-
-  <grok:grok package="megrok.z3cform.base.tests" />
-
-  <securityPolicy
-      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
-      />
-
-  <unauthenticatedPrincipal
-      id="zope.anybody"
-      title="Unauthenticated Principal"
-      />
-  <grant
-      permission="zope.View"
-      principal="zope.anybody"
-      />
-
-  <principal
-      id="zope.mgr"
-      title="Manager"
-      login="mgr"
-      password="mgrpw"
-      />
-
-  <role id="zope.Manager" title="Site Manager" />
-  <grantAll role="zope.Manager" />
-  <grant role="zope.Manager" principal="zope.mgr" />
-
-</configure>
-