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 -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 @@
   </script>
 </if>
 
-  <table class="@list_properties.class@" cellpadding="3" cellspacing="1">
+  <table class="@list_properties.class;noquote@" cellpadding="3" cellspacing="1">
 
   <if @list_properties.bulk_actions@ not nil>
-    <form name="@list_properties.name@" method="get">
-    @list_properties.bulk_action_export_chunk@
+    <form name="@list_properties.name;noquote@" method="get">
+    @list_properties.bulk_action_export_chunk;noquote@
   </if>
 
   <if @list_properties.page_size@ not nil>
@@ -57,38 +57,38 @@
           <td colspan="@elements:rowcount@" align="center">
             <if \@paginator.group_count@ gt 1>
               <if \@paginator.previous_group_url@ not nil>
-                <a href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&lt;&lt;</a>
+                <a href="\@paginator.previous_group_url;noquote@" title="\@paginator.previous_group_context;noquote@">&lt;&lt;</a>
               </if>
               <else>
                 &lt;&lt;
               </else>
             </if>
             <if \@paginator.previous_page_url@ not nil>
-              &nbsp;<a href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@">&lt;</a>&nbsp;
+              &nbsp;<a href="\@paginator.previous_page_url;noquote@" title="\@paginator.previous_page_context;noquote@">&lt;</a>&nbsp;
             </if>
             <else>
               &nbsp;&lt;&nbsp;
             </else>
 
             <multiple name="paginator_pages">
               <if \@paginator.current_page@ ne \@paginator_pages.page@>
-                <if \@paginator_pages.page@ lt 10>&nbsp;&nbsp;</if><a 
-                href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a>
+                <if \@paginator_pages.page@ lt 10>&nbsp;&nbsp;</if><a
+                href="\@paginator_pages.url;noquote@" title="\@paginator_pages.context;noquote@">\@paginator_pages.page;noquote@</a>
               </if>
               <else>
-                <if \@paginator_pages.page@ lt 10>&nbsp;&nbsp;</if><b>\@paginator_pages.page@</b>
+                <if \@paginator_pages.page;noquote@ lt 10>&nbsp;&nbsp;</if><b>\@paginator_pages.page;noquote@</b>
               </else>
             </multiple>
 
             <if \@paginator.next_page_url@ not nil>
-              &nbsp;<a href="\@paginator.next_page_url@" title="\@paginator.next_page_context@">&gt;</a>&nbsp;
+              &nbsp;<a href="\@paginator.next_page_url;noquote@" title="\@paginator.next_page_context;noquote@">&gt;</a>&nbsp;
             </if>
             <else>
               &nbsp;&gt;&nbsp;
             </else>
             <if \@paginator.group_count@ gt 1>
               <if \@paginator.next_group_url@ not nil>
-                <a href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&gt;&gt;</a>
+                <a href="\@paginator.next_group_url;noquote@" title="\@paginator.next_group_context;noquote@">&gt;&gt;</a>
               </if>
               <else>
                 &gt;&gt;
@@ -104,7 +104,7 @@
   <tr class="list-button-bar">
     <td colspan="@elements:rowcount@" class="list-button-bar">
       <multiple name="actions">
-        <span class="list-button-header"><a href="@actions.url@" class="list-button" title="@actions.title@">@actions.label@</a></span>
+        <span class="list-button-header"><a href="@actions.url;noquote@" class="list-button" title="@actions.title;noquote@">@actions.label;noquote@</a></span>
       </multiple>
     </td>
   </tr>
@@ -114,18 +114,18 @@
     <multiple name="elements">
       <tr class="list-header">
         <group column="subrownum">
-          <th class="@elements.class@"@elements.cell_attributes@>
+          <th class="@elements.class;noquote@"@elements.cell_attributes;noquote@>
             <if @elements.orderby_url@ not nil>
               <if @elements.ordering_p@ true>
-                <b>@elements.label@</b>
-                <a href="@elements.orderby_url@" title="@elements.orderby_html_title@"><if @elements.orderby_direction@ eq "desc">v</if><else>^</else></a>
+                <b>@elements.label;noquote@</b>
+                <a href="@elements.orderby_url;noquote@" title="@elements.orderby_html_title;noquote@"><if @elements.orderby_direction;noquote@ eq "desc">v</if><else>^</else></a>
               </if>
               <else>
