Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.tcl	9 Oct 2003 09:58:21 -0000	1.4
+++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.tcl	27 Oct 2003 10:17:21 -0000	1.5
@@ -2,25 +2,34 @@
     view a page revision, if no revision_id is passed then latest revision is used
 } {
     {revision_id:optional,naturalnum $current_item(latest_revision)}
+    {return_url:optional [ad_return_url]}
 }
 
-array set page_revision [bcms::revision::get_revision -revision_id $revision_id]
-
-set return_url [ad_return_url]
 set package_url [ad_conn package_url]
 
+array set page_revision [bcms::revision::get_revision -revision_id $revision_id]
+
 # we will only allow edits on the latest version, else you can only view them
 if {$revision_id == $page_revision(latest_revision)} {
-    set context_action "
-<a class=\"contextaction\" id=\"page-edit\" href=\"[export_vars -base ${package_url}manage/page-edit {revision_id return_url}]\">Edit this Page</a>
-<a class=\"contextaction\" id=\"apply-template\" href=\"[export_vars -base ${package_url}manage/apply-template {{item_id $current_item(item_id)} return_url}]\">Template this Page</a>
-<a class=\"contextaction\" id=\"revision-publish\" href=\"[export_vars -base ${package_url}manage/revision-publish {revision_id return_url}]\">Publish this Page</a>
-<a class=\"contextaction\" id=\"revision-unpublish\" href=\"[export_vars -base ${package_url}manage/revision-unpublish {revision_id return_url}]\">Unpublish this Page</a>
-<a class=\"contextaction\" id=\"categorize-item\" href=\"[export_vars -base ${package_url}manage/categorize-item {{item_id $current_item(item_id)} {folder_id $current_item(parent_id)} return_url}]\">Categorize this Page</a>
-<a class=\"contextaction\" id=\"page-revision\" href=\"[export_vars -base ${package_url}manage/page-revision {{page_id $current_item(item_id)} return_url}]\">View Version(s)</a>
-<a class=\"contextaction\" id=\"relate-item\" href=\"[export_vars -base ${package_url}manage/relate-item {{item_id_one $current_item(item_id)} {content_type_search content_revision} {relation_type pages} return_url}]\">Relate Page</a>
-<a class=\"contextaction\" id=\"relate-item\" href=\"[export_vars -base ${package_url}manage/relate-item {{item_id_one $current_item(item_id)} {content_type_search image} {relation_type images} return_url}]\">Relate Image</a>"
 
+    set context_action [bcms::ui::base::context_action_link -context_action apply-template \
+                            -export_vars [export_vars {{item_id $current_item(item_id)} return_url}]]
+    if {[empty_string_p $current_item(live_revision)]} {
+        append context_action [bcms::ui::base::context_action_link -context_action revision-publish \
+                                   -export_vars [export_vars {revision_id return_url}]]
+    } else {
+        append context_action [bcms::ui::base::context_action_link -context_action revision-unpublish \
+                                   -export_vars [export_vars {{revision_id $current_item(live_revision)} return_url}]]
+    }
+    append context_action [bcms::ui::base::context_action_link -context_action categorize-item \
+                                   -export_vars [export_vars {{item_id $current_item(item_id)} {folder_id $current_item(parent_id)} return_url}]]
+    append context_action [bcms::ui::base::context_action_link -context_action revision-list \
+                                   -export_vars [export_vars {{item_id $current_item(item_id)} return_url}]]
+    append context_action [bcms::ui::base::context_action_link -context_action relate-page \
+                                   -export_vars [export_vars {{item_id_one $current_item(item_id)} return_url}]]
+    append context_action [bcms::ui::base::context_action_link -context_action relate-image \
+                                   -export_vars [export_vars {{item_id_one $current_item(item_id)} return_url}]]
+
     set context_help "You can edit this page, etc."
 
     set title "View Page"
@@ -29,8 +38,8 @@
     lappend context "$page_revision(title)"
 
 } else {
-    set context_action "
-<a class=\"contextaction\" id=\"page-revision\" href=\"${package_url}manage/page-revision?page_id=$current_item(item_id)&return_url=$current_url\">View Version(s)</a>"
+    set context_action [bcms::ui::base::context_action_link -context_action revision-list \
+                                   -export_vars [export_vars {{item_id $current_item(item_id)} return_url}]]
 
     set context_help "This is a version of a page.  You can only view this page"