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 -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