-                <a href="@elements.orderby_url@" title="@elements.orderby_html_title@">@elements.label@</a>
+                <a href="@elements.orderby_url;noquote@" title="@elements.orderby_html_title;noquote@">@elements.label;noquote@</a>
               </else>
             </if>
             <else>
-              @elements.label@
+              @elements.label;noquote@
             </else>
           </th>
         </group>
@@ -136,14 +136,14 @@
     <if \@@list_properties.multirow@:rowcount@ eq 0>
       <tr class="list-odd">
         <td class="list" colspan="@elements:rowcount@">
-          @list_properties.no_data@
+          @list_properties.no_data;noquote@
         </td>
       </tr>
     </if>
     <else>
       <multiple name="@list_properties.multirow@">
   </noparse>
-        
+
     <if @list_properties.groupby@ not nil>
 
         <tr class="list-spacer">
@@ -154,7 +154,7 @@
 
         <tr class="list-subheader">
           <td colspan="@elements:rowcount@">
-            @list_properties.groupby_label@: <listelement name="@list_properties.groupby@">
+            @list_properties.groupby_label;noquote@: <listelement name="@list_properties.groupby@">
           </td>
         </tr>
 
@@ -174,7 +174,7 @@
     </noparse>
 
               <group column="subrownum">
-                <td class="@elements.class@"@elements.cell_attributes@>
+                <td class="@elements.class;noquote@"@elements.cell_attributes;noquote@>
                   <listelement name="@elements.name@">
                 </td>
               </group>
@@ -186,9 +186,9 @@
               <multiple name="elements">
                 <tr class="list-subheader">
                   <group column="subrownum">
-                    <td class="@elements.class@"@elements.cell_attributes@>
+                    <td class="@elements.class;noquote@"@elements.cell_attributes;noquote@>
                       <if @elements.aggregate_group_label@ not nil>
-                        @elements.aggregate_group_label@
+                        @elements.aggregate_group_label;noquote@
                       </if>
                       <if @elements.aggregate@ not nil>
                         \@@list_properties.multirow@.@elements.aggregate_group_col@@
@@ -216,9 +216,9 @@
         <multiple name="elements">
           <tr class="list-subheader">
             <group column="subrownum">
-              <td class="@elements.class@"@elements.cell_attributes@>
+              <td class="@elements.class;noquote@"@elements.cell_attributes;noquote@>
                 <if @elements.aggregate_label@ not nil>
-                  @elements.aggregate_label@
+                  @elements.aggregate_label;noquote@
                 </if>
                 <if @elements.aggregate@ not nil>
                   \@@list_properties.multirow@.@elements.aggregate_col@@
@@ -241,8 +241,8 @@
       <tr class="list-button-bar">
         <td colspan="@elements:rowcount@" class="list-button-bar">
           <multiple name="bulk_actions">
-            <span class="list-button-header"><a href="#" class="list-button" title="@bulk_actions.title@" 
-            onclick="ListBulkActionClick('@list_properties.name@', '@bulk_actions.url@')">@bulk_actions.label@</a></span>
+            <span class="list-button-header"><a href="#" class="list-button" title="@bulk_actions.title;noquote@"
+            onclick="ListBulkActionClick('@list_properties.name;noquote@', '@bulk_actions.url;noquote@')">@bulk_actions.label;noquote@</a></span>
           </multiple>
         </td>
       </tr>
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 -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 @@
   </noparse>
     <multiple name="elements">
       <noparse>
-        <if \@formerror.@elements.id@\@ not nil>
+        <if @elements.widget@ ne "submit" and \@formerror.@elements.id@\@ not nil>
         <li class="formerrorelement">
         <formerror id="@elements.id@">
           \@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 -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 @@
   </script>
 </if>
 
-<div class="@list_properties.class@">
+<div class="@list_properties.class;noquote@">
 
     <form name="@list_properties.name@" method="get">
 
   <!-- actions start -->
   <if @actions:rowcount@ gt 0>
   <div class="list-actions">
       <multiple name="actions">
