[Checkins] SVN: grokui.base/trunk/s port to grokcore.layout instead of megrok.layout

[Jan-Wijbrand Kolman]

Log message for revision 122214:
  port to grokcore.layout instead of megrok.layout

Changed:
  U   grokui.base/trunk/setup.py
  U   grokui.base/trunk/src/grokui/base/README.txt
  U   grokui.base/trunk/src/grokui/base/configure.zcml
  U   grokui.base/trunk/src/grokui/base/layout.py
  U   grokui.base/trunk/src/grokui/base/tests/test_layout.py

-=-
Modified: grokui.base/trunk/setup.py
===================================================================
--- grokui.base/trunk/setup.py	2011-07-14 08:16:08 UTC (rev 122213)
+++ grokui.base/trunk/setup.py	2011-07-14 12:37:28 UTC (rev 122214)
@@ -56,10 +56,10 @@
       install_requires=[
           'fanstatic',
           'grokcore.component',
+          'grokcore.layout',
           'grokcore.message',
           'grokcore.view',
           'grokcore.viewlet',
-          'megrok.layout >= 1.2',
           'megrok.menu',
           'setuptools',
           'zope.authentication',

Modified: grokui.base/trunk/src/grokui/base/README.txt
===================================================================
--- grokui.base/trunk/src/grokui/base/README.txt	2011-07-14 08:16:08 UTC (rev 122213)
+++ grokui.base/trunk/src/grokui/base/README.txt	2011-07-14 12:37:28 UTC (rev 122214)
@@ -113,7 +113,7 @@
 menu we want our page to appear. Pages without a title do not appear
 in the menu bar at all.
 
-Instances of `GrokUIView` are in fact `megrok.layout.Page` instances
+Instances of `GrokUIView` are in fact `grokcore.layout.Page` instances
 that render the content provided by a template or `render` method
 into a given layout (here: the general GrokUI layout).
 

Modified: grokui.base/trunk/src/grokui/base/configure.zcml
===================================================================
--- grokui.base/trunk/src/grokui/base/configure.zcml	2011-07-14 08:16:08 UTC (rev 122213)
+++ grokui.base/trunk/src/grokui/base/configure.zcml	2011-07-14 12:37:28 UTC (rev 122214)
@@ -8,15 +8,15 @@
   <include package="grokcore.component" file="meta.zcml" />
   <include package="grokcore.view" file="meta.zcml" />
   <include package="grokcore.viewlet" file="meta.zcml" />
+  <include package="grokcore.layout" file="meta.zcml" />
 
   <include package="grokcore.view" />
   <include package="grokcore.viewlet" />
+  <include package="grokcore.message" />
+  <include package="grokcore.layout" />
+
   <include package="megrok.menu" file="meta.zcml" />
-  <include package="megrok.layout" file="meta.zcml" />
 
-  <!-- Register the messaging utilities -->
-  <include package="grokcore.message" />
-
   <!-- Declares the zope.ManageServices perm -->
   <include package="zope.security" />
 

Modified: grokui.base/trunk/src/grokui/base/layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/layout.py	2011-07-14 08:16:08 UTC (rev 122213)
+++ grokui.base/trunk/src/grokui/base/layout.py	2011-07-14 12:37:28 UTC (rev 122214)
@@ -3,7 +3,7 @@
 
 from grokui.base import IGrokUIRealm, GrokUILayer, IUIPanel, MainMenu
 from grokui.base import resource
-from megrok.layout import Layout, Page
+from grokcore.layout import Layout, Page
 from zope.traversing.browser.absoluteurl import absoluteURL
 
 grok.layer(GrokUILayer)

Modified: grokui.base/trunk/src/grokui/base/tests/test_layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/tests/test_layout.py	2011-07-14 08:16:08 UTC (rev 122213)
+++ grokui.base/trunk/src/grokui/base/tests/test_layout.py	2011-07-14 12:37:28 UTC (rev 122214)
@@ -12,7 +12,7 @@
 To create a view that automatically comes with the GrokUI layout, we
 can derive from `grokui.base.AdminView`.
 
-Instances of `AdminView` are in fact `megrok.layout.Page` instances
+Instances of `AdminView` are in fact `grokcore.layout.Page` instances
 that render the content provided by a template or `render` method
 into a given layout.