[Checkins] SVN: grokui.admin/branches/fancy-layout/src/grokui/admin/ Removing unused styles
Souheil CHELFOUH
souheil at chelfouh.com
Thu Jan 28 10:52:40 EST 2010
Log message for revision 108610:
Removing unused styles
Changed:
U grokui.admin/branches/fancy-layout/src/grokui/admin/__init__.py
U grokui.admin/branches/fancy-layout/src/grokui/admin/applications.py
U grokui.admin/branches/fancy-layout/src/grokui/admin/security.py
D grokui.admin/branches/fancy-layout/src/grokui/admin/static/
U grokui.admin/branches/fancy-layout/src/grokui/admin/templates/applications.pt
U grokui.admin/branches/fancy-layout/src/grokui/admin/templates/server.pt
-=-
Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/__init__.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/__init__.py 2010-01-28 15:43:39 UTC (rev 108609)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/__init__.py 2010-01-28 15:52:40 UTC (rev 108610)
@@ -16,3 +16,7 @@
class Test(grok.Application, grok.Container):
"""My super application
"""
+
+class Other(grok.Application, grok.Container):
+ """My other application
+ """
Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/applications.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/applications.py 2010-01-28 15:43:39 UTC (rev 108609)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/applications.py 2010-01-28 15:52:40 UTC (rev 108610)
@@ -9,22 +9,15 @@
from grokui.base.layout import GrokUIView
from grokui.base.namespace import GrokUILayer
-
grok.templatedir("templates")
-from zope.annotation import IAnnotations
+
class InstalledApplication(object):
- """
- """
grok.implements(representation.IInstalledApplication)
def __init__(self, obj, request):
self.__name__ = obj.__name__
- grokui_info = IAnnotations(request).get('grokui')
- if not grokui_info:
- self.url = absoluteURL(obj, request)
- else:
- self.url = grokui_info.get('root_url')
+ self.url = absoluteURL(obj, request)
self.description = obj.__doc__
self.__parent__ = obj.__parent__
self.classname = ".".join((obj.__class__.__module__,
Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/security.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/security.py 2010-01-28 15:43:39 UTC (rev 108609)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/security.py 2010-01-28 15:52:40 UTC (rev 108610)
@@ -13,7 +13,7 @@
from zope.app.appsetup.interfaces import IDatabaseOpenedWithRootEvent
from grokui.admin.interfaces import ISecurityNotifier
from grokui.admin.utilities import getVersion, TimeoutableHTTPHandler
-from grokui.base import Header, IGrokUIRealm
+from grokui.base import Header, Messages, IGrokUIRealm
class SecurityNotificationViewlet(grok.Viewlet):
@@ -21,7 +21,7 @@
"""
grok.order(40)
grok.context(IGrokUIRealm)
- grok.viewletmanager(Header)
+ grok.viewletmanager(Messages)
@property
def security_notifier(self):
@@ -35,7 +35,7 @@
return site_manager.queryUtility(ISecurityNotifier, default=None)
def render(self):
- return '''<div id="securitynotifications">%s</div>''' % (
+ return '''<div class="grokui-security message">%s</div>''' % (
self.security_notifier.getNotification())
Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/templates/applications.pt
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/templates/applications.pt 2010-01-28 15:43:39 UTC (rev 108609)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/templates/applications.pt 2010-01-28 15:52:40 UTC (rev 108610)
@@ -49,29 +49,26 @@
<fieldset>
<legend>Add application</legend>
-
- <div class="menu-box1" tal:repeat="app view/installable">
+ <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">
- <div class="menu-box2">
- <div class="menu-head1">
- <h3 tal:content="app/__name__">Application Name</h3>
- </div>
- <div class="menu-description1">
- <p tal:replace="structure app/description">
- Application description here.
- </p>
- </div>
- <div tal:content="app/@@info" />
- <div class="menu-box3">
- <label for="name">Name your new app:</label>
- <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"/>
- </div>
- </div>
+ <fieldset>
+ <label for="name">Create a new 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>
-
+ </div>
</fieldset>
+
</div>
Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/templates/server.pt
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/templates/server.pt 2010-01-28 15:43:39 UTC (rev 108609)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/templates/server.pt 2010-01-28 15:52:40 UTC (rev 108610)
@@ -101,36 +101,46 @@
</p>
</fieldset>
- <span class="header">Server process info</span>
- <div id="server-processes">
- <dl tal:define="ri view/runtime_info">
- <dt class="emph">Uptime:</dt>
- <dd tal:content="ri/Uptime">unknown</dd>
- <dt class="emph">System platform:</dt>
- <dd tal:content="ri/SystemPlatform">unknown</dd>
- <dt class="emph">Zope version:</dt>
- <dd tal:content="ri/ZopeVersion">unknown</dd>
- <dt class="emph">Python version:</dt>
- <dd tal:content="ri/PythonVersion">unknown</dd>
- <dt class="emph">Command line:</dt>
- <dd tal:content="ri/CommandLine">unknown</dd>
- <dt class="emph">Preferred encoding:</dt>
- <dd tal:content="ri/PreferredEncoding">unknown</dd>
- <dt class="emph">File system encoding:</dt>
- <dd tal:content="ri/FileSystemEncoding">unknown</dd>
- <dt class="emph">Process ID:</dt>
- <dd tal:content="ri/ProcessId">unknown</dd>
- <dt class="emph">Python path:</dt>
- <dd>
- <ul>
- <tal:block tal:repeat="path ri/PythonPath">
- <li tal:content="path">unknown</li>
- </tal:block>
- </ul>
- </dd>
- </dl>
- </div>
-
</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