X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Ftemplates%2Ftime.tpl;h=049979cacb5b0114fef632adcbf4e2393401098f;hb=870ef02e00ccf3c54edd893bfa84cfb4d692ac0a;hp=bb8628713c58c717f62b1d36afe4133198f4c3f6;hpb=52efa3cc9f8ad94f363f41cc2bca472b6492268d;p=timetracker.git
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index bb862871..049979ca 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -18,12 +18,6 @@
-{if $group_dropdown}
-
- {$i18n.label.group}: |
- {$forms.timeRecordForm.group.control} |
-
-{/if}
{if $user_dropdown}
{$i18n.label.user}: |
@@ -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}
@@ -104,6 +104,9 @@
{if $user->isPluginEnabled('cl')}
|
{/if}
+ {if $show_cf_1}
+
+ {/if}
{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
{/if}
@@ -116,13 +119,20 @@
{/if}
-
+ |
+ |
+ {if $show_files}
+ |
+ {/if}
{foreach $time_records as $record}
{if $user->isPluginEnabled('cl')}
{$record.client|escape} |
{/if}
+ {if $show_cf_1}
+ {$record.cf_1|escape} |
+ {/if}
{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
{$record.project|escape} |
{/if}
@@ -135,17 +145,31 @@
{/if}
{if ($record.duration == '0:00' && $record.start <> '')}{$i18n.form.time.uncompleted}{else}{$record.duration}{/if} |
{if $record.comment}{$record.comment|escape}{else} {/if} |
+ {if $show_files}
+ {if $record.has_files}
+ ![{$i18n.label.files}](images/icon_files.png) |
+ {else}
+ ![{$i18n.label.files}](images/icon_file.png) |
+ {/if}
+ {/if}
- {if $record.invoice_id}
+ {if $record.approved || $record.timesheet_id || $record.invoice_id}
{else}
- {$i18n.label.edit}
+
{if ($record.duration == '0:00' && $record.start <> '')}
{/if}
+ {/if}
+ |
+
+ {if $record.approved || $record.timesheet_id || $record.invoice_id}
+
+ {else}
+
{/if}
|
@@ -155,7 +179,7 @@
-{if $time_records}
+
{$i18n.label.week_total}: {$week_total} |
@@ -164,6 +188,14 @@
{if $user->isPluginEnabled('mq')}
{$i18n.label.month_total}: {$month_total} |
+ {if $over_balance}
+ {$i18n.form.time.over_balance}: {$balance_remaining} |
+ {else}
+ {$i18n.form.time.remaining_balance}: {$balance_remaining} |
+ {/if}
+
+
+ {$i18n.label.quota}: {$month_quota} |
{if $over_quota}
{$i18n.form.time.over_quota}: {$quota_remaining} |
{else}
@@ -172,5 +204,5 @@
{/if}
-{/if}
+
{$forms.timeRecordForm.close}