Index: openacs-4/packages/cms/cms.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/cms.info,v
diff -u -r1.15.2.3 -r1.15.2.4
--- openacs-4/packages/cms/cms.info	31 Aug 2006 19:59:04 -0000	1.15.2.3
+++ openacs-4/packages/cms/cms.info	1 Sep 2006 21:41:27 -0000	1.15.2.4
@@ -18,11 +18,10 @@
         <maturity>1</maturity>
 
         <provides url="cms" version="5.0d2"/>
-        <requires url="acs-content-repository" version="5.1.5"/>
-        <requires url="acs-kernel" version="5.1.5"/>
-        <requires url="acs-mail" version="5.1.5"/>
-        <requires url="acs-tcl" version="5.1.5"/>
-        <requires url="acs-templating" version="5.1.5"/>
+        <requires url="acs-content-repository" version="5.2.3"/>
+        <requires url="acs-kernel" version="5.2.3"/>
+        <requires url="acs-tcl" version="5.2.3"/>
+        <requires url="acs-templating" version="5.2.3"/>
 
         <callbacks>
             <callback type="after-instantiate"  proc="cms::install::package_instantiate"/>
Index: openacs-4/packages/cms/www/modules/items/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/index.adp,v
diff -u -r1.7.2.3 -r1.7.2.4
--- openacs-4/packages/cms/www/modules/items/index.adp	31 Aug 2006 19:59:06 -0000	1.7.2.3
+++ openacs-4/packages/cms/www/modules/items/index.adp	1 Sep 2006 21:41:28 -0000	1.7.2.4
@@ -112,6 +112,7 @@
      Delete Item</a>
 </if>
 
+<a href="@preview_url@" target="_new" class="button">Preview Item</a>
 </div>
 
 <p>
Index: openacs-4/packages/cms/www/modules/items/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/index.tcl,v
diff -u -r1.9.2.3 -r1.9.2.4
--- openacs-4/packages/cms/www/modules/items/index.tcl	31 Aug 2006 19:59:06 -0000	1.9.2.3
+++ openacs-4/packages/cms/www/modules/items/index.tcl	1 Sep 2006 21:41:28 -0000	1.9.2.4
@@ -67,6 +67,8 @@
 set return_url [ad_return_url]
 set revise_url [export_vars -base revision-add-2 {item_id revision_id mount_point tab content_method return_url}]
 set rename_url [export_vars -base rename {item_id mount_point tab return_url}]
+set content_root [cm::modules::sitemap::getRootFolderID [ad_conn subsite_id]]
+set preview_url "[subsite::get_element -subsite_id [ad_conn subsite_id] -element url -notrailing]/[content::item::get_path -root_folder_id $content_root -item_id $item_id]"
 
 # send over to manage-items-2 to delete
 set action delete
Index: openacs-4/packages/cms/www/modules/items/item-header.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/item-header.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/cms/www/modules/items/item-header.adp	31 Aug 2006 19:59:06 -0000	1.1.2.2
+++ openacs-4/packages/cms/www/modules/items/item-header.adp	1 Sep 2006 21:41:28 -0000	1.1.2.3
@@ -1,7 +1,7 @@
 <nobr>
 <p>
 <include src="/packages/cms/lib/clip" mount_point="@mount_point@" id="@item_id@">@page_title;noquote@
-<span style="font-size: 70%;">[<a href="@path@" target="_new">preview</a>]</span>
+
 </p>
 </nobr>
 <p/>
Index: openacs-4/packages/cms/www/modules/items/item-header.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/item-header.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/cms/www/modules/items/item-header.tcl	20 Mar 2006 20:30:41 -0000	1.1.2.1
+++ openacs-4/packages/cms/www/modules/items/item-header.tcl	1 Sep 2006 21:41:28 -0000	1.1.2.2
@@ -3,5 +3,4 @@
 request set_param mount_point -datatype keyword -optional -value sitemap
 
 content::item::get -item_id $item_id -revision latest -array_name content_item
-set path "[subsite::get_element -subsite_id [ad_conn subsite_id] -element url -notrailing][content::item::get_path -item_id $item_id]"
 set page_title "Content Item - $content_item(title)"
Index: openacs-4/packages/cms/www/modules/items/revision-handler.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/Attic/revision-handler.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/cms/www/modules/items/revision-handler.tcl	31 Aug 2006 19:59:06 -0000	1.1.2.1
+++ openacs-4/packages/cms/www/modules/items/revision-handler.tcl	1 Sep 2006 21:41:28 -0000	1.1.2.2
@@ -36,7 +36,7 @@
 	    continue
 	}
 	set revision_name [content::revision::revision_name -revision_id $rev]
-	content::revision::delete -revision_id $revision_id
+	content::revision::delete -revision_id $rev
 	util_user_message -message "$revision_name deleted"
     }