-        <a href="@actions.url@" class="list-action" title="@actions.title@">@actions.label@</a>
+        <a href="@actions.url@" class="list-action" title="@actions.title;noquote@">@actions.label;noquote@</a>
       </multiple>
   </div>
   </if>
@@ -60,13 +60,13 @@
   <!-- bulk action start -->
   <if @list_properties.bulk_actions@ not nil>
     <div class="list-bulk-actions">
-    @list_properties.bulk_action_export_chunk@
+    @list_properties.bulk_action_export_chunk;noquote@
 
   <noparse><if \@@list_properties.multirow@:rowcount@ gt 0></noparse>
     <if @bulk_actions:rowcount@ gt 0>
           <multiple name="bulk_actions">
-            <a href="#" id="@bulk_actions.label@-bulkaction" class="list-button" title="@bulk_actions.title@" 
-            onclick="ListBulkActionClick('@list_properties.name@', '@bulk_actions.url@')">@bulk_actions.label@</a>
+            <a href="#" id="@bulk_actions.label;noquote@-bulkaction" class="list-button" title="@bulk_actions.title;noquote@"
+            onclick="ListBulkActionClick('@list_properties.name;noquote@', '@bulk_actions.url;noquote@')">@bulk_actions.label;noquote@</a>
           </multiple>
     </if>
   <noparse></if></noparse>
@@ -82,29 +82,29 @@
         <div class="list-paginator">
             <if \@paginator.group_count@ gt 1>
               <if \@paginator.previous_group_url@ not nil>
-                <a class="prev-group" href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@"><span class="img-alt">&lt;&lt;</span></a>
+                <a class="prev-group" href="\@paginator.previous_group_url;noquote@" title="\@paginator.previous_group_context;noquote@"><span class="img-alt">&lt;&lt;</span></a>
               </if>
             </if>
 
             <if \@paginator.previous_page_url@ not nil>
-              <a class="prev-page" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span class="img-alt">&lt;</span></a>
+              <a class="prev-page" href="\@paginator.previous_page_url;noquote@" title="\@paginator.previous_page_context;noquote@"><span class="img-alt">&lt;</span></a>
             </if>
 
             <multiple name="paginator_pages">
                 <if \@paginator.current_page@ ne \@paginator_pages.page@>
-                  <a class="page" href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a>
+                  <a class="page" href="\@paginator_pages.url;noquote@" title="\@paginator_pages.context;noquote@">\@paginator_pages.page;noquote@</a>
                 </if>
                 <else>
-                  <span class="current-page">\@paginator_pages.page@</span>
+                  <span class="current-page">\@paginator_pages.page;noquote@</span>
                 </else>
             </multiple>
 
             <if \@paginator.next_page_url@ not nil>
-              <a class="next-page" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span class="img-alt">&gt;</span></a>
+              <a class="next-page" href="\@paginator.next_page_url;noquote@" title="\@paginator.next_page_context;noquote@"><span class="img-alt">&gt;</span></a>
             </if>
             <if \@paginator.group_count@ gt 1>
               <if \@paginator.next_group_url@ not nil>
-                <a class="next-group" href="\@paginator.next_group_url@" title="\@paginator.next_group_context@"><span class="img-alt">&gt;&gt;</span></a>
+                <a class="next-group" href="\@paginator.next_group_url;noquote@" title="\@paginator.next_group_context;noquote@"><span class="img-alt">&gt;&gt;</span></a>
               </if>
             </if>
         </div>
@@ -120,23 +120,23 @@
     <multiple name="elements">
       <tr class="list-header">
         <group column="subrownum">
-          <th class="@elements.class@"@elements.cell_attributes@>
+          <th class="@elements.class;noquote@"@elements.cell_attributes;noquote@>
             <if @elements.orderby_url@ not nil>
               <if @elements.ordering_p@ true>
                     <if @elements.orderby_direction@ eq "desc">
-                        <a class="sort-desc" href="@elements.orderby_url@" title="@elements.orderby_html_title@"> <span class="img-alt">v</span>
+                        <a class="sort-desc" href="@elements.orderby_url;noquote@" title="@elements.orderby_html_title;noquote@"> <span class="img-alt">v</span>
                     </if>
                     <else>
