[Checkins] SVN: grokui.admin/branches/fancy-layout/ Corrected templates and registration to sync with grokui.base
Souheil CHELFOUH
souheil at chelfouh.com
Thu Jan 28 14:27:43 EST 2010
Log message for revision 108622:
Corrected templates and registration to sync with grokui.base
All tests pass. The dependencies are thinned down.
We can do better, though, I think.
Changed:
U grokui.admin/branches/fancy-layout/buildout.cfg
U grokui.admin/branches/fancy-layout/setup.py
U grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml
U grokui.admin/branches/fancy-layout/src/grokui/admin/tests/security.py
U grokui.admin/branches/fancy-layout/src/grokui/admin/tests/server.py
-=-
Modified: grokui.admin/branches/fancy-layout/buildout.cfg
===================================================================
--- grokui.admin/branches/fancy-layout/buildout.cfg 2010-01-28 19:08:33 UTC (rev 108621)
+++ grokui.admin/branches/fancy-layout/buildout.cfg 2010-01-28 19:27:42 UTC (rev 108622)
@@ -2,7 +2,7 @@
develop = .
parts = svn test data zopectl app
find-links = http://download.zope.org/distribution/
-extends = http://grok.zope.org/releaseinfo/grok-1.1a2.cfg
+extends = http://svn.zope.org/*checkout*/groktoolkit/trunk/grok.cfg
versions = versions
[data]
@@ -21,8 +21,8 @@
zope.publisher = 3.12
zope.contenttype = 3.5
zope.browserpage = 3.11
-zope.app.exception = 3.6.1
+
[app]
recipe = zc.zope3recipes>=0.5.3:application
eggs = grokui.admin
Modified: grokui.admin/branches/fancy-layout/setup.py
===================================================================
--- grokui.admin/branches/fancy-layout/setup.py 2010-01-28 19:08:33 UTC (rev 108621)
+++ grokui.admin/branches/fancy-layout/setup.py 2010-01-28 19:27:42 UTC (rev 108622)
@@ -47,7 +47,6 @@
'grokui.base',
'setuptools',
'z3c.flashmessage',
- 'zope.annotation',
'zope.applicationcontrol',
'zope.app.appsetup',
'zope.component',
Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml 2010-01-28 19:08:33 UTC (rev 108621)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/configure.zcml 2010-01-28 19:27:42 UTC (rev 108622)
@@ -1,15 +1,7 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:grok="http://namespaces.zope.org/grok">
<include package="grok" />
+ <include package="zope.applicationcontrol" />
<include package="zope.login" />
<grok:grok package="." />
-
- <!-- For now, it's provided this way to avoid
- zope.app.component conflicts -->
- <adapter
- for="zope.applicationcontrol.interfaces.IApplicationControl"
- provides="zope.applicationcontrol.interfaces.IRuntimeInfo"
- factory="zope.applicationcontrol.runtimeinfo.RuntimeInfo"
- permission="zope.ManageApplication" />
-
</configure>
Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/tests/security.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/tests/security.py 2010-01-28 19:08:33 UTC (rev 108621)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/tests/security.py 2010-01-28 19:27:42 UTC (rev 108622)
@@ -205,7 +205,7 @@
>>> print browser.contents
<html xmlns="http://www.w3.org/1999/xhtml">
- ...<div id="securitynotifications">Security notifications are disabled.</div>
+ ...<div id="grokui-messages"><div class="grokui-security message">Security notifications are disabled.</div>
...
But we are not bound to the default URL to do lookups. We can set
@@ -224,7 +224,7 @@
>>> print browser.contents
<html xmlns="http://www.w3.org/1999/xhtml">
- ...<div id="securitynotifications">You better smash ...</div>
+ ...<div id="grokui-messages"><div class="grokui-security message">You better smash ...</div>
...
We can of course disable security notifications at any time::
@@ -232,14 +232,13 @@
>>> browser.getControl('Disable').click()
>>> print browser.contents
<html xmlns="http://www.w3.org/1999/xhtml">
- ...<div id="securitynotifications">Security notifications are disabled.</div>
+ ...<div id="grokui-messages"><div class="grokui-security message">Security notifications are disabled.</div>
...
+
Clean up::
>>> import os
>>> os.unlink(fake_warning_file)
-
-
"""
Modified: grokui.admin/branches/fancy-layout/src/grokui/admin/tests/server.py
===================================================================
--- grokui.admin/branches/fancy-layout/src/grokui/admin/tests/server.py 2010-01-28 19:08:33 UTC (rev 108621)
+++ grokui.admin/branches/fancy-layout/src/grokui/admin/tests/server.py 2010-01-28 19:27:42 UTC (rev 108622)
@@ -60,8 +60,10 @@
>>> msg_form.submit()
>>> print browser.contents
<html xmlns="http://www.w3.org/1999/xhtml">
- ... <li class="admin">Hi there!</li>
...
+ <dl class="messages-list">
+ <dd class="admin">Hi there!</dd>
+ ...
The message stays, even if we call another page::
@@ -69,9 +71,7 @@
>>> print browser.contents
<html xmlns="http://www.w3.org/1999/xhtml">
...
- ... <li class="admin">Hi there!</li>
- ...
- ...
+ ... <dd class="admin">Hi there!</dd>
... <legend>Add application</legend>
...
@@ -81,7 +81,7 @@
>>> print browser.contents
<html xmlns="http://www.w3.org/1999/xhtml">
...
- ... <li class="admin">Hi there!</li>
+ ... <dd class="admin">Hi there!</dd>
...
More information about the checkins
mailing list