X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Ftimesheets.tpl;h=91c626df0def9c99e4cbecbcddf1c7b8265828a0;hb=024e938728d2b436f1f048531d8fd00a246920c6;hp=8c3acc95ec0dc00e42428e45014fd30631d14b71;hpb=f490a9f5e080c426f54502d1004f8ab444d26469;p=timetracker.git

diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 8c3acc95..91c626df 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -4,60 +4,83 @@
 
 {$forms.timesheetsForm.open}
 <table cellspacing="0" cellpadding="7" border="0" width="720">
-  <tr><td align="left">{$i18n.form.timesheets.hint}<br></td></tr>
 {if $user_dropdown}
   <tr><td align="center">{$i18n.label.user}: {$forms.timesheetsForm.user.control}</td></tr>
 {/if}
   <tr>
     <td valign="top">
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
-  {if $inactive_timesheets}
+{if $inactive_timesheets}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.timesheets.active_timesheets}</td></tr>
-  {/if}
+{/if}
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
-  {if $show_client}
+{if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
-  {/if}
-  {if $show_submit_status}
+{/if}
           <td class="tableHeader">{$i18n.label.submitted}</td>
-  {/if}
-  {if $show_approval_status}
           <td class="tableHeader">{$i18n.label.approved}</td>
-  {/if}
           <td class="tableHeader">{$i18n.label.view}</td>
           <td class="tableHeader">{$i18n.label.edit}</td>
-          <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
-        {foreach $active_timesheets as $timesheet}
+{foreach $active_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$timesheet.name|escape}</td>
   {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
   {/if}
-  {if $show_submit_status}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {if $timesheet.approve_status == null}
+          <td></td>
+  {else}
+          <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
-  {if $show_approval_status}
-          <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {/if}
+          <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
+          <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
+        </tr>
+{/foreach}
+      </table>
 
+      <table width="100%">
+        <tr><td align="center"><br><form><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.add}"></form></td></tr>
+      </table>
 
+{if $inactive_timesheets}
+      <table cellspacing="1" cellpadding="3" border="0" width="100%">
 
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.timesheets.inactive_timesheets}</td></tr>
+        <tr>
+          <td class="tableHeader">{$i18n.label.thing_name}</td>
+  {if $show_client}
+          <td class="tableHeader">{$i18n.label.client}</td>
+  {/if}
+          <td class="tableHeader">{$i18n.label.submitted}</td>
+          <td class="tableHeader">{$i18n.label.approved}</td>
+          <td class="tableHeader">{$i18n.label.view}</td>
+          <td class="tableHeader">{$i18n.label.edit}</td>
+        </tr>
+  {foreach $inactive_timesheets as $timesheet}
+        <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
+          <td>{$timesheet.name|escape}</td>
+    {if $show_client}
+          <td>{$timesheet.client_name|escape}</td>
+    {/if}
+          <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+    {if $timesheet.approve_status == null}
+          <td></td>
+    {else}
+          <td>{if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+    {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
-  {if !$user->isClient()}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
-          <td><a href="timesheet_delete.php?id={$timesheet.id}">{$i18n.label.delete}</a></td>
-  {/if}
         </tr>
-        {/foreach}
+  {/foreach}
       </table>
 
-  {if !$user->isClient()}
       <table width="100%">
         <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
-  {/if}
+{/if}
     </td>
   </tr>
 </table>