X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Ftimesheets.tpl;h=91c626df0def9c99e4cbecbcddf1c7b8265828a0;hb=d5923832a32b1f43cbc6c5d74bbd064888761c80;hp=dc5c8155799cf1a4e40a9a7cf1ace4187c8424e7;hpb=3ad837214ca361fdaac5363d9e702d3d40d04b17;p=timetracker.git
diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index dc5c8155..91c626df 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -4,56 +4,46 @@
{$forms.timesheetsForm.open}
-{if $show_hint}
- {$i18n.form.timesheets.hint}
|
-{/if}
{if $user_dropdown}
{$i18n.label.user}: {$forms.timesheetsForm.user.control} |
{/if}
- {if $inactive_timesheets}
+{if $inactive_timesheets}
- {/if}
+{/if}
- {if $show_client}
+{if $show_client}
- {/if}
- {if $show_submit_status}
+{/if}
- {/if}
- {if $show_approval_status}
- {/if}
- {foreach $active_timesheets as $timesheet}
+{foreach $active_timesheets as $timesheet}
{$timesheet.name|escape} |
{if $show_client}
{$timesheet.client_name|escape} |
{/if}
- {if $show_submit_status}
{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} |
- {/if}
- {if $show_approval_status}
- {if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} |
+ {if $timesheet.approve_status == null}
+ |
+ {else}
+ {if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} |
{/if}
{$i18n.label.view} |
- {if !$user->isClient()}
{$i18n.label.edit} |
- {/if}
- {/foreach}
+{/foreach}
- {if !$user->isClient()}
+
- {/if}
{if $inactive_timesheets}
@@ -64,39 +54,32 @@
{if $show_client}
{/if}
- {if $show_submit_status}
- {/if}
- {if $show_approval_status}
- {/if}
- {foreach $inactive_timesheets as $timesheet}
+ {foreach $inactive_timesheets as $timesheet}
{$timesheet.name|escape} |
- {if $show_client}
+ {if $show_client}
{$timesheet.client_name|escape} |
- {/if}
- {if $show_submit_status}
+ {/if}
{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} |
- {/if}
- {if $show_approval_status}
- {if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} |
- {/if}
+ {if $timesheet.approve_status == null}
+ |
+ {else}
+ {if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} |
+ {/if}
{$i18n.label.view} |
- {if !$user->isClient()}
{$i18n.label.edit} |
- {/if}
- {/foreach}
+ {/foreach}
- {if !$user->isClient()}
+
- {/if}
{/if}
|