[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ Application Control
UI unification
Dmitry Vasiliev
dima at hlabs.spb.ru
Sat Apr 2 14:20:07 EST 2005
Log message for revision 29843:
Application Control UI unification
Changed:
U Zope3/trunk/src/zope/app/applicationcontrol/browser/configure.zcml
U Zope3/trunk/src/zope/app/applicationcontrol/browser/ftests/test_zodbcontrol.py
U Zope3/trunk/src/zope/app/applicationcontrol/browser/server-control.pt
U Zope3/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.pt
U Zope3/trunk/src/zope/app/recorder/sessions.pt
-=-
Modified: Zope3/trunk/src/zope/app/applicationcontrol/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/applicationcontrol/browser/configure.zcml 2005-04-02 19:16:09 UTC (rev 29842)
+++ Zope3/trunk/src/zope/app/applicationcontrol/browser/configure.zcml 2005-04-02 19:20:07 UTC (rev 29843)
@@ -6,26 +6,37 @@
for="zope.app.applicationcontrol.interfaces.IApplicationControl"
permission="zope.ManageApplication"
class=".servercontrol.ServerControlView">
-
- <page name="ServerControlForm.html" template="server-control.pt"
- menu="zmi_views" title="Server Control" />
+
+ <page name="ServerControlForm.html" template="server-control.pt" />
<page name="ServerControl.html" attribute="action" />
</pages>
-
+
<page
for="zope.app.applicationcontrol.interfaces.IApplicationControl"
name="index.html"
- menu="zmi_views"
- title="Runtime Information"
template="runtimeinfo.pt"
- class=".runtimeinfo.RuntimeInfoView"
+ class=".runtimeinfo.RuntimeInfoView"
permission="zope.ManageApplication"/>
+ <menuItems
+ menu="zmi_views"
+ for="zope.app.applicationcontrol.interfaces.IApplicationControl">
+
+ <menuItem
+ order="-2"
+ title="Runtime Information"
+ action="index.html" />
+ <menuItem
+ order="-1"
+ title="Server Control"
+ action="ServerControlForm.html" />
+ </menuItems>
+
<page
for="zope.app.applicationcontrol.interfaces.IApplicationControl"
name="ZODBControl.html"
template="zodbcontrol.pt"
- class=".zodbcontrol.ZODBControlView"
+ class=".zodbcontrol.ZODBControlView"
permission="zope.ManageApplication"
menu="zmi_views" title="ZODB Control"/>
@@ -33,15 +44,15 @@
for="zope.app.applicationcontrol.interfaces.IApplicationControl"
name="TranslationDomain.html"
template="translationdomaincontrol.pt"
- class=".translationdomaincontrol.TranslationDomainControlView"
+ class=".translationdomaincontrol.TranslationDomainControlView"
permission="zope.ManageApplication"
menu="zmi_views" title="Translation Domains"/>
<!-- add a action tab to the root folder for navigation -->
- <menuItem
+ <menuItem
menu="zmi_actions"
for="zope.app.traversing.interfaces.IContainmentRoot"
- title="Manage Process"
+ title="Manage Process"
action="++etc++process/index.html" />
</zope:configure>
Modified: Zope3/trunk/src/zope/app/applicationcontrol/browser/ftests/test_zodbcontrol.py
===================================================================
--- Zope3/trunk/src/zope/app/applicationcontrol/browser/ftests/test_zodbcontrol.py 2005-04-02 19:16:09 UTC (rev 29842)
+++ Zope3/trunk/src/zope/app/applicationcontrol/browser/ftests/test_zodbcontrol.py 2005-04-02 19:20:07 UTC (rev 29843)
@@ -28,8 +28,8 @@
form={'days': u'3'})
body = response.getBody()
self.assert_('value="3"' in body)
- self.assert_('<em>Demo Storage</em>' in body)
- self.assert_('<em>100 Bytes</em>' in body)
+ self.assert_('>Demo Storage</' in body)
+ self.assert_('>100 Bytes</' in body)
def test_suite():
Modified: Zope3/trunk/src/zope/app/applicationcontrol/browser/server-control.pt
===================================================================
--- Zope3/trunk/src/zope/app/applicationcontrol/browser/server-control.pt 2005-04-02 19:16:09 UTC (rev 29842)
+++ Zope3/trunk/src/zope/app/applicationcontrol/browser/server-control.pt 2005-04-02 19:20:07 UTC (rev 29843)
@@ -6,22 +6,30 @@
<div metal:fill-slot="body">
<form name="servercontrol" action="ServerControl.html" method="post">
- <span i18n:translate="">Shutdown time:</span>
- <input type="text" name="time:int" size="5" value="0" />
- <span i18n:translate="">seconds</span>
+ <div class="row">
+ <div class="label"
+ i18n:translate="">Shutdown time</div>
+ <div class="field">
+ <input type="text" name="time:int" size="5" value="0" />
+ <span i18n:translate="">seconds</span>
+ <p i18n:translate="">
+ If you specify a time of 0 seconds, then the server
+ will do a hard shutdown.
+ </p>
+ </div>
+ </div>
- <p i18n:translate="">
- If you specify a time of 0 seconds, then the server will do a hard
- shutdown.
- </p>
+ <div class="row">
+ <div class="controls">
+ <input type="submit" name="restart" value="Restart server"
+ i18n:attributes="value" />
+
+ <input type="submit" name="shutdown" value="Shutdown server"
+ i18n:attributes="value" />
+ </div>
+ </div>
+ </form>
- <input type="submit" name="restart" value="Restart server"
- i18n:attributes="value" />
-
- <input type="submit" name="shutdown" value="Shutdown server"
- i18n:attributes="value" />
- </form>
-
</div>
</body>
</html>
Modified: Zope3/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.pt
===================================================================
--- Zope3/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.pt 2005-04-02 19:16:09 UTC (rev 29842)
+++ Zope3/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.pt 2005-04-02 19:20:07 UTC (rev 29843)
@@ -6,31 +6,34 @@
<body>
<div metal:fill-slot="body">
- <div style="font-size: 120%" i18n:translate="">
- Name of database: <em tal:content="view/getName"
- i18n:name="name">My Database</em>
+ <div class="row">
+ <div class="label"
+ i18n:translate="">Name of database</div>
+ <div class="field" tal:content="view/getName">My Database</div>
</div>
- <div style="font-size: 120%" i18n:translate="">
- Size of database: <em tal:content="view/getSize"
- i18n:name="size">1.1 MB</em>
+ <div class="row">
+ <div class="label"
+ i18n:translate="">Size of database</div>
+ <div class="field" tal:content="view/getSize">1.1 MB</div>
</div>
- <p tal:define="status view/pack"
- tal:condition="status"
- tal:content="status" />
+ <div class="row" tal:define="status view/pack"
+ tal:condition="status">
+ <div class="field" tal:content="status" />
+ </div>
<form action="." method="post" tal:attributes="action request/URL">
<div class="row">
- <div class="label" i18n:translate="">Keep up to:</div>
- <div class="view">
+ <div class="label" i18n:translate="">Keep up to</div>
+ <div class="field">
<input type="text" size="4" name="days" value="0"
tal:attributes="value request/days|string:0" />
<span tal:omit-tag="" i18n:translate="">days</span>
</div>
</div>
<div class="row">
- <div class="control">
+ <div class="controls">
<input type="submit" name="PACK" value="Pack"
i18n:attributes="value pack-button"/>
</div>
Modified: Zope3/trunk/src/zope/app/recorder/sessions.pt
===================================================================
--- Zope3/trunk/src/zope/app/recorder/sessions.pt 2005-04-02 19:16:09 UTC (rev 29842)
+++ Zope3/trunk/src/zope/app/recorder/sessions.pt 2005-04-02 19:20:07 UTC (rev 29843)
@@ -1,11 +1,5 @@
<html metal:use-macro="context/@@standard_macros/view"
i18n:domain="zope">
-<head>
- <title i18n:translate="">Recorded HTTP Sessions</title>
- <style type="text/css" metal:fill-slot="style_slot">
- td { border-bottom: 1px dotted #eee; }
- </style>
-</head>
<body>
<metal:block fill-slot="body" tal:define="requests view/requests">
@@ -49,7 +43,6 @@
<form method="GET"
tal:attributes="action request/URL">
- <hr />
<p class="error" tal:condition="view/error" tal:content="view/error">
Something's wrong.
More information about the Zope3-Checkins
mailing list