[Zope-CVS] CVS: Packages/MoZTop/moztop/content/zopetop/StatusBar - StatusBarOverlay.xul:1.3 TasksOverlay.xul:1.2 TransactionsOverlay.xul:1.2

Stephan Richter srichter@cbu.edu
Wed, 8 Jan 2003 19:45:23 -0500


Update of /cvs-repository/Packages/MoZTop/moztop/content/zopetop/StatusBar
In directory cvs.zope.org:/tmp/cvs-serv17116/content/StatusBar

Modified Files:
	StatusBarOverlay.xul TasksOverlay.xul TransactionsOverlay.xul 
Log Message:
Checkpoint checkin. I got a lot of things working again and even filled in
some new RDF data.


=== Packages/MoZTop/moztop/content/zopetop/StatusBar/StatusBarOverlay.xul 1.2 => 1.3 ===
--- Packages/MoZTop/moztop/content/zopetop/StatusBar/StatusBarOverlay.xul:1.2	Wed Jan  8 16:53:18 2003
+++ Packages/MoZTop/moztop/content/zopetop/StatusBar/StatusBarOverlay.xul	Wed Jan  8 19:45:20 2003
@@ -6,9 +6,7 @@
 <overlay id="StatusBarOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <tabbox id="statusbar"
-          orient="horizontal" 
-          align="start"
+  <tabbox id="statusbar" orient="horizontal" align="start" flex="1"
           style="padding: 5px;">
 
     <tabs orient="vertical">
@@ -25,7 +23,8 @@
   		  -moz-border-radius-bottomleft: 3px;
                   width: 24px;
                   height: 24px;
-		  background: url('chrome://moztop/content/StatusBar/task.gif');
+		  background: 
+                    url('chrome://moztop/content/StatusBar/task.gif');
                   background-repeat: no-repeat;
 		  background-position: center center;"/>
       <tab label=""
@@ -41,7 +40,8 @@
   		  -moz-border-radius-bottomleft: 3px;
                   width: 24px;
                   height: 24px;
-		  background: url('chrome://moztop/content/StatusBar/errors.gif');
+		  background: 
+                    url('chrome://moztop/content/StatusBar/errors.gif');
                   background-repeat: no-repeat;
 		  background-position: center center;"/>
     </tabs>
@@ -54,7 +54,7 @@
                 orient="vertical"
 		height="100"
                 flex="1">
-        <outliner id="TaskList"/>
+        <tree id="tasks"/>
       </tabpanel>
       <tabpanel id="newstab">
         <box id="transactions"/>


=== Packages/MoZTop/moztop/content/zopetop/StatusBar/TasksOverlay.xul 1.1 => 1.2 ===
--- Packages/MoZTop/moztop/content/zopetop/StatusBar/TasksOverlay.xul:1.1	Wed Jan  8 14:01:49 2003
+++ Packages/MoZTop/moztop/content/zopetop/StatusBar/TasksOverlay.xul	Wed Jan  8 19:45:20 2003
@@ -3,58 +3,32 @@
 <overlay id="TasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <outliner flex="1" id="TaskList" datasources="rdf:null"
-              flags="dont-build-content"
-              containment="http://home.netscape.com/NC-rdf#child">
+<tree id="tasks" flex="1" 
+      datasources="chrome://moztop/content/Data/tasks.rdf"
+      ref="urn:tasks:data">
+  <treecols>
+    <treecol id="id" label="Id" flex="1" style="text-align: right"/>
+    <treecol id="name" label="Name" primary="true" flex="8" />
+    <splitter/>
+    <treecol id="descr" label="Description" flex="16" />
+    <splitter/>
+    <treecol id="status" label="Status" flex="3" />
+  </treecols>
 
