X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Ftimesheet_view.tpl;h=bce187e7463b1f3f6d6f5352df397e66fe473702;hb=88c67a664a63623a83ed241054525aa112f9c70c;hp=1711443942b31d3b7ae23de1738867618b67514a;hpb=8fd871c1242b3309b8a374a97969ab74d5375069;p=timetracker.git

diff --git a/WEB-INF/templates/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 17114439..bce187e7 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -11,17 +11,15 @@
 {if $timesheet['client_id']}
         <tr><td align="left"><b>{$i18n.label.client}:</b> {$timesheet['client_name']|escape}</td></tr>
 {/if}
-{if $not_client}
         <tr><td align="left"><b>{$i18n.label.submitted}:</b> {if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
-  {if $timesheet['submitter_comment']}
+{if $timesheet['submitter_comment']}
         <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['submitter_comment']|escape}</td></tr>
-  {/if}
-  {if $timesheet['submit_status']}
+{/if}
+{if $timesheet['submit_status']}
         <tr><td align="left"><b>{$i18n.label.approved}:</b> {if $timesheet.approval_status != null}{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>{/if}
-  {/if}
-  {if $timesheet['manager_comment']}
+{/if}
+{if $timesheet['manager_comment']}
         <tr><td align="left"><b>{$i18n.label.note}:</b> {$timesheet['manager_comment']|escape}</td></tr>
-  {/if}
 {/if}
       </table>
     </td>
@@ -55,7 +53,7 @@
   <tr>
     <td align="center">
       <table>
-        <tr><td>{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control} {$forms.timesheetForm.btn_submit.control}</td></tr>
+        <tr><td>  {if $show_approvers}{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control}{/if} {$forms.timesheetForm.btn_submit.control}</td></tr>
       </table>
     </td>
   </tr>
@@ -66,7 +64,9 @@
   <tr>
     <td align="center">
       <table>
-        <tr><td>{$forms.timesheetForm.btn_approve.control} {$forms.timesheetForm.btn_disapprove.control}</td></tr>
+        <tr><td align="center">{$i18n.label.comment}:</td></tr>
+        <tr><td align="center">{$forms.timesheetForm.comment.control}</td></tr>
+        <tr><td align="center">{$forms.timesheetForm.btn_approve.control} {$forms.timesheetForm.btn_disapprove.control}</td></tr>
       </table>
     </td>
   </tr>