X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Ftimesheets.tpl;h=91c626df0def9c99e4cbecbcddf1c7b8265828a0;hb=352243fe0b205fa6371299c47be1bb91a7a377bb;hp=af65d14b5772263aa93ba3abaddbfc98095d8673;hpb=88bd95ec82e6b715f84b6bd09c04aebbdb4b5e4d;p=timetracker.git

diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index af65d14b..91c626df 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -18,14 +18,10 @@
 {if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
 {/if}
-{if $not_client}
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
-{/if}
           <td class="tableHeader">{$i18n.label.view}</td>
-{if $can_edit}
           <td class="tableHeader">{$i18n.label.edit}</td>
-{/if}
         </tr>
 {foreach $active_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -33,26 +29,21 @@
   {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
   {/if}
-  {if $not_client}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-     {if $timesheet.approval_status == null}
+  {if $timesheet.approve_status == null}
           <td></td>
-     {else}
-          <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-     {/if}
+  {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 $can_edit}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
-  {/if}
         </tr>
 {/foreach}
       </table>
-{if $not_client}
+
       <table width="100%">
-        <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
+        <tr><td align="center"><br><form><input type="button" onclick="chLocation('timesheet_add.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
-{/if}
 
 {if $inactive_timesheets}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
@@ -63,14 +54,10 @@
   {if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
-  {if $not_client}
           <td class="tableHeader">{$i18n.label.submitted}</td>
           <td class="tableHeader">{$i18n.label.approved}</td>
-  {/if}
           <td class="tableHeader">{$i18n.label.view}</td>
-  {if $can_edit}
           <td class="tableHeader">{$i18n.label.edit}</td>
-  {/if}
         </tr>
   {foreach $inactive_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
@@ -78,26 +65,21 @@
     {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
     {/if}
-    {if $not_client}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-      {if $timesheet.approval_status == null}
+    {if $timesheet.approve_status == null}
           <td></td>
-      {else}
-          <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-      {/if}
+    {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 $can_edit}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
-    {/if}
         </tr>
   {/foreach}
       </table>
-  {if $not_client}
+
       <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>