Index: openacs-4/packages/xcms-ui/xcms-ui.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/xcms-ui.info,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/xcms-ui.info	1 May 2004 12:09:16 -0000	1.1
+++ openacs-4/packages/xcms-ui/xcms-ui.info	1 May 2004 13:23:02 -0000	1.2
@@ -8,17 +8,19 @@
     <singleton-p>f</singleton-p>
     
     <version name="0.1d" url="http://openacs.org/repository/download/apm/xcms-ui-0.1d.apm">
-    <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
-    <owner url="mailto:goldfish@i-manila.com.ph">Jun Yamog</owner>
+        <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
+        <owner url="mailto:goldfish@i-manila.com.ph">Jun Yamog</owner>
         <summary>XCMS content management user interface</summary>
         <description format="text/html">XCMS User Interface is a
     content management system built on the OpenACS Content Repository
     and BCMS CR Tcl API. It is a work in progress. Functionality
     includes upload or text entry on content or files, categorization,
     and template editing and assignment.</description>
+        <maturity>0</maturity>
 
         <provides url="xcms-ui" version="0.1d"/>
         <requires url="bcms" version="0.3"/>
+        <requires url="categories" version="1.0d4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/xcms-ui/lib/category-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/lib/category-form.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/lib/category-form.tcl	1 May 2004 12:09:16 -0000	1.1
+++ openacs-4/packages/xcms-ui/lib/category-form.tcl	1 May 2004 13:23:02 -0000	1.2
@@ -49,7 +49,7 @@
 }
 
 
-ad_return_template "/packages/bcms-ui-base/lib/simple-form"
+ad_return_template "/packages/xcms-ui/lib/simple-form"
 
 
 
Index: openacs-4/packages/xcms-ui/lib/file-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/lib/file-form.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/lib/file-form.tcl	1 May 2004 12:09:16 -0000	1.1
+++ openacs-4/packages/xcms-ui/lib/file-form.tcl	1 May 2004 13:23:02 -0000	1.2
@@ -66,6 +66,6 @@
 
 }
 
-ad_return_template "/packages/bcms-ui-base/lib/simple-form"
+ad_return_template "/packages/xcms-ui/lib/simple-form"
 
 
Index: openacs-4/packages/xcms-ui/lib/folder-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/lib/folder-form.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/lib/folder-form.tcl	1 May 2004 12:09:16 -0000	1.1
+++ openacs-4/packages/xcms-ui/lib/folder-form.tcl	1 May 2004 13:23:02 -0000	1.2
@@ -91,5 +91,5 @@
 } 
 
 
-ad_return_template "/packages/bcms-ui-base/lib/simple-form"
+ad_return_template "/packages/xcms-ui/lib/simple-form"
 
Index: openacs-4/packages/xcms-ui/lib/image-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/lib/image-form.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/lib/image-form.tcl	1 May 2004 12:09:16 -0000	1.1
+++ openacs-4/packages/xcms-ui/lib/image-form.tcl	1 May 2004 13:23:02 -0000	1.2
@@ -91,6 +91,6 @@
 }
 
 set context "Add/Edit Image"
-ad_return_template "/packages/bcms-ui-base/lib/simple-form"
+ad_return_template "/packages/xcms-ui/lib/simple-form"
 
 
Index: openacs-4/packages/xcms-ui/lib/page-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/lib/page-form.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/lib/page-form.tcl	1 May 2004 12:09:16 -0000	1.1
+++ openacs-4/packages/xcms-ui/lib/page-form.tcl	1 May 2004 13:23:02 -0000	1.2
@@ -119,6 +119,6 @@
 
 }
 
-ad_return_template "/packages/bcms-ui-base/lib/simple-form"
+ad_return_template "/packages/xcms-ui/lib/simple-form"
 
 
Index: openacs-4/packages/xcms-ui/lib/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/lib/search.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/lib/search.tcl	1 May 2004 12:09:16 -0000	1.1
+++ openacs-4/packages/xcms-ui/lib/search.tcl	1 May 2004 13:23:02 -0000	1.2
@@ -101,27 +101,27 @@
                 label "Type"
                 display_template { 
                     <if @search_results.content_type@ eq content_folder>
-                    <a href=@search_results.name@><img src="@package_url@bcms-ui-base-images/folder.png" border="0"></a>
+                    <a href=@search_results.name@><img src="@package_url@xcms-ui-images/folder.png" border="0"></a>
                     </if>
                     <if @search_results.content_type@ eq content_revision>
                        <if @search_results.storage_type@ eq text>
-                          <a href=@search_results.name@><img src="@package_url@bcms-ui-base-images/page.png" border="0"></a>
+                          <a href=@search_results.name@><img src="@package_url@xcms-ui-images/page.png" border="0"></a>
                        </if>
                        <else>
-                          <a href=@search_results.name@><img src="@package_url@bcms-ui-base-images/file.png" border="0"></a>
+                          <a href=@search_results.name@><img src="@package_url@xcms-ui-images/file.png" border="0"></a>
                        </else>
                     </if> 
                     <if @search_results.content_type@ eq image>
-                    <a href=@search_results.name@><img src="@package_url@bcms-ui-base-images/image.png" border="0"></a>
+                    <a href=@search_results.name@><img src="@package_url@xcms-ui-images/image.png" border="0"></a>
                     </if>
                     <if @search_results.content_type@ eq sb_writing>
-                    <a href=@search_results.name@><img src="@package_url@bcms-ui-base-images/sb_writing.png" border="0"></a>
+                    <a href=@search_results.name@><img src="@package_url@xcms-ui-images/sb_writing.png" border="0"></a>
                     </if>
                     <if @search_results.content_type@ eq sb_event>
-                    <a href=@search_results.name@><img src="@package_url@bcms-ui-base-images/sb_event.png" border="0"></a>
+                    <a href=@search_results.name@><img src="@package_url@xcms-ui-images/sb_event.png" border="0"></a>
                     </if>                    
                     <if @search_results.content_type@ eq sb_download>
-                    <a href=@search_results.name@><img src="@package_url@bcms-ui-base-images/sb_download.png" border="0"></a>
+                    <a href=@search_results.name@><img src="@package_url@xcms-ui-images/sb_download.png" border="0"></a>
                     </if>    
                 }
                 html { style "width:70px" }