-                        <a class="sort-asc" href="@elements.orderby_url@" title="@elements.orderby_html_title@"> <span class="img-alt">^</span>
+                        <a class="sort-asc" href="@elements.orderby_url;noquote@" title="@elements.orderby_html_title;noquote@"> <span class="img-alt">^</span>
                     </else>
-                @elements.label@</a>
+                @elements.label;noquote@</a>
               </if>
               <else>
-                <a href="@elements.orderby_url@" title="@elements.orderby_html_title@">@elements.label@</a>
+                <a href="@elements.orderby_url;noquote@" title="@elements.orderby_html_title;noquote@">@elements.label;noquote@</a>
               </else>
             </if>
             <else>
-              @elements.label@
+              @elements.label;noquote@
             </else>
           </th>
         </group>
@@ -148,14 +148,14 @@
     <if \@@list_properties.multirow@:rowcount@ eq 0>
       <tr class="list-odd">
         <td class="list" colspan="@elements:rowcount@">
-          @list_properties.no_data@
+          @list_properties.no_data;noquote@
         </td>
       </tr>
     </if>
     <else>
       <multiple name="@list_properties.multirow@">
   </noparse>
-        
+
           <multiple name="elements">
     <noparse>
               <if \@@list_properties.multirow@.rownum@ odd>
@@ -167,8 +167,8 @@
     </noparse>
 
               <group column="subrownum">
-                <td class="@elements.class@"@elements.cell_attributes@>
-                  <listelement name="@elements.name@"> <noparse></noparse>
+                <td class="@elements.class@"@elements.cell_attributes;noquote@>
+                  <listelement name="@elements.name;noquote@"> <noparse></noparse>
                 </td>
               </group>
             </tr>
@@ -188,29 +188,29 @@
         <div class="list-paginator">
             <if \@paginator.group_count@ gt 1>
               <if \@paginator.previous_group_url@ not nil>
-                <a class="prev-group" href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@"><span class="img-alt">&lt;&lt;</span></a>
+                <a class="prev-group" href="\@paginator.previous_group_url;noquote@" title="\@paginator.previous_group_context;noquote@"><span class="img-alt">&lt;&lt;</span></a>
               </if>
             </if>
 
             <if \@paginator.previous_page_url@ not nil>
-              <a class="prev-page" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span class="img-alt">&lt;</span></a>
+              <a class="prev-page" href="\@paginator.previous_page_url;noquote@" title="\@paginator.previous_page_context;noquote@"><span class="img-alt">&lt;</span></a>
             </if>
 
             <multiple name="paginator_pages">
                 <if \@paginator.current_page@ ne \@paginator_pages.page@>
-                  <a class="page" href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a>
+                  <a class="page" href="\@paginator_pages.url;noquote@" title="\@paginator_pages.context;noquote@">\@paginator_pages.page;noquote@</a>
                 </if>
                 <else>
-                  <span class="current-page">\@paginator_pages.page@</span>
+                  <span class="current-page">\@paginator_pages.page;noquote@</span>
                 </else>
             </multiple>
 
             <if \@paginator.next_page_url@ not nil>
-              <a class="next-page" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span class="img-alt">&gt;</span></a>
+              <a class="next-page" href="\@paginator.next_page_url;noquote@" title="\@paginator.next_page_context;noquote@"><span class="img-alt">&gt;</span></a>
             </if>
             <if \@paginator.group_count@ gt 1>
               <if \@paginator.next_group_url@ not nil>
-                <a class="next-group" href="\@paginator.next_group_url@" title="\@paginator.next_group_context@"><span class="img-alt">&gt;&gt;</span></a>
+                <a class="next-group" href="\@paginator.next_group_url;noquote@" title="\@paginator.next_group_context;noquote@"><span class="img-alt">&gt;&gt;</span></a>
               </if>
             </if>
         </div>
@@ -227,8 +227,8 @@
   <noparse><if \@@list_properties.multirow@:rowcount@ gt 0></noparse>
     <if @bulk_actions:rowcount@ gt 0>
           <multiple name="bulk_actions">
