Index: openacs-4/contrib/packages/cop-base/lib/cop-sidebar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-base/lib/cop-sidebar.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/cop-base/lib/cop-sidebar.adp	23 Jun 2004 14:22:50 -0000	1.3
+++ openacs-4/contrib/packages/cop-base/lib/cop-sidebar.adp	25 Mar 2005 08:40:29 -0000	1.4
@@ -1,74 +1,80 @@
-  <p class="section">KM Toolkit</p>
+<div id="cop-side-content">
+  <h2>KM Toolkit</h2>
   <div class="cop-views">
-  <p class="head">Views</p>
-  <p>Viewed @views@ times by<br />@unique_views@ unique visitors.</p>
+    <h3>Views <help package_key="cop-base" name="views"></h3>
+    <p>Viewed @views@ times by<br />@unique_views@ unique visitors.</p>
   </div>
 
   <div class="cop-ratings">
-  <p class="head">Ratings</p>
-  <if @ratings.all_ratings@ gt 0>
-    <p>Ave Rating: @ratings.stars;noquote@ <a href="@url@ratings/ratings?object_id=@displayed_object_id@" title="see all ratings for this item">@ratings.all_ratings@</a></p>
-  </if>
-  <else>
-    <p><b>Unrated</b></p>
-  </else>
-  <if @current_rating@ gt 0>
-    <p>Your rating @stars;noquote@</p>
-    <p>@rate_form;noquote@</p>
-  </if>
-  <else>
-    <p>@rate_form;noquote@</p>
-  </else>
+    <h3>Ratings <help package_key="cop-base" name="ratings"></h3>
+    <if @ratings.all_ratings@ gt 0>
+      <p>Ave Rating: @ratings.stars;noquote@ <a href="@url@ratings/ratings?object_id=@displayed_object_id@" title="see all ratings for this item">@ratings.all_ratings@</a></p>
+    </if>
+    <else>
+      <p><b>Unrated</b></p>
+    </else>
+    <if @current_rating@ gt 0>
+      <p>Your rating: @stars;noquote@</p>
+      <p>@rate_form;noquote@</p>
+    </if>
+    <else>
+      <p>@rate_form;noquote@</p>
+    </else>
   </div>
 
   <div class="cop-related">
-  <p class="head">Related Items</p>
-  <if @related:rowcount@ gt 0>
-    <ul>
-      <multiple name="related">
-        <li><a href="/o/@related.object_id@">@related.object_title@</a> <a href="@url@@related.delete_url@" class="button">remove</a></li>
-      </multiple>
-    </ul>
-  </if>
-  <p><a href="@url@related/relate?object_one=@displayed_object_id@" class="button">Relate</a></p>
+    <h3>Related Items <help package_key="cop-base" name="related_items"></h3>
+    <if @related:rowcount@ gt 0>
+      <ul>
+        <multiple name="related">
+          <li><a href="/o/@related.object_id@">@related.object_title@</a> <span class="button"><a href="@url@related/relation-delete">Remove</a></span></li>
+        </multiple>
+      </ul>
+    </if>
+    <p><span class="button"><a href="@url@related/relate?object_one=@displayed_object_id@">Relate</a></span></p>
   </div>
 
   <div class="cop-categories">
-    <p class="head">Categories</p>
+    <h3>Categories <help package_key="cop-base" name="categories"></h3>
     <p>@catass_list;noquote@</p>
     <p>
-      <a href="@cat_url@"  class="button"
-        onclick="javascript:w=window.open('@cat_url@','Categorize','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,width=600,height=400');w.focus();return false;">Categorize</a></p>
+      <span class="button"><a href="@cat_url@"
+        onclick="javascript:w=window.open('@cat_url@','Categorize','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=no,width=600,height=400');w.focus();return false;">Categorize</a></span></p>
   </div>
 
+  <div class="cop-metadata">
+    <h3>Metadata</h2>
+      <p><a href="metadata-edit?id=@displayed_object_id@">Edit</a></p>
+  </div>
   <div class="cop-clipboards">
