Index: openacs-4/packages/download/www/help.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/help.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/download/www/help.adp	12 Sep 2013 22:02:06 -0000	1.7
+++ openacs-4/packages/download/www/help.adp	1 Jul 2015 18:41:28 -0000	1.8
@@ -4,7 +4,7 @@
 
 @help_text@
 
-<a name=permissions><h3>#download.lt_Permissions_on_Archiv#</h3></a>
+<h3>#download.lt_Permissions_on_Archiv#</h3>
   <blockquote>
     <table>
     <tr><th>#download.Permission#</th><th>#download.Description_1#</th></tr>
Index: openacs-4/packages/download/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/download/www/index.adp	1 Jul 2015 17:57:49 -0000	1.13
+++ openacs-4/packages/download/www/index.adp	1 Jul 2015 18:41:28 -0000	1.14
@@ -4,9 +4,10 @@
 <property name="context"></property>
 
 <if @master_admin_p@ eq 1>
-<table align="right"><tr><td><a href="admin/">#download.Administration#</a></td></tr></table>
+<div style='float:right; padding:5px;'><a href="admin/">#download.Administration#</a></div>
 </if>
-<table align="right"><tr><td><a href="help">#download.Help#</a></td></tr></table>
+<div style='float:right; padding:5px;'><a href="help">#download.Help#</a></div>
+<br>
 
 @description@
 <if 0>
