Index: openacs-4/contrib/packages/bcms-ui-base/resources/folder-tree.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/resources/folder-tree.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/resources/folder-tree.adp 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/resources/folder-tree.adp 15 Apr 2004 16:19:57 -0000 1.2 @@ -43,11 +43,11 @@ - +
-
- @list_properties.bulk_action_export_chunk@ + + @list_properties.bulk_action_export_chunk;noquote@
@@ -57,38 +57,38 @@ @@ -114,18 +114,18 @@ - @@ -136,14 +136,14 @@ - + @@ -154,7 +154,7 @@ @@ -174,7 +174,7 @@ - @@ -186,9 +186,9 @@ - - Index: openacs-4/contrib/packages/bcms-ui-base/resources/form-template.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/resources/form-template.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/bcms-ui-base/resources/form-template.adp 16 Dec 2003 01:27:15 -0000 1.3 +++ openacs-4/contrib/packages/bcms-ui-base/resources/form-template.adp 15 Apr 2004 16:19:57 -0000 1.4 @@ -7,7 +7,7 @@ - +
  • \@formerror.@elements.id@\@ Index: openacs-4/contrib/packages/bcms-ui-base/resources/item-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/resources/item-list.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/packages/bcms-ui-base/resources/item-list.adp 22 Sep 2003 07:36:46 -0000 1.2 +++ openacs-4/contrib/packages/bcms-ui-base/resources/item-list.adp 15 Apr 2004 16:19:57 -0000 1.3 @@ -43,15 +43,15 @@ -
    +
    @@ -60,13 +60,13 @@
    - @list_properties.bulk_action_export_chunk@ + @list_properties.bulk_action_export_chunk;noquote@ - @bulk_actions.label@ + @bulk_actions.label;noquote@ @@ -82,29 +82,29 @@
    - << + << - < + < - \@paginator_pages.page@ + \@paginator_pages.page;noquote@ - \@paginator_pages.page@ + \@paginator_pages.page;noquote@ - > + > - >> + >>
    @@ -120,23 +120,23 @@
  • - @@ -148,14 +148,14 @@ - + @@ -167,8 +167,8 @@ - @@ -188,29 +188,29 @@
    - << + << - < + < - \@paginator_pages.page@ + \@paginator_pages.page;noquote@ - \@paginator_pages.page@ + \@paginator_pages.page;noquote@ - > + > - >> + >>
    @@ -227,8 +227,8 @@ - @bulk_actions.label@ + @bulk_actions.label;noquote@ Index: openacs-4/contrib/packages/bcms-ui-base/resources/template-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/resources/template-form.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/packages/bcms-ui-base/resources/template-form.tcl 27 Oct 2003 10:17:21 -0000 1.2 +++ openacs-4/contrib/packages/bcms-ui-base/resources/template-form.tcl 15 Apr 2004 16:19:57 -0000 1.3 @@ -59,6 +59,14 @@ } -new_data { + # if this is a new template and the content is blank and the file exists + # will source out the file contents and use that + set template_filename "[acs_root_dir]/templates/${cms_context}/${name}.adp" + # read the file contents from the file system + if {[file exists $template_filename] && [empty_string_p $content]} { + set content [template::util::read_file $template_filename] + } + # create the template and revision db_transaction { set item_id [bcms::template::create_template -template_name $name -parent_id $folder_id] Index: openacs-4/contrib/packages/bcms-ui-base/tcl/bcms-ui-base-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/tcl/bcms-ui-base-procs.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/contrib/packages/bcms-ui-base/tcl/bcms-ui-base-procs.tcl 12 Jan 2004 13:36:33 -0000 1.5 +++ openacs-4/contrib/packages/bcms-ui-base/tcl/bcms-ui-base-procs.tcl 15 Apr 2004 16:19:58 -0000 1.6 @@ -25,7 +25,7 @@ @param redirect_to_folder if set to 1 then it will rebuild the return_url pointing to the new folder being moved to - @return a link, normally used for the list builder + @returns a link, normally used for the list builder } { set item_id $items_to_move set folder_id $destination_folder @@ -55,7 +55,7 @@ @param confirm if passed it will generate a link that will delete the items without confirmation - @return a link to delete the items, but if a folder that will be deleted is not empty + @returns a link to delete the items, but if a folder that will be deleted is not empty it will return a null string } { set item_id $items_to_delete @@ -80,7 +80,7 @@ @param template_id id of which template to use @param return_url after applying the template, redirect to this url - @return a link to apply the template + @returns a link to apply the template } { set url [export_vars -url -base "[ad_conn package_url]manage/apply-template" {item_id template_id return_url}] @@ -97,7 +97,7 @@ @param templates_to_delete a list of template_id you wish to delet @param return_url after deleting, move to this url - @return a link to delete the templates + @returns a link to delete the templates } { set confirm_p 1 set template_id $templates_to_delete @@ -197,24 +197,6 @@ } append context_action_link "" } - sb-event-add { - append context_action_link " id=\"sb-event-add\" href=\"${package_url}manage/sb-event-add?$export_vars\">" - if {[info exists context_action_label]} { - append context_action_link $context_action_label - } else { - append context_action_link "Add Event & Gigs" - } - append context_action_link "" - } - sb-bio-add { - append context_action_link " id=\"sb-bio-add\" href=\"${package_url}manage/sb-bio-add?$export_vars\">" - if {[info exists context_action_label]} { - append context_action_link $context_action_label - } else { - append context_action_link "Add Biography" - } - append context_action_link "" - } template-add { append context_action_link " id=\"template-add\" href=\"${package_url}manage/template-add?$export_vars\">" if {[info exists context_action_label]} { @@ -261,7 +243,7 @@ append context_action_link "" } relate-page { - append context_action_link " id=\"relate-page\" href=\"${package_url}manage/relate-item?${export_vars}&[export_vars {{content_type_search content_revision} {relation_type pages}}]\">" + append context_action_link " id=\"relate-page\" href=\"${package_url}manage/relate-item?${export_vars}&[export_vars {{content_type_search content_revision} {relation_tag pages}}]\">" if {[info exists context_action_label]} { append context_action_link $context_action_label } else { @@ -270,7 +252,7 @@ append context_action_link "" } relate-image { - append context_action_link " id=\"relate-image\" href=\"${package_url}manage/relate-item?${export_vars}&[export_vars {{content_type_search image} {relation_type images}}]\">" + append context_action_link " id=\"relate-image\" href=\"${package_url}manage/relate-item?${export_vars}&[export_vars {{content_type_search image} {relation_tag images}}]\">" if {[info exists context_action_label]} { append context_action_link $context_action_label } else { @@ -287,51 +269,6 @@ } append context_action_link "" } - sb-writing-add { - append context_action_link " id=\"sb-writing-add\" href=\"${package_url}manage/sb-writing-add?$export_vars\">" - if {[info exists context_action_label]} { - append context_action_link $context_action_label - } else { - append context_action_link "Add Writing" - } - append context_action_link "" - } - sb-download-add { - append context_action_link " id=\"sb-download-add\" href=\"${package_url}manage/sb-download-add?$export_vars\">" - if {[info exists context_action_label]} { - append context_action_link $context_action_label - } else { - append context_action_link "Add Download" - } - append context_action_link "" - } - sb-band-set { - append context_action_link " id=\"sb-band-set\" href=\"${package_url}manage/sb-band-set?$export_vars\">" - if {[info exists context_action_label]} { - append context_action_link $context_action_label - } else { - append context_action_link "Select Band" - } - append context_action_link "" - } - sb-featured-set { - append context_action_link " id=\"sb-featured-set\" href=\"${package_url}manage/sb-featured-set?$export_vars&[export_vars {{action set}}]\">" - if {[info exists context_action_label]} { - append context_action_link $context_action_label - } else { - append context_action_link "Set Featured" - } - append context_action_link "" - } - sb-featured-unset { - append context_action_link " id=\"sb-featured-set\" href=\"${package_url}manage/sb-featured-set?$export_vars&[export_vars {{action unset}}]\">" - if {[info exists context_action_label]} { - append context_action_link $context_action_label - } else { - append context_action_link "Unset Featured" - } - append context_action_link "" - } default { error "context_action = $context_action is not a valid value" } } Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/category-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/category-view.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/category-view.adp 22 Sep 2003 07:36:47 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/category-view.adp 15 Apr 2004 16:19:59 -0000 1.2 @@ -1,20 +1,20 @@ -@title@ -@context@ -@context_action@ -@context_help@ +@title;noquote@ +@context;noquote@ +@context_action;noquote@ +@context_help;noquote@
    Category
    -
    @category.heading@
    +
    @category.heading;noquote@
    -
    @category.description@
    +
    @category.description;noquote@
    Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/file-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/file-view.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/file-view.adp 27 Oct 2003 10:17:21 -0000 1.2 +++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/file-view.adp 15 Apr 2004 16:19:59 -0000 1.3 @@ -1,13 +1,13 @@ -@title@ -@context@ -@context_action@ -@context_help@ +@title;noquote@ +@context;noquote@ +@context_action;noquote@ +@context_help;noquote@ 1
    @title@ - +
    Download Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/folder-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/folder-view.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/folder-view.adp 16 Dec 2003 01:35:30 -0000 1.3 +++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/folder-view.adp 15 Apr 2004 16:19:59 -0000 1.4 @@ -1,13 +1,13 @@ -@title@ +@title;noquote@ @context;noquote@ @context_action;noquote@ @context_help;noquote@ 1
    Folder Properties - +
    Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/folder-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/folder-view.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/folder-view.tcl 16 Dec 2003 01:35:30 -0000 1.5 +++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/folder-view.tcl 15 Apr 2004 16:19:59 -0000 1.6 @@ -50,15 +50,6 @@ - - - - - - - - - } html { style "width:70px" } } @@ -139,15 +130,8 @@ -export_vars [export_vars {{folder_id $current_item(item_id)} return_url}]] append context_action [bcms::ui::base::context_action_link -context_action file-add \ -export_vars [export_vars {{folder_id $current_item(item_id)} return_url}]] - append context_action [bcms::ui::base::context_action_link -context_action sb-event-add \ - -export_vars [export_vars {{folder_id $current_item(item_id)} return_url}]] - append context_action [bcms::ui::base::context_action_link -context_action sb-bio-add \ - -export_vars [export_vars {{folder_id $current_item(item_id)} return_url}]] - append context_action [bcms::ui::base::context_action_link -context_action sb-writing-add \ - -export_vars [export_vars {{folder_id $current_item(item_id)} return_url}]] - append context_action [bcms::ui::base::context_action_link -context_action sb-download-add \ - -export_vars [export_vars {{folder_id $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 "This is a content folder. You can see the contents of the folder on your right. You may click the actions that can be performed on this folder on your left." set title "View Folder" } else { Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/image-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/image-view.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/image-view.adp 27 Oct 2003 10:17:21 -0000 1.2 +++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/image-view.adp 15 Apr 2004 16:19:59 -0000 1.3 @@ -1,13 +1,13 @@ -@title@ -@context@ -@context_action@ -@context_help@ +@title;noquote@ +@context;noquote@ +@context_action;noquote@ +@context_help;noquote@ 1
    @title@ - +
    Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/master.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/master.adp 16 Dec 2003 01:35:30 -0000 1.3 +++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/master.adp 15 Apr 2004 16:19:59 -0000 1.4 @@ -1,11 +1,10 @@ - - - -@title@ - - - + +@title@ + +@context;noquote@ +
    +
    class="active" href="@package_url@manage/switch-type?manage_type=content">Contents class="active" href="@package_url@manage/switch-type?manage_type=category">Categories @@ -33,7 +32,7 @@
    - @context_action;noquote@ + @context_action@
    @@ -52,5 +51,4 @@
    - - +
    Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.adp 27 Oct 2003 10:17:21 -0000 1.2 +++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.adp 15 Apr 2004 16:19:59 -0000 1.3 @@ -1,13 +1,13 @@ -@title@ -@context@ -@context_action@ -@context_help@ +@title;noquote@ +@context;noquote@ +@context_action;noquote@ +@context_help;noquote@ 1
    @title@ - +
    Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/search-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/search-view.adp,v diff -u -N -r1.4 -r1.5 --- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/search-view.adp 27 Oct 2003 10:17:21 -0000 1.4 +++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/search-view.adp 15 Apr 2004 16:19:59 -0000 1.5 @@ -1,7 +1,7 @@ -@title@ -@context@ +@title;noquote@ +@context;noquote@ - + Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/template-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/template-view.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/template-view.adp 27 Oct 2003 10:17:21 -0000 1.2 +++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/template-view.adp 15 Apr 2004 16:19:59 -0000 1.3 @@ -1,8 +1,8 @@ -@title@ -@context@ -@context_action@ -@context_help@ +@title;noquote@ +@context;noquote@ +@context_action;noquote@ +@context_help;noquote@ - + Index: openacs-4/contrib/packages/bcms-ui-base/www/admin/set-root-folder.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/admin/set-root-folder.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/bcms-ui-base/www/admin/set-root-folder.tcl 27 Oct 2003 10:17:21 -0000 1.3 +++ openacs-4/contrib/packages/bcms-ui-base/www/admin/set-root-folder.tcl 15 Apr 2004 16:20:01 -0000 1.4 @@ -11,7 +11,7 @@ set current_url [ad_return_url -urlencode] if {[exists_and_not_null new_content_type] && [exists_and_not_null current_root_folder_id]} { - bcms::register_content_type -folder_id $current_root_folder_id -content_type $new_content_type + bcms::folder::register_content_types -folder_id $current_root_folder_id -content_types [list $new_content_type] } set title "Set Folder" Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.adp 9 Oct 2003 09:58:21 -0000 1.2 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.adp 15 Apr 2004 16:20:02 -0000 1.3 @@ -1,11 +1,11 @@ -@title@ -@context_help@ -@return_url@ +@title;noquote@ +@context_help;noquote@ +@return_url;noquote@ -Current Template: -@current_template.title@ - Unregister +Current Template: +@current_template.title@ + Unregister none Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/categorize-item.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/categorize-item.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/categorize-item.adp 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/categorize-item.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,8 +1,8 @@ -@title@ -@return_url@ +@title;noquote@ +@return_url;noquote@
    -@title@ +@title;noquote@
    Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/delete-item.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/delete-item.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/delete-item.adp 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/delete-item.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,11 +1,11 @@ -@title@ -@return_url@ +@title;noquote@ +@return_url;noquote@ - Delete + Delete Unable to delete, one or more folders are not empty Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/file-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/file-add.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/file-add.adp 4 Oct 2003 08:47:32 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/file-add.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,8 +1,8 @@ -@title@ -@return_url@ +@title;noquote@ +@return_url;noquote@
    -@title@ - +@title;noquote@ +
    Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/folder-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/folder-add.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/folder-add.adp 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/folder-add.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,9 +1,9 @@ -@title@ -@context_help@ -@return_url@ +@title;noquote@ +@context_help;noquote@ +@return_url;noquote@
    -@title@ - +@title;noquote@ +
    Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/folder-set-category.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/folder-set-category.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/folder-set-category.adp 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/folder-set-category.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,18 +1,18 @@ -@title@ -@return_url@ +@title;noquote@ +@return_url;noquote@
    Assigned Root Category
    -
    @category.heading@
    +
    @category.heading;noquote@
    -
    @category.description@
    +
    @category.description;noquote@
    Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/move-item.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/move-item.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/move-item.adp 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/move-item.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,5 +1,5 @@ -@title@ -@return_url@ +@title;noquote@ +@return_url;noquote@ Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/page-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/page-add.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/page-add.adp 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/page-add.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,9 +1,9 @@ -@title@ -@context_help@ -@return_url@ +@title;noquote@ +@context_help;noquote@ +@return_url;noquote@
    -@title@ - +@title;noquote@ +
    Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.adp 4 Oct 2003 08:47:32 -0000 1.2 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.adp 15 Apr 2004 16:20:02 -0000 1.3 @@ -1,10 +1,10 @@ -@title@ -@return_url@ +@title;noquote@ +@return_url;noquote@ - + Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.tcl 5 Oct 2003 12:28:03 -0000 1.3 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.tcl 15 Apr 2004 16:20:02 -0000 1.4 @@ -11,12 +11,12 @@ {orderby:optional name,asc} {page:optional 1} {content_type_search:notnull} - {relation_type:notnull} + {relation_tag:notnull} } if {[info exists item_id]} { foreach related_object_id $item_id { - bcms::item::relate_item -relation_type $relation_type -item_id $item_id_one -related_object_id $related_object_id + bcms::item::relate_item -relation_tag $relation_tag -item_id $item_id_one -related_object_id $related_object_id } ad_returnredirect $return_url @@ -25,7 +25,7 @@ set package_url [ad_conn package_url] set bulk_actions [list "Relate" "${package_url}manage/relate-item" "Relate checked items"] -set bulk_action_export_vars {item_id_one return_url content_type_search relation_type} +set bulk_action_export_vars {item_id_one return_url content_type_search relation_tag} template::list::create \ -name related_items \ @@ -46,7 +46,7 @@ } -bcms::item::list_related_items -item_id $item_id_one -relation_tag $relation_type -multirow_name related_items -revision latest +bcms::item::list_related_items -item_id $item_id_one -relation_tag $relation_tag -multirow_name related_items -revision latest set title "Relate Content" Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/revision-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/revision-list.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/revision-list.adp 27 Oct 2003 10:17:22 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/revision-list.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,7 +1,7 @@ -@title@ -@return_url@ -@context_action@ +@title;noquote@ +@return_url;noquote@ +@context_action;noquote@ Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add-version.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add-version.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add-version.adp 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add-version.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,6 +1,6 @@ -@title@ -@context_help@ -@return_url@ +@title;noquote@ +@context_help;noquote@ +@return_url;noquote@ - + Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add.adp 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,6 +1,6 @@ -@title@ -@context_help@ -@return_url@ +@title;noquote@ +@context_help;noquote@ +@return_url;noquote@ - + Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add.tcl 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/template-add.tcl 15 Apr 2004 16:20:02 -0000 1.2 @@ -7,4 +7,4 @@ set title "Add Template" -set context_help "" +set context_help "If template file exists on the file system, you can leave the Template Content and file contents will be used" Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/template-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/template-delete.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/bcms-ui-base/www/manage/template-delete.adp 27 Aug 2003 17:33:49 -0000 1.1 +++ openacs-4/contrib/packages/bcms-ui-base/www/manage/template-delete.adp 15 Apr 2004 16:20:02 -0000 1.2 @@ -1,6 +1,6 @@ -@title@ -@return_url@ +@title;noquote@ +@return_url;noquote@
    - << + << << -  <  +  <   <  -   \@paginator_pages.page@ +   \@paginator_pages.page;noquote@ -   \@paginator_pages.page@ +   \@paginator_pages.page;noquote@ -  >  +  >   >  - >> + >> >> @@ -104,7 +104,7 @@
    - @actions.label@ + @actions.label;noquote@
    + - @elements.label@ - v^ + @elements.label;noquote@ + v^ - @elements.label@ + @elements.label;noquote@ - @elements.label@ + @elements.label;noquote@
    - @list_properties.no_data@ + @list_properties.no_data;noquote@
    - @list_properties.groupby_label@: + @list_properties.groupby_label;noquote@:
    +
    + - @elements.aggregate_group_label@ + @elements.aggregate_group_label;noquote@ \@@list_properties.multirow@.@elements.aggregate_group_col@@ @@ -216,9 +216,9 @@
    + - @elements.aggregate_label@ + @elements.aggregate_label;noquote@ \@@list_properties.multirow@.@elements.aggregate_col@@ @@ -241,8 +241,8 @@
    - @bulk_actions.label@ + @bulk_actions.label;noquote@
    + - v + v - ^ + ^ - @elements.label@ + @elements.label;noquote@ - @elements.label@ + @elements.label;noquote@ - @elements.label@ + @elements.label;noquote@
    - @list_properties.no_data@ + @list_properties.no_data;noquote@
    - + +