[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/boston/ Move
registred pagelets from package slots to pagelets
Roger Ineichen
roger at projekt01.ch
Thu Mar 17 21:09:25 EST 2005
Log message for revision 29541:
Move registred pagelets from package slots to pagelets
Configure pagelets in own configure files
Move more parts of the master template to pagelets
Changed:
U Zope3/trunk/src/zope/app/boston/browser/ftests.py
U Zope3/trunk/src/zope/app/boston/browser/skin.css
U Zope3/trunk/src/zope/app/boston/browser/template.pt
U Zope3/trunk/src/zope/app/boston/configure.zcml
A Zope3/trunk/src/zope/app/boston/pagelets/
A Zope3/trunk/src/zope/app/boston/pagelets/__init__.py
A Zope3/trunk/src/zope/app/boston/pagelets/addbox.zcml
A Zope3/trunk/src/zope/app/boston/pagelets/addbox_layout.pt
A Zope3/trunk/src/zope/app/boston/pagelets/configure.zcml
A Zope3/trunk/src/zope/app/boston/pagelets/contextmenu.zcml
A Zope3/trunk/src/zope/app/boston/pagelets/css.pt
A Zope3/trunk/src/zope/app/boston/pagelets/css.zcml
A Zope3/trunk/src/zope/app/boston/pagelets/head.pt
A Zope3/trunk/src/zope/app/boston/pagelets/head.zcml
A Zope3/trunk/src/zope/app/boston/pagelets/helpaction.zcml
A Zope3/trunk/src/zope/app/boston/pagelets/img/
A Zope3/trunk/src/zope/app/boston/pagelets/img/collapse.gif
U Zope3/trunk/src/zope/app/boston/slots/__init__.py
U Zope3/trunk/src/zope/app/boston/slots/configure.zcml
-=-
Modified: Zope3/trunk/src/zope/app/boston/browser/ftests.py
===================================================================
--- Zope3/trunk/src/zope/app/boston/browser/ftests.py 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/browser/ftests.py 2005-03-18 02:09:25 UTC (rev 29541)
@@ -66,14 +66,14 @@
self.assert_(response.getBody().find('src="http://localhost/++skin++Boston/@@/toggle.js') != -1)
def test_left_boxes(self):
- # Add some folders
+ # Add a folder
response = self.publish("/++skin++Boston/+/action.html",
basic='mgr:mgrpw',
form={'type_name':u'zope.app.content.Folder',
'id':u'folder'})
self.assertEqual(response.getStatus(), 302)
- response = self.publish('/++skin++Boston/folder', basic='mgr:mgrpw')
+ response = self.publish('/++skin++Boston/', basic='mgr:mgrpw')
self.assertEqual(response.getStatus(), 200)
# test zmitree cookie box
Modified: Zope3/trunk/src/zope/app/boston/browser/skin.css
===================================================================
--- Zope3/trunk/src/zope/app/boston/browser/skin.css 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/browser/skin.css 2005-03-18 02:09:25 UTC (rev 29541)
@@ -3,6 +3,7 @@
**
*/
+
/* Basic Elements
*/
html {
@@ -250,22 +251,22 @@
padding-left: 7px;
}
-#actions {
+.actions {
height: 20px;
float: left;
padding: 4px 0px 0px 0px;
}
-#actions span {
+.actions span {
white-space: nowrap;
}
-#actions a {
+.actions a {
color: #666666;
margin: 1px 6px 3px 6px;
}
-#actions a:hover {
+.actions a:hover {
color: black;
text-decoration: none;
background-color: #D9DAF2;
@@ -290,6 +291,7 @@
color: #CCCCCC;
}
+
/* navigation area
*/
#navigation {
@@ -369,20 +371,12 @@
/* content area
*/
-
-#content {
- width: 100%;
- margin: 0px;
- padding: 0px 10px 0px 10px;
-}
-
-
-#zmiviews {
+#contextmenu {
margin: 0px 0px 0px 0px;
padding: 18px 0px 0px 0px;
}
-#zmiviews div {
+#contextmenu div {
font: 100% Verdana, Helvetica, Arial, sans-serif;
background-color: #EBE9DF;
border: 1px solid #C1BBAC;
@@ -390,17 +384,17 @@
margin: 2px 0px 10px 0px;
}
-#zmiviews div span {
+#contextmenu div span {
white-space: nowrap;
}
-#zmiviews div a {
+#contextmenu div a {
color: #666666;
font-weight: normal;
padding: 2px 6px 2px 6px;
}
-#zmiviews div a:hover {
+#contextmenu div a:hover {
color: black;
text-decoration: none;
background-color: #CECEFF;
@@ -408,7 +402,7 @@
padding: 2px 5px 2px 5px;
}
-#zmiviews div a.selected {
+#contextmenu div a.selected {
color: black;
text-decoration: none;
background-color: #D9DAF2;
@@ -416,7 +410,13 @@
padding: 2px 5px 2px 5px;
}
+#content {
+ width: 100%;
+ margin: 0px;
+ padding: 0px 10px 0px 10px;
+}
+
/* standard fields
*/
div.row div.field {
@@ -472,7 +472,7 @@
}
-/* table lyout
+/* table layout
*/
table.listing {
width: 100%;
Modified: Zope3/trunk/src/zope/app/boston/browser/template.pt
===================================================================
--- Zope3/trunk/src/zope/app/boston/browser/template.pt 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/browser/template.pt 2005-03-18 02:09:25 UTC (rev 29541)
@@ -3,55 +3,32 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xml:lang="en" lang="en"
i18n:domain="zope">
-<head>
+<head>
<title metal:define-slot="title"
tal:content="string:Zope 3: ${context/zope:title_or_name}">
Zope 3: title
</title>
-
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <!-- move this javascript to a pagelet -->
- <script type="text/javascript" src="boston.js"
- tal:attributes="src string:${context/++resource++boston.js}">
- <!-- Using a separate end tag instead of a single empty tag is
- necessary to support some browsers (Firefox 1.0, for example).
- -->
- </script>
-
- <style type="text/css" media="all"
- tal:content="string: @import url(${context/++resource++skin.css});">
- @import url(skin.css);
- </style>
-
- <!-- move this styles sheet to a pagelet -->
- <style type="text/css" media="all"
- tal:content="string: @import url(${context/++resource++widget.css});">
- @import url(widget.css);
- </style>
-
- <link rel="icon" type="image/png"
- tal:attributes="href context/++resource++favicon.png" />
-
- <!-- some slots used in Zope3 Rotterdam, let's be compatible -->
- <metal:block define-slot="headers" />
- <metal:block define-slot="style_slot" />
- <metal:block define-slot="ecmascript_slot" />
-
- <!-- head pagelets -->
+ <!-- head slot -->
<metal:block tal:repeat="pagelets pagelets:zope.app.boston.slots.IHead">
<tal:block metal:use-macro="pagelets" />
</metal:block>
-
+ <metal:block define-slot="headers"></metal:block>
+
<!-- css slot -->
<metal:block tal:repeat="pagelets pagelets:zope.app.boston.slots.ICSS">
<tal:block metal:use-macro="pagelets" />
</metal:block>
-
+ <metal:block define-slot="style_slot"></metal:block>
+
<!-- javascripts slot -->
<metal:block tal:repeat="pagelets pagelets:zope.app.boston.slots.IJavaScript">
<tal:block metal:use-macro="pagelets" />
</metal:block>
+ <metal:block define-slot="ecmascript_slot"></metal:block>
+
+ <link rel="icon" type="image/png"
+ tal:attributes="href context/++resource++favicon.png" />
</head>
<body tal:define="global rooturl request/getApplicationURL;
@@ -62,9 +39,9 @@
<td colspan="2">
<!-- toolbar slot (zmi_action) -->
- <tal:block repeat="pagelets pagelets:zope.app.boston.slots.IToolBar">
- <metal:block use-macro="pagelets" />
- </tal:block>
+ <metal:block tal:repeat="pagelets pagelets:zope.app.boston.slots.IToolBar">
+ <tal:block metal:use-macro="pagelets" />
+ </metal:block>
<div id="userdetails">
<metal:block define-macro="logged_user">
@@ -111,24 +88,20 @@
<tr>
<td id="navigation">
<div id="slotbox">
- <tal:block repeat="pagelet pagelets:zope.app.boston.slots.ILeft">
- <metal:block use-macro="pagelet" />
- </tal:block>
+ <metal:block tal:repeat="pagelet pagelets:zope.app.boston.slots.ILeft">
+ <tal:block metal:use-macro="pagelet" />
+ </metal:block>
</div>
</td>
<td id="content">
- <div id="zmiviews">
- <div metal:define-slot="tabs"
- tal:condition="python:macroname == 'view'">
- <span tal:repeat="view context/@@view_get_menu/zmi_views">
- <a href=""
- tal:attributes="href view/action;
- class view/selected;"
- tal:content="view/title"
- i18n:translate="">label</a>
- </span>
- </div>
- </div>
+ <!-- context menu (zmi_views) just visible in view template -->
+ <div id="contextmenu">
+ <metal:block tal:condition="python: macroname == 'view'"
+ tal:repeat="pagelets pagelets:zope.app.boston.slots.IContextMenu">
+ <tal:block metal:use-macro="pagelets" />
+ </metal:block>
+ </div>
+ <!-- content area -->
<div metal:define-slot="message" id="message" />
<div id="body" metal:define-slot="body">
<table class="listing">
Modified: Zope3/trunk/src/zope/app/boston/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/boston/configure.zcml 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/configure.zcml 2005-03-18 02:09:25 UTC (rev 29541)
@@ -6,6 +6,7 @@
i18n_domain="zope">
<include package=".slots" />
+ <include package=".pagelets" />
<include package=".browser" />
<configure zcml:condition="have onlinehelp">
Added: Zope3/trunk/src/zope/app/boston/pagelets/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/boston/pagelets/__init__.py 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/pagelets/__init__.py 2005-03-18 02:09:25 UTC (rev 29541)
@@ -0,0 +1,17 @@
+##############################################################################
+#
+# Copyright (c) 2005 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Boston skin
+
+$Id:$
+"""
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/__init__.py
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/boston/pagelets/addbox.zcml
===================================================================
--- Zope3/trunk/src/zope/app/boston/pagelets/addbox.zcml 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/pagelets/addbox.zcml 2005-03-18 02:09:25 UTC (rev 29541)
@@ -0,0 +1,27 @@
+<configure
+ xmlns:zope="http://namespaces.zope.org/zope"
+ xmlns="http://namespaces.zope.org/browser"
+ i18n_domain="zope">
+
+ <configure package="zope.app.skintools.addbox.browser">
+ <pagelet
+ name="addbox"
+ for="zope.app.container.interfaces.IWriteContainer"
+ slot="zope.app.boston.slots.ILeft"
+ permission="zope.View"
+ template="addbox.pt"
+ layer="zope.app.boston.boston"
+ weight="1"
+ />
+ </configure>
+
+ <pagelet
+ name="addbox_layout"
+ for="*"
+ slot="zope.app.skintools.addbox.IAddBoxLayout"
+ permission="zope.View"
+ template="addbox_layout.pt"
+ layer="zope.app.boston.boston"
+ />
+
+</configure>
\ No newline at end of file
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/addbox.zcml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/boston/pagelets/addbox_layout.pt
===================================================================
--- Zope3/trunk/src/zope/app/boston/pagelets/addbox_layout.pt 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/pagelets/addbox_layout.pt 2005-03-18 02:09:25 UTC (rev 29541)
@@ -0,0 +1,25 @@
+<html>
+<body>
+
+<metal:block define-macro="addbox_layout">
+ <div class="slotbox" id="addbox">
+ <div class="header">
+ <img id="arrowAddBox" class="icon" style="cursor:hand"
+ onClick="javascript:toggle(document.getElementById('arrowAddBox'),
+ 'addboxToggle')"
+ border="0" src="collapse.gif" width="16" height="16"
+ tal:attributes="src context/++resource++collapse.gif" />
+ <metal:block define-slot="header">
+ This text will be replace by the content of the pagelet.
+ </metal:block>
+ </div>
+ <div class="toggle body" id="addboxToggle">
+ <metal:block define-slot="body">
+ This text will be replace by the content of the pagelet.
+ </metal:block>
+ </div>
+ </div>
+</metal:block>
+
+</body>
+</html>
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/addbox_layout.pt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/boston/pagelets/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/boston/pagelets/configure.zcml 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/pagelets/configure.zcml 2005-03-18 02:09:25 UTC (rev 29541)
@@ -0,0 +1,27 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:browser="http://namespaces.zope.org/browser">
+
+ <!-- IHead slot pagelets -->
+ <include file="head.zcml" />
+
+ <!-- ICSS slot pagelets -->
+ <include file="css.zcml" />
+
+ <!-- IJavaScript slot pagelets -->
+ <include file="javascript.zcml" />
+ <include file="toggle.zcml" />
+
+ <!-- IToolBar slot pagelets -->
+ <include file="toolbar.zcml" />
+ <include file="helpaction.zcml" />
+
+ <!-- ILeft slot pagelets -->
+ <include file="zmicookietreebox.zcml" />
+ <include file="addbox.zcml" />
+ <include file="tooltipbox.zcml" />
+
+ <!-- IContent slot pagelets -->
+ <include file="contextmenu.zcml" />
+
+</configure>
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/configure.zcml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/boston/pagelets/contextmenu.zcml
===================================================================
--- Zope3/trunk/src/zope/app/boston/pagelets/contextmenu.zcml 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/pagelets/contextmenu.zcml 2005-03-18 02:09:25 UTC (rev 29541)
@@ -0,0 +1,27 @@
+<configure
+ xmlns:zope="http://namespaces.zope.org/zope"
+ xmlns="http://namespaces.zope.org/browser"
+ i18n_domain="zope">
+
+ <configure package="zope.app.skintools.contextmenu.browser">
+ <pagelet
+ name="contextmenu"
+ for="*"
+ slot="zope.app.boston.slots.IContextMenu"
+ permission="zope.View"
+ template="contextmenu.pt"
+ layer="zope.app.boston.boston"
+ weight="0"
+ />
+
+ <pagelet
+ name="contextmenu_layout"
+ for="*"
+ slot="zope.app.skintools.contextmenu.IContextMenuLayout"
+ permission="zope.View"
+ template="contextmenu_layout.pt"
+ layer="zope.app.boston.boston"
+ />
+ </configure>
+
+</configure>
\ No newline at end of file
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/contextmenu.zcml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/boston/pagelets/css.pt
===================================================================
--- Zope3/trunk/src/zope/app/boston/pagelets/css.pt 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/pagelets/css.pt 2005-03-18 02:09:25 UTC (rev 29541)
@@ -0,0 +1,10 @@
+<metal:block define-macro="css">
+ <style type="text/css" media="all"
+ tal:content="string: @import url(${context/++resource++skin.css});">
+ @import url(skin.css);
+ </style>
+ <style type="text/css" media="all"
+ tal:content="string: @import url(${context/++resource++widget.css});">
+ @import url(widget.css);
+ </style>
+</metal:block>
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/css.pt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/boston/pagelets/css.zcml
===================================================================
--- Zope3/trunk/src/zope/app/boston/pagelets/css.zcml 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/pagelets/css.zcml 2005-03-18 02:09:25 UTC (rev 29541)
@@ -0,0 +1,16 @@
+<configure
+ xmlns:zope="http://namespaces.zope.org/zope"
+ xmlns="http://namespaces.zope.org/browser"
+ i18n_domain="zope">
+
+ <pagelet
+ name="css"
+ for="*"
+ slot="zope.app.boston.slots.ICSS"
+ permission="zope.Public"
+ template="css.pt"
+ layer="zope.app.boston.boston"
+ weight="0"
+ />
+
+</configure>
\ No newline at end of file
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/css.zcml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/boston/pagelets/head.pt
===================================================================
--- Zope3/trunk/src/zope/app/boston/pagelets/head.pt 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/pagelets/head.pt 2005-03-18 02:09:25 UTC (rev 29541)
@@ -0,0 +1,3 @@
+<metal:block define-macro="head">
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+</metal:block>
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/head.pt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/boston/pagelets/head.zcml
===================================================================
--- Zope3/trunk/src/zope/app/boston/pagelets/head.zcml 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/pagelets/head.zcml 2005-03-18 02:09:25 UTC (rev 29541)
@@ -0,0 +1,16 @@
+<configure
+ xmlns:zope="http://namespaces.zope.org/zope"
+ xmlns="http://namespaces.zope.org/browser"
+ i18n_domain="zope">
+
+ <pagelet
+ name="head"
+ for="*"
+ slot="zope.app.boston.slots.IHead"
+ permission="zope.Public"
+ template="head.pt"
+ layer="zope.app.boston.boston"
+ weight="2"
+ />
+
+</configure>
\ No newline at end of file
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/head.zcml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/boston/pagelets/helpaction.zcml
===================================================================
--- Zope3/trunk/src/zope/app/boston/pagelets/helpaction.zcml 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/pagelets/helpaction.zcml 2005-03-18 02:09:25 UTC (rev 29541)
@@ -0,0 +1,27 @@
+<configure
+ xmlns:zope="http://namespaces.zope.org/zope"
+ xmlns="http://namespaces.zope.org/browser"
+ i18n_domain="zope">
+
+ <configure package="zope.app.skintools.helpaction.browser">
+ <pagelet
+ name="helpaction"
+ for="*"
+ slot="zope.app.boston.slots.IToolBar"
+ permission="zope.View"
+ template="helpaction.pt"
+ layer="zope.app.boston.boston"
+ weight="2"
+ />
+
+ <pagelet
+ name="helpaction_layout"
+ for="*"
+ slot="zope.app.skintools.helpaction.IHelpActionLayout"
+ permission="zope.View"
+ template="helpaction_layout.pt"
+ layer="zope.app.boston.boston"
+ />
+ </configure>
+
+</configure>
\ No newline at end of file
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/helpaction.zcml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: Zope3/trunk/src/zope/app/boston/pagelets/img/collapse.gif
===================================================================
(Binary files differ)
Property changes on: Zope3/trunk/src/zope/app/boston/pagelets/img/collapse.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: Zope3/trunk/src/zope/app/boston/slots/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/boston/slots/__init__.py 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/slots/__init__.py 2005-03-18 02:09:25 UTC (rev 29541)
@@ -56,6 +56,15 @@
"""
+class IContextMenu(IPageletSlot):
+ """Context menu (zmi_views) pagelet slot interface.
+
+ This pagelet slot will lookup for pagelets. If you like to additional
+ content to this slot, use the 'zope.app.boston.slots.IContextMenu'
+ interface for the slot attribute in a pagelet directive.
+ """
+
+
class ILeft(IPageletSlot):
"""Left pagelet slot interface.
Modified: Zope3/trunk/src/zope/app/boston/slots/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/boston/slots/configure.zcml 2005-03-18 02:08:59 UTC (rev 29540)
+++ Zope3/trunk/src/zope/app/boston/slots/configure.zcml 2005-03-18 02:09:25 UTC (rev 29541)
@@ -7,17 +7,6 @@
<interface interface="zope.app.boston.slots.ICSS" />
<interface interface="zope.app.boston.slots.IToolBar" />
<interface interface="zope.app.boston.slots.ILeft" />
+ <interface interface="zope.app.boston.slots.IContextMenu" />
- <!-- IJavaScript slot pagelets -->
- <include file="toggle.zcml" />
-
- <!-- IToolBar slot pagelets -->
- <include file="toolbar.zcml" />
- <include file="helpaction.zcml" />
-
- <!-- ILeft slot pagelets -->
- <include file="addbox.zcml" />
- <include file="tooltipbox.zcml" />
- <include file="zmicookietreebox.zcml" />
-
</configure>
More information about the Zope3-Checkins
mailing list