[Checkins] SVN: grokcore.layout/trunk/src/grokcore/layout/ Rename Form to FormPage.

[Sylvain Viollon]

Log message for revision 122187:
  Rename Form to FormPage.
  

Changed:
  U   grokcore.layout/trunk/src/grokcore/layout/__init__.py
  U   grokcore.layout/trunk/src/grokcore/layout/components.py
  U   grokcore.layout/trunk/src/grokcore/layout/interfaces.py
  U   grokcore.layout/trunk/src/grokcore/layout/meta.zcml
  U   grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py

-=-
Modified: grokcore.layout/trunk/src/grokcore/layout/__init__.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/__init__.py	2011-07-13 17:40:40 UTC (rev 122186)
+++ grokcore.layout/trunk/src/grokcore/layout/__init__.py	2011-07-13 18:00:52 UTC (rev 122187)
@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
 
 from grokcore.layout.interfaces import ILayout, IPage
-from grokcore.layout.components import Layout, Page, Form
-from grokcore.layout.components import AddForm, EditForm, DisplayForm
+from grokcore.layout.components import Layout, Page, FormPage
+from grokcore.layout.components import AddFormPage, EditFormPage, DisplayFormPage
 from grokcore.layout.components import UnauthorizedPage, NotFoundPage
 from grokcore.layout.components import ExceptionPage
+
+
+from grokcore.layout.interfaces import IGrokcoreLayoutAPI
+__all__ = list(IGrokcoreLayoutAPI)

Modified: grokcore.layout/trunk/src/grokcore/layout/components.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/components.py	2011-07-13 17:40:40 UTC (rev 122186)
+++ grokcore.layout/trunk/src/grokcore/layout/components.py	2011-07-13 18:00:52 UTC (rev 122187)
@@ -90,7 +90,7 @@
         return mapply(self.render, (), self.request)
 
 
-class LayoutAwareForm(LayoutAware):
+class LayoutAwareFormPage(LayoutAware):
     """A mixin to make form aware of layouts.
     """
     def __call__(self):
@@ -157,28 +157,28 @@
 grokcore.view.templatedir('templates')
 
 
-class Form(LayoutAwareForm, grokcore.formlib.Form):
+class FormPage(LayoutAwareFormPage, grokcore.formlib.Form):
     """A form base class.
     """
     grok.baseclass()
     template = default_form_template
 
 
-class AddForm(LayoutAwareForm, grokcore.formlib.AddForm):
+class AddFormPage(LayoutAwareFormPage, grokcore.formlib.AddForm):
     """Base add form.
     """
     grok.baseclass()
     template = default_form_template
 
 
-class EditForm(LayoutAwareForm, grokcore.formlib.EditForm):
+class EditFormPage(LayoutAwareFormPage, grokcore.formlib.EditForm):
     """Base edit form.
     """
     grok.baseclass()
     template = default_form_template
 
 
-class DisplayForm(LayoutAwareForm, grokcore.formlib.DisplayForm):
+class DisplayFormPage(LayoutAwareFormPage, grokcore.formlib.DisplayForm):
     """Base display form.
     """
     grok.baseclass()

Modified: grokcore.layout/trunk/src/grokcore/layout/interfaces.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/interfaces.py	2011-07-13 17:40:40 UTC (rev 122186)
+++ grokcore.layout/trunk/src/grokcore/layout/interfaces.py	2011-07-13 18:00:52 UTC (rev 122187)
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from grokcore.view import interfaces
-from zope.interface import Interface
+from zope.interface import Interface, Attribute
 
 
 class ILayout(Interface):
@@ -17,3 +17,28 @@
         """Give you back the result of your Page to be included inside
         the layout.
         """
+
+
+class IBaseClasses(Interface):
+    Page = Attribute("Base class for a layout page.")
+
+    Layout = Attribute("Base class for layout.")
+
+    FormPage = Attribute("Base class for form page.")
+
+    AddFormPage = Attribute("Base class for add form page.")
+
+    EditFormPage = Attribute("Base class for edit form page.")
+
+    DisplayFormPage = Attribute("Base class for diplay form layout.")
+
+    UnauthorizedPage = Attribute("Base class for unauthorized page.")
+
+    NotFoundPage = Attribute("Base class for not found page.")
+
+    ExceptionPage = Attribute("Base class for exception page.")
+
+
+class IGrokcoreLayoutAPI(IBaseClasses):
+    """Grokcore layout API.
+    """

Modified: grokcore.layout/trunk/src/grokcore/layout/meta.zcml
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/meta.zcml	2011-07-13 17:40:40 UTC (rev 122186)
+++ grokcore.layout/trunk/src/grokcore/layout/meta.zcml	2011-07-13 18:00:52 UTC (rev 122187)
@@ -4,7 +4,7 @@
 
   <include package="grokcore.component" file="meta.zcml" />
   <include package="grokcore.security" file="meta.zcml" />
-  <include package="grokcore.view" file="meta.zcml" />
+  <include package="grokcore.view" file="meta-minimal.zcml" />
   <include package="grokcore.formlib" file="meta.zcml" />
 
   <grok:grok package=".meta" />

Modified: grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py	2011-07-13 17:40:40 UTC (rev 122186)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/models/forms.py	2011-07-13 18:00:52 UTC (rev 122187)
@@ -8,8 +8,8 @@
 
   >>> mylayout = getMultiAdapter((request, cow), ILayout)
 
-  Form:
-  >>> myform = getMultiAdapter((cow, request), name='myform')
+  FormPage:
+  >>> myform = getMultiAdapter((cow, request), name='myformpage')
   >>> print myform()
   <html>
    <body>
@@ -160,7 +160,7 @@
 import grokcore.component as grok
 
 from grokcore.view import templatedir
-from grokcore.layout import Layout, DisplayForm, EditForm, Form
+from grokcore.layout import Layout, DisplayFormPage, EditFormPage, FormPage
 from zope import interface, schema
 
 
@@ -181,12 +181,12 @@
     grok.context(Cow)
 
 
-class MyView(DisplayForm):
+class MyView(DisplayFormPage):
     grok.context(Cow)
 
 
-class MyEditView(EditForm):
+class MyEditView(EditFormPage):
     grok.context(Cow)
 
-class MyForm(Form):
+class MyFormPage(FormPage):
     grok.context(Cow)