[Checkins] SVN: grokui.admin/trunk/s depdend on latests grok for grokcore.layout support instead of megrok.layout

[Jan-Wijbrand Kolman]

Log message for revision 122242:
  depdend on latests grok for grokcore.layout support instead of megrok.layout

Changed:
  U   grokui.admin/trunk/setup.py
  U   grokui.admin/trunk/src/grokui/admin/applications.py
  U   grokui.admin/trunk/src/grokui/admin/configure.zcml
  U   grokui.admin/trunk/src/grokui/admin/views.py

-=-
Modified: grokui.admin/trunk/setup.py
===================================================================
--- grokui.admin/trunk/setup.py	2011-07-14 14:01:53 UTC (rev 122241)
+++ grokui.admin/trunk/setup.py	2011-07-14 14:04:03 UTC (rev 122242)
@@ -44,10 +44,9 @@
       namespace_packages=['grokui'],
       install_requires=[
           'ZODB3',
-          'grok',
+          'grok >= 1.8',
           'grokcore.site >= 1.5',
           'grokui.base',
-          'megrok.layout >= 1.0.1',
           'setuptools',
           'z3c.flashmessage',
           'zope.applicationcontrol',

Modified: grokui.admin/trunk/src/grokui/admin/applications.py
===================================================================
--- grokui.admin/trunk/src/grokui/admin/applications.py	2011-07-14 14:01:53 UTC (rev 122241)
+++ grokui.admin/trunk/src/grokui/admin/applications.py	2011-07-14 14:04:03 UTC (rev 122242)
@@ -10,7 +10,6 @@
 from grokui.base.namespace import GrokUILayer
 
 
-
 class InstalledApplication(object):
     grok.implements(representation.IInstalledApplication)
 

Modified: grokui.admin/trunk/src/grokui/admin/configure.zcml
===================================================================
--- grokui.admin/trunk/src/grokui/admin/configure.zcml	2011-07-14 14:01:53 UTC (rev 122241)
+++ grokui.admin/trunk/src/grokui/admin/configure.zcml	2011-07-14 14:04:03 UTC (rev 122242)
@@ -1,5 +1,6 @@
-<configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:grok="http://namespaces.zope.org/grok">
+<configure
+  xmlns="http://namespaces.zope.org/zope"
+  xmlns:grok="http://namespaces.zope.org/grok">
   <include package="grok" />
   <include package="grokui.base" />
   <include package="zope.applicationcontrol" />

Modified: grokui.admin/trunk/src/grokui/admin/views.py
===================================================================
--- grokui.admin/trunk/src/grokui/admin/views.py	2011-07-14 14:01:53 UTC (rev 122241)
+++ grokui.admin/trunk/src/grokui/admin/views.py	2011-07-14 14:04:03 UTC (rev 122242)
@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 """Views for the grok admin UI"""
 
-import grok
+from zope.component import getUtility, queryUtility
 from BTrees.OOBTree import OOBTree
+import grok
 from grok.util import create_application
 from grokui.base import IGrokUIRealm
 from grokui.admin.interfaces import ISecurityNotifier
 from grokui.admin.utilities import getVersion, getURLWithParams
 from grokui.admin.security import MSG_DISABLED
-from megrok.layout import Page
-from zope.component import getUtility, queryUtility
 
 grok.context(IGrokUIRealm)
 grok.templatedir("templates")
@@ -132,7 +131,7 @@
         self.redirect(self.url(self.context, 'applications'))
 
 
-class Rename(Page):
+class Rename(grok.Page):
     """Rename Grok applications.
     """
     grok.name('rename')