X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Ftime.tpl;h=e0418eeb660a5dbb2002682d23a819a1172bb850;hb=336dbb39dfa588646615c461e3f16b785998ea67;hp=0e05f05bc8b86ba69f97bfecde6196c80c84089a;hpb=948617a6a0f129ba4090934ee8f544009dbcd935;p=timetracker.git
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 0e05f05b..e0418eeb 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -18,16 +18,10 @@
-{if $on_behalf_group_control}
-
- {$i18n.label.group}: |
- {$forms.timeRecordForm.onBehalfGroup.control} |
-
-{/if}
-{if $on_behalf_control}
+{if $user_dropdown}
{$i18n.label.user}: |
- {$forms.timeRecordForm.onBehalfUser.control} |
+ {$forms.timeRecordForm.user.control} |
{/if}
{if $user->isPluginEnabled('cl')}
@@ -72,7 +66,13 @@
{if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
{$i18n.label.duration}: |
- {$forms.timeRecordForm.duration.control} {if $user->decimal_mark == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if} |
+ {$forms.timeRecordForm.duration.control} {if $user->getDecimalMark() == ','}{str_replace('.', ',', $i18n.form.time.duration_format)}{else}{$i18n.form.time.duration_format}{/if} |
+
+{/if}
+{if $template_dropdown}
+
+ {$i18n.label.template}: |
+ {$forms.timeRecordForm.template.control} |
{/if}
@@ -136,7 +136,7 @@
| {if ($record.duration == '0:00' && $record.start <> '')}{$i18n.form.time.uncompleted}{else}{$record.duration}{/if} |
{if $record.comment}{$record.comment|escape}{else} {/if} |
- {if $record.invoice_id}
+ {if $record.approved || $record.timesheet_id || $record.invoice_id}
{else}
{$i18n.label.edit}
@@ -155,7 +155,7 @@
|
-{if $time_records}
+