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

diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index dc5c8155..f9b89d79 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -4,7 +4,7 @@
 
 {$forms.timesheetsForm.open}
 <table cellspacing="0" cellpadding="7" border="0" width="720">
-{if $show_hint}
+{if $not_client}
   <tr><td align="left">{$i18n.form.timesheets.hint}<br></td></tr>
 {/if}
 {if $user_dropdown}
@@ -13,47 +13,49 @@
   <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}
+{if $not_client}
           <td class="tableHeader">{$i18n.label.submitted}</td>
-  {/if}
-  {if $show_approval_status}
           <td class="tableHeader">{$i18n.label.approved}</td>
-  {/if}
+{/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}
+{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}
+  {if $not_client}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {/if}
-  {if $show_approval_status}
+     {if $timesheet.approval_status == null}
+          <td></td>
+     {else}
           <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+     {/if}
   {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
-  {if !$user->isClient()}
+  {if $can_edit}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
   {/if}
         </tr>
-        {/foreach}
+{/foreach}
       </table>
-  {if !$user->isClient()}
+{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}
 
 {if $inactive_timesheets}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
@@ -64,35 +66,37 @@
   {if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
-  {if $show_submit_status}
+  {if $not_client}
           <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>
+  {if $can_edit}
           <td class="tableHeader">{$i18n.label.edit}</td>
+  {/if}
         </tr>
-        {foreach $inactive_timesheets as $timesheet}
+  {foreach $inactive_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$timesheet.name|escape}</td>
-  {if $show_client}
+    {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
-  {/if}
-  {if $show_submit_status}
+    {/if}
+    {if $not_client}
           <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {/if}
-  {if $show_approval_status}
+      {if $timesheet.approval_status == null}
+          <td></td>
+      {else}
           <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
-  {/if}
+      {/if}
+    {/if}
           <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
-  {if !$user->isClient()}
+    {if $can_edit}
           <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
-  {/if}
+    {/if}
         </tr>
-        {/foreach}
+  {/foreach}
       </table>
-  {if !$user->isClient()}
+  {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>