-            <a href="#" id="@bulk_actions.label@-bulkaction" class="list-button" title="@bulk_actions.title@" 
-            onclick="ListBulkActionClick('@list_properties.name@', '@bulk_actions.url@')">@bulk_actions.label@</a>
+            <a href="#" id="@bulk_actions.label;noquote@-bulkaction" class="list-button" title="@bulk_actions.title;noquote@"
+            onclick="ListBulkActionClick('@list_properties.name;noquote@', '@bulk_actions.url;noquote@')">@bulk_actions.label;noquote@</a>
           </multiple>
     </if>
   <noparse></if></noparse>
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 -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 -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 "</a>"
         }
-        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 "</a>"
-        }
-        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 "</a>"
-        }
         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 "</a>"
         }
         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 "</a>"
         }
         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 "</a>"
         }
-        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 "</a>"
-        }
-        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 "</a>"
-        }
-        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 "</a>"
-        }
-        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 "</a>"
-        }
-        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 "</a>"
-        }
         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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-<property name="context_action">@context_action@</property>
-<property name="context_help">@context_help@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="context_action">@context_action;noquote@</property>
+<property name="context_help">@context_help;noquote@</property>
 
 <if @category.category_id@ not nil>
     <fieldset class="formtemplate">
         <legend>Category</legend>
         <div class="formtemplate">
             <div class="oneelement">
                 <label>Category Heading</label>
-                <div class="formfield">@category.heading@</div>
+                <div class="formfield">@category.heading;noquote@</div>
             </div>
             <div class="oneelement">
                 <label>Description</label>
-                <div class="formfield">@category.description@</div>
+                <div class="formfield">@category.description;noquote@</div>
             </div>
         </div>
     </fieldset>
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-<property name="context_action">@context_action@</property>
-<property name="context_help">@context_help@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="context_action">@context_action;noquote@</property>
+<property name="context_help">@context_help;noquote@</property>
 <property name="display_switch_context_p">1</property>
 
 <fieldset class="formtemplate">
 <legend>@title@</legend>
-<include src="/packages/bcms-ui-base/resources/file-form" revision_id="@revision_id@" return_url="@return_url@" form_mode="display">
+<include src="/packages/bcms-ui-base/resources/file-form" revision_id="@revision_id;noquote@" return_url="@return_url;noquote@" form_mode="display">
 </fieldset>
 
 <a href="@current_item.name@?preview_p=1">Download</a>
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
+<property name="title">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
 <property name="context_action">@context_action;noquote@</property>
 <property name="context_help">@context_help;noquote@</property>
 <property name="display_switch_context_p">1</property>
 
 <fieldset class="formtemplate">
 <legend>Folder Properties</legend>
-<include src="/packages/bcms-ui-base/resources/folder-form" folder_id="@current_item.item_id@" return_url="@return_url@" form_mode="display">
+<include src="/packages/bcms-ui-base/resources/folder-form" folder_id="@current_item.item_id;noquote@" return_url="@return_url;noquote@" form_mode="display">
 </fieldset>
 
 <fieldset class="formtemplate">
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 -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 @@
                     <if @item_list.content_type@ eq image>
                     <a href=@item_list.name@><img src="@package_url@bcms-ui-base-images/image.png" border="0"></a>
                     </if>
-                    <if @item_list.content_type@ eq sb_writing>
-                    <a href=@item_list.name@><img src="@package_url@bcms-ui-base-images/sb_writing.png" border="0"></a>
-                    </if>
-                    <if @item_list.content_type@ eq sb_event>
-                    <a href=@item_list.name@><img src="@package_url@bcms-ui-base-images/sb_event.png" border="0"></a>
-                    </if>                    
-                    <if @item_list.content_type@ eq sb_download>
-                    <a href=@item_list.name@><img src="@package_url@bcms-ui-base-images/sb_download.png" border="0"></a>
-                    </if>                    
                 }
                 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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-<property name="context_action">@context_action@</property>
-<property name="context_help">@context_help@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="context_action">@context_action;noquote@</property>
+<property name="context_help">@context_help;noquote@</property>
 <property name="display_switch_context_p">1</property>
 
 <fieldset class="formtemplate">
 <legend>@title@</legend>
