From 352243fe0b205fa6371299c47be1bb91a7a377bb Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Fri, 5 Apr 2019 19:09:02 +0000 Subject: [PATCH] Added delete option on time.php pages. --- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/mobile/time.tpl | 1 + WEB-INF/templates/time.tpl | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 6f48e05b..6d0c07e9 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- + {/foreach}
 Anuko Time Tracker 1.18.63.4907 | Copyright © Anuko | +  Anuko Time Tracker 1.18.63.4908 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl index 06d2775d..38ec1914 100644 --- a/WEB-INF/templates/mobile/time.tpl +++ b/WEB-INF/templates/mobile/time.tpl @@ -26,6 +26,7 @@ {/if} {if ($record.duration == '0:00' && $record.start <> '')}{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}{/if} {if $record.approved || $record.timesheet_id || $record.invoice_id} {else}{$i18n.label.edit}{/if}{if $record.approved || $record.timesheet_id || $record.invoice_id} {else}{$i18n.label.delete}{/if}
diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index c03297a5..0b5a77ca 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -117,6 +117,7 @@ {$i18n.label.duration} {$i18n.label.note} + {foreach $time_records as $record} @@ -146,6 +147,13 @@ {/if} + {/if} + + + {if $record.approved || $record.timesheet_id || $record.invoice_id} +   + {else} + {$i18n.label.delete} {/if} -- 2.20.1