X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Ftime.tpl;h=6d294fb189f1342c3e623489e2fb952fb945e382;hb=8ba5ac4b2800060721eb6777792cd945045c3804;hp=a4f4af6d0fce951b65542f1f3bf157dd71bdc2eb;hpb=fbc20abb396e51360640d5df9057aecd710b4d99;p=timetracker.git diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index a4f4af6d..6d294fb1 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -237,7 +237,7 @@ function get_time() { {/if} {if ($custom_fields && $custom_fields->fields[0])}
{$i18n.label.client} | @@ -304,8 +304,8 @@ function get_time() {{$i18n.label.task} | {/if} {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))} -{$i18n.label.start} | -{$i18n.label.finish} | +{$i18n.label.start} | +{$i18n.label.finish} | {/if}{$i18n.label.duration} | {$i18n.label.note} | @@ -314,30 +314,30 @@ function get_time() { {foreach $time_records as $record}||||||||||
{$record.client|escape:'html'} | +{$record.client|escape} | {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} -{$record.project|escape:'html'} | +{$record.project|escape} | {/if} {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} -{$record.task|escape:'html'} | +{$record.task|escape} | {/if} {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))} -{if $record.start}{$record.start}{else} {/if} | -{if $record.finish}{$record.finish}{else} {/if} | +{if $record.start}{$record.start}{else} {/if} | +{if $record.finish}{$record.finish}{else} {/if} | {/if} -{if $record.duration <> '0:00'}{$record.duration}{else}{$i18n.form.time.uncompleted}{/if} | -{if $record.comment}{$record.comment|escape:'html'}{else} {/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 $record.invoice_id} {else} - {$i18n.label.edit} - {if $record.duration == '0:00'} - - - - + {$i18n.label.edit} + {if ($record.duration == '0:00' && $record.start <> '')} + + + + {/if} {/if} | @@ -354,13 +354,13 @@ function get_time() {{$i18n.label.week_total}: {$week_total} | {$i18n.label.day_total}: {$day_total} |
{$i18n.label.month_total}: {$month_total} | {if $over_quota} -{$i18n.form.time.over_quota}: {$month_left} | +{$i18n.form.time.over_quota}: {$quota_remaining} | {else} -{$i18n.form.time.remaining_quota}: {$month_left} | +{$i18n.form.time.remaining_quota}: {$quota_remaining} | {/if}