-<include src="/packages/bcms-ui-base/resources/image-form" revision_id="@revision_id@" return_url="@return_url@" form_mode="display">
+<include src="/packages/bcms-ui-base/resources/image-form" revision_id="@revision_id;noquote@" return_url="@return_url;noquote@" form_mode="display">
 </fieldset>
 
 <img src="@current_item.name@?preview_p=1">
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 -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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<html xmlns	= "http://www.w3.org/1999/xhtml">
-<head>
-<title>@title@</title>
-<link rel="stylesheet" type="text/css" href="@package_url@bcms-ui-base-style" />
-</head>
-<body>
+<master>
+<property name="title">@title@</property>
+<property name="header_stuff"><link rel="stylesheet" type="text/css" href="@package_url@bcms-ui-base-style" /></property>
+<property name="context">@context;noquote@</property>
 
+<div id="bcms-ui-base">
+
 <div class="tabs">
     <a <if @manage_type@ eq "content">class="active"</if> href="@package_url@manage/switch-type?manage_type=content">Contents</a>
     <a <if @manage_type@ eq "category">class="active"</if> href="@package_url@manage/switch-type?manage_type=category">Categories</a>
@@ -33,7 +32,7 @@
     <div id="contextpane">
         <if @context_action@ not nil>
         <div id="contextaction">
-            @context_action;noquote@
+            @context_action@
         </div>
         </if>
         <div id="contexthelp">
@@ -52,5 +51,4 @@
 
 </div>
 
-</body>
-</html>
+</div>
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-<property name="context_action">@context_action@</property>
-<property name="context_help">@context_help@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="context_action">@context_action;noquote@</property>
+<property name="context_help">@context_help;noquote@</property>
 <property name="display_switch_context_p">1</property>
 
 <fieldset class="formtemplate">
 <legend>@title@</legend>
-<include src="/packages/bcms-ui-base/resources/page-form" revision_id="@revision_id@" return_url="@return_url@" form_mode="display">
+<include src="/packages/bcms-ui-base/resources/page-form" revision_id="@revision_id;noquote@" return_url="@return_url;noquote@" form_mode="display">
 </fieldset>
 
 
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
-<include src="/packages/bcms-ui-base/resources/search" name_search="@name_search@" title_search="@title_search@" content_search="@content_search@" 
-display_search_results="@display_search_results@" orderby="@orderby@" page="@page@">
+<include src="/packages/bcms-ui-base/resources/search" name_search="@name_search;noquote@" title_search="@title_search;noquote@" content_search="@content_search;noquote@"
+display_search_results="@display_search_results;noquote@" orderby="@orderby;noquote@" page="@page;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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context">@context@</property>
-<property name="context_action">@context_action@</property>
-<property name="context_help">@context_help@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="context_action">@context_action;noquote@</property>
+<property name="context_help">@context_help;noquote@</property>
 
-<include src="/packages/bcms-ui-base/resources/template-form" revision_id="@revision_id@" return_url="@return_url@" form_mode="display">
+<include src="/packages/bcms-ui-base/resources/template-form" revision_id="@revision_id;noquote@" return_url="@return_url;noquote@" form_mode="display">
 
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 -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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_help">@context_help@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_help">@context_help;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
-Current Template: 
-<if @current_template.title@ not nil>@current_template.title@ 
-    <a href="@package_url@manage/unregister-template?item_id=@item_id@&template_id=@current_template.item_id@&context=public&return_url=@current_url@"> Unregister </a>
+Current Template:
+<if @current_template.title@ not nil>@current_template.title@
+    <a href="@package_url;noquote@manage/unregister-template?item_id=@item_id@&template_id=@current_template.item_id@&context=public&return_url=@current_url;noquote@"> Unregister </a>
 </if>
 <else>
     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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
 <fieldset class="formtemplate">
-<legend>@title@</legend>
+<legend>@title;noquote@</legend>
 <formtemplate id="simpleform" style="../../../bcms-ui-base/resources/form-template"></formtemplate>
 </fieldset>
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
 <listtemplate name="delete_list"></listtemplate>
 
 <if @confirm_link@ ne "">
