From 8ba5ac4b2800060721eb6777792cd945045c3804 Mon Sep 17 00:00:00 2001 From: anuko Date: Mon, 23 Jan 2017 00:29:53 +0000 Subject: [PATCH] A bit more consistent usage of quotes in template files. --- WEB-INF/templates/expense_delete.tpl | 2 +- WEB-INF/templates/expense_edit.tpl | 2 +- WEB-INF/templates/expenses.tpl | 12 ++++---- WEB-INF/templates/export.tpl | 2 +- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/import.tpl | 2 +- WEB-INF/templates/invoice_view.tpl | 22 +++++++------- WEB-INF/templates/login.db.tpl | 2 +- WEB-INF/templates/mail.tpl | 10 +++---- WEB-INF/templates/mobile/expense_delete.tpl | 2 +- WEB-INF/templates/mobile/expenses.tpl | 8 +++--- WEB-INF/templates/mobile/project_edit.tpl | 4 +-- WEB-INF/templates/mobile/task_add.tpl | 2 +- WEB-INF/templates/mobile/task_edit.tpl | 2 +- WEB-INF/templates/mobile/time.tpl | 10 +++---- WEB-INF/templates/mobile/time_delete.tpl | 2 +- WEB-INF/templates/mobile/time_edit.tpl | 4 +-- WEB-INF/templates/mobile/timer.tpl | 8 +++--- WEB-INF/templates/time.tpl | 32 ++++++++++----------- 19 files changed, 65 insertions(+), 65 deletions(-) diff --git a/WEB-INF/templates/expense_delete.tpl b/WEB-INF/templates/expense_delete.tpl index 2e6b97c5..8b4e642f 100644 --- a/WEB-INF/templates/expense_delete.tpl +++ b/WEB-INF/templates/expense_delete.tpl @@ -2,7 +2,7 @@ - + diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 07297885..ca9f38ef 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- +
{if $user->isPluginEnabled('cl')} diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl index a9c09580..a679820e 100644 --- a/WEB-INF/templates/expense_edit.tpl +++ b/WEB-INF/templates/expense_edit.tpl @@ -24,7 +24,7 @@ projects = new Array(); {/foreach} // Mandatory top option for project dropdown. -empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}'; +empty_label_project = "{$i18n.dropdown.select|escape:'javascript'}"; // The fillProjectDropdown function populates the project combo box with // projects associated with a selected client (client id is passed here as id). diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl index 550e3efa..75540046 100644 --- a/WEB-INF/templates/expenses.tpl +++ b/WEB-INF/templates/expenses.tpl @@ -24,7 +24,7 @@ projects = new Array(); {/foreach} // Mandatory top option for project dropdown. -empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}'; +empty_label_project = "{$i18n.dropdown.select|escape:'javascript'}"; // The fillProjectDropdown function populates the project combo box with // projects associated with a selected client (client id is passed here as id). @@ -134,14 +134,14 @@ function get_date() { {foreach $expense_items as $item} {if $user->isPluginEnabled('cl')} - + {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - + {/if} - - - + + + {/foreach}
{$i18n.label.client}
{$item.client|escape}{$item.client|escape}{$item.project|escape}{$item.project|escape}{$item.item|escape}{$item.cost}{if $item.invoice_id} {else}{$i18n.label.edit}{/if}{$item.item|escape}{$item.cost}{if $item.invoice_id} {else}{$i18n.label.edit}{/if}
diff --git a/WEB-INF/templates/export.tpl b/WEB-INF/templates/export.tpl index a431c4bd..1c9866ed 100644 --- a/WEB-INF/templates/export.tpl +++ b/WEB-INF/templates/export.tpl @@ -11,7 +11,7 @@
{$i18n.form.export.hint}
 
{$i18n.form.export.compression}:{$i18n.form.export.compression}: {$forms.exportForm.compression.control}
{$forms.exportForm.btn_submit.control}
- - + diff --git a/WEB-INF/templates/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl index 90c7ad7e..31ff8e76 100644 --- a/WEB-INF/templates/invoice_view.tpl +++ b/WEB-INF/templates/invoice_view.tpl @@ -7,16 +7,16 @@
 Anuko Time Tracker 1.9.35.3554 | Copyright © Anuko | +  Anuko Time Tracker 1.9.35.3555 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/import.tpl b/WEB-INF/templates/import.tpl index 250677a5..b85bc757 100644 --- a/WEB-INF/templates/import.tpl +++ b/WEB-INF/templates/import.tpl @@ -8,7 +8,7 @@
{$i18n.form.import.hint}
 
