Index: openacs-4/contrib/packages/bcms-ui-base/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/index.vuh,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/bcms-ui-base/www/index.vuh	22 Sep 2003 07:36:47 -0000	1.2
+++ openacs-4/contrib/packages/bcms-ui-base/www/index.vuh	4 Oct 2003 08:47:32 -0000	1.3
@@ -14,7 +14,7 @@
 
 # route to the default template of the current cms_context
 set cms_context [ad_get_client_property -default public [ad_conn package_id] cms_context]
-set file "/templates/$cms_context/default"
+set file "/templates/$cms_context/default_template"
 rp_internal_redirect $file
 
 
Index: openacs-4/contrib/packages/bcms-ui-base/www/bcms-ui-base-images/file.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/bcms-ui-base-images/file.png,v
diff -u
Binary files differ
Index: openacs-4/contrib/packages/bcms-ui-base/www/bcms-ui-base-images/image.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/bcms-ui-base-images/image.png,v
diff -u
Binary files differ
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/file-add.adp	4 Oct 2003 08:47:32 -0000	1.1
@@ -0,0 +1,8 @@
+<master src="master">
+<property name="title">@title@</property>
+<property name="context_url">@return_url@</property>
+
+<fieldset class="formtemplate">
+<legend>@title@</legend>
+<include src="/packages/bcms-ui-base/resources/file-form" folder_id="@folder_id@" return_url="@return_url@">
+</fieldset>
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/file-add.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/file-add.tcl	4 Oct 2003 08:47:32 -0000	1.1
@@ -0,0 +1,9 @@
+ad_page_contract {
+    create a file
+} {
+    folder_id:notnull,integer
+    return_url:notnull
+}
+
+
+set title "Add File"
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/file-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/Attic/file-edit.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/file-edit.adp	4 Oct 2003 08:47:32 -0000	1.1
@@ -0,0 +1,9 @@
+<master src="master">
+<property name="title">@title@</property>
+<property name="context_help">@context_help@</property>
+<property name="context_url">@return_url@</property>
+
+<fieldset class="formtemplate">
+<legend>@title@</legend>
+<include src="/packages/bcms-ui-base/resources/file-form" revision_id="@revision_id@" return_url="@return_url@">
+</fieldset>
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/file-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/Attic/file-edit.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/file-edit.tcl	4 Oct 2003 08:47:32 -0000	1.1
@@ -0,0 +1,10 @@
+ad_page_contract {
+    edit a file
+} {
+    revision_id:notnull,integer
+    return_url:notnull
+}
+
+
+set title "Edit File"
+set context_help ""
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/image-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/image-add.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/image-add.adp	4 Oct 2003 08:47:32 -0000	1.1
@@ -0,0 +1,8 @@
+<master src="master">
+<property name="title">@title@</property>
+<property name="context_url">@return_url@</property>
+
+<fieldset class="formtemplate">
+<legend>@title@</legend>
+<include src="/packages/bcms-ui-base/resources/image-form" folder_id="@folder_id@" return_url="@return_url@">
+</fieldset>
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/image-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/image-add.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/image-add.tcl	4 Oct 2003 08:47:32 -0000	1.1
@@ -0,0 +1,9 @@
+ad_page_contract {
+    create a image
+} {
+    folder_id:notnull,integer
+    return_url:notnull
+}
+
+
+set title "Add Image"
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/image-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/Attic/image-edit.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/image-edit.adp	4 Oct 2003 08:47:32 -0000	1.1
@@ -0,0 +1,9 @@
+<master src="master">
+<property name="title">@title@</property>
+<property name="context_help">@context_help@</property>
+<property name="context_url">@return_url@</property>
+
+<fieldset class="formtemplate">
+<legend>@title@</legend>
+<include src="/packages/bcms-ui-base/resources/image-form" revision_id="@revision_id@" return_url="@return_url@">
+</fieldset>
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/image-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/Attic/image-edit.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/image-edit.tcl	4 Oct 2003 08:47:32 -0000	1.1
@@ -0,0 +1,10 @@
+ad_page_contract {
+    edit a image
+} {
+    revision_id:notnull,integer
+    return_url:notnull
+}
+
+
+set title "Edit Image"
+set context_help ""
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/packages/bcms-ui-base/www/manage/page-publish.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
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.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.adp	22 Sep 2003 07:36:47 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.adp	4 Oct 2003 08:47:32 -0000	1.2
@@ -4,8 +4,7 @@
 
 <listtemplate name="related_items" style="../../../bcms-ui-base/resources/item-list"></listtemplate>
 
-<include src="../../resources/search" 
-display_search_results="@display_search_results@" name_search="@name_search@" title_search="@title_search@" content_search="@content_search@" 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@" 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@">
 
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.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.tcl	22 Sep 2003 07:36:47 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/relate-item.tcl	4 Oct 2003 08:47:32 -0000	1.2
@@ -3,13 +3,13 @@
 } {
     item_id_one:notnull
     item_id:optional,multiple
+    return_url:notnull
     {name_search:optional ""}
     {title_search:optional ""}
     {content_search:optional ""}
     {display_search_results:optional 0}
+    {orderby:optional name,asc}
     {page:optional 1}
-    {orderby:optional ""}
-    return_url:notnull
 }
 
 if {[info exists item_id]} {
@@ -23,18 +23,15 @@
 
 set package_url [ad_conn package_url]
 set content_type_search content_revision
-set bulk_actions {"Relate" "${package_url}manage/relate-item" "Relate checked items"}
+set bulk_actions [list "Relate" "${package_url}manage/relate-item" "Relate checked items"]
 set bulk_action_export_vars {item_id_one return_url}
 
-
 template::list::create \
     -name related_items \
     -multirow related_items \
     -key rel_id \
     -pass_properties { package_url } \
-    -bulk_actions {
-        "Unrelate" "${package_url}manage/unrelate-item" "Unrelate checked items"
-    } \
+    -bulk_actions [list "Unrelate" "${package_url}manage/unrelate-item" "Unrelate checked items"] \
     -bulk_action_export_vars {
         return_url
     } \
@@ -52,6 +49,4 @@
 bcms::item::list_related_items -item_id $item_id_one -relation_tag pages -multirow_name related_items -revision latest
 
 
-
-
 set title "Relate Content"
Index: openacs-4/contrib/packages/bcms-ui-base/www/manage/revision-publish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-base/www/manage/revision-publish.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/bcms-ui-base/www/manage/revision-publish.tcl	4 Oct 2003 08:47:32 -0000	1.1
@@ -0,0 +1,24 @@
+ad_page_contract {
+    publish this revision
+} {
+    revision_id:notnull,naturalnum
+    return_url:notnull
+}
+
+array set revision [bcms::revision::get_revision -revision_id $revision_id]
+
+if {[array size revision] > 0} {
+    #if we are publishing the latest revision then we create a newer version
+    #so we will not edit the live and latest revision.
+    if {$revision(latest_revision) == $revision_id} {
+        bcms::revision::copy_revision -revision_id $revision_id
+    }
+    # publish it if the revision is not live, otherwise its has already been published
+    if {$revision(live_revision) != $revision_id} {
+        bcms::revision::set_revision_status -revision_id $revision_id -status live
+    }
+} else {
+    error "revision does not exist"
+}
+
+ad_returnredirect $return_url