Index: openacs-4/packages/cms/todo
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/todo,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/todo	9 May 2005 22:44:47 -0000	1.5
+++ openacs-4/packages/cms/todo	16 May 2005 22:59:23 -0000	1.6
@@ -27,11 +27,8 @@
 
 top priority
 ------------
-set up install procs that set contexts appropriately
-remove unused procs files
-tidy up "view revision" page
-move tab setup in index pages into a per section tab master and call that from each subpage
- - select from cm_modules to build tabs
+set up install procs that set contexts appropriately (done, not thoroughly tested)
+fix child items include
 
 basic/cosmetic
 ---------
@@ -53,6 +50,7 @@
 use ad_form where appropriate
 integrate categories and workflow packages
 ad_page_contract for non-include pages?
+select from cm_modules to build tabs?
 
 questions/ideas
 ---------
Index: openacs-4/packages/cms/tcl/module-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/module-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/cms/tcl/module-procs.tcl	9 May 2005 22:44:48 -0000	1.8
+++ openacs-4/packages/cms/tcl/module-procs.tcl	16 May 2005 22:59:24 -0000	1.9
@@ -72,7 +72,7 @@
     return $result
 }
 
-ad_proc -public cm::modules::workspace::getRootFolderID {} { return 0 } 
+ad_proc -public cm::modules::workspace::getRootFolderID { package_id } { return 0 } 
 
 ad_proc -public cm::modules::workspace::getChildFolders { id } {
     return [list]
@@ -99,7 +99,7 @@
 
 } {
     if { [string equal $id {}] } {
-        set id [getRootFolderID]
+        set id [getRootFolderID [ad_conn package_id]]
     }
 
     # query for child site nodes
@@ -144,7 +144,7 @@
 
 } {
     if { [string equal $id {}] } {
-        set id [getRootFolderID]
+        set id [getRootFolderID [ad_conn package_id]]
     }
 
     # query for child site nodes
@@ -185,7 +185,7 @@
     return $result
 }
 