-    <a href="@confirm_link@">Delete</a>
+    <a href="@confirm_link;noquote@">Delete</a>
 </if>
 <else>
     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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
 <fieldset class="formtemplate">
-<legend>@title@</legend>
-<include src="/packages/bcms-ui-base/resources/file-form" folder_id="@folder_id@" return_url="@return_url@">
+<legend>@title;noquote@</legend>
+<include src="/packages/bcms-ui-base/resources/file-form" folder_id="@folder_id;noquote@" return_url="@return_url;noquote@">
 </fieldset>
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_help">@context_help@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_help">@context_help;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
 <fieldset class="formtemplate">
-<legend>@title@</legend>
-<include src="/packages/bcms-ui-base/resources/folder-form" parent_id="@parent_id@" create_index_p="true" return_url="@return_url@">
+<legend>@title;noquote@</legend>
+<include src="/packages/bcms-ui-base/resources/folder-form" parent_id="@parent_id;noquote@" create_index_p="true" return_url="@return_url;noquote@">
 </fieldset>
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
 <if @category.category_id@ not nil>
     <fieldset class="formtemplate">
         <legend>Assigned Root Category</legend>
         <div class="formtemplate">
             <div class="oneelement">
                 <label>Category Heading</label>
-                <div class="formfield">@category.heading@</div>
+                <div class="formfield">@category.heading;noquote@</div>
             </div>
             <div class="oneelement">
                 <label>Description</label>
-                <div class="formfield">@category.description@</div>
+                <div class="formfield">@category.description;noquote@</div>
             </div>
         </div>
     </fieldset>
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
 <listtemplate name="folder_tree" style="../../../bcms-ui-base/resources/folder-tree"></listtemplate>
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_help">@context_help@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_help">@context_help;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
 <fieldset class="formtemplate">
-<legend>@title@</legend>
-<include src="/packages/bcms-ui-base/resources/page-form" folder_id="@folder_id@" return_url="@return_url@">
+<legend>@title;noquote@</legend>
+<include src="/packages/bcms-ui-base/resources/page-form" folder_id="@folder_id;noquote@" return_url="@return_url;noquote@">
 </fieldset>
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
 <listtemplate name="related_items" style="../../../bcms-ui-base/resources/item-list"></listtemplate>
 
-<include src="../../resources/search" name_search="@name_search@" title_search="@title_search@" content_search="@content_search@" 
-display_search_results="@display_search_results@" content_type_search="@content_type_search@" bulk_actions="@bulk_actions@" 
-bulk_action_export_vars="@bulk_action_export_vars@" orderby="@orderby@" page="@page@">
+<include src="../../resources/search" name_search="@name_search;noquote@" title_search="@title_search;noquote@" content_search="@content_search;noquote@"
+display_search_results="@display_search_results;noquote@" content_type_search="@content_type_search;noquote@" bulk_actions="@bulk_actions;noquote@"
+bulk_action_export_vars="@bulk_action_export_vars;noquote@" orderby="@orderby;noquote@" page="@page;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 -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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_url">@return_url@</property>
-<property name="context_action">@context_action@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
+<property name="context_action">@context_action;noquote@</property>
 
 <listtemplate name="revision_list" style="../../../bcms-ui-base/resources/item-list"></listtemplate>
 
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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_help">@context_help@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_help">@context_help;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
-<include src="/packages/bcms-ui-base/resources/template-form" template_id="@template_id@" return_url="@return_url@">
+<include src="/packages/bcms-ui-base/resources/template-form" template_id="@template_id;noquote@" return_url="@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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_help">@context_help@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_help">@context_help;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
-<include src="/packages/bcms-ui-base/resources/template-form" folder_id="@folder_id@" return_url="@return_url@">
+<include src="/packages/bcms-ui-base/resources/template-form" folder_id="@folder_id;noquote@" return_url="@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 -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 -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 @@
 <master src="master">
-<property name="title">@title@</property>
-<property name="context_url">@return_url@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_url">@return_url;noquote@</property>
 
 <listtemplate name="delete_list" style="../../../bcms-ui-base/resources/item-list"></listtemplate>