{$i18n.form.import.file}:{$i18n.form.import.file}: {$forms.importForm.xmlfile.control}
{$forms.importForm.btn_submit.control}
- - - + + +
{$i18n.title.invoice} {$invoice_name|escape}
{$i18n.label.date}: {$invoice_date}
{$i18n.label.client}: {$client_name|escape}
{$i18n.label.client_address}: {$client_address|escape}
{$i18n.label.date}: {$invoice_date}
{$i18n.label.client}: {$client_name|escape}
{$i18n.label.client_address}: {$client_address|escape}
{if $invoice_items} - +
@@ -32,17 +32,17 @@ {foreach $invoice_items as $invoice_item} - - + + {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - + {/if} {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - + {/if} - - - + + + {/foreach} diff --git a/WEB-INF/templates/login.db.tpl b/WEB-INF/templates/login.db.tpl index 2e9e4f31..977d9b99 100644 --- a/WEB-INF/templates/login.db.tpl +++ b/WEB-INF/templates/login.db.tpl @@ -9,7 +9,7 @@ - + diff --git a/WEB-INF/templates/mail.tpl b/WEB-INF/templates/mail.tpl index cae2304a..8abe8572 100644 --- a/WEB-INF/templates/mail.tpl +++ b/WEB-INF/templates/mail.tpl @@ -7,23 +7,23 @@
{$i18n.label.date} {$i18n.form.invoice.person}
{$invoice_item.date}{$invoice_item.user_name|escape}{$invoice_item.date}{$invoice_item.user_name|escape}{$invoice_item.project_name|escape}{$invoice_item.project_name|escape}{$invoice_item.task_name|escape}{$invoice_item.task_name|escape}{$invoice_item.note|escape}{$invoice_item.duration}{$invoice_item.cost}{$invoice_item.note|escape}{$invoice_item.duration}{$invoice_item.cost}
 
 {$i18n.form.login.forgot_password}{$i18n.form.login.forgot_password}
  - + - + - + - + - + diff --git a/WEB-INF/templates/mobile/expense_delete.tpl b/WEB-INF/templates/mobile/expense_delete.tpl index 5685bd66..a1c0fd78 100644 --- a/WEB-INF/templates/mobile/expense_delete.tpl +++ b/WEB-INF/templates/mobile/expense_delete.tpl @@ -2,7 +2,7 @@
{$i18n.form.mail.from} (*):{$i18n.form.mail.from} (*): {$smarty.const.SENDER}
{$i18n.form.mail.to} (*):{$i18n.form.mail.to} (*): {$forms.mailForm.receiver.control}
{$i18n.form.mail.cc}:{$i18n.form.mail.cc}: {$forms.mailForm.cc.control}
{$i18n.form.mail.subject} (*):{$i18n.form.mail.subject} (*): {$forms.mailForm.subject.control}
{$i18n.label.comment}:{$i18n.label.comment}: {$forms.mailForm.comment.control}
- +
{if $user->isPluginEnabled('cl')} diff --git a/WEB-INF/templates/mobile/expenses.tpl b/WEB-INF/templates/mobile/expenses.tpl index 276f8265..52de0a91 100644 --- a/WEB-INF/templates/mobile/expenses.tpl +++ b/WEB-INF/templates/mobile/expenses.tpl @@ -144,13 +144,13 @@ function get_date() { {foreach $expense_items as $item} {if $user->isPluginEnabled('cl')} - + {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - + {/if} - - + + {/foreach}
{$i18n.label.client}
{$item.client|escape}{$item.client|escape}{$item.project|escape}{$item.project|escape}{if $item.invoice_id} {$item.item|escape} {else}{$item.item|escape}{/if}{$item.cost}{if $item.invoice_id} {$item.item|escape} {else}{$item.item|escape}{/if}{$item.cost}
diff --git a/WEB-INF/templates/mobile/project_edit.tpl b/WEB-INF/templates/mobile/project_edit.tpl index d479207f..4a94bfeb 100644 --- a/WEB-INF/templates/mobile/project_edit.tpl +++ b/WEB-INF/templates/mobile/project_edit.tpl @@ -4,11 +4,11 @@ 		- + - + diff --git a/WEB-INF/templates/mobile/task_add.tpl b/WEB-INF/templates/mobile/task_add.tpl index 53ce483d..68e415e1 100644 --- a/WEB-INF/templates/mobile/task_add.tpl +++ b/WEB-INF/templates/mobile/task_add.tpl @@ -8,7 +8,7 @@ - + diff --git a/WEB-INF/templates/mobile/task_edit.tpl b/WEB-INF/templates/mobile/task_edit.tpl index f9136284..f6672c73 100644 --- a/WEB-INF/templates/mobile/task_edit.tpl +++ b/WEB-INF/templates/mobile/task_edit.tpl @@ -8,7 +8,7 @@ - + diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl index 83bb19f7..bb800ffd 100644 --- a/WEB-INF/templates/mobile/time.tpl +++ b/WEB-INF/templates/mobile/time.tpl @@ -224,16 +224,16 @@ function get_date() { {foreach $time_records as $record} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - + {/if} - - + + {/foreach}
{$i18n.label.thing_name} (*):{$i18n.label.thing_name} (*): {$forms.projectForm.project_name.control}
{$i18n.label.description}:{$i18n.label.description}: {$forms.projectForm.description.control}
{$forms.taskForm.name.control}
{$i18n.label.description}:{$i18n.label.description}: {$forms.taskForm.description.control}
{$forms.taskForm.name.control}
{$i18n.label.description}:{$i18n.label.description}: {$forms.taskForm.description.control}
{$record.project|escape}{$record.project|escape}{if ($record.duration == '0:00' && $record.start <> '')}{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}{/if}{if $record.invoice_id} {else}{$i18n.label.edit}{/if}{if ($record.duration == '0:00' && $record.start <> '')}{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}{/if}{if $record.invoice_id} {else}{$i18n.label.edit}{/if}
- +
- +
{$i18n.label.day_total}:{$i18n.label.day_total}: {$day_total}
diff --git a/WEB-INF/templates/mobile/time_delete.tpl b/WEB-INF/templates/mobile/time_delete.tpl index bda0e93e..0428e13b 100644 --- a/WEB-INF/templates/mobile/time_delete.tpl +++ b/WEB-INF/templates/mobile/time_delete.tpl @@ -2,7 +2,7 @@
- +
{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} diff --git a/WEB-INF/templates/mobile/time_edit.tpl b/WEB-INF/templates/mobile/time_edit.tpl index 17c970d6..117e2082 100644 --- a/WEB-INF/templates/mobile/time_edit.tpl +++ b/WEB-INF/templates/mobile/time_edit.tpl @@ -206,9 +206,9 @@ function get_date() {
{$i18n.label.project}
- +
-
+ {if $user->isPluginEnabled('cl')} diff --git a/WEB-INF/templates/mobile/timer.tpl b/WEB-INF/templates/mobile/timer.tpl index e1c7d76e..3daf0649 100644 --- a/WEB-INF/templates/mobile/timer.tpl +++ b/WEB-INF/templates/mobile/timer.tpl @@ -213,7 +213,7 @@ startTimer();
{$i18n.label.client}:
- +
@@ -252,13 +252,13 @@ startTimer();
{if $time_records} - +
- + - +
{$i18n.label.day_total}:{$i18n.label.day_total}: {$day_total}
{$i18n.label.week_total}:{$i18n.label.week_total}: {$week_total}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index ff414e10..6d294fb1 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -292,7 +292,7 @@ function get_time() {
{if $time_records} - +
{if $user->isPluginEnabled('cl')} @@ -304,8 +304,8 @@ function get_time() { {/if} {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))} - - + + {/if} @@ -314,30 +314,30 @@ function get_time() { {foreach $time_records as $record} {if $user->isPluginEnabled('cl')} - + {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - + {/if} {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - + {/if} {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))} - - + + {/if} - - - + + -- 2.20.1
{$i18n.label.client}{$i18n.label.task}{$i18n.label.start}{$i18n.label.finish}{$i18n.label.start}{$i18n.label.finish}{$i18n.label.duration} {$i18n.label.note}
{$record.client|escape}{$record.client|escape}{$record.project|escape}{$record.project|escape}{$record.task|escape}{$record.task|escape}{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 ($record.duration == '0:00' && $record.start <> '')}{$i18n.form.time.uncompleted}{else}{$record.duration}{/if}{if $record.comment}{$record.comment|escape}{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} + {$i18n.label.edit} {if ($record.duration == '0:00' && $record.start <> '')} - - - - + + + + {/if} {/if}