From 6856837ddde5cc90ac5dad2e5d67204036ec3158 Mon Sep 17 00:00:00 2001 From: anuko Date: Mon, 27 Nov 2017 14:00:11 +0000 Subject: [PATCH] Some style fixes to keep things consistent after recent pull request integration. --- WEB-INF/lib/ttReportHelper.class.php | 4 ++-- WEB-INF/templates/admin_teams.tpl | 2 +- WEB-INF/templates/cf_custom_fields.tpl | 2 +- WEB-INF/templates/cf_dropdown_options.tpl | 2 +- WEB-INF/templates/expense_delete.tpl | 2 +- WEB-INF/templates/expenses.tpl | 2 +- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/invoice_view.tpl | 2 +- WEB-INF/templates/invoices.tpl | 2 +- WEB-INF/templates/mobile/clients.tpl | 4 ++-- WEB-INF/templates/mobile/expense_delete.tpl | 2 +- WEB-INF/templates/mobile/expenses.tpl | 2 +- WEB-INF/templates/mobile/projects.tpl | 6 +++--- WEB-INF/templates/mobile/tasks.tpl | 6 +++--- WEB-INF/templates/mobile/time.tpl | 2 +- WEB-INF/templates/mobile/users.tpl | 6 +++--- WEB-INF/templates/notifications.tpl | 2 +- WEB-INF/templates/predefined_expenses.tpl | 2 +- WEB-INF/templates/time.tpl | 2 +- WEB-INF/templates/time_delete.tpl | 2 +- default.css | 2 +- 21 files changed, 29 insertions(+), 29 deletions(-) diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index cfa10794..7b7808cb 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -1062,7 +1062,7 @@ class ttReportHelper { $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;'; $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;'; $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;'; - $rowItem = 'background-color: #ccccce;'; + $rowItem = 'background-color: #ffffff;'; $rowItemAlt = 'background-color: #f5f5f5;'; $rowSubtotal = 'background-color: #e0e0e0;'; $cellLeftAligned = 'text-align: left; vertical-align: top;'; @@ -1334,7 +1334,7 @@ class ttReportHelper { $style_title = 'text-align: center; font-size: 15pt; font-family: Arial, Helvetica, sans-serif;'; $tableHeader = 'font-weight: bold; background-color: #a6ccf7; text-align: left;'; $tableHeaderCentered = 'font-weight: bold; background-color: #a6ccf7; text-align: center;'; - $rowItem = 'background-color: #ccccce;'; + $rowItem = 'background-color: #ffffff;'; $rowItemAlt = 'background-color: #f5f5f5;'; $rowSubtotal = 'background-color: #e0e0e0;'; $cellLeftAligned = 'text-align: left; vertical-align: top;'; diff --git a/WEB-INF/templates/admin_teams.tpl b/WEB-INF/templates/admin_teams.tpl index bb4c16ae..bbbf2843 100644 --- a/WEB-INF/templates/admin_teams.tpl +++ b/WEB-INF/templates/admin_teams.tpl @@ -17,7 +17,7 @@ {if $teams} {foreach $teams as $team} - + {$team.id} {$team.name|escape} {$team.date} diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl index 54be19d2..51e83769 100644 --- a/WEB-INF/templates/cf_custom_fields.tpl +++ b/WEB-INF/templates/cf_custom_fields.tpl @@ -13,7 +13,7 @@ {if $custom_fields} {foreach $custom_fields as $field} - + {$field['label']|escape} {if CustomFields::TYPE_TEXT == $field['type']} {$i18n.label.type_text} diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl index 61a40435..414c3bc2 100644 --- a/WEB-INF/templates/cf_dropdown_options.tpl +++ b/WEB-INF/templates/cf_dropdown_options.tpl @@ -15,7 +15,7 @@ {if $options} {foreach $options as $key=>$val} - + {$val|escape} {$i18n.label.edit} {$i18n.label.delete} diff --git a/WEB-INF/templates/expense_delete.tpl b/WEB-INF/templates/expense_delete.tpl index 8b4e642f..52462c8d 100644 --- a/WEB-INF/templates/expense_delete.tpl +++ b/WEB-INF/templates/expense_delete.tpl @@ -14,7 +14,7 @@ {$i18n.label.item} {$i18n.label.cost} - + {if $user->isPluginEnabled('cl')} {$expense_item.client_name|escape} {/if} diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl index d2105079..85d27eae 100644 --- a/WEB-INF/templates/expenses.tpl +++ b/WEB-INF/templates/expenses.tpl @@ -179,7 +179,7 @@ function recalculateCost() { {$i18n.label.edit} {foreach $expense_items as $item} - + {if $user->isPluginEnabled('cl')} {$item.client|escape} {/if} diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 0f14b905..fb3889c1 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- {foreach $invoice_items as $invoice_item} - + {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl index 4d6f50a9..1dfd43ad 100644 --- a/WEB-INF/templates/invoices.tpl +++ b/WEB-INF/templates/invoices.tpl @@ -17,7 +17,7 @@ {/if} {foreach $invoices as $invoice} - + diff --git a/WEB-INF/templates/mobile/clients.tpl b/WEB-INF/templates/mobile/clients.tpl index 00a19eee..db0826ca 100644 --- a/WEB-INF/templates/mobile/clients.tpl +++ b/WEB-INF/templates/mobile/clients.tpl @@ -15,7 +15,7 @@ {foreach $active_clients as $client} - + @@ -34,7 +34,7 @@ {foreach $inactive_clients as $client} - + diff --git a/WEB-INF/templates/mobile/expense_delete.tpl b/WEB-INF/templates/mobile/expense_delete.tpl index a1c0fd78..bfd6dbc1 100644 --- a/WEB-INF/templates/mobile/expense_delete.tpl +++ b/WEB-INF/templates/mobile/expense_delete.tpl @@ -14,7 +14,7 @@ - + {if $user->isPluginEnabled('cl')} {/if} diff --git a/WEB-INF/templates/mobile/expenses.tpl b/WEB-INF/templates/mobile/expenses.tpl index 52de0a91..a4a38478 100644 --- a/WEB-INF/templates/mobile/expenses.tpl +++ b/WEB-INF/templates/mobile/expenses.tpl @@ -142,7 +142,7 @@ function get_date() { {foreach $expense_items as $item} - + {if $user->isPluginEnabled('cl')} {/if} diff --git a/WEB-INF/templates/mobile/projects.tpl b/WEB-INF/templates/mobile/projects.tpl index d40e792a..f486739b 100644 --- a/WEB-INF/templates/mobile/projects.tpl +++ b/WEB-INF/templates/mobile/projects.tpl @@ -16,7 +16,7 @@ {if $active_projects} {foreach $active_projects as $project} - + @@ -40,7 +40,7 @@ {foreach $inactive_projects as $project} - + @@ -63,7 +63,7 @@ {if $active_projects} {foreach $active_projects as $project} - + diff --git a/WEB-INF/templates/mobile/tasks.tpl b/WEB-INF/templates/mobile/tasks.tpl index 8ed15fb8..5ea6a2a6 100644 --- a/WEB-INF/templates/mobile/tasks.tpl +++ b/WEB-INF/templates/mobile/tasks.tpl @@ -16,7 +16,7 @@ {if $active_tasks} {foreach $active_tasks as $task} - + @@ -40,7 +40,7 @@ {foreach $inactive_tasks as $task} - + @@ -63,7 +63,7 @@ {if $active_tasks} {foreach $active_tasks as $task} - + diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl index ce96dde4..3b8b0f8b 100644 --- a/WEB-INF/templates/mobile/time.tpl +++ b/WEB-INF/templates/mobile/time.tpl @@ -20,7 +20,7 @@ {if $time_records}
 Anuko Time Tracker 1.12.3.3684 | Copyright © Anuko | +  Anuko Time Tracker 1.12.3.3685 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl index 31ff8e76..1ff5c834 100644 --- a/WEB-INF/templates/invoice_view.tpl +++ b/WEB-INF/templates/invoice_view.tpl @@ -31,7 +31,7 @@ {$i18n.label.cost}
{$invoice_item.date} {$invoice_item.user_name|escape}
{$invoice.name|escape} {$invoice.client_name|escape} {$invoice.date}{$i18n.label.address}
{$client.name|escape} {$client.address|escape}
{$i18n.label.address}
{$client.name|escape} {$client.address|escape}
{$i18n.label.item} {$i18n.label.cost}
{$expense_item.client_name|escape}{$i18n.label.cost}
{$item.client|escape}
{$project.name|escape} {$project.description|escape}
{$i18n.label.description}
{$project.name|escape} {$project.description|escape}
{$project.name|escape} {$project.description|escape}
{$task.name|escape} {$task.description|escape}
{$i18n.label.description}
{$task.name|escape} {$task.description|escape}
{$task.name|escape} {$task.description|escape}
{foreach $time_records as $record} - + {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} {/if} diff --git a/WEB-INF/templates/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl index 6ff3269a..956ee55a 100644 --- a/WEB-INF/templates/mobile/users.tpl +++ b/WEB-INF/templates/mobile/users.tpl @@ -17,7 +17,7 @@ {if $active_users} {foreach $active_users as $u} - + {foreach $inactive_users as $u} - + {foreach $active_users as $u} - + {if $smarty.const.ROLE_MANAGER == $u.role} diff --git a/WEB-INF/templates/notifications.tpl b/WEB-INF/templates/notifications.tpl index c9f43f2f..71cc13a3 100644 --- a/WEB-INF/templates/notifications.tpl +++ b/WEB-INF/templates/notifications.tpl @@ -14,7 +14,7 @@ {if $notifications} {foreach $notifications as $notification} - + diff --git a/WEB-INF/templates/predefined_expenses.tpl b/WEB-INF/templates/predefined_expenses.tpl index a254da39..265bdf1b 100644 --- a/WEB-INF/templates/predefined_expenses.tpl +++ b/WEB-INF/templates/predefined_expenses.tpl @@ -12,7 +12,7 @@ {if $predefined_expenses} {foreach $predefined_expenses as $predefined_expense} - + diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index 25fc81c1..a1b39583 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -106,7 +106,7 @@ {foreach $time_records as $record} - + {if $user->isPluginEnabled('cl')} {/if} diff --git a/WEB-INF/templates/time_delete.tpl b/WEB-INF/templates/time_delete.tpl index b3d8a397..41b7a4e9 100644 --- a/WEB-INF/templates/time_delete.tpl +++ b/WEB-INF/templates/time_delete.tpl @@ -19,7 +19,7 @@ {/if} - + {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} {/if} diff --git a/default.css b/default.css index b1b7ec36..49299176 100644 --- a/default.css +++ b/default.css @@ -84,7 +84,7 @@ select{ font-size: 10pt; font-family: verdana; } } .rowReportItem { - background-color: #ccccce; + background-color: #ffffff; } .rowReportItemAlt { -- 2.20.1
{$record.project|escape}
{if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_indicators} @@ -65,7 +65,7 @@ {$i18n.label.edit}
{if $user->isManager()} {$u.name|escape} @@ -111,7 +111,7 @@ {$i18n.form.users.role}
{$u.name|escape} {$u.login|escape}
{$notification['name']|escape} {$notification['cron_spec']|escape} {$notification['email']|escape}
{$predefined_expense['name']|escape} {$predefined_expense['cost']|escape} {$i18n.label.edit}{$i18n.label.edit}
{$record.client|escape}{$i18n.label.note}
{$time_rec.project_name|escape}