Index: openacs-4/packages/general-comments/www/comment-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-add-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/general-comments/www/comment-add-2.tcl 9 Mar 2002 02:00:02 -0000 1.4 +++ openacs-4/packages/general-comments/www/comment-add-2.tcl 5 Sep 2002 10:05:16 -0000 1.5 @@ -18,7 +18,7 @@ { return_url {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue comment_mime_type:onevalue title:onevalue content:onevalue @@ -41,7 +41,7 @@ set comment_id [db_nextval acs_object_id_seq] set page_title "Confirm comment on $object_name" -set context_bar {"Confirm comment"} +set context {"Confirm comment"} set target "comment-add-3" set html_content [ad_html_text_convert -from $comment_mime_type -- $content] Index: openacs-4/packages/general-comments/www/comment-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-add.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/general-comments/www/comment-add.tcl 31 Oct 2001 20:42:07 -0000 1.3 +++ openacs-4/packages/general-comments/www/comment-add.tcl 5 Sep 2002 10:05:16 -0000 1.4 @@ -15,7 +15,7 @@ { return_url "" } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue target:onevalue title:onevalue content:onevalue @@ -38,7 +38,7 @@ } set page_title "Add a comment to: $object_name" -set context_bar {"Add comment"} +set context {"Add comment"} set target "comment-add-2" set title "" set content "" Index: openacs-4/packages/general-comments/www/comment-ae-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-ae-2.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/comment-ae-2.adp 31 Oct 2001 20:42:07 -0000 1.2 +++ openacs-4/packages/general-comments/www/comment-ae-2.adp 5 Sep 2002 10:05:16 -0000 1.3 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ Here is how your comment would appear: Index: openacs-4/packages/general-comments/www/comment-ae.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/Attic/comment-ae.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/general-comments/www/comment-ae.adp 24 Jul 2002 09:49:09 -0000 1.3 +++ openacs-4/packages/general-comments/www/comment-ae.adp 5 Sep 2002 10:05:16 -0000 1.4 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ comment.title @page_title@ Index: openacs-4/packages/general-comments/www/comment-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-edit-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/general-comments/www/comment-edit-2.tcl 9 Mar 2002 02:00:02 -0000 1.4 +++ openacs-4/packages/general-comments/www/comment-edit-2.tcl 5 Sep 2002 10:05:16 -0000 1.5 @@ -22,7 +22,7 @@ { return_url {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue mime_type:onevalue title:onevalue content:onevalue @@ -33,7 +33,7 @@ ad_require_permission $comment_id write set page_title "Confirm comment on: [acs_object_name $object_id]" -set context_bar {"Confirm comment"} +set context {"Confirm comment"} set target "comment-edit-3" set html_content [ad_html_text_convert -from $comment_mime_type -- $content] Index: openacs-4/packages/general-comments/www/comment-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/general-comments/www/comment-edit.tcl 31 Oct 2001 20:42:07 -0000 1.3 +++ openacs-4/packages/general-comments/www/comment-edit.tcl 5 Sep 2002 10:05:16 -0000 1.4 @@ -15,7 +15,7 @@ { return_url {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue target:onevalue title:onevalue content:onevalue @@ -50,7 +50,7 @@ } set page_title "Edit comment on: [acs_object_name $object_id]" -set context_bar {"Edit comment"} +set context {"Edit comment"} set target "comment-edit-2" ad_return_template "comment-ae" Index: openacs-4/packages/general-comments/www/delete-attachment.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/delete-attachment.adp 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/packages/general-comments/www/delete-attachment.adp 5 Sep 2002 10:05:16 -0000 1.2 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ Do you really wish to delete this attachment?

Index: openacs-4/packages/general-comments/www/delete-attachment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/delete-attachment.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/delete-attachment.tcl 5 Sep 2002 10:05:16 -0000 1.3 @@ -16,7 +16,7 @@ { return_url {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue attach_id:onevalue parent_id:onevalue return_url:onevalue @@ -27,6 +27,6 @@ # set template variables set page_title "Delete attachment" -set context_bar {"Delete attachment"} +set context {"Delete attachment"} ad_return_template Index: openacs-4/packages/general-comments/www/file-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-add.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/file-add.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/file-add.tcl 5 Sep 2002 10:05:16 -0000 1.3 @@ -14,7 +14,7 @@ {return_url {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue parent_id:onevalue target:onevalue title:onevalue @@ -34,7 +34,7 @@ # set variables for template set attach_id [db_nextval acs_object_id_seq] set page_title "Add a file attachment to comment #$parent_id" -set context_bar {[list "view-comment?comment_id=$parent_id" "Go back to comment"] "Add file attachment"} +set context [list [list "view-comment?comment_id=$parent_id" "Go back to comment"] "Add file attachment"] set target "file-add-2" set title "" set file_name "" Index: openacs-4/packages/general-comments/www/file-ae.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-ae.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/file-ae.adp 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/packages/general-comments/www/file-ae.adp 5 Sep 2002 10:05:16 -0000 1.2 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ @parent_id@

Index: openacs-4/packages/general-comments/www/file-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/file-edit.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/file-edit.tcl 5 Sep 2002 10:05:17 -0000 1.3 @@ -16,7 +16,7 @@ { return_url {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue parent_id:onevalue target:onevalue title:onevalue @@ -37,7 +37,7 @@ # set variables for template set page_title "Edit file attachment on comment #$parent_id" -set context_bar {[list "view-comment?comment_id=$parent_id" "Go back to comment"] "Edit file attachment"} +set context [list [list "view-comment?comment_id=$parent_id" "Go back to comment"] "Edit file attachment"] set target "file-edit-2" ad_return_template "file-ae" Index: openacs-4/packages/general-comments/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/index.adp 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/packages/general-comments/www/index.adp 5 Sep 2002 10:05:17 -0000 1.2 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ [ Administer ] Index: openacs-4/packages/general-comments/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/index.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/index.tcl 5 Sep 2002 10:05:17 -0000 1.3 @@ -11,7 +11,7 @@ {orderby {pretty_date*} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue dimensional_bar:onevalue comments_table:onevalue } @@ -85,7 +85,7 @@ comments_select $sql $table_def] set page_title "General Comments" -set context_bar {} +set context {} ad_return_template Index: openacs-4/packages/general-comments/www/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/Attic/master.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/master.adp 24 Jul 2002 09:49:09 -0000 1.2 +++ openacs-4/packages/general-comments/www/master.adp 5 Sep 2002 10:05:17 -0000 1.3 @@ -1,8 +1,9 @@ @page_title@ +@context@ @focus@

@page_title@

-<%= [eval ad_context_bar $context_bar] %> +<%= [eval ad_context_bar $context] %>
Index: openacs-4/packages/general-comments/www/test.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/test.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/test.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/test.tcl 5 Sep 2002 10:05:17 -0000 1.3 @@ -10,7 +10,7 @@ } { } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue package_id:onevalue gc_package_id:onevalue package_url:onevalue @@ -25,7 +25,7 @@ } set page_title "Test page for General Comments" -set context_bar {"test"} +set context {"test"} if { ![db_0or1row get_gc_package_id { select package_id Index: openacs-4/packages/general-comments/www/url-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-add.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/url-add.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/url-add.tcl 5 Sep 2002 10:05:17 -0000 1.3 @@ -14,7 +14,7 @@ { return_url {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue parent_id:onevalue target:onevalue label:onevalue @@ -36,7 +36,7 @@ # set variables for template set attach_id [db_nextval acs_object_id_seq] set page_title "Add url attachment to comment #$parent_id" -set context_bar {[list "view-comment?comment_id=$parent_id" "Go back to comment"] "Add url comment"} +set context [list [list "view-comment?comment_id=$parent_id" "Go back to comment"] "Add url comment"] set target "url-add-2" set label "" set url "" Index: openacs-4/packages/general-comments/www/url-ae.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-ae.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/url-ae.adp 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/packages/general-comments/www/url-ae.adp 5 Sep 2002 10:05:17 -0000 1.2 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ @parent_id@ Index: openacs-4/packages/general-comments/www/url-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/url-edit.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/url-edit.tcl 5 Sep 2002 10:05:17 -0000 1.3 @@ -13,7 +13,7 @@ { return_url {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue parent_id:onevalue target:onevalue label:onevalue @@ -34,7 +34,7 @@ } set page_title "Edit url attachment on comment #$parent_id" -set context_bar {[list "view-comment?comment_id=$parent_id" "Go back to comment"] "Edit url attachment"} +set context [list [list "view-comment?comment_id=$parent_id" "Go back to comment"] "Edit url attachment"] set target "url-edit-2" ad_return_template "url-ae" Index: openacs-4/packages/general-comments/www/view-comment.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/view-comment.adp 31 Oct 2001 20:42:07 -0000 1.2 +++ openacs-4/packages/general-comments/www/view-comment.adp 5 Sep 2002 10:05:17 -0000 1.3 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ @return_url@ @object_name@ Index: openacs-4/packages/general-comments/www/view-comment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/general-comments/www/view-comment.tcl 9 Mar 2002 02:00:02 -0000 1.4 +++ openacs-4/packages/general-comments/www/view-comment.tcl 5 Sep 2002 10:05:17 -0000 1.5 @@ -14,7 +14,7 @@ { return_url {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue return_url:onevalue object_name:onevalue title:onevalue @@ -134,7 +134,7 @@ } set comment_on_id [db_string get_object_id "select object_id from general_comments where comment_id = :comment_id"] set page_title "View comment on: [acs_object_name $comment_on_id]" -set context_bar {"View comment"} +set context {"View comment"} set return_url_view "[ad_urlencode view-comment?[export_ns_set_vars url]]" set is_creator_p "f" if { $user_id == $creation_user } { Index: openacs-4/packages/general-comments/www/view-image.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-image.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/view-image.adp 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/packages/general-comments/www/view-image.adp 5 Sep 2002 10:05:17 -0000 1.2 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ @return_url@
Index: openacs-4/packages/general-comments/www/view-image.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-image.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/view-image.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/view-image.tcl 5 Sep 2002 10:05:17 -0000 1.3 @@ -12,7 +12,7 @@ { return_url {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue return_url:onevalue image_id:onevalue width:onevalue @@ -37,7 +37,7 @@ } set page_title "Image attachment" -set context_bar {[list "$return_url" "Go back to comment"] "Image attachment"} +set context [list [list "$return_url" "Go back to comment"] "Image attachment"] ad_return_template Index: openacs-4/packages/general-comments/www/admin/delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/admin/delete.adp 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/packages/general-comments/www/admin/delete.adp 5 Sep 2002 10:05:17 -0000 1.2 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ <%= [export_form_vars comment_id return_url] %> Index: openacs-4/packages/general-comments/www/admin/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/admin/delete.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/admin/delete.tcl 5 Sep 2002 10:05:17 -0000 1.3 @@ -14,7 +14,7 @@ { return_url {}} } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue title:onevalue comment_id:onevalue mime_type:onevalue @@ -45,6 +45,6 @@ } set page_title "Delete a comment" -set context_bar {"Delete a comment"} +set context {"Delete a comment"} ad_return_template Index: openacs-4/packages/general-comments/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/index.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/admin/index.adp 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/packages/general-comments/www/admin/index.adp 5 Sep 2002 10:05:17 -0000 1.2 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@

@dimensional_bar@ Index: openacs-4/packages/general-comments/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/admin/index.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/admin/index.tcl 5 Sep 2002 10:05:17 -0000 1.3 @@ -11,7 +11,7 @@ {orderby {} } } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue dimensional_bar:onevalue comments_table:onevalue } @@ -85,7 +85,7 @@ comments_select $sql $table_def] set page_title "General Comments Administration" -set context_bar {} +set context {} ad_return_template Index: openacs-4/packages/general-comments/www/admin/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/Attic/master.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/admin/master.adp 20 Apr 2001 20:51:11 -0000 1.1 +++ openacs-4/packages/general-comments/www/admin/master.adp 5 Sep 2002 10:05:17 -0000 1.2 @@ -1,7 +1,8 @@ @page_title@ +@context@

@page_title@

-<%= [eval ad_context_bar $context_bar] %> +<%= [eval ad_context_bar $context] %>