-      <outlinercols>
-        <outlinercol id="taskid" flex="1" label="Id" sort="?taskid"
-                     primary="true" />
-        <splitter/>
-        <outlinercol id="name" label="Name" sort="?name" flex="2"/>
-        <splitter/>
-        <outlinercol id="description" label="Description" sort="?descr" flex="10"/>
-        <splitter/>
-        <outlinercol id="status" label="Status" sort="?status" flex="3"/>
-      </outlinercols>
-
-      <template>
-        <rule>
-          <conditions>
-            <outlineritem uri="?uri" />
-            <member container="?uri" child="?task" />
-          </conditions>
-  
-          <bindings>
-            <binding subject="?task"
-                     predicate="http://home.netscape.com/NC-rdf#taskid"
-                     object="?taskid" />
-            <binding subject="?task"
-                     predicate="http://home.netscape.com/NC-rdf#name"
-                     object="?name" />
-            <binding subject="?task"
-                     predicate="http://home.netscape.com/NC-rdf#descr"
-                     object="?descr" />
-            <binding subject="?task"
-                     predicate="http://home.netscape.com/NC-rdf#status"
-                     object="?status" />
-          </bindings>
-  
-          <action>
-            <outlinerchildren>
-              <outlineritem uri="?task">
-                <outlinerrow>
-                  <outlinercell label="?taskid" />
-                  <outlinercell label="?name" />
-                  <outlinercell label="?descr" />
-                  <outlinercell label="?status" />
-                </outlinerrow>
-              </outlineritem>
-            </outlinerchildren>
-          </action>
-        </rule>
-      </template>
-
-    </outliner>
+    <template>
+      <rule>
+        <treechildren flex="1">
+          <treeitem uri="rdf:*">
+            <treerow>
+              <treecell label="rdf:http://www.zope.org/rdf/task#id"/>
+              <treecell label="rdf:http://www.zope.org/rdf/task#name"/>
+              <treecell label="rdf:http://www.zope.org/rdf/task#descr"/>
+              <treecell label="rdf:http://www.zope.org/rdf/task#status"/>
+            </treerow>
+          </treeitem>
+        </treechildren>
+      </rule>
+    </template>
+</tree>
 
 </overlay>


=== Packages/MoZTop/moztop/content/zopetop/StatusBar/TransactionsOverlay.xul 1.1 => 1.2 ===
--- Packages/MoZTop/moztop/content/zopetop/StatusBar/TransactionsOverlay.xul:1.1	Wed Jan  8 14:01:49 2003
+++ Packages/MoZTop/moztop/content/zopetop/StatusBar/TransactionsOverlay.xul	Wed Jan  8 19:45:20 2003
@@ -3,55 +3,35 @@
 <overlay id="TransactionsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <box id="transactions"
-       orient="vertical"
-       flex="1">
+  <box id="transactions" orient="vertical" flex="1">
 
-  <outliner id="transaction-grid" flex="1" 
-            datasources="tasks.rdf" 
-	    ref="urn:tasks:data">
-    <outlinercols>
-      <outlinercol id="taskid" label="Task Id" flex="2"/>
+  <tree id="transactions" flex="1" 
+        datasources="chrome://moztop/content/Data/transactions.rdf"
+        ref="urn:tasks:data">
+    <treecols>
+      <treecol id="id" label="Id" flex="1" style="text-align: right"/>
+      <treecol id="name" label="Name" primary="true" flex="8" />
       <splitter/>
-      <outlinercol id="description" label="Description" flex="10"/>
+      <treecol id="descr" label="Description" flex="16" />
       <splitter/>
-      <outlinercol id="progress" label="Progress" flex="3"/>
-    </outlinercols>
-     
-    <template>
-      <rule>
-        <conditions>
-          <content uri="?list"/>
-          <member container="?list" child="?child"/>
-          <triple subject="?child"
-                  predicate="http://www.zope.org/rdf#taskid"
-                  object="?taskid"/>
-        </conditions>
-        <bindings>
-          <binding subject="?child"
-                   predicate="http://www.zope.org/rdf#taskid"
-                   object="?taskid"/>
-          <binding subject="?child"
-                   predicate="http://www.zope.org/rdf#description"
-                   object="?description"/>
-          <binding subject="?child"
-                   predicate="http://www.zope.org/rdf#progress"
-                   object="?progress"/>
-        </bindings>
-        <action>
-          <outlinerchildren>
-            <outlineritem uri="?child">
-              <outlinerrow>
-                <outlinercell label="?taskid"/>
-                <outlinercell label="?description"/>
-                <outlinercell label="?progress"/>
-              </outlinerrow>
-            </outlineritem>
-          </outlinerchildren>
-        </action>
-      </rule>
-    </template>
-  </outliner>
+      <treecol id="status" label="Status" flex="3" />
+    </treecols>
+
+      <template>
+        <rule>
+          <treechildren flex="1">
+            <treeitem uri="rdf:*">
+              <treerow>
+                <treecell label="rdf:http://www.zope.org/rdf/task#id"/>
+                <treecell label="rdf:http://www.zope.org/rdf/task#name"/>
+                <treecell label="rdf:http://www.zope.org/rdf/task#descr"/>
+                <treecell label="rdf:http://www.zope.org/rdf/task#status"/>
+              </treerow>
+            </treeitem>
+          </treechildren>
+        </rule>
+      </template>
+  </tree>
 
   <box orient="horizontal">
     <spacer flex="100%"/>