From: anuko Date: Sun, 22 Jan 2017 23:36:18 +0000 (+0000) Subject: Simplified templates by using the default Smarty escape calls. X-Git-Tag: timetracker_1.19-1~1601 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7ece3d4c1cf7c91fc469373a6b8a997fd4ea3398;p=timetracker.git Simplified templates by using the default Smarty escape calls. --- diff --git a/WEB-INF/templates/admin_team_delete.tpl b/WEB-INF/templates/admin_team_delete.tpl index a320bd99..a8b0712f 100644 --- a/WEB-INF/templates/admin_team_delete.tpl +++ b/WEB-INF/templates/admin_team_delete.tpl @@ -4,7 +4,7 @@ - + diff --git a/WEB-INF/templates/admin_teams.tpl b/WEB-INF/templates/admin_teams.tpl index f68cea9d..bb4c16ae 100644 --- a/WEB-INF/templates/admin_teams.tpl +++ b/WEB-INF/templates/admin_teams.tpl @@ -19,7 +19,7 @@ {foreach $teams as $team} - + diff --git a/WEB-INF/templates/cf_custom_field_delete.tpl b/WEB-INF/templates/cf_custom_field_delete.tpl index d6746b07..00ad37ff 100644 --- a/WEB-INF/templates/cf_custom_field_delete.tpl +++ b/WEB-INF/templates/cf_custom_field_delete.tpl @@ -5,7 +5,7 @@ {if $user->canManageTeam()}
{$team_to_delete|escape:'html'}{$team_to_delete|escape}
 
{$team.id}{$team.name|escape:'html'}{$team.name|escape} {$team.date} {$team.lang} {$i18n.label.edit}
- + diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl index 4a21d5b3..54be19d2 100644 --- a/WEB-INF/templates/cf_custom_fields.tpl +++ b/WEB-INF/templates/cf_custom_fields.tpl @@ -14,7 +14,7 @@ {if $custom_fields} {foreach $custom_fields as $field} - + {if CustomFields::TYPE_TEXT == $field['type']} diff --git a/WEB-INF/templates/cf_dropdown_option_delete.tpl b/WEB-INF/templates/cf_dropdown_option_delete.tpl index 96b9db8a..6a273db0 100644 --- a/WEB-INF/templates/cf_dropdown_option_delete.tpl +++ b/WEB-INF/templates/cf_dropdown_option_delete.tpl @@ -5,7 +5,7 @@ {if $user->canManageTeam()}
{$field|escape:'html'}{$field|escape}
 
{$field['label']|escape:'html'}{$field['label']|escape}{$i18n.label.type_text}
- + diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl index 4446353f..61a40435 100644 --- a/WEB-INF/templates/cf_dropdown_options.tpl +++ b/WEB-INF/templates/cf_dropdown_options.tpl @@ -16,7 +16,7 @@ {if $options} {foreach $options as $key=>$val} - + diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl index 4c676147..5e173e10 100644 --- a/WEB-INF/templates/charts.tpl +++ b/WEB-INF/templates/charts.tpl @@ -22,7 +22,7 @@
{$option|escape:'html'}{$option|escape}
 
