[Checkins] SVN: grokui.admin/branches/fancy-layout/s Fixed server page.

[Souheil CHELFOUH]

Log message for revision 108616:
  Fixed server page.
  What shall we do about that zope.app.component conflict ?
  That needs some dependencies cleaning, for sure.
  

Changed:
  U   grokui.admin/branches/fancy-layout/setup.py
  U   grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml
  U   grokui.admin/branches/fancy-layout/src/grokui/admin/server.py

-=-
Modified: grokui.admin/branches/fancy-layout/setup.py
===================================================================
--- grokui.admin/branches/fancy-layout/setup.py	2010-01-28 16:10:00 UTC (rev 108615)
+++ grokui.admin/branches/fancy-layout/setup.py	2010-01-28 16:24:54 UTC (rev 108616)
@@ -49,7 +49,6 @@
           'z3c.flashmessage',
           'zope.annotation',
           'zope.applicationcontrol',
-          'zope.app.applicationcontrol',
           'zope.app.appsetup',
           'zope.component',
           'zope.contentprovider',

Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml	2010-01-28 16:10:00 UTC (rev 108615)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml	2010-01-28 16:24:54 UTC (rev 108616)
@@ -3,4 +3,13 @@
   <include package="grok" />
   <include package="zope.login" />
   <grok:grok package="." />
+
+  <!-- For now, it's provided this way to avoid
+       zope.app.component conflicts -->
+  <adapter 
+     for="zope.applicationcontrol.interfaces.IApplicationControl"
+     provides="zope.applicationcontrol.interfaces.IRuntimeInfo"
+     factory="zope.applicationcontrol.runtimeinfo.RuntimeInfo"
+     permission="zope.ManageApplication" />
+
 </configure>

Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/server.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/server.py	2010-01-28 16:10:00 UTC (rev 108615)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/server.py	2010-01-28 16:24:54 UTC (rev 108616)
@@ -97,12 +97,13 @@
     @property
     def runtime_info(self):
         try:
-            ri = IRuntimeInfo(self.context)
+            ri = IRuntimeInfo(applicationController)
         except TypeError:
             formatted = dict.fromkeys(self._fields, self._unavailable)
             formatted["Uptime"] = self._unavailable
         else:
             formatted = self._getInfo(ri)
+            
         return formatted
 
     def _getInfo(self, ri):