Index: openacs-4/packages/cms/www/modules/templates/edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/edit.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/templates/edit.adp	9 May 2005 22:44:49 -0000	1.5
+++ openacs-4/packages/cms/www/modules/templates/edit.adp	16 May 2005 20:47:56 -0000	1.6
@@ -1,31 +1,17 @@
 <master src="../../master">
 <property name="title">Edit Template</property>
 
-<script language=JavaScript>
-  function setSrc(name, src) {
-    document.images[name].src = "assets/" + src;
-  }
-</script>
+<include src="template-header" mount_point=@mount_point@ item_id=@template_id@ template_props_tab=@template_props_tab@>
 
-<h3>Edit Template</h3>
-@path;noquote@
-<br/>
+<include src="template-tabs" mount_point=@mount_point@ item_id=@template_id@ template_props_tab=@template_props_tab@>
 
-<formtemplate id="edit_template">
-<formwidget id=template_id>
-<formwidget id=revision_id>
-<formwidget id=content>
+<div id="subnavbar-body">
 
-<br/>
-Output Type: 
-<formwidget id="mime_type">
-<br/>
-Create new revision: 
-<formgroup id="is_update">
-  @formgroup.widget;noquote@ @formgroup.label;noquote@
-</formgroup>
-<br/>
-<input type=submit name=action value="Save">&nbsp;&nbsp;
-<input type=submit name=action value="Cancel">
+ <div id=section>
+  <div id=section-header>Edit Template @path;noquote@</div>
+   <p/>
+   <formtemplate id="edit_template"></formtemplate>
+ </div>
 
-</formtemplate>
+</div>
+
Index: openacs-4/packages/cms/www/modules/templates/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/edit.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/templates/edit.tcl	19 Aug 2002 04:07:50 -0000	1.3
+++ openacs-4/packages/cms/www/modules/templates/edit.tcl	16 May 2005 20:47:56 -0000	1.4
@@ -1,6 +1,12 @@
-request create -params {
-  template_id -datatype integer
-  edit_revision -datatype integer -optional
+ad_page_contract {
+
+    @author Michael Steigman
+    @creation-date May 2005
+} {
+    { template_id:integer }
+    { edit_revision:optional "" }
+    { mount_point "templates"}
+    { template_props_tab:optional "revision"}
 }
 
 if { ! [request is_valid] } { return }
Index: openacs-4/packages/cms/www/modules/templates/properties.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/properties.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/templates/properties.adp	9 May 2005 22:44:49 -0000	1.5
+++ openacs-4/packages/cms/www/modules/templates/properties.adp	16 May 2005 20:47:56 -0000	1.6
@@ -1,98 +1,20 @@
 <master src="../../master">
 <property name="title">@page_title@</property>
 
-<nobr><p class="h1">
-<include src="../../bookmark" mount_point="@mount_point@" id="@item_id@">
-@page_title;noquote@ 
-</p>
-</nobr>
-<p/>
+<include src="template-header" mount_point=@mount_point@ item_id=@item_id@ template_props_tab=@template_props_tab@>
 
-&nbsp;&nbsp;&nbsp;
-<if @description@ not nil>@description;noquote@</if>
-<else>No description</else>
+<include src="template-tabs" mount_point=@mount_point@ item_id=@item_id@ template_props_tab=@template_props_tab@>
 
-<p/>
-
-<include src="../sitemap/ancestors" mount_point=@mount_point@ item_id=@item_id@>
-
-<p/>
-
-<!-- Tabs -->
-
-<div id="subnavbar-div">
-  <div id="subnavbar-container">
-    <div id="subnavbar">
-
- <if @template_props_tab@ eq revisions>
-   <div class="tab" id="subnavbar-here">
-     Revisions
-   </div>
- </if>
- <else>
-   <div class="tab">
-     <a href="@package_url@modules/templates/properties?item_id=@item_id@&mount_point=@mount_point@&template_props_tab=revisions" title="" class="subnavbar-unselected">Revisions</a>
-   </div>
- </else>
-
- <if @template_props_tab@ eq datasources>
-   <div class="tab" id="subnavbar-here">
-     Datasources
-   </div>
- </if>
- <else>
-   <div class="tab">
-     <a href="@package_url@modules/templates/properties?item_id=@item_id@&mount_point=@mount_point@&template_props_tab=datasources" title="" class="subnavbar-unselected">Datasources</a>
-   </div>
- </else>
-
- <if @template_props_tab@ eq assets>
-   <div class="tab" id="subnavbar-here">
-     Assets
-   </div>
- </if>
- <else>
-   <div class="tab">
-     <a href="@package_url@modules/templates/properties?item_id=@item_id@&mount_point=@mount_point@&template_props_tab=assets" title="" class="subnavbar-unselected">Assets</a>
-   </div>
- </else>
-
- <if @template_props_tab@ eq types>
-   <div class="tab" id="subnavbar-here">
-     Content Types
-   </div>
- </if>
- <else>
-   <div class="tab">
-     <a href="@package_url@modules/templates/properties?item_id=@item_id@&mount_point=@mount_point@&template_props_tab=types" title="" class="subnavbar-unselected">Content Types</a>
-   </div>
- </else>
-
- <if @template_props_tab@ eq items>
-   <div class="tab" id="subnavbar-here">
-     Content Items
-   </div>
- </if>
- <else>
-   <div class="tab">
-     <a href="@package_url@modules/templates/properties?item_id=@item_id@&mount_point=@mount_point@&template_props_tab=items" title="" class="subnavbar-unselected">Content Items</a>
-   </div>
- </else>
-
-  </div>
- </div>
-</div>
-
 <div id="subnavbar-body">
 
 <div id=section>
  <include src=@template_props_tab@ template_id=@item_id@>
 </div>
 
 <ul class="action-links">
- <li><a href="edit?template_id=@item_id@">Edit</a> this template in the browser</li>
- <li><a href="download?template_id=@item_id@">Save</a> the latest version of this template to a file</li>
- <li><a href="upload?template_id=@item_id@">Upload</a> a new version of this template</li>
+ <li><a href="edit?template_id=@item_id@&template_props_tab=@template_props_tab@">Edit</a> this template in the browser</li>
+ <li><a href="download?template_id=@item_id@&template_props_tab=@template_props_tab@">Save</a> the latest version of this template to a file</li>
+ <li><a href="upload?template_id=@item_id@&template_props_tab=@template_props_tab@">Upload</a> a new version of this template</li>
 </ul>
 
 </div>
\ No newline at end of file
Index: openacs-4/packages/cms/www/modules/templates/properties.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/properties.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/templates/properties.tcl	16 Nov 2004 22:32:51 -0000	1.4
+++ openacs-4/packages/cms/www/modules/templates/properties.tcl	16 May 2005 20:47:56 -0000	1.5
@@ -38,8 +38,6 @@
   template::forward index?id=$item_id
 }
 