{$val|escape:'html'}{$val|escape} {$i18n.label.edit} {$i18n.label.delete}
{section name=i loop=$totals} {if $smarty.section.i.index <= 12} - + {/if} {/section}
{$totals[i].name|escape:'html'}
{$totals[i].name|escape}
diff --git a/WEB-INF/templates/client_delete.tpl b/WEB-INF/templates/client_delete.tpl index 551b42e2..f40b94c1 100644 --- a/WEB-INF/templates/client_delete.tpl +++ b/WEB-INF/templates/client_delete.tpl @@ -5,7 +5,7 @@ - + diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl index eb46259f..2d19b001 100644 --- a/WEB-INF/templates/clients.tpl +++ b/WEB-INF/templates/clients.tpl @@ -18,8 +18,8 @@ {foreach $active_clients as $client} - - + + @@ -41,8 +41,8 @@ {foreach $inactive_clients as $client} - - + + diff --git a/WEB-INF/templates/expense_delete.tpl b/WEB-INF/templates/expense_delete.tpl index 1b2d6d62..2e6b97c5 100644 --- a/WEB-INF/templates/expense_delete.tpl +++ b/WEB-INF/templates/expense_delete.tpl @@ -16,12 +16,12 @@ {if $user->isPluginEnabled('cl')} - + {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - + {/if} - +
{$i18n.form.client.client_to_delete}:{$client_to_delete|escape:'html'}{$client_to_delete|escape}
{$i18n.form.client.client_entries}:
{$client.name|escape:'html'}{$client.address|escape:'html'}{$client.name|escape}{$client.address|escape} {$i18n.label.edit} {$i18n.label.delete}
{$client.name|escape:'html'}{$client.address|escape:'html'}{$client.name|escape}{$client.address|escape} {$i18n.label.edit} {$i18n.label.delete}
{$expense_item.client_name|escape:'html'}{$expense_item.client_name|escape}{$expense_item.project_name|escape:'html'}{$expense_item.project_name|escape}{$expense_item.name|escape:'html'}{$expense_item.name|escape} {$expense_item.cost}
diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl index 7881d792..a9c09580 100644 --- a/WEB-INF/templates/expense_edit.tpl +++ b/WEB-INF/templates/expense_edit.tpl @@ -94,7 +94,7 @@ function get_date() { {$i18n.label.cost}: - {$forms.expenseItemForm.cost.control} {$user->currency|escape:'html'} + {$forms.expenseItemForm.cost.control} {$user->currency|escape} {$i18n.label.date}: diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl index 12d9534d..550e3efa 100644 --- a/WEB-INF/templates/expenses.tpl +++ b/WEB-INF/templates/expenses.tpl @@ -97,7 +97,7 @@ function get_date() { {$i18n.label.cost} (*): - {$forms.expensesForm.cost.control} {$user->currency|escape:'html'} + {$forms.expensesForm.cost.control} {$user->currency|escape} @@ -134,12 +134,12 @@ function get_date() { {foreach $expense_items as $item} {if $user->isPluginEnabled('cl')} - {$item.client|escape:'html'} + {$item.client|escape} {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - {$item.project|escape:'html'} + {$item.project|escape} {/if} - {$item.item|escape:'html'} + {$item.item|escape} {$item.cost} {if $item.invoice_id} {else}{$i18n.label.edit}{/if} @@ -147,7 +147,7 @@ function get_date() { - +
{$i18n.label.day_total}: {$user->currency|escape:'html'} {$day_total}{$i18n.label.day_total}: {$user->currency|escape} {$day_total}
{/if} diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 5c1d5366..07297885 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- {foreach $invoices as $invoice} - - + + {if !$user->isClient()} diff --git a/WEB-INF/templates/mobile/client_delete.tpl b/WEB-INF/templates/mobile/client_delete.tpl index 551b42e2..f40b94c1 100644 --- a/WEB-INF/templates/mobile/client_delete.tpl +++ b/WEB-INF/templates/mobile/client_delete.tpl @@ -5,7 +5,7 @@
 Anuko Time Tracker 1.9.35.3553 | Copyright © Anuko | +  Anuko Time Tracker 1.9.35.3554 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl index 3bedfb1e..4e4a4146 100644 --- a/WEB-INF/templates/header.tpl +++ b/WEB-INF/templates/header.tpl @@ -150,7 +150,7 @@ {if $title} - +
{$title}{if $timestring}: {$timestring}{/if}
{$user->name|escape:'html'}{if $user->isAdmin()} {$i18n.label.role_admin}{elseif $user->isManager()} {$i18n.label.role_manager}{elseif $user->canManageTeam()} {$i18n.label.role_comanager}{/if}{if $user->behalf_id > 0} {$i18n.label.on_behalf} {$user->behalf_name|escape:'html'}{/if}{if $user->team}, {$user->team|escape:'html'}{/if}
{$user->name|escape}{if $user->isAdmin()} {$i18n.label.role_admin}{elseif $user->isManager()} {$i18n.label.role_manager}{elseif $user->canManageTeam()} {$i18n.label.role_comanager}{/if}{if $user->behalf_id > 0} {$i18n.label.on_behalf} {$user->behalf_name|escape}{/if}{if $user->team}, {$user->team|escape}{/if}
{/if} diff --git a/WEB-INF/templates/invoice_delete.tpl b/WEB-INF/templates/invoice_delete.tpl index c89a72cd..0f539377 100644 --- a/WEB-INF/templates/invoice_delete.tpl +++ b/WEB-INF/templates/invoice_delete.tpl @@ -5,7 +5,7 @@ - + diff --git a/WEB-INF/templates/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl index 57b917e7..90c7ad7e 100644 --- a/WEB-INF/templates/invoice_view.tpl +++ b/WEB-INF/templates/invoice_view.tpl @@ -6,10 +6,10 @@ @@ -33,14 +33,14 @@ {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} - + @@ -49,16 +49,16 @@ {if $tax} - + - + {/if} - +
{$i18n.form.invoice.invoice_to_delete}:{$invoice_to_delete|escape:'html'}{$invoice_to_delete|escape}
{$i18n.form.invoice.invoice_entries}:
- + - - + +
{$i18n.title.invoice} {$invoice_name|escape:'html'}
{$i18n.title.invoice} {$invoice_name|escape}
{$i18n.label.date}: {$invoice_date}
{$i18n.label.client}: {$client_name|escape:'html'}
{$i18n.label.client_address}: {$client_address|escape:'html'}
{$i18n.label.client}: {$client_name|escape}
{$i18n.label.client_address}: {$client_address|escape}
{$invoice_item.date}{$invoice_item.user_name|escape:'html'}{$invoice_item.user_name|escape}{$invoice_item.project_name|escape:'html'}{$invoice_item.project_name|escape}{$invoice_item.task_name|escape:'html'}{$invoice_item.task_name|escape}{$invoice_item.note|escape:'html'}{$invoice_item.note|escape} {$invoice_item.duration} {$invoice_item.cost}
{$i18n.label.subtotal}:{$subtotal|escape:'html'}{$subtotal|escape}
{$i18n.label.tax}:{$tax|escape:'html'}{$tax|escape}
{$i18n.label.total}:{$total|escape:'html'}{$total|escape}
{/if} diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl index 56046f45..4d6f50a9 100644 --- a/WEB-INF/templates/invoices.tpl +++ b/WEB-INF/templates/invoices.tpl @@ -18,8 +18,8 @@
{$invoice.name|escape:'html'}{$invoice.client_name|escape:'html'}{$invoice.name|escape}{$invoice.client_name|escape} {$invoice.date} {$i18n.label.view}
- + diff --git a/WEB-INF/templates/mobile/clients.tpl b/WEB-INF/templates/mobile/clients.tpl index a6132011..00a19eee 100644 --- a/WEB-INF/templates/mobile/clients.tpl +++ b/WEB-INF/templates/mobile/clients.tpl @@ -16,8 +16,8 @@ {foreach $active_clients as $client} - - + + {/foreach}
{$i18n.form.client.client_to_delete}:{$client_to_delete|escape:'html'}{$client_to_delete|escape}
{$i18n.form.client.client_entries}:
{$client.name|escape:'html'}{$client.address|escape:'html'}{$client.name|escape}{$client.address|escape}
@@ -35,8 +35,8 @@ {foreach $inactive_clients as $client} - {$client.name|escape:'html'} - {$client.address|escape:'html'} + {$client.name|escape} + {$client.address|escape} {/foreach} diff --git a/WEB-INF/templates/mobile/expense_delete.tpl b/WEB-INF/templates/mobile/expense_delete.tpl index 8fc771c4..5685bd66 100644 --- a/WEB-INF/templates/mobile/expense_delete.tpl +++ b/WEB-INF/templates/mobile/expense_delete.tpl @@ -16,12 +16,12 @@ {if $user->isPluginEnabled('cl')} - {$expense_item.client_name|escape:'html'} + {$expense_item.client_name|escape} {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - {$expense_item.project_name|escape:'html'} + {$expense_item.project_name|escape} {/if} - {$expense_item.name|escape:'html'} + {$expense_item.name|escape} {$expense_item.cost} diff --git a/WEB-INF/templates/mobile/expense_edit.tpl b/WEB-INF/templates/mobile/expense_edit.tpl index 7881d792..a9c09580 100644 --- a/WEB-INF/templates/mobile/expense_edit.tpl +++ b/WEB-INF/templates/mobile/expense_edit.tpl @@ -94,7 +94,7 @@ function get_date() { {$i18n.label.cost}: - {$forms.expenseItemForm.cost.control} {$user->currency|escape:'html'} + {$forms.expenseItemForm.cost.control} {$user->currency|escape} {$i18n.label.date}: diff --git a/WEB-INF/templates/mobile/expenses.tpl b/WEB-INF/templates/mobile/expenses.tpl index a0fe73f9..276f8265 100644 --- a/WEB-INF/templates/mobile/expenses.tpl +++ b/WEB-INF/templates/mobile/expenses.tpl @@ -106,7 +106,7 @@ function get_date() { {$i18n.label.cost} (*): - {$forms.expensesForm.cost.control} {$user->currency|escape:'html'} + {$forms.expensesForm.cost.control} {$user->currency|escape} @@ -144,19 +144,19 @@ function get_date() { {foreach $expense_items as $item} {if $user->isPluginEnabled('cl')} - {$item.client|escape:'html'} + {$item.client|escape} {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - {$item.project|escape:'html'} + {$item.project|escape} {/if} - {if $item.invoice_id} {$item.item|escape:'html'} {else}{$item.item|escape:'html'}{/if} + {if $item.invoice_id} {$item.item|escape} {else}{$item.item|escape}{/if} {$item.cost} {/foreach} - +
{$i18n.label.day_total}: {$user->currency|escape:'html'} {$day_total}{$i18n.label.day_total}: {$user->currency|escape} {$day_total}
{/if} diff --git a/WEB-INF/templates/mobile/project_delete.tpl b/WEB-INF/templates/mobile/project_delete.tpl index 62041434..98d3e836 100644 --- a/WEB-INF/templates/mobile/project_delete.tpl +++ b/WEB-INF/templates/mobile/project_delete.tpl @@ -4,7 +4,7 @@ - + diff --git a/WEB-INF/templates/mobile/projects.tpl b/WEB-INF/templates/mobile/projects.tpl index b371c803..d40e792a 100644 --- a/WEB-INF/templates/mobile/projects.tpl +++ b/WEB-INF/templates/mobile/projects.tpl @@ -17,8 +17,8 @@ {if $active_projects} {foreach $active_projects as $project} - - + + {/foreach} {/if} @@ -41,8 +41,8 @@ {foreach $inactive_projects as $project} - - + + {/foreach}
{$project_to_delete|escape:'html'}{$project_to_delete|escape}
 
{$project.name|escape:'html'}{$project.description|escape:'html'}{$project.name|escape}{$project.description|escape}
{$project.name|escape:'html'}{$project.description|escape:'html'}{$project.name|escape}{$project.description|escape}
@@ -64,8 +64,8 @@ {if $active_projects} {foreach $active_projects as $project} - {$project.name|escape:'html'} - {$project.description|escape:'html'} + {$project.name|escape} + {$project.description|escape} {/foreach} {/if} diff --git a/WEB-INF/templates/mobile/task_delete.tpl b/WEB-INF/templates/mobile/task_delete.tpl index f25cc951..9f16d7c3 100644 --- a/WEB-INF/templates/mobile/task_delete.tpl +++ b/WEB-INF/templates/mobile/task_delete.tpl @@ -4,7 +4,7 @@ - + diff --git a/WEB-INF/templates/mobile/tasks.tpl b/WEB-INF/templates/mobile/tasks.tpl index c877e989..8ed15fb8 100644 --- a/WEB-INF/templates/mobile/tasks.tpl +++ b/WEB-INF/templates/mobile/tasks.tpl @@ -17,8 +17,8 @@ {if $active_tasks} {foreach $active_tasks as $task} - - + + {/foreach} {/if} @@ -41,8 +41,8 @@ {foreach $inactive_tasks as $task} - - + + {/foreach}
{$task_to_delete|escape:'html'}{$task_to_delete|escape}
 
{$task.name|escape:'html'}{$task.description|escape:'html'}{$task.name|escape}{$task.description|escape}
{$task.name|escape:'html'}{$task.description|escape:'html'}{$task.name|escape}{$task.description|escape}
@@ -64,8 +64,8 @@ {if $active_tasks} {foreach $active_tasks as $task} - {$task.name|escape:'html'} - {$task.description|escape:'html'} + {$task.name|escape} + {$task.description|escape} {/foreach} {/if} diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl index c3e9b59b..83bb19f7 100644 --- a/WEB-INF/templates/mobile/time.tpl +++ b/WEB-INF/templates/mobile/time.tpl @@ -224,7 +224,7 @@ 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)} - {$record.project|escape:'html'} + {$record.project|escape} {/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} @@ -258,7 +258,7 @@ function get_date() { {/if} {if ($custom_fields && $custom_fields->fields[0])} - {$custom_fields->fields[0]['label']|escape:'html'}: + {$custom_fields->fields[0]['label']|escape}: {$forms.timeRecordForm.cf_1.control} {/if} {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_delete.tpl b/WEB-INF/templates/mobile/time_delete.tpl index 380e95bc..bda0e93e 100644 --- a/WEB-INF/templates/mobile/time_delete.tpl +++ b/WEB-INF/templates/mobile/time_delete.tpl @@ -12,10 +12,10 @@ {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} - {$time_rec.project_name|escape:'html'} + {$time_rec.project_name|escape} {/if} {if ($time_rec.duration == '0:00' && $time_rec.start <> '')}{$i18n.form.time.uncompleted}{else}{$time_rec.duration}{/if} - {if $time_rec.comment}{$time_rec.comment|escape:'html'}{else} {/if} + {if $time_rec.comment}{$time_rec.comment|escape}{else} {/if} diff --git a/WEB-INF/templates/mobile/time_edit.tpl b/WEB-INF/templates/mobile/time_edit.tpl index f6381d6a..17c970d6 100644 --- a/WEB-INF/templates/mobile/time_edit.tpl +++ b/WEB-INF/templates/mobile/time_edit.tpl @@ -218,7 +218,7 @@ function get_date() { {/if} {if ($custom_fields && $custom_fields->fields[0])} - + {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} diff --git a/WEB-INF/templates/mobile/timer.tpl b/WEB-INF/templates/mobile/timer.tpl index c8df7988..e1c7d76e 100644 --- a/WEB-INF/templates/mobile/timer.tpl +++ b/WEB-INF/templates/mobile/timer.tpl @@ -225,7 +225,7 @@ startTimer(); {/if} {if ($custom_fields && $custom_fields->fields[0])} - + {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} diff --git a/WEB-INF/templates/mobile/user_delete.tpl b/WEB-INF/templates/mobile/user_delete.tpl index 1f5b442e..e85d97f1 100644 --- a/WEB-INF/templates/mobile/user_delete.tpl +++ b/WEB-INF/templates/mobile/user_delete.tpl @@ -4,7 +4,7 @@
{$custom_fields->fields[0]['label']|escape:'html'}:
{$custom_fields->fields[0]['label']|escape}:
{$forms.timeRecordForm.cf_1.control}
{$custom_fields->fields[0]['label']|escape:'html'}:
{$custom_fields->fields[0]['label']|escape}:
{$forms.timerRecordForm.cf_1.control}
- + diff --git a/WEB-INF/templates/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl index 202e018e..6ff3269a 100644 --- a/WEB-INF/templates/mobile/users.tpl +++ b/WEB-INF/templates/mobile/users.tpl @@ -23,16 +23,16 @@ {/if} {if $user->isManager()} - {$u.name|escape:'html'} + {$u.name|escape} {else} {if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)} - {$u.name|escape:'html'} + {$u.name|escape} {else} - {$u.name|escape:'html'} + {$u.name|escape} {/if} {/if} - + {if $smarty.const.ROLE_MANAGER == $u.role} {elseif $smarty.const.ROLE_COMANAGER == $u.role} @@ -68,12 +68,12 @@ - + {if $smarty.const.ROLE_MANAGER == $u.role} {elseif $smarty.const.ROLE_COMANAGER == $u.role} @@ -112,8 +112,8 @@ {foreach $active_users as $u} - - + + {if $smarty.const.ROLE_MANAGER == $u.role} {elseif $smarty.const.ROLE_COMANAGER == $u.role} diff --git a/WEB-INF/templates/notification_delete.tpl b/WEB-INF/templates/notification_delete.tpl index 919453d7..fac015c3 100644 --- a/WEB-INF/templates/notification_delete.tpl +++ b/WEB-INF/templates/notification_delete.tpl @@ -4,7 +4,7 @@
{$user_to_delete|escape:'html'}{$user_to_delete|escape}
 {$u.login|escape:'html'}{$u.login|escape}{$i18n.form.users.manager}
{if $user->isManager()} - {$u.name|escape:'html'} + {$u.name|escape} {else} - {if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)}{$u.name|escape:'html'}{/if} + {if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)}{$u.name|escape}{/if} {/if} {$u.login|escape:'html'}{$u.login|escape}{$i18n.form.users.manager}
{$u.name|escape:'html'}{$u.login|escape:'html'}{$u.name|escape}{$u.login|escape}{$i18n.form.users.manager} - + diff --git a/WEB-INF/templates/notifications.tpl b/WEB-INF/templates/notifications.tpl index 7daf3dc9..7d51f52a 100644 --- a/WEB-INF/templates/notifications.tpl +++ b/WEB-INF/templates/notifications.tpl @@ -14,9 +14,9 @@ {if $notifications} {foreach $notifications as $notification} - - - + + + diff --git a/WEB-INF/templates/project_delete.tpl b/WEB-INF/templates/project_delete.tpl index 62041434..98d3e836 100644 --- a/WEB-INF/templates/project_delete.tpl +++ b/WEB-INF/templates/project_delete.tpl @@ -4,7 +4,7 @@
{$notification_to_delete|escape:'html'}{$notification_to_delete|escape}
 
{$notification['name']|escape:'html'}{$notification['cron_spec']|escape:'html'}{$notification['email']|escape:'html'}{$notification['name']|escape}{$notification['cron_spec']|escape}{$notification['email']|escape} {$i18n.label.edit} {$i18n.label.delete}
- + diff --git a/WEB-INF/templates/projects.tpl b/WEB-INF/templates/projects.tpl index 59d356ed..1c97753e 100644 --- a/WEB-INF/templates/projects.tpl +++ b/WEB-INF/templates/projects.tpl @@ -19,8 +19,8 @@ {if $active_projects} {foreach $active_projects as $project} - - + + @@ -47,8 +47,8 @@ {foreach $inactive_projects as $project} - - + + @@ -72,8 +72,8 @@ {if $active_projects} {foreach $active_projects as $project} - - + + {/foreach} {/if} diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl index 4ed3baa1..a05618db 100644 --- a/WEB-INF/templates/report.tpl +++ b/WEB-INF/templates/report.tpl @@ -14,13 +14,13 @@ {if $bean->getAttribute('chtotalsonly')} - + {if $bean->getAttribute('chduration')}{/if} {if $bean->getAttribute('chcost')}{/if} {foreach $subtotals as $subtotal} - + {if $bean->getAttribute('chduration')}{/if} {if $bean->getAttribute('chcost')}{/if} @@ -30,7 +30,7 @@ {if $bean->getAttribute('chduration')}{/if} - {if $bean->getAttribute('chcost')}{/if} + {if $bean->getAttribute('chcost')}{/if} {else} @@ -40,7 +40,7 @@ {if $bean->getAttribute('chclient')}{/if} {if $bean->getAttribute('chproject')}{/if} {if $bean->getAttribute('chtask')}{/if} - {if $bean->getAttribute('chcf_1')}{/if} + {if $bean->getAttribute('chcf_1')}{/if} {if $bean->getAttribute('chstart')}{/if} {if $bean->getAttribute('chfinish')}{/if} {if $bean->getAttribute('chduration')}{/if} @@ -56,11 +56,11 @@ {if $cur_grouped_by != $prev_grouped_by && !$first_pass} {/if}{/if} - {if $bean->getAttribute('chclient')}{/if}{/if} - {if $bean->getAttribute('chproject')}{/if}{/if} - {if $bean->getAttribute('chtask')}{/if}{/if} - {if $bean->getAttribute('chcf_1')}{/if}{/if} + {if $user->canManageTeam() || $user->isClient()}{/if}{/if} + {if $bean->getAttribute('chclient')}{/if}{/if} + {if $bean->getAttribute('chproject')}{/if}{/if} + {if $bean->getAttribute('chtask')}{/if}{/if} + {if $bean->getAttribute('chcf_1')}{/if}{/if} {if $bean->getAttribute('chstart')}{/if} {if $bean->getAttribute('chfinish')}{/if} {if $bean->getAttribute('chduration')}{/if} @@ -78,18 +78,18 @@ {/if} - {if $user->canManageTeam() || $user->isClient()}{/if} - {if $bean->getAttribute('chclient')}{/if} - {if $bean->getAttribute('chproject')}{/if} - {if $bean->getAttribute('chtask')}{/if} - {if $bean->getAttribute('chcf_1')}{/if} + {if $user->canManageTeam() || $user->isClient()}{/if} + {if $bean->getAttribute('chclient')}{/if} + {if $bean->getAttribute('chproject')}{/if} + {if $bean->getAttribute('chtask')}{/if} + {if $bean->getAttribute('chcf_1')}{/if} {if $bean->getAttribute('chstart')}{/if} {if $bean->getAttribute('chfinish')}{/if} {if $bean->getAttribute('chduration')}{/if} - {if $bean->getAttribute('chnote')}{/if} + {if $bean->getAttribute('chnote')}{/if} {if $bean->getAttribute('chcost')}{/if} {if $bean->getAttribute('chinvoice')} - + {if $use_checkboxes} {if 1 == $item.type}{/if} {if 2 == $item.type}{/if} @@ -103,11 +103,11 @@ {if $print_subtotals} {/if}{/if} - {if $bean->getAttribute('chclient')}{/if}{/if} - {if $bean->getAttribute('chproject')}{/if}{/if} - {if $bean->getAttribute('chtask')}{/if}{/if} - {if $bean->getAttribute('chcf_1')}{/if}{/if} + {if $user->canManageTeam() || $user->isClient()}{/if}{/if} + {if $bean->getAttribute('chclient')}{/if}{/if} + {if $bean->getAttribute('chproject')}{/if}{/if} + {if $bean->getAttribute('chtask')}{/if}{/if} + {if $bean->getAttribute('chcf_1')}{/if}{/if} {if $bean->getAttribute('chstart')}{/if} {if $bean->getAttribute('chfinish')}{/if} {if $bean->getAttribute('chduration')}{/if} @@ -129,7 +129,7 @@ {if $bean->getAttribute('chfinish')}{/if} {if $bean->getAttribute('chduration')}{/if} {if $bean->getAttribute('chnote')}{/if} - {if $bean->getAttribute('chcost')}{/if} + {if $bean->getAttribute('chcost')}{/if} {if $bean->getAttribute('chinvoice')}{/if} {/if} diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl index ce804dc5..5ca7a171 100644 --- a/WEB-INF/templates/reports.tpl +++ b/WEB-INF/templates/reports.tpl @@ -261,7 +261,7 @@ function handleCheckboxes() { {if ($custom_fields && $custom_fields->fields[0])} - + {else} {/if} diff --git a/WEB-INF/templates/task_delete.tpl b/WEB-INF/templates/task_delete.tpl index f25cc951..9f16d7c3 100644 --- a/WEB-INF/templates/task_delete.tpl +++ b/WEB-INF/templates/task_delete.tpl @@ -4,7 +4,7 @@
{$project_to_delete|escape:'html'}{$project_to_delete|escape}
 
{$project.name|escape:'html'}{$project.description|escape:'html'}{$project.name|escape}{$project.description|escape} {$i18n.label.edit} {$i18n.label.delete}
{$project.name|escape:'html'}{$project.description|escape:'html'}{$project.name|escape}{$project.description|escape} {$i18n.label.edit} {$i18n.label.delete}
{$project.name|escape:'html'}{$project.description|escape:'html'}{$project.name|escape}{$project.description|escape}
{$group_by_header|escape:'html'}{$group_by_header|escape}{$i18n.label.duration}{$i18n.label.cost}
{if $subtotal['name']}{$subtotal['name']|escape:'html'}{else} {/if}{if $subtotal['name']}{$subtotal['name']|escape}{else} {/if}{$subtotal['time']}{if $user->canManageTeam() || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}
{$i18n.label.total}{$totals['time']}{$user->currency|escape:'html'} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}
{$i18n.label.client}{$i18n.label.project}{$i18n.label.task}{$custom_fields->fields[0]['label']|escape:'html'}{$custom_fields->fields[0]['label']|escape}{$i18n.label.start}{$i18n.label.finish}{$i18n.label.duration}
{$i18n.label.subtotal} - {if $user->canManageTeam() || $user->isClient()}{if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape:'html'}{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape:'html'}{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape:'html'}{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape:'html'}{if $group_by == 'cf_1'}{$subtotals[$prev_grouped_by]['name']|escape:'html'}{if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape}{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape}{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape}{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape}{if $group_by == 'cf_1'}{$subtotals[$prev_grouped_by]['name']|escape}{$subtotals[$prev_grouped_by]['time']}
{$item.date}{$item.user|escape:'html'}{$item.client|escape:'html'}{$item.project|escape:'html'}{$item.task|escape:'html'}{$item.cf_1|escape:'html'}{$item.user|escape}{$item.client|escape}{$item.project|escape}{$item.task|escape}{$item.cf_1|escape}{$item.start}{$item.finish}{$item.duration}{$item.note|escape:'html'}{$item.note|escape}{if $user->canManageTeam() || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}{$item.invoice|escape:'html'}{$item.invoice|escape}
{$i18n.label.subtotal} - {if $user->canManageTeam() || $user->isClient()}{if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape:'html'}{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape:'html'}{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape:'html'}{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape:'html'}{if $group_by == 'cf_1'}{$subtotals[$cur_grouped_by]['name']|escape:'html'}{if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape}{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape}{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape}{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape}{if $group_by == 'cf_1'}{$subtotals[$cur_grouped_by]['name']|escape}{$subtotals[$cur_grouped_by]['time']}{$totals['time']}{$user->currency|escape:'html'} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}
{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}{/if} - + diff --git a/WEB-INF/templates/tasks.tpl b/WEB-INF/templates/tasks.tpl index 2c996a1f..23d5ec4c 100644 --- a/WEB-INF/templates/tasks.tpl +++ b/WEB-INF/templates/tasks.tpl @@ -19,8 +19,8 @@ {if $active_tasks} {foreach $active_tasks as $task} - - + + @@ -47,8 +47,8 @@ {foreach $inactive_tasks as $task} - - + + @@ -72,8 +72,8 @@ {if $active_tasks} {foreach $active_tasks as $task} - - + + {/foreach} {/if} diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index 0afaa15b..ff414e10 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])} - + {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} @@ -314,20 +314,20 @@ 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} - + {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))} @@ -33,7 +33,7 @@ {if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))} {/if} - +
{$task_to_delete|escape:'html'}{$task_to_delete|escape}
 
