Index: openacs-4/packages/file-storage/www/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/delete.adp,v
diff -u -r1.2 -r1.2.6.1
--- openacs-4/packages/file-storage/www/delete.adp	17 May 2004 15:15:14 -0000	1.2
+++ openacs-4/packages/file-storage/www/delete.adp	19 Feb 2007 00:04:05 -0000	1.2.6.1
@@ -2,6 +2,8 @@
 <property name="title">@title@</property>
 <property name="context">context</property>
 
+<h1>@title;noquote@</h1>
+
  <if @allowed_count@ gt 0>
       
   <if @not_allowed_count@ gt 0>@not_allowed_count@ items can not be deleted.</if>
Index: openacs-4/packages/file-storage/www/file-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.adp,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/file-storage/www/file-add.adp	8 Aug 2006 21:26:49 -0000	1.12
+++ openacs-4/packages/file-storage/www/file-add.adp	19 Feb 2007 00:01:21 -0000	1.12.2.1
@@ -2,6 +2,8 @@
 <property name="title">#file-storage.Upload_New_File#</property>
 <property name="context">@context;noquote@</property>
 
+<h1>#file-storage.Upload_New_File#</h1>
+
 <if @unpack_available_p@ true>
   <script language="JavaScript">
       function UnpackChanged(elm) {
@@ -12,10 +14,12 @@
         if (document.forms[form_name] == null) return;
 
         if (elm.checked == true) {
-            document.forms[form_name].elements["title"].disabled = true;
-            document.forms[form_name].elements["title"].value = "";
-        } else {
+            document.forms[form_name].elements["title"].disabled = true;   
+	     document.getElementById('fs_title_msg').innerHTML= 'The title you entered will not be used if you upload multiple files at once';
+
+         } else {
             document.forms[form_name].elements["title"].disabled = false;
+	     document.getElementById('fs_title_msg').innerHTML= '';
         }
     }
   </script>
Index: openacs-4/packages/file-storage/www/folder-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-create.adp,v
diff -u -r1.7 -r1.7.10.1
--- openacs-4/packages/file-storage/www/folder-create.adp	5 Jan 2004 02:16:58 -0000	1.7
+++ openacs-4/packages/file-storage/www/folder-create.adp	19 Feb 2007 00:01:21 -0000	1.7.10.1
@@ -3,6 +3,8 @@
 <property name="context">@context;noquote@</property>
 <property name="focus">folder.folder_name</property>
 
+<h1>#file-storage.Create_New_Folder#</h1>
+
 <formtemplate id="folder-ae"></formtemplate>
 
 
Index: openacs-4/packages/file-storage/www/folder-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-edit.adp,v
diff -u -r1.3 -r1.3.12.1
--- openacs-4/packages/file-storage/www/folder-edit.adp	22 May 2003 14:55:53 -0000	1.3
+++ openacs-4/packages/file-storage/www/folder-edit.adp	19 Feb 2007 00:01:21 -0000	1.3.12.1
@@ -2,20 +2,28 @@
 <property name="title">#file-storage.Edit_Folder#</property>
 <property name="context">@context_bar;noquote@</property>
 
+<h1>#file-storage.Edit_Folder#</h1>
 
-<form method=POST action=folder-edit-2>
+<form method=POST action=folder-edit-2 class="margin-form">
 <input type=hidden name=folder_id value="@folder_id@">
+<fieldset>
 
-<table>
- <tr>
-  <td align=right>#file-storage.Folder_Name#</td>
-  <td><input type=text name=folder_name value="@folder_name@" size=20></td>
- </tr>
- <tr>
-  <td>&nbsp;</td>
-  <td><input type=submit value="#file-storage.Save#"></td>
- </tr>
-</table>
+<div class="form-item-wrapper">
+	<div class="form-label">
+		<label for="folder_name">
+			#file-storage.Folder_Name#
+		</label>
+	</div>
+	
+	<div class="form-widget">                  
+		<input type=text name=folder_name id=folder_name value="@folder_name@" size=30>
+	</div>
+</div>
 
+<div class="form-button">
+	  <input type=submit value="#file-storage.Save#">
+</div>
+</fieldset>
+
 </form>
 
Index: openacs-4/packages/file-storage/www/folder-zip-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-zip-add.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/file-storage/www/folder-zip-add.adp	8 Aug 2006 21:26:49 -0000	1.2
+++ openacs-4/packages/file-storage/www/folder-zip-add.adp	19 Feb 2007 00:01:21 -0000	1.2.2.1
@@ -1,7 +1,7 @@
 <master>
 <property name="title">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
-
+<h1>#file-storage.lt_Upload_compressed_fol#</h1>
 <blockquote>
   <formtemplate id="file_add"></formtemplate>
 </blockquote>
\ No newline at end of file
Index: openacs-4/packages/file-storage/www/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/permissions.adp,v
diff -u -r1.1 -r1.1.6.1
--- openacs-4/packages/file-storage/www/permissions.adp	7 Mar 2005 15:32:12 -0000	1.1
+++ openacs-4/packages/file-storage/www/permissions.adp	19 Feb 2007 00:04:05 -0000	1.1.6.1
@@ -2,4 +2,6 @@
   <property name="title">@page_title@</property>
   <property name="context">@context@</property>
 
+<h1>@page_title;noquote@ - #file-storage.Permissions#</h1>
+
   <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id@" />
Index: openacs-4/packages/file-storage/www/simple-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-add.adp,v
diff -u -r1.9 -r1.9.10.1
--- openacs-4/packages/file-storage/www/simple-add.adp	18 Jan 2004 14:19:42 -0000	1.9
+++ openacs-4/packages/file-storage/www/simple-add.adp	19 Feb 2007 00:04:05 -0000	1.9.10.1
@@ -2,6 +2,8 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
+<h1>@page_title;noquote@</h1>
+
 <formtemplate id="simple-add"></formtemplate>