Index: openacs-4/packages/cms/todo
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/todo,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/todo	16 Nov 2004 23:22:36 -0000	1.2
+++ openacs-4/packages/cms/todo	17 Nov 2004 23:07:35 -0000	1.3
@@ -1,7 +1,6 @@
 basic/cosmetic
 ---------
 list-ize child items (or what to do with it? shouldn't we be able to relate items that already exist?)
-templates not showing up on clipboard as templates
 better navigation strategy (i.e., "back" links while visiting attributes, rename, delete pages, etc.)
 new icon for "clipping" items - new listbuilder checkboxes confuse UI a bit
 include description in heading on folder attributes page
Index: openacs-4/packages/cms/www/modules/clipboard/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/clipboard/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/clipboard/index.adp	16 Nov 2004 22:32:48 -0000	1.2
+++ openacs-4/packages/cms/www/modules/clipboard/index.adp	17 Nov 2004 23:07:36 -0000	1.3
@@ -71,14 +71,14 @@
    </div>
  </else>
 
- <if @clip_tab@ eq keywords>
+ <if @clip_tab@ eq categories>
    <div class="tab" id="subnavbar-here">
      Keywords
    </div>
  </if>
  <else>
    <div class="tab">
-     <a href="@package_url@modules/clipboard/index?mount_point=@mount_point@&clip_tab=keywords" title="" class="subnavbar-unselected">Keywords</a>
+     <a href="@package_url@modules/clipboard/index?mount_point=@mount_point@&clip_tab=categories" title="" class="subnavbar-unselected">Keywords</a>
    </div>
  </else>
 
Index: openacs-4/packages/cms/www/modules/clipboard/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/clipboard/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/clipboard/index.tcl	16 Nov 2004 22:32:48 -0000	1.4
+++ openacs-4/packages/cms/www/modules/clipboard/index.tcl	17 Nov 2004 23:07:36 -0000	1.5
@@ -37,7 +37,7 @@
 set clip [clipboard::parse_cookie]
 
 set total_items [clipboard::get_total_items $clip]
-set user_id [User::getID]
+set user_id [auth::require_login]
 
 if { ![util::is_nil id] } {
   
Index: openacs-4/packages/cms/www/modules/items/keywords.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/keywords.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/keywords.tcl	16 Nov 2004 22:32:48 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/keywords.tcl	17 Nov 2004 23:07:36 -0000	1.6
@@ -28,14 +28,14 @@
     -elements {
 	heading {
 	    label "Heading"
-	    display_template "<a href=\"@keywords.keyword_url@\" title=\"View keyword\">keywords.heading</a>"
+	    display_template "<a href=\"@keywords.keyword_url@\" title=\"View keyword\">@keywords.heading@</a>"
 	}
 	description {
 	    label "Description"
 	}
     }    
 
-db_multirow keywords get_keywords "" {
+db_multirow -extend {keyword_url} keywords get_keywords "" {
     set keyword_url "../categories/index?id=$keyword_id&mount_point=categories"
 }
 
Index: openacs-4/packages/cms/www/modules/templates/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/index.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/templates/index.tcl	16 Nov 2004 22:32:51 -0000	1.7
+++ openacs-4/packages/cms/www/modules/templates/index.tcl	17 Nov 2004 23:07:37 -0000	1.8
@@ -87,17 +87,17 @@
     }
 
 db_multirow -extend { copy file_size is_folder template_id upload_url edit_url type item_url } -unclobber folder_contents get_folders "" {
-    set copy [clipboard::render_bookmark sitemap $item_id $package_url]
+    set copy [clipboard::render_bookmark templates $item_id $package_url]
     set is_folder 1
     set type "Template Folder"
     set item_url [export_vars -base index { item_id }]
 }
 
 db_multirow -append -extend { copy is_folder folder_id label upload_url edit_url type item_url } folder_contents get_items "" {
-    set copy [clipboard::render_bookmark sitemap $item_id $package_url]
+    set copy [clipboard::render_bookmark templates $item_id $package_url]
     set is_folder 0
     set type "Template"
     set item_url [export_vars -base properties { item_id }]
     set edit_url [export_vars -base edit { template_id }]
     set upload_url [export_vars -base upload { template_id }]
-}
\ No newline at end of file
+}