[Checkins] SVN: grokui.base/trunk/src/grokui/base/ Renaming viewlets to remove the "admin" prefix, totally useless.
Souheil CHELFOUH
souheil at chelfouh.com
Fri Sep 18 10:34:08 EDT 2009
Log message for revision 104333:
Renaming viewlets to remove the "admin" prefix, totally useless.
Added static files.
Changed:
U grokui.base/trunk/src/grokui/base/layout.py
D grokui.base/trunk/src/grokui/base/layout_templates/
A grokui.base/trunk/src/grokui/base/static/
A grokui.base/trunk/src/grokui/base/static/banner.jpg
A grokui.base/trunk/src/grokui/base/static/logo.gif
A grokui.base/trunk/src/grokui/base/static/shadow.jpg
D grokui.base/trunk/src/grokui/base/templates/administrationauthors.pt
D grokui.base/trunk/src/grokui/base/templates/administrationmenuviewlet.pt
U grokui.base/trunk/src/grokui/base/templates/adminlayout.pt
A grokui.base/trunk/src/grokui/base/templates/authors.pt
A grokui.base/trunk/src/grokui/base/templates/menuviewlet.pt
U grokui.base/trunk/src/grokui/base/templates/messages.pt
U grokui.base/trunk/src/grokui/base/viewlets.py
-=-
Modified: grokui.base/trunk/src/grokui/base/layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/layout.py 2009-09-18 14:32:40 UTC (rev 104332)
+++ grokui.base/trunk/src/grokui/base/layout.py 2009-09-18 14:34:07 UTC (rev 104333)
@@ -3,7 +3,9 @@
from megrok.layout import Layout, Page
from zope.app.folder.interfaces import IRootFolder
+grok.templatedir("templates")
+
class AdminLayout(Layout):
"""The general layout for the administration
"""
Added: grokui.base/trunk/src/grokui/base/static/banner.jpg
===================================================================
(Binary files differ)
Property changes on: grokui.base/trunk/src/grokui/base/static/banner.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: grokui.base/trunk/src/grokui/base/static/logo.gif
===================================================================
(Binary files differ)
Property changes on: grokui.base/trunk/src/grokui/base/static/logo.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: grokui.base/trunk/src/grokui/base/static/shadow.jpg
===================================================================
(Binary files differ)
Property changes on: grokui.base/trunk/src/grokui/base/static/shadow.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: grokui.base/trunk/src/grokui/base/templates/administrationauthors.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/administrationauthors.pt 2009-09-18 14:32:40 UTC (rev 104332)
+++ grokui.base/trunk/src/grokui/base/templates/administrationauthors.pt 2009-09-18 14:34:07 UTC (rev 104333)
@@ -1,3 +0,0 @@
- <div>
- <p id="footer-copyright">© Copyright 2007, The Zope Foundation<br />Design inspired by Sebastian Ware</p>
- </div>
\ No newline at end of file
Deleted: grokui.base/trunk/src/grokui/base/templates/administrationmenuviewlet.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/administrationmenuviewlet.pt 2009-09-18 14:32:40 UTC (rev 104332)
+++ grokui.base/trunk/src/grokui/base/templates/administrationmenuviewlet.pt 2009-09-18 14:34:07 UTC (rev 104333)
@@ -1,12 +0,0 @@
-<dl class="display-menu incontext-action" tal:condition="viewlet/actions">
- <dd>
- <ul>
- <li tal:repeat="action viewlet/actions">
- <a href="" tal:content="action/title"
- tal:attributes="href string:${viewlet/contexturl}/${action/action};
- title action/title;"
- />
- </li>
- </ul>
- </dd>
-</dl>
Modified: grokui.base/trunk/src/grokui/base/templates/adminlayout.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/adminlayout.pt 2009-09-18 14:32:40 UTC (rev 104332)
+++ grokui.base/trunk/src/grokui/base/templates/adminlayout.pt 2009-09-18 14:34:07 UTC (rev 104333)
@@ -1,17 +1,10 @@
-<html xmlns="http://www.w3.org/1999/xhtml"
- i18n:domain="zope"
- metal:define-macro="gaia-page">
+<html xmlns="http://www.w3.org/1999/xhtml" i18n:domain="zope">
<head>
- <title
- metal:define-slot="title"
- >grok administration interface</title>
- <link metal:define-slot="header"
- rel="stylesheet" type="text/css" href="static/grok.css"
- tal:on-error="nothing"
- tal:attributes="href view/static/grok.css" />
-
+ <title>grok administration interface</title>
+ <link rel="stylesheet" type="text/css" href="static/grok.css"
+ tal:on-error="nothing"
+ tal:attributes="href view/static/grok.css" />
</head>
-
<body>
<tal:header replace="structure provider:grokui_admin_header" />
<div id="content"
Copied: grokui.base/trunk/src/grokui/base/templates/authors.pt (from rev 104323, grokui.base/trunk/src/grokui/base/templates/administrationauthors.pt)
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/authors.pt (rev 0)
+++ grokui.base/trunk/src/grokui/base/templates/authors.pt 2009-09-18 14:34:07 UTC (rev 104333)
@@ -0,0 +1,3 @@
+ <div>
+ <p id="footer-copyright">© Copyright 2007, The Zope Foundation<br />Design inspired by Sebastian Ware</p>
+ </div>
\ No newline at end of file
Property changes on: grokui.base/trunk/src/grokui/base/templates/authors.pt
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: grokui.base/trunk/src/grokui/base/templates/menuviewlet.pt (from rev 104323, grokui.base/trunk/src/grokui/base/templates/administrationmenuviewlet.pt)
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/menuviewlet.pt (rev 0)
+++ grokui.base/trunk/src/grokui/base/templates/menuviewlet.pt 2009-09-18 14:34:07 UTC (rev 104333)
@@ -0,0 +1,12 @@
+<dl class="display-menu incontext-action" tal:condition="viewlet/actions">
+ <dd>
+ <ul>
+ <li tal:repeat="action viewlet/actions">
+ <a href="" tal:content="action/title"
+ tal:attributes="href string:${viewlet/contexturl}/${action/action};
+ title action/title;"
+ />
+ </li>
+ </ul>
+ </dd>
+</dl>
Property changes on: grokui.base/trunk/src/grokui/base/templates/menuviewlet.pt
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: grokui.base/trunk/src/grokui/base/templates/messages.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/messages.pt 2009-09-18 14:32:40 UTC (rev 104332)
+++ grokui.base/trunk/src/grokui/base/templates/messages.pt 2009-09-18 14:34:07 UTC (rev 104333)
@@ -1,6 +1,6 @@
<ul>
<li
- tal:repeat="message view/messages"
+ tal:repeat="message viewlet/messages"
tal:attributes="class message/type"
tal:content="message/message">Sauron will arrive soon!
</li>
Modified: grokui.base/trunk/src/grokui/base/viewlets.py
===================================================================
--- grokui.base/trunk/src/grokui/base/viewlets.py 2009-09-18 14:32:40 UTC (rev 104332)
+++ grokui.base/trunk/src/grokui/base/viewlets.py 2009-09-18 14:34:07 UTC (rev 104333)
@@ -1,41 +1,51 @@
# -*- coding: utf-8 -*-
import grok
-from zope.app.folder.interfaces import IRootFolder
-from grokui.base.contentproviders import AdministrationHeader, AdministrationFooter
+
from zope.component import getUtility
+from zope.app.folder.interfaces import IRootFolder
from zope.traversing.browser.absoluteurl import absoluteURL
from zope.app.publisher.interfaces.browser import IBrowserMenu
from zope.app.security.interfaces import IUnauthenticatedPrincipal
+from z3c.flashmessage.interfaces import IMessageReceiver
+from grokui.base.contentproviders import AdministrationHeader
+from grokui.base.contentproviders import AdministrationFooter
+
grok.context(IRootFolder)
grok.templatedir("templates")
grok.viewletmanager(AdministrationHeader)
-class AdministrationMenuViewlet(grok.Viewlet):
- grok.order(40)
- grok.name("admin_menu")
+class Banner(grok.Viewlet):
+ grok.order(10)
+ grok.name('grokui.banner')
+
+class LoginInformation(grok.Viewlet):
+ grok.order(20)
+ grok.name('grokui.login')
+
+ @property
+ def is_authenticated(self):
+ """Check, wether we are authenticated.
+ """
+ return not IUnauthenticatedPrincipal.providedBy(self.request.principal)
+
+
+class MenuViewlet(grok.Viewlet):
+ grok.order(30)
+ grok.name("grokui.menu")
+
def update(self):
self.contexturl = absoluteURL(self.context, self.request)
menu = getUtility(IBrowserMenu, 'grokui_admin_menu')
self.actions = menu.getMenuItems(self.context, self.request)
-
-class AdministrationBanner(grok.Viewlet):
- grok.order(10)
- grok.name('admin_banner')
-
-class GrokRelax(grok.Viewlet):
- grok.order(20)
- grok.name('admin_decoration')
-
-
class Messages(grok.Viewlet):
grok.order(40)
- grok.name('admin_messages')
+ grok.name('grokui.messages')
@property
def messages(self):
@@ -43,18 +53,7 @@
return receiver.receive()
-class LoginInformation(grok.Viewlet):
- grok.order(30)
- grok.name('admin_login')
-
- @property
- def is_authenticated(self):
- """Check, wether we are authenticated.
- """
- return not IUnauthenticatedPrincipal.providedBy(self.request.principal)
-
-
-class AdministrationAuthors(grok.Viewlet):
+class Authors(grok.Viewlet):
grok.order(10)
- grok.name('admin_authors')
+ grok.name('grokui.authors')
grok.viewletmanager(AdministrationFooter)
More information about the checkins
mailing list