-  <p class="head">Clipboards</p>
-  <if @clipboards:rowcount@ eq 1>
-    <multiple name="clipboards">
-      <a href="@url@clipboards/attach?object_id=@displayed_object_id@&amp;clipboard_id=@clipboards.clipboard_id@">Clip this item</a>
-    </multiple>
-  </if>
-  <if @clipboards:rowcount@ gt 1>
-    <p>Clip this item to</p>
-    <form style="display: inline;" action="@url@clipboards/attach">
-      <input type="hidden" name="object_id" value="@displayed_object_id@"></input>
-      <select name="clipboard_id">
-        <multiple name="clipboards">
-          <option value="@clipboards.clipboard_id@" @clipboards.selected@>@clipboards.title@</option>
-        </multiple>
-      </select>
-      <input type="submit" value="Go"></input>
-    </form>
-  </if>
-  <if @clipped:rowcount@ gt 0>
-    <p>Currently clipped to</p>
-    <ul>
-      <multiple name="clipped"> 
-        <li><a href="@url@clipboards/view?clipboard_id=@clipped.clipboard_id@" title="View clipboard">@clipped.title@</a>&nbsp;<a href="@url@clipboards/remove?clipboard_id=@clipped.clipboard_id@&object_id=@displayed_object_id@" class="button">remove</a><li>
+    <h3>Clipboards <help package_key="cop-base" name="clipboards"></h3>
+    <if @clipboards:rowcount@ eq 1>
+      <multiple name="clipboards">
+        <span class="button"><a href="@url@clipboards/attach?object_id=@displayed_object_id@&amp;clipboard_id=@clipboards.clipboard_id@">Clip this item</a></span>
       </multiple>
-    </ul>
-  </if>
-  <if @clipboards:rowcount@ gt 0>
-    <p><a href="@url@clipboards/" class="button" title="View all existing clipboards">View&nbsp;All</a></p>
-  </if>
+    </if>
+    <if @clipboards:rowcount@ gt 1>
+      <p>Clip this item to</p>
+      <form style="display: inline;" action="@url@clipboards/attach">
+        <input type="hidden" name="object_id" value="@displayed_object_id@"></input>
+        <select name="clipboard_id">
+          <multiple name="clipboards">
+            <option value="@clipboards.clipboard_id@" @clipboards.selected@>@clipboards.title@</option>
+          </multiple>
+        </select>
+        <input type="submit" value="Go" class="formbutton"></input>
+      </form>
+    </if>
+    <if @clipped:rowcount@ gt 0>
+      <p>Currently clipped to</p>
+      <ul>
+        <multiple name="clipped"> 
+          <li><a href="@url@clipboards/view?clipboard_id=@clipped.clipboard_id@" title="View clipboard">@clipped.title@</a>&nbsp;<span class="button"><a href="@url@clipboards/remove?clipboard_id=@clipped.clipboard_id@&object_id=@displayed_object_id@">Remove</a></span></li>
+        </multiple>
+      </ul>
+    </if>
+    <if @clipboards:rowcount@ gt 0>
+      <p><span class="button"><a href="@url@clipboards/" title="View all existing clipboards">View all</a></span></p>
+    </if>
   </div>
+</div>
Index: openacs-4/contrib/packages/cop-base/tcl/cop-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-base/tcl/cop-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/packages/cop-base/tcl/cop-procs.tcl	23 Jun 2004 14:22:50 -0000	1.7
+++ openacs-4/contrib/packages/cop-base/tcl/cop-procs.tcl	25 Mar 2005 08:40:29 -0000	1.8
@@ -24,7 +24,7 @@
     @creation-date 2003-10-30
 } {
     if {[empty_string_p $node_id]} { 
-        set node_id [site_node::closest_ancestor_package -package_key acs-subsite -node_id [ad_conn node_id] -include_self -element node_id]
+        set node_id [site_node::closest_ancestor_package -package_key [subsite::package_keys] -node_id [ad_conn node_id] -include_self -element node_id]
     }
 
     return [lindex [site_node::get_children -node_id $node_id -package_key cop-ui -all] 0]