From 3c96bcaf6046242b9af54af454e2782ece8baa66 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Sun, 7 Apr 2019 22:49:08 +0000 Subject: [PATCH] Finished replacing edit and delete text links with icons. --- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/invoices.tpl | 4 ++-- WEB-INF/templates/templates.tpl | 16 ++++++++-------- WEB-INF/templates/timesheets.tpl | 12 ++++++++---- WEB-INF/templates/week.tpl | 14 +++++++++++--- 5 files changed, 30 insertions(+), 18 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index fc3d4b6e..1a0e0ad1 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- {if !$user->isClient()} - + {/if} {foreach $invoices as $invoice} @@ -29,7 +29,7 @@ {/if} {if !$user->isClient()} - + {/if} {/foreach} diff --git a/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl index c1a8d5b4..2e388b49 100644 --- a/WEB-INF/templates/templates.tpl +++ b/WEB-INF/templates/templates.tpl @@ -9,15 +9,15 @@ - - + + {foreach $active_templates as $template} - - + + {/foreach}
 Anuko Time Tracker 1.18.64.4925 | Copyright © Anuko | +  Anuko Time Tracker 1.18.64.4926 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl index 86e7e525..7301ce2c 100644 --- a/WEB-INF/templates/invoices.tpl +++ b/WEB-INF/templates/invoices.tpl @@ -16,7 +16,7 @@ {/if} {$i18n.label.view}{$i18n.label.delete}
{$i18n.label.view}{$i18n.label.delete}{$i18n.label.delete}
{$i18n.label.thing_name} {$i18n.label.description}{$i18n.label.edit}{$i18n.label.delete}
{$template['name']|escape} {$template['description']|escape}{$i18n.label.edit}{$i18n.label.delete}{$i18n.label.edit}{$i18n.label.delete}
@@ -30,15 +30,15 @@ {$i18n.label.thing_name} {$i18n.label.description} - {$i18n.label.edit} - {$i18n.label.delete} + + {foreach $inactive_templates as $template} {$template['name']|escape} {$template['description']|escape} - {$i18n.label.edit} - {$i18n.label.delete} + {$i18n.label.edit} + {$i18n.label.delete} {/foreach} diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl index 91c626df..c38e2d44 100644 --- a/WEB-INF/templates/timesheets.tpl +++ b/WEB-INF/templates/timesheets.tpl @@ -21,7 +21,8 @@ {$i18n.label.submitted} {$i18n.label.approved} {$i18n.label.view} - {$i18n.label.edit} + + {foreach $active_timesheets as $timesheet} @@ -36,7 +37,8 @@ {if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} {/if} {$i18n.label.view} - {$i18n.label.edit} + {$i18n.label.edit} + {$i18n.label.delete} {/foreach} @@ -57,7 +59,8 @@ {$i18n.label.submitted} {$i18n.label.approved} {$i18n.label.view} - {$i18n.label.edit} + + {foreach $inactive_timesheets as $timesheet} @@ -72,7 +75,8 @@ {if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} {/if} {$i18n.label.view} - {$i18n.label.edit} + {$i18n.label.edit} + {$i18n.label.delete} {/foreach} diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl index 8eaa5fa8..6fc08b8a 100644 --- a/WEB-INF/templates/week.tpl +++ b/WEB-INF/templates/week.tpl @@ -117,7 +117,8 @@ function fillDropdowns() { {/if} {$i18n.label.duration} {$i18n.label.note} - {$i18n.label.edit} + + {foreach $time_records as $record} @@ -138,16 +139,23 @@ function fillDropdowns() { {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} + {if $record.approved || $record.timesheet_id || $record.invoice_id}   {else} - {$i18n.label.edit} + {$i18n.label.edit} {if ($record.duration == '0:00' && $record.start <> '')} {/if} + {/if} + + + {if $record.approved || $record.timesheet_id || $record.invoice_id} +   + {else} + {$i18n.label.delete} {/if} -- 2.20.1