X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Ftime.tpl;h=0afaa15bb1d03732f08ac2740627d2332ada0966;hb=b0e8ffd3af439b5dc6dd5044a46a906d9833932b;hp=da0441027b95f1836bf91ac824553b917eca63dc;hpb=11441db31dcbed7b2070e800bcb1b0e6547b86bd;p=timetracker.git
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index da044102..0afaa15b 100644
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -41,7 +41,7 @@ task_names = new Array();
empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}';
empty_label_task = '{$i18n.dropdown.select|escape:'javascript'}';
-// The populateDropdowns function populates the "project" and "task" dropdown controls
+// The fillDropdowns function populates the "project" and "task" dropdown controls
// with relevant values.
function fillDropdowns() {
if(document.body.contains(document.timeRecordForm.client))
@@ -248,7 +248,7 @@ function get_time() {
{/if}
{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
- {$i18n.label.task} (*): |
+ {$i18n.label.task}: |
{$forms.timeRecordForm.task.control} |
{/if}
@@ -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}