Index: openacs-4/contrib/packages/cop-ui/lib/cop-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/lib/cop-master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/cop-ui/lib/cop-master.adp	31 Mar 2004 22:31:55 -0000	1.2
+++ openacs-4/contrib/packages/cop-ui/lib/cop-master.adp	29 Apr 2004 15:56:04 -0000	1.3
@@ -1,5 +1,5 @@
   <master src="/www/site-master">
-  <div id="searchbox" style="float: right; background: #ddd; border: 2px solid black; padding: 3px;"><form style="display: inline;" method="GET" action="/search/search"><input type="text" name="q" width="30" maxlength="256"><input type="submit" name="search" value="Search"></form></div>
+  <div id="searchbox" style="float: right; background: #ddd; border: 2px solid black; padding: 3px;"><form style="display: inline;" method="GET" action="/search/search"><input type="text" name="q" size="30" maxlength="256"><input type="submit" name="search" value="Search"></form></div>
   <if @title@ not nil>
     <property name="title">@title;noquote@</property>
   </if>
@@ -13,89 +13,70 @@
     <property name="context">@context;noquote@</property>
   </if>
   <property name="header_stuff">
-    @header_stuff;noquote@
     <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
+    @header_stuff;noquote@
   </property>
   <if @displayed_object_id@ not nil><property name="displayed_object_id">@displayed_object_id;noquote@</property></if>
-
-  <div id="subsite-name">
-    <if @subsite_url@ not nil><a href="@subsite_url@" class="subsite-name">@subsite_name@</a></if>
-    <else>@subsite_name@</else>
-  </div>
   <!-- Top level navigation -->
-
-  <div id="navbar-div">
-    <div id="navbar-container">
-      <div id="navbar">
+  <div id="side">
+    <div id="button">
+      <ul id="navbarx">
         <multiple name="sections">
           <if @sections.selected_p@ true>
-            <div class="tab" id="navbar-here">
-              <if @sections.link_p@ true>
-                <a href="@sections.url@" title="@sections.title@">@sections.label@</a>
-              </if>
-              <else>
-                @sections.label@
-              </else>
-            </div>
+            <if @sections.link_p@ true>
+              <li id="navbar-here"><a href="@sections.url@" title="@sections.title@">@sections.label@</a>
+            </if>
+            <else>
+              <li id="navbar-here"><a href="#">@sections.label@</a>
+            </else>
+            <if @subsections:rowcount@ gt 0>
+              <ul id="subnavbarx">
+                <multiple name="subsections">
+                  <if @subsections.selected_p@ true>
+                    <if @subsections.link_p@ true>
+                      <li id="subnavbar-here"><a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a></li>
+                    </if>
+                    <else>
+                      <li id="subnavbar-here"><a href="#">@subsections.label@</a></li>
+                    </else>
+                  </if>
+                  <else>
+                    <if @subsections.link_p@ true>
+                      <li><a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a></li>
+                    </if>
+                    <else>
+                      <li><a href="#">@subsections.label@</a></li>
+                    </else>
+                  </else>
+                </multiple>
+              </ul>
+            </if>
+          </li>
           </if>
           <else>
-            <div class="tab">
-              <if @sections.link_p@ true>
-                <a href="@sections.url@" title="@sections.title@">@sections.label@</a>
-              </if>
-              <else>
-                @sections.label@
-              </else>
-            </div>
+            <if @sections.link_p@ true>
+              <li><a href="@sections.url@" title="@sections.title@">@sections.label@</a></li>
+            </if>
+            <else>
+              <li><a href="#">@sections.label@</a></li>
+            </else>
           </else>
         </multiple>
-      </div>
+      </ul>
     </div>
-  </div>
-  <div id="navbar-body">
-
-    <!-- Second level navigation -->
-
-    <if @subsections:rowcount@ gt 0>
-
-      <div id="subnavbar-div">
-        <div id="subnavbar-container">
-          <div id="subnavbar">
-            <multiple name="subsections">
-              <if @subsections.selected_p@ true>
-                <div class="tab" id="subnavbar-here">
-                  <if @subsections.link_p@ true>
-                    <a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a>
-                  </if>
-                  <else>
-                    @subsections.label@
-                  </else>
-                </div>
-              </if>
-              <else>
-                <div class="tab">
-                  <if @subsections.link_p@ true>
-                    <a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a>
-                  </if>
-                  <else>
-                    @subsections.label@
-                  </else>
-                </div>
-              </else>
-            </multiple>
-          </div>
-        </div>
-      </div>
-      <div id="subnavbar-body">
+    <if @displayed_object_id@ not nil>
+      <include src="/packages/cop-base/lib/cop-sidebar" displayed_object_id="@displayed_object_id@" />
     </if>
-    <else>
-    </else>
+  </div>
+  <div id="navbar-bodyx">
+    <div id="subsite-name">
+      <if @subsite_url@ not nil><a href="@subsite_url@" class="subsite-name">@subsite_name@</a></if>
+      <else>@subsite_name@</else>
+    </div>
     <if @title@ not nil and @title@ ne @subsite_name@><h1 class="page-title">@title@</h1></if>
     <slave>
-      <div style="clear: both;"></div>
-      <if @subsections:rowcount@ gt 0></div></if>
-</div>
-<if @displayed_object_id@ not nil>
-  <include src="/packages/cop-base/lib/cop-footer" displayed_object_id="@displayed_object_id@" />
-</if>
+      <if @displayed_object_id@ not nil>
+        <include src="/packages/cop-base/lib/cop-footer" displayed_object_id="@displayed_object_id@" />
+      </if>
+  </div>