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