X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Ftime.tpl;h=ee17d9d439dffa87192c6d929a138064dd820071;hb=5fdf8659516ad2b07458deba8eda234e8e07c554;hp=d526c46fbeeba3b29b212d3f5de95f969a6530d9;hpb=ba0b5f34efabfeded3112115086eaa9d00f2a345;p=timetracker.git diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index d526c46f..ee17d9d4 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -326,14 +326,14 @@ function get_time() { {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.duration == '0:00' && $record.start <> '')}{$i18n.form.time.uncompleted}{else}{$record.duration}{/if} {if $record.comment}{$record.comment|escape:'html'}{else} {/if} {if $record.invoice_id}   {else} {$i18n.label.edit} - {if $record.duration == '0:00'} + {if ($record.duration == '0:00' && $record.start <> '')} @@ -354,13 +354,13 @@ function get_time() { {$i18n.label.week_total}: {$week_total} {$i18n.label.day_total}: {$day_total} - {if $month_total} + {if $user->isPluginEnabled('mq')} {$i18n.label.month_total}: {$month_total} - {if $month_left|strpos:'-' === 0} - {$i18n.label.month_over}: {$month_left|substr:1} + {if $over_quota} + {$i18n.form.time.over_quota}: {$quota_remaining} {else} - {$i18n.label.month_left}: {$month_left} + {$i18n.form.time.remaining_quota}: {$quota_remaining} {/if} {/if}