{$task.name|escape:'html'}{$task.description|escape:'html'}{$task.name|escape}{$task.description|escape} {$i18n.label.edit} {$i18n.label.delete}
{$task.name|escape:'html'}{$task.description|escape:'html'}{$task.name|escape}{$task.description|escape} {$i18n.label.edit} {$i18n.label.delete}
{$task.name|escape:'html'}{$task.description|escape:'html'}{$task.name|escape}{$task.description|escape}
{$custom_fields->fields[0]['label']|escape:'html'}{if $custom_fields->fields[0]['required']} (*){/if}:{$forms.timeRecordForm.cf_1.control}{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:{$forms.timeRecordForm.cf_1.control}
{$record.client|escape:'html'}{$record.client|escape}{$record.project|escape:'html'}{$record.project|escape}{$record.task|escape:'html'}{$record.task|escape}{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:'html'}{else} {/if}{if $record.comment}{$record.comment|escape}{else} {/if} {if $record.invoice_id}   diff --git a/WEB-INF/templates/time_delete.tpl b/WEB-INF/templates/time_delete.tpl index 4ebbe558..b3d8a397 100644 --- a/WEB-INF/templates/time_delete.tpl +++ b/WEB-INF/templates/time_delete.tpl @@ -21,10 +21,10 @@
{$time_rec.project_name|escape:'html'}{$time_rec.project_name|escape}{$time_rec.task_name|escape:'html'}{$time_rec.task_name|escape}{if $time_rec.start}{$time_rec.start}{else} {/if}{if ($time_rec.duration == '0:00' && $time_rec.start <> '')}{$i18n.form.time.uncompleted}{else}{$time_rec.duration}{/if}{if $time_rec.comment}{$time_rec.comment|escape:'html'}{else} {/if}{if $time_rec.comment}{$time_rec.comment|escape}{else} {/if}
diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl index fd3c1730..a4e26a6f 100644 --- a/WEB-INF/templates/time_edit.tpl +++ b/WEB-INF/templates/time_edit.tpl @@ -219,7 +219,7 @@ function setNow(formField) { {/if} {if ($custom_fields && $custom_fields->fields[0])} - + {/if} {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} diff --git a/WEB-INF/templates/user_delete.tpl b/WEB-INF/templates/user_delete.tpl index 1f5b442e..e85d97f1 100644 --- a/WEB-INF/templates/user_delete.tpl +++ b/WEB-INF/templates/user_delete.tpl @@ -4,7 +4,7 @@
{$custom_fields->fields[0]['label']|escape:'html'}{if $custom_fields->fields[0]['required']} (*){/if}:{$forms.timeRecordForm.cf_1.control}{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:{$forms.timeRecordForm.cf_1.control}
- + diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl index 99d617bd..3ea9ceb3 100644 --- a/WEB-INF/templates/users.tpl +++ b/WEB-INF/templates/users.tpl @@ -24,9 +24,9 @@ {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_indicators} {/if} - {$u.name|escape:'html'} + {$u.name|escape} - + {if $smarty.const.ROLE_MANAGER == $u.role} {elseif $smarty.const.ROLE_COMANAGER == $u.role} @@ -70,8 +70,8 @@ {foreach $inactive_users as $u} - - + + {if $smarty.const.ROLE_MANAGER == $u.role} {elseif $smarty.const.ROLE_COMANAGER == $u.role} @@ -112,8 +112,8 @@ {foreach $active_users as $u} - - + + {if $smarty.const.ROLE_MANAGER == $u.role} {elseif $smarty.const.ROLE_COMANAGER == $u.role}
{$user_to_delete|escape:'html'}{$user_to_delete|escape}
 {$u.login|escape:'html'}{$u.login|escape}{$i18n.form.users.manager}
{$u.name|escape:'html'}{$u.login|escape:'html'}{$u.name|escape}{$u.login|escape}{$i18n.form.users.manager}
{$u.name|escape:'html'}{$u.login|escape:'html'}{$u.name|escape}{$u.login|escape}{$i18n.form.users.manager}