[Checkins] SVN: grokui.admin/trunk/src/grokui/admin/ Move templates into module-specific template-dirs to keep templatedir-registry quiet.
Uli Fouquet
uli at gnufix.de
Wed May 19 07:41:31 EDT 2010
Log message for revision 112518:
Move templates into module-specific template-dirs to keep templatedir-registry quiet.
Changed:
U grokui.admin/trunk/src/grokui/admin/applications.py
A grokui.admin/trunk/src/grokui/admin/applications_templates/
A grokui.admin/trunk/src/grokui/admin/applications_templates/applications.pt
U grokui.admin/trunk/src/grokui/admin/server.py
A grokui.admin/trunk/src/grokui/admin/server_templates/
A grokui.admin/trunk/src/grokui/admin/server_templates/server.pt
D grokui.admin/trunk/src/grokui/admin/templates/applications.pt
D grokui.admin/trunk/src/grokui/admin/templates/server.pt
-=-
Modified: grokui.admin/trunk/src/grokui/admin/applications.py
===================================================================
--- grokui.admin/trunk/src/grokui/admin/applications.py 2010-05-19 11:37:58 UTC (rev 112517)
+++ grokui.admin/trunk/src/grokui/admin/applications.py 2010-05-19 11:41:31 UTC (rev 112518)
@@ -9,7 +9,6 @@
from grokui.base.layout import GrokUIView
from grokui.base.namespace import GrokUILayer
-grok.templatedir("templates")
class InstalledApplication(object):
Copied: grokui.admin/trunk/src/grokui/admin/applications_templates/applications.pt (from rev 112514, grokui.admin/trunk/src/grokui/admin/templates/applications.pt)
===================================================================
--- grokui.admin/trunk/src/grokui/admin/applications_templates/applications.pt (rev 0)
+++ grokui.admin/trunk/src/grokui/admin/applications_templates/applications.pt 2010-05-19 11:41:31 UTC (rev 112518)
@@ -0,0 +1,78 @@
+<div id="applications-panel" tal:define="root context/@@absolute_url">
+ <form action="manageapps" id="installed">
+ <fieldset>
+ <legend>Installed applications</legend>
+
+ <div tal:condition="not: view/installed">
+ <p class="menu-description1">
+ Currently no working applications are installed.
+ </p>
+ </div>
+
+ <div tal:condition="view/installed"
+ tal:repeat="app view/installed">
+ <input type="checkbox"
+ class="checkbox"
+ tal:attributes="value app/__name__;
+ name string:items" />
+ <a tal:attributes="href app/url">
+ <b><span tal:replace="app/__name__"/></b>
+ </a>
+ (<span tal:replace="app/classname"/>)
+ <div tal:content="app/@@info" />
+ </div>
+
+ <div tal:condition="view/broken">
+ <br/><div class="emph">Broken applications:</div>
+ </div>
+ <div tal:repeat="app view/broken">
+ <input type="checkbox"
+ class="checkbox"
+ tal:attributes="value app/__name__;
+ name string:items" />
+ <span tal:content="app/__name__" />
+ (broken type: <span tal:replace="app/classname"/>).
+ This application is broken!
+ </div>
+
+ <p>
+ <input tal:condition="view/has_apps"
+ class="button" type="submit" name="delete"
+ id="form.actions.delete"
+ value="Delete Selected"/>
+ <input tal:condition="view/installed"
+ class="button" type="submit" name="rename"
+ value="Rename"/>
+ </p>
+ </fieldset>
+ </form>
+
+ <fieldset>
+ <legend>Add application</legend>
+ <div tal:repeat="app view/installable">
+ <div class="details">
+ <h3 tal:content="app/__name__">Application Name</h3>
+ <p class="description"
+ tal:content="structure app/description">
+ Application description here.
+ </p>
+ <div tal:content="app/@@info" />
+ </div>
+ <form action="add" tal:attributes="name app/classname">
+ <fieldset>
+ <label for="name">
+ Name and create a new
+ <span tal:replace="app/__name__">Foo</span>
+ application
+ </label>
+ <br />
+ <input type="text" name="name"/>
+ <input type="hidden" name="application" value=""
+ tal:attributes="value app/classname" />
+ <input class="button" type="submit" name="Add" value="Create"/>
+ </fieldset>
+ </form>
+ </div>
+ </fieldset>
+
+</div>
Modified: grokui.admin/trunk/src/grokui/admin/server.py
===================================================================
--- grokui.admin/trunk/src/grokui/admin/server.py 2010-05-19 11:37:58 UTC (rev 112517)
+++ grokui.admin/trunk/src/grokui/admin/server.py 2010-05-19 11:41:31 UTC (rev 112518)
@@ -19,7 +19,6 @@
from zope.i18nmessageid import MessageFactory
_ = MessageFactory('grokui')
-grok.templatedir("templates")
class Server(GrokUIView):
Copied: grokui.admin/trunk/src/grokui/admin/server_templates/server.pt (from rev 112514, grokui.admin/trunk/src/grokui/admin/templates/server.pt)
===================================================================
--- grokui.admin/trunk/src/grokui/admin/server_templates/server.pt (rev 0)
+++ grokui.admin/trunk/src/grokui/admin/server_templates/server.pt 2010-05-19 11:41:31 UTC (rev 112518)
@@ -0,0 +1,150 @@
+<div>
+ <h1>Manage your Zope 3 instance</h1>
+
+ <fieldset>
+ <legend>Security notifications</legend>
+ <form method="post" action=""
+ tal:attributes="action
+ string:${context/@@absolute_url}/server">
+ <div>
+ Running Grok <span tal:replace="view/grok_version" /> /
+ grokui.admin <span tal:replace="view/grokuiadmin_version" />
+ </div>
+ <div> </div>
+ <div>
+ You can be notified if serious security-related issues were
+ discovered that concern your installation.
+ </div>
+ <div>
+ Note, that if you enable this, HTTP-lookups of the grok site
+ will happen to check, whether there are any published
+ security issues for the installed version of grok.
+ </div>
+ <div> </div>
+ <div>
+ <label for="secnotesource">URL to lookup:</label>
+ <input type="text" size="30" name="secnotesource"
+ tal:attributes="value view/security_notifier_url" />
+ <input class="button" type="submit" name="setsecnotesource"
+ value="Set URL" />
+ </div>
+ <div> </div>
+ <div tal:condition="view/secnotes_enabled">
+ <span class="emph">
+ Status: Security notifications are enabled
+ </span>
+ <input class="button" type="submit" name="setsecnotes"
+ value="Disable" />
+ </div>
+ <div tal:condition="not: view/secnotes_enabled">
+ <span class="emph">
+ Status: Security notifications are disabled
+ </span>
+ <input class="button" type="submit" name="setsecnotes"
+ value="Enable" />
+ </div>
+ </form>
+ </fieldset>
+
+ <form method="post" action=""
+ tal:attributes="action string:${context/@@absolute_url}/server">
+ <fieldset>
+ <p>
+ <legend>Manage server process</legend>
+ <span tal:condition="view/server_control">
+ <input type="submit" name="restart" class="button"
+ value="Restart server" />
+ <input type="submit" name="shutdown" class="button"
+ value="Stop server" />
+ after <input type="text" name="time" value="0" size="4" /> seconds
+ <input type="hidden" name="submitted" value="true"/>
+ </span>
+ <span tal:condition="not: view/server_control">
+ You have to start/stop/restart the server process from the cmdline.
+ </span>
+ </p>
+ </fieldset>
+ </form>
+
+ <fieldset>
+ <legend>Manage your databases</legend>
+ <div tal:condition="not: python: len(view.databases)">
+ <p class="menu-description1">Currently no databases are active.</p>
+ </div>
+ <div tal:condition="python: len(view.databases) or True"
+ tal:repeat="db view/databases">
+ <form method="post" action=""
+ tal:attributes="action string:${context/@@absolute_url}/server">
+ <input type="hidden" name="submitted" value="true"/>
+ <input type="hidden" name="dbName" value=""
+ tal:attributes="value db/utilName" />
+ <input type="text" name="days" value="0"
+ size="3" title="Days of history to keep" />
+ <input class="button" type="submit" name="pack" value="Pack" />
+ <span tal:replace="db/dbName" />
+ <span tal:replace="db/size" />
+ </form>
+ </div>
+ </fieldset>
+
+ <form method="post" action=""
+ tal:attributes="action string:${context/@@absolute_url}/server">
+ <fieldset>
+ <legend>Admin message</legend>
+
+ <p>Lets you display an administrative message on all pages.<br />
+
+ <input
+ type="text"
+ name="admin_message"
+ tal:attributes="value view/current_message/message|nothing"
+ />
+
+ <input type="hidden" name="submitted" value="true"/>
+ <input type="submit" name="save_message" class="button" value="Save"/>
+
+ </p>
+ </fieldset>
+ </form>
+
+ <fieldset id="server-process-info">
+ <legend>Server process info</legend>
+ <dl class="table" tal:define="ri view/runtime_info">
+
+ <dt>Uptime</dt>
+ <dd tal:content="ri/Uptime" />
+
+ <dt>System platform</dt>
+ <dd tal:content="ri/SystemPlatform" />
+
+ <dt>Zope version</dt>
+ <dd tal:content="ri/ZopeVersion" />
+
+ <dt>Python version</dt>
+ <dd tal:content="ri/PythonVersion" />
+
+ <dt>Command line</dt>
+ <dd tal:content="ri/CommandLine" />
+
+ <dt>Preferred encoding</dt>
+ <dd tal:content="ri/PreferredEncoding" />
+
+ <dt>File system encoding</dt>
+ <dd tal:content="ri/FileSystemEncoding" />
+
+ <dt>Process ID</dt>
+ <dd tal:content="ri/ProcessId" />
+
+ <dt>Python path</dt>
+ <dd>
+ <ul class="simple">
+ <tal:block tal:repeat="path ri/PythonPath">
+ <li tal:content="path">unknown</li>
+ </tal:block>
+ </ul>
+ </dd>
+
+ </dl>
+ </fieldset>
+ </div>
+
\ No newline at end of file
Deleted: grokui.admin/trunk/src/grokui/admin/templates/applications.pt
===================================================================
--- grokui.admin/trunk/src/grokui/admin/templates/applications.pt 2010-05-19 11:37:58 UTC (rev 112517)
+++ grokui.admin/trunk/src/grokui/admin/templates/applications.pt 2010-05-19 11:41:31 UTC (rev 112518)
@@ -1,78 +0,0 @@
-<div id="applications-panel" tal:define="root context/@@absolute_url">
- <form action="manageapps" id="installed">
- <fieldset>
- <legend>Installed applications</legend>
-
- <div tal:condition="not: view/installed">
- <p class="menu-description1">
- Currently no working applications are installed.
- </p>
- </div>
-
- <div tal:condition="view/installed"
- tal:repeat="app view/installed">
- <input type="checkbox"
- class="checkbox"
- tal:attributes="value app/__name__;
- name string:items" />
- <a tal:attributes="href app/url">
- <b><span tal:replace="app/__name__"/></b>
- </a>
- (<span tal:replace="app/classname"/>)
- <div tal:content="app/@@info" />
- </div>
-
- <div tal:condition="view/broken">
- <br/><div class="emph">Broken applications:</div>
- </div>
- <div tal:repeat="app view/broken">
- <input type="checkbox"
- class="checkbox"
- tal:attributes="value app/__name__;
- name string:items" />
- <span tal:content="app/__name__" />
- (broken type: <span tal:replace="app/classname"/>).
- This application is broken!
- </div>
-
- <p>
- <input tal:condition="view/has_apps"
- class="button" type="submit" name="delete"
- id="form.actions.delete"
- value="Delete Selected"/>
- <input tal:condition="view/installed"
- class="button" type="submit" name="rename"
- value="Rename"/>
- </p>
- </fieldset>
- </form>
-
- <fieldset>
- <legend>Add application</legend>
- <div tal:repeat="app view/installable">
- <div class="details">
- <h3 tal:content="app/__name__">Application Name</h3>
- <p class="description"
- tal:content="structure app/description">
- Application description here.
- </p>
- <div tal:content="app/@@info" />
- </div>
- <form action="add" tal:attributes="name app/classname">
- <fieldset>
- <label for="name">
- Name and create a new
- <span tal:replace="app/__name__">Foo</span>
- application
- </label>
- <br />
- <input type="text" name="name"/>
- <input type="hidden" name="application" value=""
- tal:attributes="value app/classname" />
- <input class="button" type="submit" name="Add" value="Create"/>
- </fieldset>
- </form>
- </div>
- </fieldset>
-
-</div>
Deleted: grokui.admin/trunk/src/grokui/admin/templates/server.pt
===================================================================
--- grokui.admin/trunk/src/grokui/admin/templates/server.pt 2010-05-19 11:37:58 UTC (rev 112517)
+++ grokui.admin/trunk/src/grokui/admin/templates/server.pt 2010-05-19 11:41:31 UTC (rev 112518)
@@ -1,150 +0,0 @@
-<div>
- <h1>Manage your Zope 3 instance</h1>
-
- <fieldset>
- <legend>Security notifications</legend>
- <form method="post" action=""
- tal:attributes="action
- string:${context/@@absolute_url}/server">
- <div>
- Running Grok <span tal:replace="view/grok_version" /> /
- grokui.admin <span tal:replace="view/grokuiadmin_version" />
- </div>
- <div> </div>
- <div>
- You can be notified if serious security-related issues were
- discovered that concern your installation.
- </div>
- <div>
- Note, that if you enable this, HTTP-lookups of the grok site
- will happen to check, whether there are any published
- security issues for the installed version of grok.
- </div>
- <div> </div>
- <div>
- <label for="secnotesource">URL to lookup:</label>
- <input type="text" size="30" name="secnotesource"
- tal:attributes="value view/security_notifier_url" />
- <input class="button" type="submit" name="setsecnotesource"
- value="Set URL" />
- </div>
- <div> </div>
- <div tal:condition="view/secnotes_enabled">
- <span class="emph">
- Status: Security notifications are enabled
- </span>
- <input class="button" type="submit" name="setsecnotes"
- value="Disable" />
- </div>
- <div tal:condition="not: view/secnotes_enabled">
- <span class="emph">
- Status: Security notifications are disabled
- </span>
- <input class="button" type="submit" name="setsecnotes"
- value="Enable" />
- </div>
- </form>
- </fieldset>
-
- <form method="post" action=""
- tal:attributes="action string:${context/@@absolute_url}/server">
- <fieldset>
- <p>
- <legend>Manage server process</legend>
- <span tal:condition="view/server_control">
- <input type="submit" name="restart" class="button"
- value="Restart server" />
- <input type="submit" name="shutdown" class="button"
- value="Stop server" />
- after <input type="text" name="time" value="0" size="4" /> seconds
- <input type="hidden" name="submitted" value="true"/>
- </span>
- <span tal:condition="not: view/server_control">
- You have to start/stop/restart the server process from the cmdline.
- </span>
- </p>
- </fieldset>
- </form>
-
- <fieldset>
- <legend>Manage your databases</legend>
- <div tal:condition="not: python: len(view.databases)">
- <p class="menu-description1">Currently no databases are active.</p>
- </div>
- <div tal:condition="python: len(view.databases) or True"
- tal:repeat="db view/databases">
- <form method="post" action=""
- tal:attributes="action string:${context/@@absolute_url}/server">
- <input type="hidden" name="submitted" value="true"/>
- <input type="hidden" name="dbName" value=""
- tal:attributes="value db/utilName" />
- <input type="text" name="days" value="0"
- size="3" title="Days of history to keep" />
- <input class="button" type="submit" name="pack" value="Pack" />
- <span tal:replace="db/dbName" />
- <span tal:replace="db/size" />
- </form>
- </div>
- </fieldset>
-
- <form method="post" action=""
- tal:attributes="action string:${context/@@absolute_url}/server">
- <fieldset>
- <legend>Admin message</legend>
-
- <p>Lets you display an administrative message on all pages.<br />
-
- <input
- type="text"
- name="admin_message"
- tal:attributes="value view/current_message/message|nothing"
- />
-
- <input type="hidden" name="submitted" value="true"/>
- <input type="submit" name="save_message" class="button" value="Save"/>
-
- </p>
- </fieldset>
- </form>
-
- <fieldset id="server-process-info">
- <legend>Server process info</legend>
- <dl class="table" tal:define="ri view/runtime_info">
-
- <dt>Uptime</dt>
- <dd tal:content="ri/Uptime" />
-
- <dt>System platform</dt>
- <dd tal:content="ri/SystemPlatform" />
-
- <dt>Zope version</dt>
- <dd tal:content="ri/ZopeVersion" />
-
- <dt>Python version</dt>
- <dd tal:content="ri/PythonVersion" />
-
- <dt>Command line</dt>
- <dd tal:content="ri/CommandLine" />
-
- <dt>Preferred encoding</dt>
- <dd tal:content="ri/PreferredEncoding" />
-
- <dt>File system encoding</dt>
- <dd tal:content="ri/FileSystemEncoding" />
-
- <dt>Process ID</dt>
- <dd tal:content="ri/ProcessId" />
-
- <dt>Python path</dt>
- <dd>
- <ul class="simple">
- <tal:block tal:repeat="path ri/PythonPath">
- <li tal:content="path">unknown</li>
- </tal:block>
- </ul>
- </dd>
-
- </dl>
- </fieldset>
- </div>
-
\ No newline at end of file
More information about the checkins
mailing list