Index: openacs-4/contrib/packages/bcms-ui-base/resources/file-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/resources/file-form.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-base/resources/file-form.tcl	4 Oct 2003 08:44:51 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-base/resources/file-form.tcl	9 Oct 2003 09:58:21 -0000	1.2
@@ -74,8 +74,13 @@
 
 } -edit_data {
 
-    bcms::revision::set_revision -revision_id $revision_id \
-       -title $title -description $description
+    if {[exists_and_not_null upload_file]} {
+        bcms::revision::set_revision -revision_id $revision_id \
+            -title $title -description $description -upload_file $upload_file
+    } else {
+        bcms::revision::set_revision -revision_id $revision_id \
+            -title $title -description $description
+    }
     if {[info exists file_name]} {
         bcms::item::set_item -item_id $file_id -name $file_name
         # we have renamed the file, we need to redirect on the new name
Index: openacs-4/contrib/packages/bcms-ui-base/resources/image-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/resources/image-form.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/bcms-ui-base/resources/image-form.tcl	5 Oct 2003 12:28:03 -0000	1.2
+++ openacs-4/contrib/packages/bcms-ui-base/resources/image-form.tcl	9 Oct 2003 09:58:21 -0000	1.3
@@ -80,7 +80,7 @@
 
     if {[exists_and_not_null upload_image]} {
         bcms::revision::set_revision -revision_id $revision_id \
-            -title $title -description $description -mime_type $upload_mime_type -upload_file $upload_file
+            -title $title -description $description -upload_file $upload_image
     } else {
         bcms::revision::set_revision -revision_id $revision_id \
             -title $title -description $description
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.2 -r1.3
--- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/folder-view.tcl	4 Oct 2003 08:46:40 -0000	1.2
+++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/folder-view.tcl	9 Oct 2003 09:58:21 -0000	1.3
@@ -66,6 +66,9 @@
                 label "Last Modified"
                 html { style "width:180px" }
             }
+            publish_status {
+                label "Status"
+            }
         } \
         -orderby {
             default_value name,asc
Index: openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.tcl	5 Oct 2003 12:28:03 -0000	1.3
+++ openacs-4/contrib/packages/bcms-ui-base/templates/bcms-ui-base/page-view.tcl	9 Oct 2003 09:58:21 -0000	1.4
@@ -15,6 +15,7 @@
 <a class=\"contextaction\" id=\"page-edit\" href=\"[export_vars -base ${package_url}manage/page-edit {revision_id return_url}]\">Edit this Page</a>
 <a class=\"contextaction\" id=\"apply-template\" href=\"[export_vars -base ${package_url}manage/apply-template {{item_id $current_item(item_id)} return_url}]\">Template this Page</a>
 <a class=\"contextaction\" id=\"revision-publish\" href=\"[export_vars -base ${package_url}manage/revision-publish {revision_id return_url}]\">Publish this Page</a>
+<a class=\"contextaction\" id=\"revision-unpublish\" href=\"[export_vars -base ${package_url}manage/revision-unpublish {revision_id return_url}]\">Unpublish this Page</a>
 <a class=\"contextaction\" id=\"categorize-item\" href=\"[export_vars -base ${package_url}manage/categorize-item {{item_id $current_item(item_id)} {folder_id $current_item(parent_id)} return_url}]\">Categorize this Page</a>
 <a class=\"contextaction\" id=\"page-revision\" href=\"[export_vars -base ${package_url}manage/page-revision {{page_id $current_item(item_id)} return_url}]\">View Version(s)</a>
 <a class=\"contextaction\" id=\"relate-item\" href=\"[export_vars -base ${package_url}manage/relate-item {{item_id_one $current_item(item_id)} {content_type_search content_revision} {relation_type pages} return_url}]\">Relate Page</a>
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.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.adp	27 Aug 2003 17:33:49 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.adp	9 Oct 2003 09:58:21 -0000	1.2
@@ -3,4 +3,12 @@
 <property name="context_help">@context_help@</property>
 <property name="context_url">@return_url@</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>
+</if>
+<else>
+    none
+</else>
+
 <listtemplate name="template_list" style="../../../bcms-ui-base/resources/item-list"></listtemplate>
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.tcl	27 Aug 2003 17:33:49 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/apply-template.tcl	9 Oct 2003 09:58:21 -0000	1.2
@@ -6,6 +6,9 @@
     return_url:notnull
 }
 
+set package_url [ad_conn package_url]
+set current_url [ad_return_url -urlencode]
+
 if {[info exists template_id]} {
 
     bcms::template::apply_template -item_id $item_id -template_id $template_id -context public
@@ -31,4 +34,10 @@
 
     set title "Apply Template"
     set context_help ""
+
+    array set current_template [bcms::template::get_template -item_id $item_id -context public]
+    if {[array size current_template] > 0 && ![string equal $current_template(name) default_template]} {
+        array set current_template [bcms::item::get_item -item_id $current_template(item_id) -revision live]
+    }
+    
 }
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/page-revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/Attic/page-revision.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-base/www/manage/page-revision.tcl	27 Aug 2003 17:33:49 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/page-revision.tcl	9 Oct 2003 09:58:21 -0000	1.2
@@ -19,7 +19,7 @@
             display_template {@revision_list.first_names@ @revision_list.last_name@}
         }
         revision_id {
-            display_template {<a href="${package_url}ttttttt?revision_id=@revision_list.revision_id@">View</a>}
+            display_template {<a href="${return_url}?revision_id=@revision_list.revision_id@">View</a>}
         }
         
     }
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/revision-unpublish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/revision-unpublish.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/revision-unpublish.tcl	9 Oct 2003 09:58:21 -0000	1.1
@@ -0,0 +1,10 @@
+ad_page_contract {
+    unpublish this revision
+} {
+    revision_id:notnull,naturalnum
+    return_url:notnull
+}
+
+bcms::revision::set_revision_status -revision_id $revision_id -status production
+
+ad_returnredirect $return_url
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/unregister-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/unregister-template.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/unregister-template.tcl	9 Oct 2003 09:58:21 -0000	1.1
@@ -0,0 +1,13 @@
+ad_page_contract {
+    unregister a template from a content item
+} {
+    item_id:notnull,naturalnum
+    template_id:notnull,naturalnum
+    context:notnull
+    return_url:notnull
+}
+
+bcms::template::unregister_template -item_id $item_id -template_id $template_id -context $context
+
+ad_returnredirect $return_url
+ad_script_abort