Index: openacs-4/packages/cms/todo
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/todo,v
diff -u -N -r1.7.2.5 -r1.7.2.6
--- openacs-4/packages/cms/todo	31 Aug 2006 19:59:04 -0000	1.7.2.5
+++ openacs-4/packages/cms/todo	15 Nov 2006 20:21:03 -0000	1.7.2.6
@@ -9,17 +9,16 @@
 make content_method stuff make sense (ok for now, if developer sets up the type information [content_method, mime_type] correctly?)
 when you view a symlink in CMS should the path show up as the path of the linked item or the symlink (latter methinks)?
 show symlinks to an item (extra tab, if they exist) or folder (where in UI?)
-junk move/copy/symlink stuff in sitemap, revisions in items/templates
 continue cleanup/removal of xql files
 add interface to allow admin to map subsite to cms instance
  - should copy index.vuh to /www/subsite and add entry to subsite_package_map
-printer friendly template (steal from xcms-ui? add ad_page_contract to index.vuh with preview/printer-friendly option?)
+printer friendly template (steal from xcms-ui? add ad_page_contract to index.vuh with preview/printer-friendly option? pass in use_context?)
 new icon for "clipping" items - competing with new listbuilder checkboxes, confuses UI a bit
 go through various listbuilder lists and remove "un-xxx" links in favor of bulk actions
  unregister item templates - types/content methods & templates
 redo tab files - just cycle through list of tabs to create the tab html?
 floating clipboard working?
-hide data model for users creating/editing items:
+(done, except for storage type) hide data model for users creating/editing items:
  - for new items, if:
    -> if has_text_mime_types_p, forward to create-2 with content_method=text_entry
    -> if !has_text_mime_types_p & has_mime_types, forward with cm=file_upload
@@ -29,12 +28,13 @@
    -> if storage_type is text and content ne "", forward to revision-add-2 with content_method=text_entry "Author new revision"
    -> if storage_type is files, use content_method=file_upload "Upload new revision"
 
+
 plumbing
 --------
 dav for templates root
 internationalization
 integrate categories and workflow packages
-fix search module (will try when i have tsearch2, ie upgrade to rhel4)
+fix search module
 
 questions/ideas
 ---------
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 -N -r1.7.2.4 -r1.7.2.5
--- openacs-4/packages/cms/www/modules/items/index.adp	1 Sep 2006 21:41:28 -0000	1.7.2.4
+++ openacs-4/packages/cms/www/modules/items/index.adp	15 Nov 2006 20:21:03 -0000	1.7.2.5
@@ -104,15 +104,18 @@
 
 <p>
 
+<if @preview_p@>
+  <a href="@preview_url@" target="_new" class="button">Preview</a>
+</if>
+
 <if @write_p@>
   <a href="@revise_url@" class="button">@revise_button@</a>
-  <a href="@rename_url@" class="button">Rename Item</a> 
+  <a href="@rename_url@" class="button">Rename</a> 
   <a href="@delete_url@" class="button" 
      onClick="return confirm('Warning! You are about to delete this @content_item.content_type@: @content_item.title@.');">
-     Delete Item</a>
+     Delete</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 -N -r1.9.2.4 -r1.9.2.5
--- openacs-4/packages/cms/www/modules/items/index.tcl	1 Sep 2006 21:41:28 -0000	1.9.2.4
+++ openacs-4/packages/cms/www/modules/items/index.tcl	15 Nov 2006 20:21:03 -0000	1.9.2.5
@@ -36,24 +36,20 @@
     set revision_id $content_item(latest_revision)
 }
 
-#db_1row get_info "" -column_array info
-#template::util::array_to_vars info
-
 set page_title "Content Item - $content_item(title)"
 
 # build the path to the custom interface directory for this content type
-
 set custom_dir [file dirname [ns_conn url]]/custom/$content_item(content_type)
 
 # check for the custom info page and redirect if found
-
 if { [file exists [ns_url2file $custom_dir/index.tcl]] } {
 
   template::forward $custom_dir/index?item_id=$item_id
 }
 
+# set some options for revising via the UI
 if { [cms::item::storage_type -revision_id $revision_id] eq "text" } {
-    set revise_button "Author Revision"
+    set revise_button "Revise"
     if { [cms::item::has_text_content_p -revision_id $revision_id] } {
 	set content_method text_entry
     } else {
@@ -67,11 +63,18 @@
 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 up preview link, if template exists for this item
 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]"
+if { [content::item::get_template -item_id $item_id -use_context public] ne "" } {
+    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]
+    set preview_p 1
+} else {
+    set preview_p 0
+}
 
 # send over to manage-items-2 to delete
 set action delete
 set folder_id $content_item(parent_id)
 set delete_url [export_vars -base ../sitemap/manage-items-2 {item_id mount_point folder_id action return_url}]
-