-set package_url [ad_conn package_url]
-
 # query the content_type of the item ID so we can check for a custom info page
 db_1row get_info "" -column_array info
 template::util::array_to_vars info
Index: openacs-4/packages/cms/www/modules/templates/template-header.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-header.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/template-header.adp	16 May 2005 20:47:56 -0000	1.1
@@ -0,0 +1,16 @@
+<nobr><p>
+<include src="../../bookmark" mount_point="@mount_point@" id="@item_id@">
+@page_title;noquote@ 
+</p>
+</nobr>
+<p/>
+
+&nbsp;&nbsp;&nbsp;
+<if @description@ not nil>@description;noquote@</if>
+<else>No description</else>
+
+<p/>
+
+<include src="../sitemap/ancestors" mount_point=@mount_point@ item_id=@item_id@>
+
+<p/>
\ No newline at end of file
Index: openacs-4/packages/cms/www/modules/templates/template-header.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-header.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/template-header.tcl	16 May 2005 20:47:56 -0000	1.1
@@ -0,0 +1,12 @@
+request create -params {
+    item_id -datatype integer
+    mount_point -datatype keyword -optional -value templates
+    template_props_tab -datatype keyword -optional -value revisions
+}
+
+# query the content_type of the item ID so we can check for a custom info page
+db_1row get_info "" -column_array info
+template::util::array_to_vars info
+
+set item_title [db_string get_item_title ""]
+set page_title "Content Template - $item_title"
\ No newline at end of file
Index: openacs-4/packages/cms/www/modules/templates/template-header.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-header.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/template-header.xql	16 May 2005 20:47:56 -0000	1.1
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_info">      
+      <querytext>
+      
+  select 
+    i.content_type, i.latest_revision, r.description
+  from 
+    cr_items i, cr_revisions r
+  where 
+   i.item_id = :item_id
+  and 
+   r.revision_id = content_item__get_best_revision(:item_id)
+
+      </querytext>
+</fullquery>
+
+<fullquery name="get_item_title">
+ <querytext>
+
+  select title from cr_revisions where revision_id = :latest_revision
+
+ </querytext>
+</fullquery>
+ 
+</queryset>
Index: openacs-4/packages/cms/www/modules/templates/template-tabs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-tabs.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/template-tabs.adp	16 May 2005 20:47:56 -0000	1.1
@@ -0,0 +1,64 @@
+<!-- Tabs -->
+
+<div id="subnavbar-div">
+  <div id="subnavbar-container">
+    <div id="subnavbar">
+
+ <if @template_props_tab@ eq revisions>
+   <div class="tab" id="subnavbar-here">
+     Revisions
+   </div>
+ </if>
+ <else>
+   <div class="tab">
+     <a href="@package_url@modules/templates/properties?item_id=@item_id@&mount_point=@mount_point@&template_props_tab=revisions" title="" class="subnavbar-unselected">Revisions</a>
+   </div>
+ </else>
+
+ <if @template_props_tab@ eq datasources>
+   <div class="tab" id="subnavbar-here">
+     Datasources
+   </div>
+ </if>
+ <else>
+   <div class="tab">
+     <a href="@package_url@modules/templates/properties?item_id=@item_id@&mount_point=@mount_point@&template_props_tab=datasources" title="" class="subnavbar-unselected">Datasources</a>
+   </div>
+ </else>
+
+ <if @template_props_tab@ eq assets>
+   <div class="tab" id="subnavbar-here">
+     Assets
+   </div>
+ </if>
+ <else>
+   <div class="tab">
+     <a href="@package_url@modules/templates/properties?item_id=@item_id@&mount_point=@mount_point@&template_props_tab=assets" title="" class="subnavbar-unselected">Assets</a>
+   </div>
+ </else>
+
+ <if @template_props_tab@ eq types>
+   <div class="tab" id="subnavbar-here">
+     Content Types
+   </div>
+ </if>
+ <else>
+   <div class="tab">
+     <a href="@package_url@modules/templates/properties?item_id=@item_id@&mount_point=@mount_point@&template_props_tab=types" title="" class="subnavbar-unselected">Content Types</a>
+   </div>
+ </else>
+
+ <if @template_props_tab@ eq items>
+   <div class="tab" id="subnavbar-here">
+     Content Items
+   </div>
+ </if>
+ <else>
+   <div class="tab">
+     <a href="@package_url@modules/templates/properties?item_id=@item_id@&mount_point=@mount_point@&template_props_tab=items" title="" class="subnavbar-unselected">Content Items</a>
+   </div>
+ </else>
+
+  </div>
+ </div>
+</div>
Index: openacs-4/packages/cms/www/modules/templates/template-tabs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-tabs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/templates/template-tabs.tcl	16 May 2005 20:47:56 -0000	1.1
@@ -0,0 +1,7 @@
+request create -params {
+    item_id -datatype integer
+    mount_point -datatype text -optional -value templates
+    template_props_tab -datatype text
+}
+
+set package_url [ad_conn package_url]
Index: openacs-4/packages/cms/www/modules/templates/upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/upload.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/templates/upload.adp	9 May 2005 22:44:49 -0000	1.4
+++ openacs-4/packages/cms/www/modules/templates/upload.adp	16 May 2005 20:47:56 -0000	1.5
@@ -1,23 +1,17 @@
 <master src="../../master">
 <property name="title">Upload new template revision</property>
 
