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.4 -r1.5
--- openacs-4/contrib/packages/cop-ui/lib/cop-master.adp	7 May 2004 17:25:39 -0000	1.4
+++ openacs-4/contrib/packages/cop-ui/lib/cop-master.adp	14 May 2004 11:30:15 -0000	1.5
@@ -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" size="30" maxlength="256"><input type="submit" name="search" value="Search"></form></div>
+  <div id="searchbox"><form method="get" action="/search/search"><input type="text" name="q" size="30" maxlength="256" /><input type="submit" name="search" value="Search" /></form></div>
   <div style="clear: left;"></div>
   <if @title@ not nil>
     <property name="title">@title;noquote@</property>
@@ -14,14 +14,14 @@
     <property name="context">@context;noquote@</property>
   </if>
   <property name="header_stuff">
-    <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
+    <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>
   <!-- Top level navigation -->
   <div id="side">
     <div id="button">
-      <ul id="navbarx">
+      <ul id="navbar">
         <multiple name="sections">
           <if @sections.selected_p@ true>
             <if @sections.link_p@ true>
@@ -31,7 +31,7 @@
               <li id="navbar-here"><a href="#">@sections.label@</a>
             </else>
             <if @subsections:rowcount@ gt 0>
-              <ul id="subnavbarx">
+              <ul id="subnavbar">
                 <multiple name="subsections">
                   <if @subsections.selected_p@ true>
                     <if @subsections.link_p@ true>
@@ -65,18 +65,18 @@
         </multiple>
       </ul>
     </div>
-    <if @displayed_object_id@ not nil>
-      <include src="/packages/cop-base/lib/cop-sidebar" displayed_object_id="@displayed_object_id@" />
-    </if>
   </div>
-  <div id="navbar-bodyx">
+  <if @displayed_object_id@ not nil>
+    <div id="cop-side"><include src="/packages/cop-base/lib/cop-sidebar" displayed_object_id="@displayed_object_id@" /></div>
+  </if>
+  <div id="content-body">
     <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>
-      <if @displayed_object_id@ not nil>
-        <include src="/packages/cop-base/lib/cop-footer" displayed_object_id="@displayed_object_id@" />
-      </if>
+    <slave />
   </div>
+  <if @displayed_object_id@ not nil>
+    <include src="/packages/cop-base/lib/cop-footer" displayed_object_id="@displayed_object_id@" />
+  </if>