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.2 -r1.3
--- openacs-4/packages/xcms-ui/lib/template-form.tcl	1 May 2004 13:23:02 -0000	1.2
+++ openacs-4/packages/xcms-ui/lib/template-form.tcl	27 Aug 2004 10:36:04 -0000	1.3
@@ -5,7 +5,7 @@
 # return_url - requires a return_url, so after creating or editing a folder it redirect to this url
 # form_mode - either "edit" or "display"
 
-bcms_ui_base::check_include_vars
+bcms::ui::base::check_include_vars
 
 set cms_context [parameter::get -parameter cms_context -default ""]
 if {[string equal $cms_context ""]} {
Index: openacs-4/packages/xcms-ui/www/manage/apply-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/www/manage/apply-template.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/www/manage/apply-template.tcl	1 May 2004 12:09:18 -0000	1.1
+++ openacs-4/packages/xcms-ui/www/manage/apply-template.tcl	27 Aug 2004 10:36:04 -0000	1.2
@@ -25,7 +25,7 @@
         -elements {
             title {
                 label "Title"
-                link_url_eval {[bcms_ui_base::apply_template_url -item_id $item_id -template_id $template_id -return_url $return_url]}
+                link_url_eval {[xcms_ui::apply_template_url -item_id $item_id -template_id $template_id -return_url $return_url]}
             }
 	    description {
 		label "Description"
Index: openacs-4/packages/xcms-ui/www/template/template-add-version.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/www/template/template-add-version.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/www/template/template-add-version.adp	1 May 2004 12:09:21 -0000	1.1
+++ openacs-4/packages/xcms-ui/www/template/template-add-version.adp	27 Aug 2004 10:36:04 -0000	1.2
@@ -3,4 +3,4 @@
 <property name="context_help">@context_help@</property>
 <property name="context_url">@return_url@</property>
 
-<include src="/packages/bcms-ui-base/lib/template-form" template_id="@template_id@" return_url="@return_url@">
+<include src="/packages/xcms-ui/lib/template-form" template_id="@template_id@" return_url="@return_url@">
Index: openacs-4/packages/xcms-ui/www/template/template-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/www/template/template-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/www/template/template-add.adp	1 May 2004 12:09:21 -0000	1.1
+++ openacs-4/packages/xcms-ui/www/template/template-add.adp	27 Aug 2004 10:36:04 -0000	1.2
@@ -3,4 +3,4 @@
 <property name="context_help">@context_help@</property>
 <property name="context_url">@return_url@</property>
 <property name="context">context</property>
-<include src="/packages/bcms-ui-base/lib/template-form" parent_id="@parent_id@" return_url="@return_url@">
+<include src="/packages/xcms-ui/lib/template-form" parent_id="@parent_id@" return_url="@return_url@" folder_id="@parent_id@">
Index: openacs-4/packages/xcms-ui/www/template/template-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/www/template/template-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/www/template/template-view.adp	1 May 2004 12:09:21 -0000	1.1
+++ openacs-4/packages/xcms-ui/www/template/template-view.adp	27 Aug 2004 10:36:04 -0000	1.2
@@ -10,5 +10,5 @@
 </multiple>
 
 
-<include src="/packages/bcms-ui-base/lib/template-form" revision_id="@revision_id@" return_url="@return_url@" form_mode="display">
+<include src="/packages/xcms-ui/lib/template-form" revision_id="@revision_id@" return_url="@return_url@" form_mode="display" parent_id="@parent_id@">
 
Index: openacs-4/packages/xcms-ui/www/template/template-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xcms-ui/www/template/template-view.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xcms-ui/www/template/template-view.tcl	1 May 2004 12:09:21 -0000	1.1
+++ openacs-4/packages/xcms-ui/www/template/template-view.tcl	27 Aug 2004 10:36:04 -0000	1.2
@@ -42,3 +42,5 @@
 set context [bcms::widget::item_context -item_id $item_id -root_id $root_id]
 set context [lrange $context 0 [expr [llength $context] - 2]]
 lappend context "$template_revision(title)"
+
+set parent_id $template_revision(parent_id)