Index: openacs-4/packages/download/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/download/www/index.tcl	1 Jul 2015 18:00:43 -0000	1.19
+++ openacs-4/packages/download/www/index.tcl	1 Jul 2015 18:41:28 -0000	1.20
@@ -54,25 +54,25 @@
 lappend type_dimlist {"" "#download.all#" {}}
 
 set dimensional [list [list versions "#download.Versions#" current [list \
-									 [list current [_ download.current] {where "[db_map archive_where_clause]"} ] \
-									 [list all [_ download.all] {where "da.archive_id = dar.archive_id"} ]
+									 [list current "[_ download.current]" {where "[db_map archive_where_clause]"} ] \
+									 [list all "[_ download.all]" {where "da.archive_id = dar.archive_id"} ]
 								     ]]\
-		     [list archive_type_id [_ download.Type]    "" $type_dimlist] \
-		     [list updated         [_ download.Updated] all [list \
-								   [list 1d [_ download.last_24hrs] {where "[db_map date_clause_1]"}] \
-								   [list 1w [_ download.last_week]  {where "[db_map date_clause_7]"}] \
-								   [list 1m [_ download.last_month] {where "[db_map date_clause_30]"}] \
-								   [list all [_ download.all] {}]]
+		     [list archive_type_id "[_ download.Type]"    "" $type_dimlist] \
+		     [list updated         "[_ download.Updated]" all [list \
+								   [list 1d "[_ download.last_24hrs]" {where "[db_map date_clause_1]"}] \
+								   [list 1w "[_ download.last_week]"  {where "[db_map date_clause_7]"}] \
+								   [list 1m "[_ download.last_month]" {where "[db_map date_clause_30]"}] \
+								   [list all "[_ download.all]" {}]]
 		     ]]
 
 if { $admin_p } {
     set approval ""
-    lappend dimensional [list approved [_ download.Approval] approved \
+    lappend dimensional [list approved "[_ download.Approval]" approved \
 			     [list \
-				  [list pending [_ download.pending]   {where "dar.approved_p is null"}] \
-				  [list approved [_ download.approved] {where "dar.approved_p = 't'"}] \
-				  [list rejected [_ download.rejected] {where "dar.approved_p = 'f'"}] \
-				  [list all [_ download.all] {}] \
+				  [list pending "[_ download.pending]"   {where "dar.approved_p is null"}] \
+				  [list approved "[_ download.approved]" {where "dar.approved_p = 't'"}] \
+				  [list rejected "[_ download.rejected]" {where "dar.approved_p = 'f'"}] \
+				  [list all "[_ download.all]" {}] \
 				  ]
 			 ]
 } else {
@@ -136,7 +136,7 @@
 
 if { $admin_p } {
     lappend element_list approved_p {
-        label [_ download.Approval]
+        label "[_ download.Approval]"
         display_template {
             <font color="@downloads_multirow.approved_color@">@downloads_multirow.approved_text@</font> 
             \[<font size="-1"><a href='@downloads_multirow.approved_url@'>@downloads_multirow.approved_action@</a></font>\]
Index: openacs-4/packages/download/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/index.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/download/www/admin/index.adp	12 Sep 2013 22:02:07 -0000	1.6
+++ openacs-4/packages/download/www/admin/index.adp	1 Jul 2015 18:41:28 -0000	1.7
@@ -5,17 +5,17 @@
 @description@
 
 <ul>
-<li> #download.lt_Configure_the_downloa#</li>
+<li> #download.lt_Configure_the_downloa#
    <ul>
    <li><a href="/permissions/one?object_id=@repository_id@">#download.lt_Set_Repository_Permis#</a></li>
    <li><a href="repository-ae?repository_id=@repository_id@">#download.Edit#</a> #download.lt_the_repository_descri#</li>
    <li><a href="repository-types">#download.ViewEditAdd#</a> #download.lt_the_repository_archiv#</li>
    <li><a href="repository-metadata">#download.ViewEditAdd#</a> #download.lt_the_metadata_collecte#</li>
    <li><a href="repository-reasons">#download.ViewEditAdd#</a> #download.lt_the_repository_downlo#</li>
-   </ul>
-<li> #download.Download_Reports#</li>
+   </ul></li>
+<li> #download.Download_Reports#
    <ul>
    <li><a href="report-by-user">#download.Download_by_user#</a>.</li>
    <li><a href="report-by-ip">#download.lt_Download_by_IP_addres#</a>.</li>
-   </ul>
+   </ul></li>
 </ul>
Index: openacs-4/packages/download/www/admin/report-by-ip.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/download/www/admin/report-by-ip.adp	12 Sep 2013 22:02:07 -0000	1.11
+++ openacs-4/packages/download/www/admin/report-by-ip.adp	1 Jul 2015 18:41:28 -0000	1.12
@@ -4,11 +4,10 @@
 
 <p>
 <form method="post" action="spam-users">
-  @user_id_list_export;noquote@
-  <input type="submit" value="Spam Downloaders" />
+  <div>@user_id_list_export;noquote@
+  <input type="submit" value="Spam Downloaders" ></div>
 </form>
-</p>
 
-@dimensional_html;noquote@
+@dimensional_html;literal@
 <listtemplate name="ips_list"></listtemplate>
     
\ No newline at end of file
Index: openacs-4/packages/download/www/admin/report-by-ip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/download/www/admin/report-by-ip.tcl	12 Sep 2013 10:26:12 -0000	1.8
+++ openacs-4/packages/download/www/admin/report-by-ip.tcl	1 Jul 2015 18:41:28 -0000	1.9
@@ -26,7 +26,7 @@
 
 template::list::create -name ips_list \
     -multirow ips \
-    -html {width "90%" align center} \
+    -html {width "90%" style "margin: 0 auto;"} \
     -elements {
         download_ip {
             label "From IP"
@@ -52,4 +52,4 @@
 
 set context [list "Downloads by IP"]
 
-ad_return_template
\ No newline at end of file
+ad_return_template
Index: openacs-4/packages/download/www/admin/report-by-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-user.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/download/www/admin/report-by-user.adp	12 Sep 2013 22:02:07 -0000	1.10
+++ openacs-4/packages/download/www/admin/report-by-user.adp	1 Jul 2015 18:41:28 -0000	1.11
@@ -4,10 +4,12 @@
 
 <p>
 <form method="post" action="spam-users">
+<div>
   @user_id_list_export;noquote@
-  <input type="submit" value="Spam Downloaders" />
+  <input type="submit" value="Spam Downloaders" >
+</div>  
 </form>
-</p>
 
-@dimensional_html;noquote@
+
+@dimensional_html;literal@
 <listtemplate name="users_list"></listtemplate>
Index: openacs-4/packages/download/www/admin/report-by-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-user.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/download/www/admin/report-by-user.tcl	12 Sep 2013 10:26:12 -0000	1.8
+++ openacs-4/packages/download/www/admin/report-by-user.tcl	1 Jul 2015 18:41:29 -0000	1.9
@@ -28,7 +28,7 @@
 
 template::list::create -name users_list \
     -multirow users \
-    -html { width "90%" align center} \
+    -html { width "90%" style "margin: 0 auto;"} \
     -elements {
         user_name {
             label "User Name (Last name, first name)"
@@ -51,4 +51,4 @@
 set user_id_list_export [export_vars -form -sign user_id_list]
 
 set context [list "Downloads by User"]
-ad_return_template
\ No newline at end of file
+ad_return_template
Index: openacs-4/packages/download/www/admin/repository-metadata.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-metadata.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/download/www/admin/repository-metadata.adp	12 Sep 2013 22:02:08 -0000	1.6
+++ openacs-4/packages/download/www/admin/repository-metadata.adp	1 Jul 2015 18:41:29 -0000	1.7
@@ -4,6 +4,7 @@
 
 <formtemplate id="add_metadata"></formtemplate>
 
+<if @metadata:rowcount;literal@ gt 0>
 <h3>#download.Current_Metadata#</h3>
 <ul>
 <multiple name=metadata>
@@ -20,4 +21,4 @@
       <a href="repository-metadata-edit?metadata_id=@metadata.metadata_id@">#download.Edit#</a>
 </multiple>
 </ul>
-
+</if>
Index: openacs-4/packages/download/www/admin/repository-reasons.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-reasons.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/download/www/admin/repository-reasons.adp	12 Sep 2013 22:02:08 -0000	1.6
+++ openacs-4/packages/download/www/admin/repository-reasons.adp	1 Jul 2015 18:41:29 -0000	1.7
@@ -6,6 +6,8 @@
 
 <formtemplate id="add_reason"></formtemplate>
 
+
+<if @reasons:rowcount;literal@ gt 0>
 <h3>#download.Current_Reasons#</h3>
 <ul>
 <multiple name=reasons>
@@ -14,4 +16,5 @@
       <a href="repository-reasons-edit?download_reason_id=@reasons.download_reason_id@">#download.Edit#</a>
 </multiple>
 </ul>
+</if>
 
Index: openacs-4/packages/download/www/admin/repository-types.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-types.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/download/www/admin/repository-types.adp	12 Sep 2013 22:02:08 -0000	1.6
+++ openacs-4/packages/download/www/admin/repository-types.adp	1 Jul 2015 18:41:29 -0000	1.7
@@ -7,8 +7,8 @@
 <h3>#download.lt_Current_Archive_Types#</h3>
 <ul>
 <multiple name=types>
-  <li>@types.pretty_name@ <br />
-      @types.description@ <br />
+  <li>@types.pretty_name@ <br >
+      @types.description@ <br >
       <a href="repository-types-delete?archive_type_id=@types.archive_type_id@">#download.Delete#</a> |
       <a href="repository-types-edit?archive_type_id=@types.archive_type_id@">#download.Edit#</a></li>
 </multiple>