- html fixes

- adapt to new design

www/hours/full.adp

@@ -3,7 +3,9 @@
 <property name="context">#intranet-timesheet2.context#</property>
 <property name="main_navbar_label">timesheet2_timesheet</property>
 
+<%= [im_box_header $page_title] %>
 @page_body;noquote@
+<%= [im_box_footer] %>
 
 
 

www/hours/one-project.adp

@@ -3,7 +3,9 @@
 <property name="context">#intranet-timesheet2.context#</property>
 <property name="main_navbar_label">timesheet2_timesheet</property>
 
+<%= [im_box_header $page_title] %>
 @page_body;noquote@
+<%= [im_box_footer] %>
 
 
 

www/hours/projects.adp

@@ -3,7 +3,9 @@
 <property name="context">#intranet-timesheet2.context#</property>
 <property name="main_navbar_label">timesheet2_timesheet</property>
 
+<%= [im_box_header $page_title] %>
 @page_body;noquote@
+<%= [im_box_footer] %>
 
 
 

www/hours/total.adp

@@ -3,7 +3,9 @@
 <property name="context">#intranet-timesheet2.context#</property>
 <property name="main_navbar_label">timesheet2_timesheet</property>
 
+<%= [im_box_header $page_title] %>
 @page_body;noquote@
+<%= [im_box_footer] %>
 
 
 

www/weekly_report.adp

@@ -3,10 +3,27 @@
 <property name="context">context</property>
 <property name="main_navbar_label">finance</property>
 
-<%= $filter_html %>
+<div class="filter-list">
+   <div class="filter">
+      <div class="filter-block">
+        <div class="filter-title">
+	    #intranet-timesheet2.Admin#
+        </div>
+        <ul>
+	@admin_html;noquote@
+        </ul>
+      </div>
+   </div> <!-- filter -->
 
-<table width=100% cellpadding=2 cellspacing=2 border=0>
-  <%= $table_header_html %>
-  <%= $table_body_html %>
-  <%= $table_continuation_html %>
-</table>
+   <div class="fullwidth-list">
+      <%= [im_box_header $page_title] %>
+         <table>
+            <%= $table_header_html %>
+            <%= $table_body_html %>
+            <%= $table_continuation_html %>
+         </table>
+     <%= [im_box_footer] %>
+   </div>
+   <div class="filter-list-footer"></div>
+
+</div>

www/weekly_report.tcl

@@ -179,7 +179,7 @@ if { $display == "all" } { set sel_all "selected" }
 if { $display == "project" } { set sel_pro "selected" }
 
 if { $project_id != 0 } {
-    set filter_form_html "<td>
+    set filter_form_html "
 <form method=get action='$return_url' name=filter_form>
 [export_form_vars start_at duration owner_id project_id]
 <table border=0 cellpadding=0 cellspacing=0>
@@ -202,7 +202,7 @@ if { $project_id != 0 } {
 </tr>
 </table>
 <!-- <a href=\"$return_url?\">[_ intranet-timesheet2.lt_Display_all_hours_on_]</a> -->
-</form></td><td>&nbsp;</td>"
+</form>"
 } else {
      set filter_form_html ""
 }
@@ -210,39 +210,17 @@ if { $project_id != 0 } {
 set admin_html ""
 
 if { [im_permission $user_id "add_absences"] } {
-    append admin_html "<li><a href=/intranet-timesheet2/absences/new>[_ intranet-timesheet2.Add_a_new_Absence]</a>\n"
+    append admin_html "<li><a href=/intranet-timesheet2/absences/new>[_ intranet-timesheet2.Add_a_new_Absence]</a></li>\n"
 }
 if { [im_permission $user_id "view_absences_all"] } {
-    append admin_html "<li><a href=/intranet-timesheet2/absences>[_ intranet-timesheet2.View_all_Absences]</a>\n"
+    append admin_html "<li><a href=/intranet-timesheet2/absences>[_ intranet-timesheet2.View_all_Absences]</a></li>\n"
 }
 if { [im_permission $user_id "add_hours"] } {
-    append admin_html "<li><a href=/intranet-timesheet2/hours>[_ intranet-timesheet2.Log_your_hours]</a>\n"
+    append admin_html "<li><a href=/intranet-timesheet2/hours>[_ intranet-timesheet2.Log_your_hours]</a></li>\n"
 }
 
-
 if { $admin_html != "" } {
-    set filter_html "
-
-<table border=0 cellpadding=0 cellspacing=0>
-<tr>
-    $filter_form_html
-  <td valign=top>
-    <table border=0 cellpadding=0 cellspacing=0>
-    <tr>
-	<td class=rowtitle align=center>
-	[_ intranet-timesheet2.Admin]
-	</td>
-    </tr>
-    <tr>
-	<td>
-	$admin_html
-	</td>
-    </tr>
-    </table>
-  </td>
-</tr>
-</table><br>
-"
+    set filter_html "<ul>$admin_html</ul>"
 } else {
     set filter_html $filter_form_html
 }