[Zope3-checkins] CVS: Zope3/src/zope/app/browser/skins/rotterdam - folder_contents.pt:1.4 template.pt:1.5 xmlobject.py:1.4 xmltree.js:1.6 zope3.css:1.3

Godefroid Chapelle gotcha@swing.be
Mon, 30 Dec 2002 10:54:25 -0500


Update of /cvs-repository/Zope3/src/zope/app/browser/skins/rotterdam
In directory cvs.zope.org:/tmp/cvs-serv7271

Modified Files:
	folder_contents.pt template.pt xmlobject.py xmltree.js 
	zope3.css 
Log Message:
navigation tree now includes service managers and their packages

some styling


=== Zope3/src/zope/app/browser/skins/rotterdam/folder_contents.pt 1.3 => 1.4 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/folder_contents.pt:1.3	Fri Dec 27 10:22:51 2002
+++ Zope3/src/zope/app/browser/skins/rotterdam/folder_contents.pt	Mon Dec 30 10:54:25 2002
@@ -10,7 +10,8 @@
     <a href="#"
        tal:attributes="href string:${request/getURL}?type_name=${info/action};
                        class info/selected" >
-    <div tal:attributes="value info/id|default"
+    <div tal:define="oddrow repeat/info/odd"
+                tal:attributes="class python:oddrow and 'even' or 'odd'; value info/id|default"
             tal:content="info/title">Folder
     </div>
     </a>


=== Zope3/src/zope/app/browser/skins/rotterdam/template.pt 1.4 => 1.5 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/template.pt:1.4	Sun Dec 29 17:28:25 2002
+++ Zope3/src/zope/app/browser/skins/rotterdam/template.pt	Mon Dec 30 10:54:25 2002
@@ -53,24 +53,6 @@
 
     </div>
 
-    <div id="breadcrumbs"
-         metal:define-macro="breadcrumbs"
-         > Location:&nbsp;<tal:block
-             repeat="breadcrumb context/@@absolute_url/breadcrumbs"
-            ><a href=""
-                tal:condition="repeat/breadcrumb/start"
-                tal:content="string:[top]"
-                tal:attributes="
-                href string:${breadcrumb/url}/@@SelectedManagementView.html"
-                >XXX should not hardcode root folder name string</a
-               ><a href=""
-                   tal:condition="not:repeat/breadcrumb/start"
-                   tal:content="string:${breadcrumb/name}"
-                   tal:attributes="
-                   href string:${breadcrumb/url}/@@SelectedManagementView.html"
-                    >breadcrumb item</a>/</tal:block></div>
-
-
     <div id="navigators">
 
       <div class="box" id="navigationTree">
@@ -104,7 +86,8 @@
              tal:attributes="href info/action" 
              tal:repeat="info actions"
              >
-            <div tal:attributes="value info/id|default"
+            <div tal:define="oddrow repeat/info/odd"
+                tal:attributes="class python:oddrow and 'even' or 'odd'; value info/id|default"
                  tal:content="info/title">Do something
             </div>
           </a>
@@ -132,7 +115,24 @@
 
     <div id="content">
 
-      <div class="itemViews"
+        <div id="breadcrumbs"
+         metal:define-macro="breadcrumbs"
+         > Location:&nbsp;<tal:block
+             repeat="breadcrumb context/@@absolute_url/breadcrumbs"
+            ><a href=""
+                tal:condition="repeat/breadcrumb/start"
+                tal:content="string:[top]"
+                tal:attributes="
+                href string:${breadcrumb/url}/@@SelectedManagementView.html"
+                >XXX should not hardcode root folder name string</a
+               ><a href=""
+                   tal:condition="not:repeat/breadcrumb/start"
+                   tal:content="string:${breadcrumb/name}"
+                   tal:attributes="
+                   href string:${breadcrumb/url}/@@SelectedManagementView.html"
+                    >breadcrumb item</a>/</tal:block></div>
+      
+        <div class="itemViews"
            metal:define-macro="zmi_tabs">
 
         <tal:block repeat="view context/@@view_get_menu/zmi_views">


=== Zope3/src/zope/app/browser/skins/rotterdam/xmlobject.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/xmlobject.py:1.3	Mon Dec 30 07:52:36 2002
+++ Zope3/src/zope/app/browser/skins/rotterdam/xmlobject.py	Mon Dec 30 10:54:25 2002
@@ -34,10 +34,9 @@
             result = icon.url()
         return result
 
-    def children_utility(self):
+    def children_utility(self, container):
         """Return an XML document that contains the children of an object."""
         result = []
-        container = self.context
 
         keys = list(container.keys())
 
@@ -66,9 +65,10 @@
         
     def children(self):
         """ """
+        container = self.context
         self.request.response.setHeader('Content-Type', 'text/xml')
         return (u'<?xml version="1.0" ?><children> %s </children>'
-                % self.children_utility()
+                % self.children_utility(container)
                 )
 
     def singleBranchTree(self, root=''):
@@ -86,8 +86,15 @@
             if item == oldItem:                
                     continue
             subItems = []
-            for name in item.keys():
-                subItem = item[name]
+            keys = list(item.keys())
+
+            # include the service manager
+            keys.append('++etc++Services')
+
+            for name in keys:
+                # Only include items we can traverse to
+                subItem = traverse(item, name, None)
+
                 iconUrl = self.getIconUrl(subItem)
                 if IReadContainer.isImplementedBy(subItem):
                     if oldItem and subItem == oldItem:


=== Zope3/src/zope/app/browser/skins/rotterdam/xmltree.js 1.5 => 1.6 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/xmltree.js:1.5	Mon Dec 30 06:40:39 2002
+++ Zope3/src/zope/app/browser/skins/rotterdam/xmltree.js	Mon Dec 30 10:54:25 2002
@@ -7,7 +7,7 @@
 var EXPAND = 'EXPAND';
 var XML_CHILDREN_VIEW = '@@children.xml';
 var SINGLE_BRANCH_TREE_VIEW = '@@singleBranchTree.xml';
-var CONTENT_VIEW = '@@contents.html';
+var CONTENT_VIEW = '@@SelectedManagementView.html';
 
 
 var LG_DEBUG = 6;
@@ -21,7 +21,7 @@
 var baseurl;
 var navigationTree;
 
-var loglevel = LG_INFO;
+var loglevel = LG_NOLOG;
 
 
 


=== Zope3/src/zope/app/browser/skins/rotterdam/zope3.css 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/zope3.css:1.2	Mon Dec 30 06:40:39 2002
+++ Zope3/src/zope/app/browser/skins/rotterdam/zope3.css	Mon Dec 30 10:54:25 2002
@@ -268,10 +268,9 @@
 }
 
 #breadcrumbs {
-    border-bottom: 1px solid black;
-/*    color: blue; */
-    padding-bottom: 1px;
-    padding-top: 1px;
+    border: 1px solid #74AE0B;
+    padding: 0.1em 1em;
+    margin-top: 2em;
 }
 
 #navigators {
@@ -343,9 +342,16 @@
     padding: 0.1em 1em 0.3em 0.5em;
 }
 
-div.box div.body a div{
-    display: list-item;
-    list-style-position: inside;
+div.box div.body a div.odd{
+/*    display: list-item;
+    list-style-position: inside; */
+    background: transparent;
+}
+
+div.box div.body a div.even{
+/*    display: list-item;
+    list-style-position: inside; */
+    background: #F7F9FA;
 }