[Checkins] SVN: Sandbox/ulif/grok-adminui/src/grok/admin/view Some
cleanup.
Christian Theune
ct at gocept.com
Thu Jul 12 10:57:15 EDT 2007
Log message for revision 77747:
Some cleanup.
Changed:
U Sandbox/ulif/grok-adminui/src/grok/admin/view.py
U Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/macros.pt
A Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/server.pt
D Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/z3index.pt
-=-
Modified: Sandbox/ulif/grok-adminui/src/grok/admin/view.py
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/admin/view.py 2007-07-12 14:53:54 UTC (rev 77746)
+++ Sandbox/ulif/grok-adminui/src/grok/admin/view.py 2007-07-12 14:57:14 UTC (rev 77747)
@@ -125,10 +125,9 @@
self.installed_applications = inst_apps
-class Z3Index(GAIAView):
+class Server(GAIAView):
"""Zope3 management screen."""
- grok.name('z3index')
grok.require('grok.ManageApplications')
riv = RuntimeInfoView()
Modified: Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/macros.pt
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/macros.pt 2007-07-12 14:53:54 UTC (rev 77746)
+++ Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/macros.pt 2007-07-12 14:57:14 UTC (rev 77747)
@@ -28,7 +28,6 @@
<img alt="Fire" src="images/Fire.gif"
tal:attributes="src view/static/grok-relax5.png" />
</div>
- <p></p>
<center tal:define="currview python:view.url()">
<span class="menu_link_inactive"
tal:define="target string:${view/root_url}/appsindex">
@@ -42,51 +41,46 @@
</span>
</span>
- <!--<span class="menu_link_inactive"
- tal:define="target python:view.root_url('z3index')"> -->
- <!-- <span class="menu_link_inactive"
- tal:define="target python:view.context.url('z3index')"> -->
- <span class="menu_link_inactive"
- tal:define="target string:${view/root_url}/z3index"
- talasd:define="target string:${view/context/@@absolute_url}/z3index"
- >
- <a href="z3index"
- tal:condition="python: target != currview"
- tal:attributes="href target"
- >Server Control</a>
- <span class="emph"
- tal:condition="python: target == currview">
- Server Control
- </span>
- </span>
-
- <a href=""
- tal:attributes="href view/root_url">Debug</a>
-
- <a href=""
- tal:attributes="href string:${view/root_url}/docgrok/">
- <span tal:attributes="class python:view.in_docgrok() and 'emph'"
- >Documentation</span>
- </a>
- </center>
+ <span class="menu_link_inactive"
+ tal:define="target string:${view/root_url}/server"
+ >
+ <a href="z3index"
+ tal:condition="python: target != currview"
+ tal:attributes="href target"
+ >Server Control</a>
+ <span class="emph"
+ tal:condition="python: target == currview">
+ Server Control
+ </span>
+ </span>
+
+ <a href=""
+ tal:attributes="href view/root_url">Debug</a>
+
+ <a href=""
+ tal:attributes="href string:${view/root_url}/docgrok/">
+ <span tal:attributes="class python:view.in_docgrok() and 'emph'"
+ >Documentation</span>
+ </a>
+ </center>
- <center>
- <div id="Content">
- <div metal:define-slot="content">
+ <center>
+ <div id="Content">
+ <div metal:define-slot="content">
- <h1>Welcome to Grok!</h1>
+ <h1>Welcome to Grok!</h1>
- <div>
- Your friendly and easy way to Zope 3.
- </div>
-
- </div>
- <div>
- <p id="Footer-copyright">© Copyright 2007, The Zope Foundation<br />Design inspired by Sebastian Ware</p>
- </div>
+ <div>
+ Your friendly and easy way to Zope 3.
</div>
- </center>
+ </div>
+ <div>
+ <p id="Footer-copyright">© Copyright 2007, The Zope Foundation<br />Design inspired by Sebastian Ware</p>
+ </div>
+ </div>
+ </center>
- </body>
- </html>
+ </div>
+ </body>
+</html>
Copied: Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/server.pt (from rev 77742, Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/z3index.pt)
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/server.pt (rev 0)
+++ Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/server.pt 2007-07-12 14:57:14 UTC (rev 77747)
@@ -0,0 +1,60 @@
+<html metal:use-macro="context/@@macros/gaia-page">
+ <div metal:fill-slot="content">
+ <h1>Manage your Zope 3 instance:</h1>
+
+ <form method="POST" action=""
+ tal:attributes="action string:${context/@@absolute_url}/server">
+ <fieldset>
+ <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
+ </fieldset>
+
+ <fieldset tal:define="ri view/ri">
+ <legend>Server Process Info</legend>
+ <div>
+ <span class="emph">Uptime:</span>
+ <span tal:content="ri/Uptime">unknown</span>
+ </div>
+ <div>
+ <span class="emph">System Platform:</span>
+ <span tal:content="ri/SystemPlatform">unknown</span>
+ </div>
+ <div>
+ <span class="emph">Zope Version:</span>
+ <span tal:content="ri/ZopeVersion">unknown</span>
+ </div>
+ <div>
+ <span class="emph">Python Version:</span>
+ <span tal:content="ri/PythonVersion">unknown</span>
+ </div>
+ <div>
+ <span class="emph">Command Line:</span>
+ <span tal:content="ri/CommandLine">unknown</span>
+ </div>
+ <div>
+ <span class="emph">Preferred Encoding:</span>
+ <span tal:content="ri/PreferredEncoding">unknown</span>
+ </div>
+ <div>
+ <span class="emph">File System Encoding:</span>
+ <span tal:content="ri/FileSystemEncoding">unknown</span>
+ </div>
+ <div>
+ <span class="emph">Process Id:</span>
+ <span tal:content="ri/ProcessId">unknown</span>
+ </div>
+ <div>
+ <span class="emph">Python Path:</span>
+ <div tal:repeat="path ri/PythonPath">
+ <span tal:content="path">unknown</span>
+ </div>
+ </div>
+ </fieldset>
+
+ </form>
+
+ </div>
+
+</html>
Deleted: Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/z3index.pt
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/z3index.pt 2007-07-12 14:53:54 UTC (rev 77746)
+++ Sandbox/ulif/grok-adminui/src/grok/admin/view_templates/z3index.pt 2007-07-12 14:57:14 UTC (rev 77747)
@@ -1,60 +0,0 @@
-<html metal:use-macro="context/@@macros/gaia-page">
- <div metal:fill-slot="content">
- <h1>Manage your Zope 3 instance:</h1>
-
- <form method="POST" action=""
- tal:attributes="action string:${context/@@absolute_url}/z3index">
- <fieldset>
- <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
- </fieldset>
-
- <fieldset tal:define="ri view/ri">
- <legend>Server Process Info</legend>
- <div>
- <span class="emph">Uptime:</span>
- <span tal:content="ri/Uptime">unknown</span>
- </div>
- <div>
- <span class="emph">System Platform:</span>
- <span tal:content="ri/SystemPlatform">unknown</span>
- </div>
- <div>
- <span class="emph">Zope Version:</span>
- <span tal:content="ri/ZopeVersion">unknown</span>
- </div>
- <div>
- <span class="emph">Python Version:</span>
- <span tal:content="ri/PythonVersion">unknown</span>
- </div>
- <div>
- <span class="emph">Command Line:</span>
- <span tal:content="ri/CommandLine">unknown</span>
- </div>
- <div>
- <span class="emph">Preferred Encoding:</span>
- <span tal:content="ri/PreferredEncoding">unknown</span>
- </div>
- <div>
- <span class="emph">File System Encoding:</span>
- <span tal:content="ri/FileSystemEncoding">unknown</span>
- </div>
- <div>
- <span class="emph">Process Id:</span>
- <span tal:content="ri/ProcessId">unknown</span>
- </div>
- <div>
- <span class="emph">Python Path:</span>
- <div tal:repeat="path ri/PythonPath">
- <span tal:content="path">unknown</span>
- </div>
- </div>
- </fieldset>
-
- </form>
-
- </div>
-
-</html>
More information about the Checkins
mailing list