-<script language=JavaScript>
-  function setSrc(name, src) {
-    document.images[name].src = "assets/" + src;
-  }
-</script>
+<include src="template-header" mount_point=@mount_point@ item_id=@template_id@ template_props_tab=@template_props_tab@>
 
-<h3>Upload Template</h3>
-@path@
+<include src="template-tabs" mount_point=@mount_point@ item_id=@template_id@ template_props_tab=@template_props_tab@>
 
-<br/>
-<formtemplate id="edit_template">
-<formwidget id=template_id>
-<formwidget id=revision_id>
-<formwidget id=content>
-<br/>
+<div id="subnavbar-body">
 
-<input type=submit name=action value="Upload">
-<input type=submit name=action value="Cancel">
+ <div id=section>
+  <div id=section-header>Upload Template @path;noquote@</div>
+   <p/>
+   <formtemplate id="edit_template"></formtemplate>
+ </div>
 
-</formtemplate>
+</div>
+
Index: openacs-4/packages/cms/www/modules/templates/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/upload.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/templates/upload.tcl	20 Aug 2002 04:18:00 -0000	1.3
+++ openacs-4/packages/cms/www/modules/templates/upload.tcl	16 May 2005 20:47:56 -0000	1.4
@@ -1,5 +1,11 @@
-request create -params {
-  template_id -datatype integer
+ad_page_contract {
+
+    @author Michael Steigman
+    @creation-date May 2005
+} {
+    { template_id:integer }
+    { mount_point "templates"}
+    { template_props_tab:optional "revision"}
 }
 
 if { ! [request is_valid] } { return }