[Checkins] SVN: zam.skin/trunk/src/zam/skin/ Include IJSONRPCLayer
in ZAM skin
Roger Ineichen
roger at projekt01.ch
Sun Mar 23 07:35:39 EDT 2008
Log message for revision 84871:
Include IJSONRPCLayer in ZAM skin
Configure JSONRPC (ZAM) skin
Fix json tree rendering (note this will move to a z3c.* package later)
Move add menu to the left side
Changed:
U zam.skin/trunk/src/zam/skin/__init__.py
U zam.skin/trunk/src/zam/skin/browser/js/divmenu-0.5.0.js
U zam.skin/trunk/src/zam/skin/browser/js/zam-0.0.1.js
U zam.skin/trunk/src/zam/skin/browser/template.pt
U zam.skin/trunk/src/zam/skin/browser/zam.css
U zam.skin/trunk/src/zam/skin/skin.zcml
-=-
Modified: zam.skin/trunk/src/zam/skin/__init__.py
===================================================================
--- zam.skin/trunk/src/zam/skin/__init__.py 2008-03-23 11:32:26 UTC (rev 84870)
+++ zam.skin/trunk/src/zam/skin/__init__.py 2008-03-23 11:35:38 UTC (rev 84871)
@@ -16,10 +16,11 @@
"""
__docformat__ = "reStructuredText"
-import z3c.layer.ready2go
+import z3c.jsonrpc.layer
from zam.api import layer as apiLayer
from zam.skin import layer as skinLayer
-class IZAMBrowserSkin(skinLayer.IZAMSkinLayer, apiLayer.IZAMBrowserLayer):
+class IZAMBrowserSkin(skinLayer.IZAMSkinLayer, apiLayer.IZAMBrowserLayer,
+ z3c.jsonrpc.layer.IJSONRPCLayer):
"""The ``ZAM`` browser skin."""
Modified: zam.skin/trunk/src/zam/skin/browser/js/divmenu-0.5.0.js
===================================================================
--- zam.skin/trunk/src/zam/skin/browser/js/divmenu-0.5.0.js 2008-03-23 11:32:26 UTC (rev 84870)
+++ zam.skin/trunk/src/zam/skin/browser/js/divmenu-0.5.0.js 2008-03-23 11:35:38 UTC (rev 84871)
@@ -4,7 +4,7 @@
//----------------------------------------------------------------------------
(function($) {
-$.fn.jqDdivMenu = function (settings) {
+$.fn.z3cDivMenu = function (settings) {
settings = $.extend({
contentURL: false
}, settings);
@@ -87,7 +87,7 @@
/* get level */
function getLevel(id) {
if (!id) {return false};
- var menuId = 'jqDdivMenu'
+ var menuId = 'z3cDivMenu'
var s = id.substr(menuId.length);
return s.split("-").length - 1;
}
Modified: zam.skin/trunk/src/zam/skin/browser/js/zam-0.0.1.js
===================================================================
--- zam.skin/trunk/src/zam/skin/browser/js/zam-0.0.1.js 2008-03-23 11:32:26 UTC (rev 84870)
+++ zam.skin/trunk/src/zam/skin/browser/js/zam-0.0.1.js 2008-03-23 11:35:38 UTC (rev 84871)
@@ -20,6 +20,8 @@
$(document).ready(function(){
- $('#appMenuContainer').jqDdivMenu()
- $('#addMenu').jqDdivMenu()
+ $('#appMenuContainer').z3cDivMenu();
+ $('#addMenu').z3cDivMenu();
+ // setup z3c.jsontree based trees
+ $('.z3cJSONTree').z3cJSONTree();
});
Modified: zam.skin/trunk/src/zam/skin/browser/template.pt
===================================================================
--- zam.skin/trunk/src/zam/skin/browser/template.pt 2008-03-23 11:32:26 UTC (rev 84870)
+++ zam.skin/trunk/src/zam/skin/browser/template.pt 2008-03-23 11:35:38 UTC (rev 84871)
@@ -19,7 +19,9 @@
<link rel="icon" type="image/png"
tal:attributes="href context/++resource++favicon.png" />
</head>
-<body tal:define="applicationURL request/getApplicationURL">
+<body tal:define="applicationURL request/getApplicationURL;
+ globalMenu provider:IGlobalMenu;
+ siteMenu provider:ISiteMenu">
<div id="layoutContainer">
<div id="headerContainer">
<div id="user">
@@ -36,9 +38,9 @@
<div id="appMenuContainer">
<table cellspacing="0" cellpadding="0" class="z3cDivMenu">
<tr>
- <td>
+ <td tal:condition="globalMenu">
<a class="topMenu" href="#">Global Menu</a>
- <tal:block replace="structure provider:IGlobalMenu">
+ <tal:block replace="structure globalMenu">
<div class="menuGroup">
<a href="#" class="selected">Menu item</a>
<a href="#">Menu item</a>
@@ -46,7 +48,8 @@
</div>
</tal:block>
</td>
- <td tal:replace="structure provider:ISiteMenu">
+ <td tal:condition="siteMenu"
+ tal:replace="structure siteMenu">
<div class="menuGroup">
<a href="#" class="selected">Menu item</a>
</div>
@@ -63,16 +66,16 @@
</div>
<div id="contentContainer">
<div id="contextMenuContainer">
+ <div id="addMenu" class="addMenu">
+ <a href="#" class="topMenu" i18n:translate="">+</a>
+ <tal:block replace="structure provider:IAddMenu">
+ </tal:block>
+ </div>
<ul tal:replace="structure provider:IContextMenu">
<li>
<a href="#" class="selected">Menu item</a>
</li>
</ul>
- <div id="addMenu" class="addMenu">
- <a href="#" class="topMenu" i18n:translate="">Adding</a>
- <tal:block replace="structure provider:IAddMenu">
- </tal:block>
- </div>
</div>
<div id="content">
<tal:block replace="structure provider:pagelet">pagelet provider</tal:block>
Modified: zam.skin/trunk/src/zam/skin/browser/zam.css
===================================================================
--- zam.skin/trunk/src/zam/skin/browser/zam.css 2008-03-23 11:32:26 UTC (rev 84870)
+++ zam.skin/trunk/src/zam/skin/browser/zam.css 2008-03-23 11:35:38 UTC (rev 84871)
@@ -280,12 +280,12 @@
/*---[ add menu ]---------------------------------------------------------*/
#addMenu {
- float: right;
- width: 150px;
+ float: left;
+ width: 20px;
height: 22px;
color: red;
background: #3F69C3 url(./img/menuBlueBG.gif) repeat-x top left;
- border-left: 8px solid white;
+ border-right: 8px solid white;
}
.addMenu .topMenu,
Modified: zam.skin/trunk/src/zam/skin/skin.zcml
===================================================================
--- zam.skin/trunk/src/zam/skin/skin.zcml 2008-03-23 11:32:26 UTC (rev 84870)
+++ zam.skin/trunk/src/zam/skin/skin.zcml 2008-03-23 11:35:38 UTC (rev 84871)
@@ -8,4 +8,10 @@
name="ZAM"
/>
+ <interface
+ interface="zam.skin.IZAMBrowserSkin"
+ type="z3c.jsonrpc.interfaces.IJSONRPCSkinType"
+ name="ZAM"
+ />
+
</configure>
More information about the Checkins
mailing list