X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=WEB-INF%2Ftemplates%2Ftimesheets.tpl;h=dc5c8155799cf1a4e40a9a7cf1ace4187c8424e7;hb=3ad837214ca361fdaac5363d9e702d3d40d04b17;hp=8c3acc95ec0dc00e42428e45014fd30631d14b71;hpb=f490a9f5e080c426f54502d1004f8ab444d26469;p=timetracker.git

diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 8c3acc95..dc5c8155 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -4,7 +4,9 @@
 
 {$forms.timesheetsForm.open}
 <table cellspacing="0" cellpadding="7" border="0" width="720">
+{if $show_hint}
   <tr><td align="left">{$i18n.form.timesheets.hint}<br></td></tr>
+{/if}
 {if $user_dropdown}
   <tr><td align="center">{$i18n.label.user}: {$forms.timesheetsForm.user.control}</td></tr>
 {/if}
@@ -27,7 +29,6 @@
   {/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}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -40,24 +41,63 @@
   {/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>
+  {if !$user->isClient()}
+          <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
+  {/if}
+        </tr>
+        {/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 $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}
+  {if $show_submit_status}
+          <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>
+        </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}
+  {if $show_submit_status}
+          <td>{if $timesheet.submit_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>
   {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}
       </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>