-ad_proc -public cm::modules::types::getRootFolderID {} { return "content_revision" } 
+ad_proc -public cm::modules::types::getRootFolderID { package_id } { return "content_revision" } 
 
 ad_proc -public cm::modules::types::getChildFolders { id } {
 
@@ -195,7 +195,7 @@
     set children [list]
 
     if { [string equal $id {}] } {
-        set id [getRootFolderID]
+        set id [getRootFolderID [ad_conn package_id]]
     }
 
     # query for message categories
@@ -208,14 +208,14 @@
 
 # end of types namespace
 
-ad_proc -public cm::modules::search::getRootFolderID {} { return 0 } 
+ad_proc -public cm::modules::search::getRootFolderID { package_id } { return 0 } 
 
 ad_proc -public cm::modules::search::getChildFolders { id } {
     return [list]
 }
 
 
-ad_proc -public cm::modules::categories::getRootFolderID {} { return 0 } 
+ad_proc -public cm::modules::categories::getRootFolderID { package_id } { return 0 } 
 
 ad_proc -public cm::modules::categories::getChildFolders { id } {
 
@@ -295,7 +295,7 @@
 
 
 
-ad_proc -public cm::modules::clipboard::getRootFolderID {} { return 0 } 
+ad_proc -public cm::modules::clipboard::getRootFolderID { package_id } { return 0 } 
 
 ad_proc -public cm::modules::clipboard::getChildFolders { id } {
 
Index: openacs-4/packages/cms/tcl/publish-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/publish-procs.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/cms/tcl/publish-procs.tcl	9 May 2005 22:44:48 -0000	1.14
+++ openacs-4/packages/cms/tcl/publish-procs.tcl	16 May 2005 22:59:24 -0000	1.15
@@ -415,25 +415,22 @@
 
 } {
 
-  if { [template::util::is_nil interval] } {
-    # Kludge: relies on that CMS is a singleton package
-    set package_id [apm_package_id_from_key "cms"]
-    if { ![template::util::is_nil package_id] } {
-      set interval [ad_parameter -package_id $package_id StatusSweepInterval 3600]
-      # if cms is installed but not mounted, return reasonable default
-      if { $interval == "" } {
-        set interval 3600
-      }
-    } else { 
-      ns_log Warning "publish::schedule_status_sweep: unable to lookup package_id for cms defaulting to interval 3600"
-      set interval 3600
-    } 
-  }
+    if { [template::util::is_nil interval] } {
+	
+	db_foreach package_id {} {
 
-  ns_log notice "publish::schedule_status_sweep: Scheduling status sweep every $interval seconds"
-  set proc_id [ns_schedule_proc -thread $interval publish::track_publish_status]
-  cache set status_sweep_proc_id $proc_id
-  
+	    set interval [ad_parameter -package_id $package_id StatusSweepInterval 3600]
+	    # if cms is installed but not mounted, return reasonable default
+	    if { $interval == "" } {
+		set interval 3600
+		ns_log Warning "publish::schedule_status_sweep: unable to lookup package_id for cms defaulting to interval 3600"
+	    }
+	}
+
+	ns_log notice "publish::schedule_status_sweep: Scheduling status sweep every $interval seconds"
+	set proc_id [ns_schedule_proc -thread $interval publish::track_publish_status]
+	cache set status_sweep_proc_id $proc_id
+    }
 }
 
 ad_proc -public publish::unschedule_status_sweep {} {
Index: openacs-4/packages/cms/www/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/master.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/master.tcl	17 Nov 2004 19:02:45 -0000	1.3
+++ openacs-4/packages/cms/www/master.tcl	16 May 2005 22:59:24 -0000	1.4
@@ -1,27 +1,36 @@
+request create -params {
+  mount_point -datatype text -optional
+}
+
 set url [ad_conn url]
 set package_url [ad_conn package_url]
 
-#default (needed?)
-set section sitemap
-
-if {[string match *sitemap* $url]} {
+if {[template::util::is_nil mount_point]} {
+    
+    #default (needed?)
     set section sitemap
-} elseif {[string match *templates* $url]} {
-    set section templates
-} elseif {[string match *types* $url]} {
-    set section types
-} elseif {[string match *search* $url]} {
-    set section search
-} elseif {[string match *workflow* $url]} {
-    set section workflow
-} elseif {[string match *workspace* $url]} {
-    set section workspace
-} elseif {[string match *clipboard* $url]} {
-    set section clipboard
-} elseif {[string match *categories* $url]} {
-    set section categories
-} elseif {[string match *users* $url]} {
-    set section users
+    
+    if {[string match *sitemap* $url]} {
+	set section sitemap
+    } elseif {[string match *templates* $url]} {
+	set section templates
+    } elseif {[string match *types* $url]} {
+	set section types
+    } elseif {[string match *search* $url]} {
+	set section search
+    } elseif {[string match *workflow* $url]} {
+	set section workflow
+    } elseif {[string match *workspace* $url]} {
+	set section workspace
+    } elseif {[string match *clipboard* $url]} {
+	set section clipboard
+    } elseif {[string match *categories* $url]} {
+	set section categories
+    } elseif {[string match *users* $url]} {
+	set section users
+    }
+} else {
+    set section $mount_point
 }
 
 
Index: openacs-4/packages/cms/www/modules/categories/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/index.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/categories/index.tcl	12 Apr 2005 21:45:42 -0000	1.5
+++ openacs-4/packages/cms/www/modules/categories/index.tcl	16 May 2005 22:59:24 -0000	1.6
@@ -13,7 +13,7 @@
 
 set original_id $id
 
-set root_id [cm::modules::${mount_point}::getRootFolderID]
+set root_id [cm::modules::${mount_point}::getRootFolderID [ad_conn package_id]]
 if { [util::is_nil id] || [string equal $id _all_] } {
     set where_clause "k.parent_id is null"
 } else {
Index: openacs-4/packages/cms/www/modules/categories/keyword-assign.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/keyword-assign.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/categories/keyword-assign.tcl	27 May 2001 00:22:34 -0000	1.3
+++ openacs-4/packages/cms/www/modules/categories/keyword-assign.tcl	16 May 2005 22:59:24 -0000	1.4
@@ -7,7 +7,7 @@
   -optional -value "sitemap"
 
 if { [template::util::is_nil item_id] } {
-  set resolved_id [cm::modules::${mount_point}::getRootFolderID]
+  set resolved_id [cm::modules::${mount_point}::getRootFolderID [ad_conn package_id]]
 } else {
   set resolved_id $item_id
 }
Index: openacs-4/packages/cms/www/modules/categories/keyword-unassign.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/keyword-unassign.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/categories/keyword-unassign.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/categories/keyword-unassign.tcl	16 May 2005 22:59:24 -0000	1.3
@@ -8,7 +8,7 @@
   -optional -value "sitemap"
 
 if { [template::util::is_nil item_id] } {
-  set resolved_id [cm::modules::${mount_point}::getRootFolderID]
+  set resolved_id [cm::modules::${mount_point}::getRootFolderID [ad_conn package_id]]
 } else {
   set resolved_id $item_id
 }
Index: openacs-4/packages/cms/www/modules/items/assign-keywords.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/assign-keywords.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/assign-keywords.tcl	13 Apr 2005 20:15:19 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/assign-keywords.tcl	16 May 2005 22:59:24 -0000	1.4
@@ -12,7 +12,7 @@
     -object_id $id -privilege write
 
 if { [template::util::is_nil id] } {
-  set root_id [cm::modules::${mount_point}::getRootFolderID]
+  set root_id [cm::modules::${mount_point}::getRootFolderID [ad_conn package_id]]
 } else {
   set root_id $id
 }
Index: openacs-4/packages/cms/www/modules/items/attributes-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/attributes-edit.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/items/attributes-edit.tcl	16 May 2005 03:06:16 -0000	1.7
+++ openacs-4/packages/cms/www/modules/items/attributes-edit.tcl	16 May 2005 22:59:24 -0000	1.8
@@ -28,7 +28,6 @@
 # Create the form
 
 form create add_revision -html { enctype "multipart/form-data" } \
-    -cancel_url [export_vars -base index {item_id mount_point item_props_tab}] \
     -elements {
 	item_id         -datatype integer -widget hidden
 	latest_revision -datatype integer -widget hidden
Index: openacs-4/packages/cms/www/modules/items/children.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/children.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/children.adp	13 Apr 2005 20:15:19 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/children.adp	16 May 2005 22:59:24 -0000	1.6
@@ -1,3 +1,5 @@
+<listtemplate name="children"></listtemplate>
+
 <table bgcolor=#6699CC cellspacing=0 cellpadding=4 border=0 width="95%">
 <tr bgcolor="#FFFFFF">
   <th align=left valign=bottom>Child Items</th>
Index: openacs-4/packages/cms/www/modules/items/children.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/children.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/children.tcl	13 Apr 2005 20:15:19 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/children.tcl	16 May 2005 22:59:24 -0000	1.6
@@ -28,6 +28,7 @@
 template::list::create \
     -name children \
     -key rel_id \
+    -no_data "No child items" \
     -multirow children \
     -actions [list "Relate marked items to this item" \
 		  "relate-items?item_id=$item_id" \
Index: openacs-4/packages/cms/www/modules/items/create-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/create-1.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/create-1.adp	22 May 2003 14:27:33 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/create-1.adp	16 May 2005 22:59:24 -0000	1.3
@@ -1,5 +1,10 @@
 <master src="../../master">
-<property name="title">Create a New @content_type_name;noquote@</property>
-<h2>Create a New @content_type_name@</h2>
-<formtemplate id="choose_content_method"></formtemplate>
+<property name="title">@page_title;noquote@</property>
 
+ <div id=section>
+  <div id=section-header>@page_title@</div>
+   <p/>
+   <formtemplate id="choose_content_method"></formtemplate>
+ </div>
+
+
Index: openacs-4/packages/cms/www/modules/items/create-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/create-1.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/create-1.tcl	13 Apr 2005 20:15:19 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/create-1.tcl	16 May 2005 22:59:24 -0000	1.5
@@ -10,7 +10,7 @@
 # Manually set the value since the templating system is still broken in 
 # the -value flag
 if { [template::util::is_nil parent_id] } {
-  set parent_id [cm::modules::${mount_point}::getRootFolderID]
+    set parent_id [cm::modules::${mount_point}::getRootFolderID [ad_conn package_id]]
 }
 
 permission::require_permission -party_id [auth::require_login] \
@@ -25,6 +25,7 @@
 
 
 set content_type_name [db_string get_content_typ_name ""]
+set page_title "Create a New $content_type_name"
 
 if { [template::util::is_nil content_type_name] } {
     template::request::error bad_content_type \
Index: openacs-4/packages/cms/www/modules/items/create-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/create-2.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/create-2.adp	13 Apr 2005 20:15:19 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/create-2.adp	16 May 2005 22:59:24 -0000	1.4
@@ -2,6 +2,11 @@
   <master src="../../master">
   <property name="title">@page_title;noquote@</property>
 </if>
-<h2>@page_title@</h2>
 
-<formtemplate id="create_item"></formtemplate>
+ <div id=section>
+  <div id=section-header>@page_title;noquote@</div>
+   <p/>
+   <formtemplate id="create_item"></formtemplate>
+ </div>
+
+
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.8 -r1.9
--- openacs-4/packages/cms/www/modules/items/index.tcl	16 May 2005 03:06:16 -0000	1.8
+++ openacs-4/packages/cms/www/modules/items/index.tcl	16 May 2005 22:59:24 -0000	1.9
@@ -8,7 +8,7 @@
 } {
     { item_id:integer }
     { mount_point:optional "sitemap" }
-    { item_props_tab:optional "editing"}
+    { item_props_tab:optional "editing" }
 }
 
 set package_url [ad_conn package_url]
Index: openacs-4/packages/cms/www/modules/items/relate-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/relate-items.adp	22 May 2003 14:27:33 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/relate-items.adp	16 May 2005 22:59:24 -0000	1.3
@@ -1,21 +1,34 @@
 <master src="../../master">
 <property name="title">@page_title;noquote@</property>
 
-<h2>@page_title@ (Step 1)</h2>
-<a href="index?item_id=@item_id@">@item_title@</a>
+<include src="item-header" item_id="@item_id@" mount_point="sitemap">
 
-<hr>
+<include src="item-tabs" item_id="@item_id@" item_props_tab="related">
 
-<if @no_items_on_clipboard@ eq "t">
-  <p>No items are currently available for relating.  Please mark
+<div id="subnavbar-body">
+
+ <div id=section>
+  <div id=section-header>@page_title@ (Step 1)</div>
+   <p/>
+   <a href="index?item_id=@item_id@">@item_title@</a>
+   <hr>
+   <if @no_items_on_clipboard@ eq "t">
+     <p>No items are currently available for relating.  Please mark
      your choices and return to this form.</p>
-</if>
-<else>
-  <if @no_valid_items@ eq "t">
-    <p>None of the marked items may be related to "@item_title@"</p>
-  </if>
-  <else>
-  <formtemplate id=rel_form style=grid cols=8
+   </if>
+   <else>
+    <if @no_valid_items@ eq "t">
+     <p>None of the marked items may be related to "@item_title@"</p>
+    </if>
+    <else>
+     <formtemplate id=rel_form style=grid cols=8
      headers="Check Title Type Tag Order" title="Choose items to relate"></formtemplate>
-  </else>
-</else>
\ No newline at end of file
+    </else>
+   </else>
+ </div>
+
+</div>
+
+
+
+
Index: openacs-4/packages/cms/www/modules/items/relate-order.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-order.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/items/relate-order.tcl	13 Apr 2005 20:15:19 -0000	1.6
+++ openacs-4/packages/cms/www/modules/items/relate-order.tcl	16 May 2005 22:59:24 -0000	1.7
@@ -5,9 +5,7 @@
 request set_param order         -datatype keyword 
 request set_param mount_point   -datatype keyword -value "sitemap"
 request set_param return_url    -datatype text    -value "index"
-request set_param item_props_tab -datatype text    -value "children"
-request set_param passthrough   -datatype text \
-	-value [content::assemble_passthrough mount_point]
+request set_param item_props_tab -datatype text    -value "related"
 request set_param relation_type -datatype keyword -value "relation" 
 
 # Use hardcoding instead of inheritance, since inheritance is not in the
Index: openacs-4/packages/cms/www/modules/items/related-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/related-items.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/related-items.tcl	13 Apr 2005 20:15:19 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/related-items.tcl	16 May 2005 22:59:24 -0000	1.6
@@ -1,6 +1,7 @@
 request create -params {
     item_id -datatype integer
-    mount_point -datatype keyword -value sitemap
+    mount_point -datatype text -value sitemap
+    item_props_tab -datatype text -optional
 }
 
 permission::require_permission -party_id [auth::require_login] \
@@ -9,12 +10,13 @@
 template::list::create \
     -name related \
     -key rel_id \
+    -no_data "No related items" \
     -multirow related \
     -actions [list "Relate marked items to this item" \
-		  "relate-items?item_id=$item_id" \
+		  [export_vars -base relate-items {item_id item_props_tab mount_point}] \
 		  "Relate marks items to this item"] \
     -bulk_actions [list "Remove marked relations" \
-		       "[export_vars -base unrelate-item?mount_point=sitemap { rel_id }]" \
+		       [export_vars -base unrelate-item?mount_point=sitemap { rel_id }] \
 		       "Remove marked relations from this item"] \
     -elements {
 	content_type {
@@ -27,9 +29,8 @@
 	type_name {
 	    label "Relationship Type"
 	}
-	relation_view_url {
+	tag {
 	    label "Tag"
-	    display_template "<a href=\"@related.relation_view_url@\" title=\"View relation\">@related.tag@</a>"
 	}
 	reorder {
 	    label "Move"
@@ -40,8 +41,7 @@
 
 db_multirow -extend { title_url relation_view_url move_up_url move_down_url reorder } related get_related "" {
     set title_url "index?item_id=$item_id&mount_point=$mount_point"
-    set relation_view_url "relationship-view?rel_id=$rel_id&mount_point=$mount_point"
-    set move_up_url "relate-order?rel_id=$rel_id&order=up&mount_point=$mount_point&item_props_tab=children&relation_type=relation"
-    set move_down_url "relate-order?rel_id=$rel_id&order=down&mount_point=$mount_point&item_props_tab=children&relation_type=relation"
+    set move_up_url "relate-order?rel_id=$rel_id&order=up&mount_point=$mount_point&item_props_tab=related&relation_type=relation"
+    set move_down_url "relate-order?rel_id=$rel_id&order=down&mount_point=$mount_point&item_props_tab=related&relation_type=relation"
 }
 
Index: openacs-4/packages/cms/www/modules/items/rename.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/rename.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/items/rename.tcl	16 May 2005 03:06:16 -0000	1.7
+++ openacs-4/packages/cms/www/modules/items/rename.tcl	16 May 2005 22:59:24 -0000	1.8
@@ -13,7 +13,7 @@
 
 set page_title "Rename $item_name"
 
-form create rename_item -cancel_url [export_vars -base index {item_id mount_point item_props_tab}]
+form create rename_item 
 
 element create rename_item mount_point \
     -datatype text \
Index: openacs-4/packages/cms/www/modules/items/revision-add-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-add-1.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/revision-add-1.adp	22 May 2003 14:27:33 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/revision-add-1.adp	16 May 2005 22:59:24 -0000	1.3
@@ -1,8 +1,22 @@
 <master src="../../master">
 <property name="title">Add a Revision to @name;noquote@</property>
-<h2>Add a Revision to @name@</h2>
-<formtemplate id="choose_content_method"></formtemplate>
 
+<include src="item-header" item_id="@item_id@" mount_point="sitemap">
 
+<include src="item-tabs" item_id="@item_id@" item_props_tab="editing">
 
+<div id="subnavbar-body">
 
+ <div id=section>
+  <div id=section-header>Add a Revision to @name@</div>
+   <p/>
+   <formtemplate id="choose_content_method"></formtemplate>
+ </div>
+
+</div>
+
+
+
+
+
+
Index: openacs-4/packages/cms/www/modules/items/revision-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-add-2.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/items/revision-add-2.tcl	16 May 2005 03:06:16 -0000	1.6
+++ openacs-4/packages/cms/www/modules/items/revision-add-2.tcl	16 May 2005 22:59:24 -0000	1.7
@@ -24,9 +24,7 @@
   template::forward "custom/$content_type/revision-add-1?item_id=$item_id&content_method=$content_method"
 }
 
-form create add_revision \
-    -html { enctype "multipart/form-data" } \
-    -cancel_url [export_vars -base index {item_id mount_point item_props_tab}]
+form create add_revision -html { enctype "multipart/form-data" }
 
 # autogenerate the revision form
 content::add_revision_form \
Index: openacs-4/packages/cms/www/modules/items/revision-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-postgresql.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/revision-postgresql.xql	8 Dec 2001 01:18:00 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/revision-postgresql.xql	16 May 2005 22:59:24 -0000	1.5
@@ -17,7 +17,6 @@
      where 
        mime_type = cr_revisions.mime_type
     ) as mime_type_pretty,
-    to_char(publish_date,'Month DD, YYYY') as publish_date_pretty,
     content_length as content_size
   from 
     cr_revisions
@@ -36,7 +35,6 @@
       </querytext>
 </fullquery>
 
- 
 <fullquery name="get_one_item">      
       <querytext>
       
Index: openacs-4/packages/cms/www/modules/items/revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/revision.adp	13 Apr 2005 20:15:19 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/revision.adp	16 May 2005 22:59:24 -0000	1.5
@@ -1,110 +1,55 @@
 <master src="../../master">
 <property name="title">@page_title;noquote@</property>
-<h2>@page_title@</h2>
 
+<include src="item-header" item_id="@item_id@" mount_point="sitemap">
 
-<h4>Content Type: @content_type@</h4>
+<include src="item-tabs" item_id="@item_id@" item_props_tab="editing">
 
-<if @live_revision_p@ eq 1>
-  This revision is live. &nbsp;
-  <a href="unpublish?item_id=@item_id@">Unpublish</a>
-</if>
-<else>
-  <if @is_publishable@ eq t>
-    [ <a href="publish?item_id=@item_id@&revision_id=@revision_id@">
-      Make this revision live
-    </a> ]
-  </if>
-</else>
-<p>
+<div id="subnavbar-body">
 
-<include src="../../table-header">
+ <div id=section>
+  <div id=section-header>@page_title@ (@content_type@)</div>
 
-<table bgcolor="#6699CC" cellspacing=0 cellpadding=4 border=0 width="100%">
-  <tr bgcolor="#99ccff">
-    <th>Attribute</th>
-    <th>Revision Type</th>
-    <th>Value</th>
-  </tr>
-    
-  <tr bgcolor="#FFFFFF">
-    <td>Title</td>
-    <td>Basic Item</td>
-    <td>@one_revision.title@</td>
-  </tr>
-  <tr bgcolor="#EEEEEE">
-    <td>Mime Type</td>
-    <td>Basic Item</td>
-    <td>@one_revision.mime_type_pretty@</td>
-  </tr>
-  <tr bgcolor="#FFFFFF">
-    <td>Description</td>
-    <td>Basic Item</td>
-    <td>
-      <if @one_revision.description@ nil>&nbsp</if>
-      <else>@one_revision.description@</else>
-    </td>
-  </tr>
-  <tr bgcolor="#EEEEEE">
-    <td>Publish Date</td>
-    <td>Basic Item</td>
-    <td>
-      <if @one_revision.publish_date_pretty@ nil>&nbsp</if>
-      <else>@one_revision.publish_date_pretty@</else>
-    </td>
-  </tr>
+   <p/>
 
-  @revision_attr_html;noquote@
+   <if @content_size@ gt 1>
+     <if @is_text_mime_type@ eq t>@content;noquote@</if>
+     <else>
+       <if @is_image_mime_type@ eq t>
+          <img src="content-download?revision_id=@revision_id@">
+       </if>
+       <else>
+          <a href="content-download?revision_id=@revision_id@">View Content</a>
+       </else>
+     </else>
+   </if>
+   <else>No Content</else>
 
-</table>
-<include src="../../table-footer">
+   <p/>
 
+   <ul class="action-links">
+    <if @content_size@ le 1>
+     <if @write_p@>
+       <li>There is no content. <a href="content-add-1?revision_id=@revision_id@">
+         Create new content for this item</a></li>
+     </if>
+    </if>
+    <if @write_p@>
+     <li><a href="revision-add-1?item_id=@item_id@">
+        Add a revision this content item</a></li>
+    </if>
+    <if @live_revision_p@ eq 1>
+     <li>This revision is live. &nbsp;
+      <a href="unpublish?item_id=@item_id@">Unpublish</a></li>
+    </if>
+    <else>
+     <if @is_publishable@ eq t>
+      <li><a href="publish?item_id=@item_id@&revision_id=@revision_id@">
+        Make this revision live</a></li>
+     </if>
+    </else>
+    <li><a href="index?item_id=@item_id@">Back to the content item</a></li>
+   </ul>
 
-<include src="../../table-header">
-<table bgcolor="#6699CC" cellspacing=0 cellpadding=4 border=0 width="100%">
-    
-  <tr bgcolor="#99CCFF">
-    <th align=left>Content</th>
-    <td align=right>
-      <if @content_size@ gt 1>&nbsp;</if>
-      <else>
-        <if @write_p@>
-	  [<a href="content-add-1?revision_id=@revision_id@">Add</a>]
-        </if>
-        <else>&nbsp;</else>
-      </else>
-    </td>
-  </tr>
-  <tr bgcolor="#FFFFFF">
-    <td colspan=2>
-      <if @content_size@ gt 1>
-	<if @is_text_mime_type@ eq t>@content@</if>
-        <else>
-          <if @is_image_mime_type@ eq t>
-            <img src="content-download?revision_id=@revision_id@">
-          </if>
-          <else>
-	    <a href="content-download?revision_id=@revision_id@">
-   	      View Content
-            </a>
-          </else>
-        </else>
-      </if>
-      <else><i>No Content</i></else>
-    </td>
-  </tr>
-</table>
-
-<include src="../../table-footer">
-<p>
-
-
-<if @write_p@>
-  <a href="revision-add-1?item_id=@item_id@">
-    Add a revision this content item</a>
-  <br> 
-</if>
-
-
-<a href="index?item_id=@item_id@">Back to the content item</a>
-<p>
+ </div>
+</div>
Index: openacs-4/packages/cms/www/modules/items/revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/cms/www/modules/items/revision.tcl	13 Apr 2005 20:15:19 -0000	1.8
+++ openacs-4/packages/cms/www/modules/items/revision.tcl	16 May 2005 22:59:24 -0000	1.9
@@ -24,7 +24,6 @@
     return
 }
 
-
 # check if the item is publishable (but does not need live revision)
 set is_publishable [db_string get_status ""]
 
@@ -36,114 +35,20 @@
 # flag indicating whether the MIME type of the content is text
 set is_text_mime_type f
 set is_image_mime_type f
-if { [regexp {text/} $mime_type] } {
+
+if { [string match "text/*" $mime_type] } {
     set is_text_mime_type t
     set content [db_string get_content ""]
-  
-    ns_log notice $content
-
-    # HACK: special chars in the text confuse TCL
-    if { [regexp {<|>|\[|\]|\{|\}|\$} $content match] } {
-      set is_text_mime_type f
-    }
-
-} elseif { [regexp {image/} $mime_type] } {
+} elseif { [string match "image/*" $mime_type] } {
     set is_image_mime_type t
 }
-
-
+ns_log notice "----- $is_text_mime_type $is_image_mime_type $valid_revision_p $is_publishable $write_p $revision_count"
 # get item info
 db_1row get_one_item ""
     
 if { $live_revision_id == $revision_id } {
   set live_revision_p 1
 }
 
-################################################################
-################################################################
+set page_title "$title : Revision $revision_number of $revision_count for $name"
 
-
-# get the attribute types for a given revision item
-# if attr.table_name is null, then use o.table_name
-# if column_name is null, then use the attribute_name
-# if id_column is null, then use 'attribute_id' and 'acs_attribute_values'
-
-set meta_attributes [db_list_of_lists get_meta_attrs ""]
-
-set attr_columns [list]
-set attr_tables [list]
-set column_id_cons [list]
-set attr_display [list]
-
-foreach meta $meta_attributes {
-    set attribute_id   [lindex $meta 0]
-    set pretty_name    [lindex $meta 1]
-    set object_type    [lindex $meta 2]
-    set attribute_name [lindex $meta 3]
-    set table_name     [lindex $meta 4]
-    set id_column      [lindex $meta 5]
-
-    lappend attr_display [list $pretty_name $object_type]
-
-    # add the column constraint and table to the query only if it
-    #   isn't there already
-    if { [lsearch -exact $attr_tables $table_name] == -1 } {
-	lappend attr_tables $table_name
-	lappend column_id_cons "$table_name.$id_column = :revision_id"
-    }
-
-    # the attribute value columns we want to fetch are either in
-    #   acs_attribute_values (object_id,attribute_id) 
-    #   or in $table_name ($id_column)
-    if { ![string equal $attribute_name ""] && \
-	    ![string equal $table_name ""] } {
-	lappend attr_columns "$table_name.$attribute_name"
-    } else {
-	lappend attr_columns "acs_attribute_values.attr_value"
-
-	if { [lsearch -exact $attr_tables "acs_attribute_values"] == -1 } {
-	    lappend attr_tables "acs_attribute_values"
-	    lappend column_id_cons \
-		    "acs_attribute_values.attribute_id = $attribute_id
-                     and acs_attribute_values.object_id = :revision_id"
-	}
-    }
-}
-
-if { ![string equal $attr_columns ""] } {
-
-    set attribute_values [db_list_of_lists get_attr_values ""]
-
-    # write the body of the attribute display table to $revision_attr_html
-    set revision_attr_html ""
-    set i 0
-    set attribute_count [llength $attribute_values]
-    foreach attr_value [lindex $attribute_values 0] {
-	set pretty_name [lindex [lindex $attr_display $i] 0]
-	set object_type [lindex [lindex $attr_display $i] 1]
-	
-	if { [expr [expr $i+1] % 2] == 0 } {
-	    set bgcolor "#EEEEEE"
-	} else {
-	    set bgcolor "#ffffff"
-	}
-	if { [string equal $attr_value ""] } {
-	    set attr_value "&nbsp"
-	}
-
-	append revision_attr_html "
-        <tr bgcolor=\"$bgcolor\">
-          <td>$pretty_name</td>
-          <td>$object_type</td>
-          <td>$attr_value</td>
-        </tr>
-        "
-	incr i
-      }
-} else {
-  set revision_attr_html ""
-}
-
-set page_title \
-	"$title : Revision $revision_number of $revision_count for $name"
-
Index: openacs-4/packages/cms/www/modules/items/status-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/status-edit.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/cms/www/modules/items/status-edit.tcl	16 May 2005 03:06:16 -0000	1.8
+++ openacs-4/packages/cms/www/modules/items/status-edit.tcl	16 May 2005 22:59:24 -0000	1.9
@@ -1,14 +1,21 @@
-# Build an appropriate form to edit the publishing status for an item.
-request create
-request set_param item_id -datatype integer
-request set_param mount_point -datatype keyword -value sitemap
-request set_param parent_id -datatype integer -optional
-request set_param item_props_tab -datatype text
+ad_page_contract {
+    Build an appropriate form to edit the publishing status for an item.
 
+    @author Michael Steigman
+    @creation-date May 2005
+} {
+    { item_id:integer }
+    { parent_id:integer,optional }
+    { mount_point "sitemap" }
+    { item_props_tab ""}
+}
+
 ## Create the form
 
-form create publish_status -cancel_url [export_vars -base index {item_id mount_point item_props_tab}]
+set cancel_url [export_vars -base index {item_props_tab item_id mount_point}]
 
+form create publish_status -cancel_url $cancel_url -cancel_label "Cancel Operation"
+
 element create publish_status item_id \
   -datatype integer -widget hidden -value $item_id
 
Index: openacs-4/packages/cms/www/modules/items/unrelate-item.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/unrelate-item.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/items/unrelate-item.tcl	13 Apr 2005 20:15:19 -0000	1.7
+++ openacs-4/packages/cms/www/modules/items/unrelate-item.tcl	16 May 2005 22:59:24 -0000	1.8
@@ -7,7 +7,6 @@
     { rel_id:integer,multiple }
     { mount_point "sitemap" }
     { return_url "index" }
-    { passthrough "[content::assemble_passthrough mount_point]" }
 }
 
 set item_id ""
@@ -27,7 +26,5 @@
     
 }
 
-lappend passthrough [list item_id $item_id]
-
-set item_props_tab children
-ad_returnredirect [export_vars -base $return_url {item_props_tab mount_pount}]
+set item_props_tab related
+ad_returnredirect [export_vars -base $return_url {item_props_tab mount_pount item_props_tab}]
Index: openacs-4/packages/cms/www/modules/sitemap/attributes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/attributes.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/sitemap/attributes.adp	9 May 2005 22:44:49 -0000	1.7
+++ openacs-4/packages/cms/www/modules/sitemap/attributes.adp	16 May 2005 22:59:24 -0000	1.8
@@ -1,7 +1,8 @@
 <master src="../../master">
 <property name="title">@page_title@</property>
+<property name="mount_point">@mount_point@</property>
 
-<nobr><p class="h1">
+<nobr><p>
 <include src="../../bookmark" mount_point="@mount_point@" id="@folder_id@">
 @page_title;noquote@ 
 </p>
Index: openacs-4/packages/cms/www/modules/sitemap/copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/copy.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/sitemap/copy.tcl	13 Apr 2005 20:15:19 -0000	1.6
+++ openacs-4/packages/cms/www/modules/sitemap/copy.tcl	16 May 2005 22:59:24 -0000	1.7
@@ -5,7 +5,7 @@
 request set_param mount_point -datatype keyword -value sitemap
 
 
-set root_id [cm::modules::${mount_point}::getRootFolderID]
+set root_id [cm::modules::${mount_point}::getRootFolderID [ad_conn package_id]]
 if { [template::util::is_nil folder_id] } {
   set folder_id $root_id
 } 
Index: openacs-4/packages/cms/www/modules/sitemap/create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/create.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/create.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/create.adp	16 May 2005 22:59:24 -0000	1.2
@@ -1,6 +1,9 @@
 <master src="../../master">
 <property name="title">Create a Folder</property>
 
-<h3>Create new folder</h3>
-
+<div id=section>
+<div id=section-header>Create a Folder</div>
 <formtemplate id=add_folder></formtemplate>
+</div>
+
+
Index: openacs-4/packages/cms/www/modules/sitemap/move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/move.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/sitemap/move.tcl	13 Apr 2005 20:15:19 -0000	1.6
+++ openacs-4/packages/cms/www/modules/sitemap/move.tcl	16 May 2005 22:59:24 -0000	1.7
@@ -5,7 +5,7 @@
 request set_param mount_point -datatype keyword -value sitemap
 
 
-set root_id [cm::modules::${mount_point}::getRootFolderID]
+set root_id [cm::modules::${mount_point}::getRootFolderID [ad_conn package_id]]
 if { [template::util::is_nil id] } {
   set folder_id $root_id
 } else {
@@ -67,7 +67,7 @@
 
 if { [form is_valid move] } {
 
-    set root_id [cm::modules::${mount_point}::getRootFolderID]
+    set root_id [cm::modules::${mount_point}::getRootFolderID [ad_conn package_id]]
 
     form get_values move id mount_point
     set moved_items [element get_values move moved_items]
Index: openacs-4/packages/cms/www/modules/sitemap/rename.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/rename.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/sitemap/rename.adp	13 Apr 2005 20:15:19 -0000	1.3
+++ openacs-4/packages/cms/www/modules/sitemap/rename.adp	16 May 2005 22:59:24 -0000	1.4
@@ -1,6 +1,10 @@
 <master src="../../master">
 <property name="title">Rename Folder</property>
 
-<h2>Rename folder</h2>
-
+<div id=section>
+<div id=section-header>Rename Folder</div>
 <formtemplate id=rename_folder></formtemplate>
+</div>
+
+
+
Index: openacs-4/packages/cms/www/modules/sitemap/symlink.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/symlink.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/sitemap/symlink.tcl	13 Apr 2005 20:15:19 -0000	1.7
+++ openacs-4/packages/cms/www/modules/sitemap/symlink.tcl	16 May 2005 22:59:24 -0000	1.8
@@ -10,7 +10,7 @@
 
 
 if { [template::util::is_nil id] } {
-    set folder_id [cm::modules::${mount_point}::getRootFolderID]
+    set folder_id [cm::modules::${mount_point}::getRootFolderID [ad_conn package_id]]
 } else {
     set folder_id $id
 }
Index: openacs-4/packages/cms/www/modules/templates/new-folder.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/new-folder.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/templates/new-folder.adp	9 May 2005 22:44:49 -0000	1.4
+++ openacs-4/packages/cms/www/modules/templates/new-folder.adp	16 May 2005 22:59:24 -0000	1.5
@@ -1,5 +1,11 @@
 <master src="../../master">
 <property name="title">@title@</property>
-<h3>@title@</h3>
 
+<include src="template-header" mount_point=templates item_id=@parent_id@ template_props_tab=revisions>
+
+<div id=section>
+<div id=section-header>@title@</div>
 <formtemplate id="new_folder"></formtemplate>
+</div>
+
+
Index: openacs-4/packages/cms/www/modules/templates/new-folder.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/new-folder.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/templates/new-folder.tcl	9 May 2005 22:44:49 -0000	1.7
+++ openacs-4/packages/cms/www/modules/templates/new-folder.tcl	16 May 2005 22:59:24 -0000	1.8
@@ -1,5 +1,6 @@
 request create -params {
-  parent_id -datatype integer
+  parent_id -datatype integer -optional \
+      -value [cm::modules::templates::getRootFolderID [ad_conn package_id]]
 }
 
 set path [db_string get_path ""]
Index: openacs-4/packages/cms/www/modules/templates/template-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-create.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/templates/template-create.tcl	19 Aug 2002 04:19:45 -0000	1.5
+++ openacs-4/packages/cms/www/modules/templates/template-create.tcl	16 May 2005 22:59:24 -0000	1.6
@@ -6,7 +6,7 @@
 
 # Cannot use -value due to negative values
 if { [template::util::is_nil parent_id] } {
-  set parent_id [cm::modules::templates::getRootFolderID]
+  set parent_id [cm::modules::templates::getRootFolderID [ad_conn package_id]]
 }
 
 set folder_name [db_string get_folder_name "" -default ""]
@@ -43,7 +43,7 @@
     set ip_address [ns_conn peeraddr]
     
     if { [util::is_nil parent_id] } {
-      set parent_id [cm::modules::templates::getRootFolderID]
+      set parent_id [cm::modules::templates::getRootFolderID [ad_conn package_id]]
     }
  
     db_transaction {
Index: openacs-4/packages/cms/www/modules/templates/template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/templates/template.tcl	22 Aug 2002 03:04:32 -0000	1.5
+++ openacs-4/packages/cms/www/modules/templates/template.tcl	16 May 2005 22:59:24 -0000	1.6
@@ -14,7 +14,7 @@
 }
 
 # The root ID is to determine the appropriate path to the item
-set root_id [cm::modules::templates::getRootFolderID]
+set root_id [cm::modules::templates::getRootFolderID [ad_conn package_id]]
 
 
 # resolve any symlinks
Index: openacs-4/packages/cms/www/modules/types/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/index.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/cms/www/modules/types/index.tcl	16 May 2005 17:38:19 -0000	1.9
+++ openacs-4/packages/cms/www/modules/types/index.tcl	16 May 2005 22:59:25 -0000	1.10
@@ -72,8 +72,6 @@
 # get template information
 db_multirow -extend {unreg_link unreg_link_url set_default_url} type_templates get_type_templates "" {
     set context $use_context
-    set unreg_link_url [export_vars -base unregister-template {template_id context content_type}]
-    set set_default_url [export_vars -base set-default-template {template_id context content_type}]
+    set unreg_link_url [export_vars -base unregister-template {template_id context content_type type_props_tab}]
+    set set_default_url [export_vars -base set-default-template {template_id context content_type type_props_tab}]
 }
-
-
Index: openacs-4/packages/cms/www/modules/types/register-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/register-templates.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/types/register-templates.tcl	16 May 2005 17:38:19 -0000	1.5
+++ openacs-4/packages/cms/www/modules/types/register-templates.tcl	16 May 2005 22:59:25 -0000	1.6
@@ -26,8 +26,11 @@
 	-widget hidden \
 	-param
 
+element create register_templates type_props_tab \
+    -datatype keyword \
+    -widget hidden \
+    -value $type_props_tab
 
-
 # grab marked templates from the clipboard
 #set root_id [cm::modules::templates::getRootFolderID]
 set clip [clipboard::parse_cookie]
@@ -124,16 +127,11 @@
 	eval "set context $$context_name"
 
         db_transaction {
-            db_exec_plsql register_templates "begin
-                   content_type.register_template(
-                       content_type => :content_type,
-	               template_id  => :template_id,
-	               use_context  => :context );
-                 end;"
+            db_exec_plsql register_templates {}
         }
 
     }
 
-    forward "index?id=$content_type"
+    ad_returnredirect [export_vars -base index {content_type type_props_tab}]
 
 }
Index: openacs-4/packages/cms/www/modules/types/relation-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-unregister.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/types/relation-unregister.tcl	16 May 2005 17:38:19 -0000	1.7
+++ openacs-4/packages/cms/www/modules/types/relation-unregister.tcl	16 May 2005 22:59:25 -0000	1.8
@@ -5,6 +5,7 @@
 request create
 request set_param rel_type -datatype keyword -value item
 request set_param content_type -datatype keyword
+request set_param type_props_tab -datatype keyword -optional -value related
 request set_param target_type -datatype keyword
 request set_param relation_tag -datatype text -value ""
 
@@ -29,16 +30,9 @@
 }
 
 
-if { [catch {db_exec_plsql unregister "
-      begin
-      content_type.${unregister_method} (
-          $content_key  => :content_type,
-          $target_key   => :target_type,
-          relation_tag  => :relation_tag
-      );
-      end;"} errmsg] } {
+if { [catch {db_exec_plsql unregister {}} errmsg] } {
     template::request::error unregister_relation_type \
 	    "Could not unregister relation type - $errmsg"
 }
 
-template::forward "index?id=$content_type&type_props_tab=relations"
+ad_returnredirect [export_vars -base index {content_type type_props_tab mount_point}]
Index: openacs-4/packages/cms/www/modules/types/relations.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relations.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/cms/www/modules/types/relations.tcl	16 May 2005 17:38:19 -0000	1.7
+++ openacs-4/packages/cms/www/modules/types/relations.tcl	16 May 2005 22:59:25 -0000	1.8
@@ -36,7 +36,7 @@
 
 db_multirow -extend {item_unreg_link} rel_types get_rel_types "" {
     set rel_type item_rel
-    set item_unreg_link [export_vars -base relation-unregister {rel_type content_type target_type relation_tag}]
+    set item_unreg_link [export_vars -base relation-unregister {rel_type content_type target_type relation_tag type_props_tab}]
 }
 
 template::list::create \
@@ -67,5 +67,5 @@
 db_multirow -extend {child_unreg_link} child_types get_child_types "" {
     set rel_type child_rel
     set target_type $child_type
-    set child_unreg_link [export_vars -base relation-unregister {rel_type content_type target_type relation_tag}]
+    set child_unreg_link [export_vars -base relation-unregister {rel_type content_type target_type relation_tag type_props_tab}]
 }
Index: openacs-4/packages/cms/www/modules/types/unregister-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/unregister-template.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/unregister-template.tcl	24 May 2001 23:57:17 -0000	1.2
+++ openacs-4/packages/cms/www/modules/types/unregister-template.tcl	16 May 2005 22:59:25 -0000	1.3
@@ -6,16 +6,11 @@
 request set_param template_id -datatype integer
 request set_param context -datatype keyword
 request set_param content_type -datatype keyword
+request set_param type_props_tab -datatype text -optional -value templates
+request set_param mount_point -datatype text -optional -value types
 
-
 db_transaction {
-    db_exec_plsql unregister_template "
-  begin
-    content_type.unregister_template(
-      template_id  => :template_id,
-      content_type => :content_type,
-      use_context  => :context );
-  end;"
+    db_exec_plsql unregister_template {}
 }
 
-template::forward "../types/index?id=$content_type&mount_point=types"
+ad_returnredirect [export_vars -base index {content_type mount_point type_props_tab}]