Index: openacs-4/packages/xcms-ui/lib/template-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/lib/template-form.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/lib/template-form.tcl	1 May 2004 12:09:16 -0000	1.1
+++ openacs-4/packages/xcms-ui/lib/template-form.tcl	1 May 2004 13:23:02 -0000	1.2
@@ -92,6 +92,6 @@
 
 }
 
-ad_return_template "/packages/bcms-ui-base/lib/simple-form"
+ad_return_template "/packages/xcms-ui/lib/simple-form"
 
 
Index: openacs-4/packages/xcms-ui/www/admin/setup.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/www/admin/setup.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/xcms-ui/www/admin/setup.tcl	1 May 2004 12:44:04 -0000	1.2
+++ openacs-4/packages/xcms-ui/www/admin/setup.tcl	1 May 2004 13:23:03 -0000	1.3
@@ -81,7 +81,7 @@
 	file mkdir $www_dir
 }
 
-set templates [list bcms-default content_revision "Default Content Template" bcms-folder-default content_folder "Default Folder Template"]
+set templates [list xcms-default content_revision "Default Content Template" xcms-folder-default content_folder "Default Folder Template"]
 set template_base "[acs_root_dir]/packages/xcms-ui/lib/"
 foreach {filename content_type title } $templates {
 
Index: openacs-4/packages/xcms-ui/www/manage/folder-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/www/manage/folder-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/www/manage/folder-view.adp	1 May 2004 12:09:18 -0000	1.1
+++ openacs-4/packages/xcms-ui/www/manage/folder-view.adp	1 May 2004 13:23:03 -0000	1.2
@@ -6,12 +6,13 @@
 <property name="display_switch_context_p">1</property>
 <fieldset class="formtemplate">
 <legend>Folder Properties</legend>
-<include src="/packages/bcms-ui-base/lib/folder-form" folder_id="@current_item.item_id@" return_url="@return_url@" form_mode="display">
-<include src="/packages/bcms-ui-base/lib/categories-form" item_id="@current_item.item_id@" parent_id="@current_item.parent_id@" return_url="@return_url" form_mode="display">
+    <include src="/packages/xcms-ui/lib/folder-form" folder_id="@current_item.item_id@" return_url="@return_url@" form_mode="display">
+<include src="/packages/xcms-ui/lib/categories-form" item_id="@current_item.item_id@" parent_id="@current_item.parent_id@" return_url="@return_url" form_mode="display">
 </fieldset>
 
 <fieldset class="formtemplate">
-<legend>Folder Contents</legend>
+    <legend>Folder Contents</legend>
 <formtemplate id="add-item"></formtemplate>
-<listtemplate name="item_list"></listtemplate>
+    <listtemplate name="item_list"></listtemplate>
+
 </fieldset>
Index: openacs-4/packages/xcms-ui/www/manage/folder-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/www/manage/folder-view.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/www/manage/folder-view.tcl	1 May 2004 12:09:18 -0000	1.1
+++ openacs-4/packages/xcms-ui/www/manage/folder-view.tcl	1 May 2004 13:23:03 -0000	1.2
@@ -29,16 +29,15 @@
 	ad_returnredirect "[ad_conn package_url]manage/${item_type}?[export_vars {{parent_id $folder_id} return_url}]"
 }
 
+set url_base "${package_url}/manage/"
+
     template::list::create \
         -name item_list \
         -multirow item_list \
         -pass_properties { package_url } \
         -key item_id \
-        -actions [list \
-	     "Set Folder Category" "/categories/cadmin/one-object?[export_vars {{object_id $folder_id} return_url}]" "Set the root category for the currently displayed folder" \
-	      "Change Template" "${url_base}apply-template?[export_vars { {item_id $folder_id} return_url}]" "Change the template used to display this item."] \		      
-	    ] \
-	-bulk_actions [list \
+    -actions [list "Set Folder Category" "/categories/cadmin/one-object?[export_vars {{object_id $folder_id} return_url}]" "Set the root category for the currently displayed folder" "Change Template" "${url_base}apply-template?[export_vars { {item_id $folder_id} return_url}]" "Change the template used to display this item."] \
+    -bulk_actions [list \
             "Delete" "${package_url}manage/delete-item" "Delete checked items" \
             "Move" "${package_url}manage/move-item" "Move checked items" \
                           ]\
Index: openacs-4/packages/xcms-ui/www/manage/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/www/manage/master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/www/manage/master.adp	1 May 2004 12:09:18 -0000	1.1
+++ openacs-4/packages/xcms-ui/www/manage/master.adp	1 May 2004 13:23:03 -0000	1.2
@@ -2,7 +2,7 @@
 <property name="context">@context;noquote@</property>
 <property name="title">@title@</property>
 <div id="main">
-<include src="/packages/bcms-ui-base/lib/navbar">
+<include src="/packages/xcms-ui/lib/navbar">
     <div id="contextpane">
         <if @context_action@ not nil>
         <div id="contextaction">