[Checkins] SVN: Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view Some layout finetuning of sever section.

Uli Fouquet uli at gnufix.de
Mon Aug 20 00:42:47 EDT 2007


Log message for revision 79010:
  Some layout finetuning of sever section.

Changed:
  U   Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view.py
  U   Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/macros.pt
  U   Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/permissions.pt
  U   Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/server.pt
  U   Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/users.pt

-=-
Modified: Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view.py
===================================================================
--- Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view.py	2007-08-20 04:17:02 UTC (rev 79009)
+++ Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view.py	2007-08-20 04:42:47 UTC (rev 79010)
@@ -112,6 +112,8 @@
 
     """
 
+    in_server = False
+
     def root_url(self, name=None):
         obj = self.context
         result = ""
@@ -370,6 +372,7 @@
     """Zope3 management screen."""
 
     grok.require('grok.ManageApplications')
+    in_server = True
 
     @property
     def server_control(self):
@@ -423,6 +426,7 @@
     """
     grok.name('permissions')
     grok.require('grok.ManageApplications')
+    in_server = True
 
     msg = None
 
@@ -496,6 +500,7 @@
                 else:
                     # Unknown value. Ignore it.
                     pass
+        self.msg = u"Permissions successfully updated."
 
 
     def update(self, set_proles=None):
@@ -515,7 +520,8 @@
 
     grok.name('users')
     grok.require('grok.ManageApplications')
-
+    in_server = True
+    
     msg = None
 
     def getUserFolder(self):

Modified: Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/macros.pt
===================================================================
--- Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/macros.pt	2007-08-20 04:17:02 UTC (rev 79009)
+++ Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/macros.pt	2007-08-20 04:42:47 UTC (rev 79010)
@@ -59,9 +59,10 @@
         <span class="menu-link-inactive"
           tal:define="target string:${view/root_url}/server"
           >
-          <a href="z3index"
+          <a href="server"
             tal:condition="python: target != currview"
-            tal:attributes="href target"
+            tal:attributes="href target;
+			    class python:view.in_server and 'emph'"
             >Server Control</a>
           <span class="emph"
             tal:condition="python: target == currview">

Modified: Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/permissions.pt
===================================================================
--- Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/permissions.pt	2007-08-20 04:17:02 UTC (rev 79009)
+++ Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/permissions.pt	2007-08-20 04:42:47 UTC (rev 79010)
@@ -8,7 +8,12 @@
     </div>
 
     <div>
+      <a href=""
+	 tal:attributes="href string:${view/root_url}/users">Edit principals</a>
+    </div>
 
+    <div>
+
       <fieldset>
 	<legend>Roles and Permissions:</legend>
 	

Modified: Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/server.pt
===================================================================
--- Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/server.pt	2007-08-20 04:17:02 UTC (rev 79009)
+++ Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/server.pt	2007-08-20 04:42:47 UTC (rev 79010)
@@ -6,7 +6,7 @@
       tal:attributes="action string:${context/@@absolute_url}/server">
       <fieldset>
       <p>
-        <legend>Manage server process</legend>
+        <legend>Manage Server Process</legend>
         <input type="submit" name="restart" class="button" value="Restart Zope 3" />
         <input type="submit" name="shutdown" class="button" value="Stop Zope 3" />
         after <input type="text" name="time" value="0" size="4" /> seconds
@@ -14,7 +14,7 @@
       </fieldset>
 
       <fieldset>
-        <legend>Admin message</legend>
+        <legend>Administrator Message</legend>
 
         <p>Lets you display an administrative message on all pages.<br />
 
@@ -31,22 +31,22 @@
       </fieldset>
 
       <fieldset>
-        <legend>Users, Roles and Permissions</legend>
+        <legend>Principals, Roles and Permissions</legend>
 
-        <p>Edit users and roles.<br />
+        <p>
 
 	<span class="docgrok-annotation1">
-	  <a href="users">Edit Users</a>
+	  <a href="users">Principals and Roles</a>
 	</span><br />
 
 	<span class="docgrok-annotation1">
-	  <a href="permissions">Edit Permissions</a>
+	  <a href="permissions">Roles and Permissions</a>
 	</span><br />
 
 	</p>
       </fieldset>
 
-      <span class="header">Server process info</span>
+      <span class="header">Server Process Information</span>
       <div id="server-processes">
       <dl tal:define="ri view/runtime_info">
           <dt class="emph">Uptime:</dt>

Modified: Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/users.pt
===================================================================
--- Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/users.pt	2007-08-20 04:17:02 UTC (rev 79009)
+++ Sandbox/ulif/grok-adminui-with-principals/src/grok/admin/view_templates/users.pt	2007-08-20 04:42:47 UTC (rev 79010)
@@ -7,6 +7,11 @@
       <span class="emph" tal:content="view/msg">Message</span>
     </div>
 
+    <div>
+      <a href=""
+	 tal:attributes="href string:${view/root_url}/permissions">Edit roles and permissions</a>
+    </div>
+
     <div tal:condition="view/userfolder">
 
       <fieldset>



More information about the Checkins mailing list