Index: openacs-4/packages/xowiki/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/xowiki/www/view.tcl	23 May 2006 17:58:47 -0000	1.19
+++ openacs-4/packages/xowiki/www/view.tcl	19 Jun 2006 00:40:04 -0000	1.20
@@ -15,6 +15,7 @@
   {folder_id:optional}
   {object_type:optional}
   {master 1}
+  page:optional
 }
 
 set package_id [ad_conn package_id]
@@ -23,38 +24,61 @@
 set admin_p [permission::permission_p -object_id $package_id -privilege "admin"]
 
 ::xowiki::Page set recursion_count 0
-set page [::Generic::CrItem instantiate \
-	      -item_id $item_id \
-	      -revision_id $revision_id]
+if {![info exists page]} {
+  set static_page 0
+  set page [::Generic::CrItem instantiate \
+		-item_id $item_id \
+		-revision_id $revision_id]
+} else {
+  set static_page 1
+}
 
 if {![info exists folder_id]} {set folder_id [$page set parent_id]}
 ::xowiki::Page require_folder_object -folder_id $folder_id -package_id $package_id
 
 set content [$page render]
 
-if {[ad_parameter "user_tracking" -package_id $package_id] } {
-  $page record_last_visited
+if {!$static_page} {
+  if {[ad_parameter "user_tracking" -package_id $package_id]} {
+    $page record_last_visited
+  }
+  set references [$page references]
+} else {
+  set references ""
 }
-set references [$page references]
-set header_stuff [::xowiki::Page header_stuff]
-#ns_log notice "--HEADER-Stuff = <$header_stuff>"
 
+# only activate tags when the user is logged in
+set no_tags [expr {[ad_conn user_id] == 0}]
+set tags ""
+if {!$no_tags} {
+  ::xowiki::Page requireJS  "/resources/xowiki/get-http-object.js"
+  set entries [list]
+  set tags [lsort [::xowiki::Page get_tags -user_id [ad_conn user_id] \
+		       -item_id $item_id -package_id $package_id]]
+  set href [site_node::get_url_from_object_id -object_id $package_id]weblog?summary=1
+  foreach tag $tags {lappend entries "<a href='$href&tag=[ad_urlencode $tag]'>$tag</a>"}
+  set tags_with_links [join $entries {, }]
+}
+
+set header_stuff [::xowiki::Page header_stuff]
 if {[$page exists master] && $master == 1} {set master [$page set master]}
 
 # export title, text, and lang_links to current scope
 $page instvar title name text lang_links
 if {$master} {
   set context [list $title]
 
+  set return_url  [::xowiki::Page pretty_link $name]
+
   set base [apm_package_url_from_id $package_id]
   set rev_link    [export_vars -base ${base}revisions {{page_id $item_id} name}]
   set edit_link   [export_vars -base ${base}edit {item_id}]
   set delete_link [export_vars -base ${base}delete {item_id}]
   set new_link    [export_vars -base ${base}edit {object_type}]
   set admin_link  [export_vars -base ${base}admin/ {}]
   set index_link  [export_vars -base ${base} {}]
-
-  set return_url  [::xowiki::Page pretty_link $name]
+  set save_tag_link [export_vars -base ${base}save_tags {}]
+  set popular_tags_link [export_vars -base ${base}popular_tags {item_id}]
   set gc_link     [general_comments_create_link $item_id $return_url]
   set gc_comments [general_comments_get_comments $item_id $return_url]