From: Nik Okuntseff <support@anuko.com>
Date: Wed, 11 Apr 2018 17:29:09 +0000 (+0000)
Subject: Implemented group delete feature.
X-Git-Tag: timetracker_1.19-1~848
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b262cc9f78e50e6910fefc1744782ddd64bbccda;p=timetracker.git

Implemented group delete feature.
---

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index af4bc1d2..8b280c80 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -513,6 +513,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'Per a',
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d907c6e9..f167910c 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -527,6 +527,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Komu',
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 4d94cccf..4d28aa36 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -474,6 +474,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Fra',
 'form.mail.to' => 'Til',
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index eb5a6483..1f1b4f13 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -471,6 +471,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Erweiterungen',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Von',
 'form.mail.to' => 'An',
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 298a575f..85430647 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -449,6 +449,9 @@ $i18n_key_words = array(
 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'From',
 'form.mail.to' => 'To',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index e79f3d4a..faf8d4a5 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -528,6 +528,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 1187ed72..85a1f07b 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -523,6 +523,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Kellelt',
 'form.mail.to' => 'Kellele',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 3539f357..47f3f56e 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -500,6 +500,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'پلاگین ها',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'از',
 'form.mail.to' => 'به',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 7ff1bc1e..20d882e4 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -481,6 +481,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Lisäosat',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Lähettäjä',
 'form.mail.to' => 'Vastaanottaja',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 1456edc6..249acbd2 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -470,6 +470,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'À',
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 2d2d0d5e..1b78e55e 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -452,6 +452,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Πρόσθετα',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Από',
 'form.mail.to' => 'Προς',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6cfccd8e..92450b5d 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -507,6 +507,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'תוספים',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'מאת',
 'form.mail.to' => 'אל',
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f897844c..7510442f 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -516,6 +516,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Feladó',
 'form.mail.to' => 'Címzett',
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8a62db50..7d4c79ab 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -468,6 +468,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugin',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Da',
 'form.mail.to' => 'A',
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index aad7afe6..636f2dd7 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -519,6 +519,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'から',
 'form.mail.to' => 'まで',
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index ca50b7e1..5e621fe5 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -517,6 +517,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => '부터',
 'form.mail.to' => '까지', // TODO: is this correct? The meaning is that we send an email TO this person.
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 9841116f..7fdae205 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -448,6 +448,10 @@ $i18n_key_words = array(
 'form.profile.allow_ip' => 'Toegestane IP adressen',
 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Van',
 'form.mail.to' => 'Aan',
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index d6c6fbb1..2cfb3ad3 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -516,6 +516,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Fra',
 'form.mail.to' => 'Til',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 2c1210ea..7fc6fdc6 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -483,6 +483,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Dodatkowe moduły',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Do',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index ad7d5d13..bdc77215 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -478,6 +478,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index a5139b78..5b9c4db2 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -500,6 +500,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De',
 'form.mail.to' => 'Para',
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9b068a7e..93f00f70 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -522,6 +522,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'De la',
 'form.mail.to' => 'Catre',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 1399049a..ad714129 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -446,6 +446,9 @@ $i18n_key_words = array(
 'form.profile.allow_ip' => 'Разрешить доступ с IP',
 'form.profile.plugins' => 'Плагины',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+'form.group_delete.hint' => 'Вы уверены, что хотите удалить всю группу?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'От',
 'form.mail.to' => 'Кому',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 8fed200f..0414d224 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -498,6 +498,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Doplnkové moduly',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Komu',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 8c006293..f1731ab9 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -496,6 +496,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Za',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 6aede0a0..1c98dc95 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -482,6 +482,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Dodaci',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Forma mejla. Pogledajte primer na https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Od',
 'form.mail.to' => 'Za',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index ad943a30..6348480a 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -477,6 +477,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 'form.profile.plugins' => 'Tillägg',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Från',
 'form.mail.to' => 'Till',
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index fcbd981a..06d21c21 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -535,6 +535,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => 'Kimden',
 'form.mail.to' => 'Kime',
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index b1a1bdaa..d299b8e3 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -503,6 +503,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => '从',
 'form.mail.to' => '到',
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index a070b1a2..c28dd025 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -511,6 +511,10 @@ $i18n_key_words = array(
 // 'form.profile.allow_ip' => 'Allow IP',
 // 'form.profile.plugins' => 'Plugins',
 
+// Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
+// TODO: translate the following.
+// 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
+
 // Mail form. See example at https://timetracker.anuko.com/report_send.php when emailing a report.
 'form.mail.from' => '從',
 'form.mail.to' => '到',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6ba9e4fc..e4b69918 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.17.87.4252 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.88.4253 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
diff --git a/WEB-INF/templates/group_delete.tpl b/WEB-INF/templates/group_delete.tpl
index 57164d4a..a14373f5 100644
--- a/WEB-INF/templates/group_delete.tpl
+++ b/WEB-INF/templates/group_delete.tpl
@@ -3,6 +3,8 @@
   <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
+        <tr><td colspan="2">{$i18n.form.group_delete.hint}</td></tr>
+        <tr><td>&nbsp;</td></tr>
         <tr>
           <td colspan="2" align="center"><b>{$group_to_delete|escape}</b></td>
         </tr>
diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index 7cb8d2e6..aba5ea61 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -1,4 +1,6 @@
 <script>
+function chLocation(newLocation) { document.location = newLocation; }
+
 // handleTaskRequiredCheckbox - controls visibility of the Task Required checkbox.
 function handleTaskRequiredCheckbox() {
   var taskRequiredCheckbox = document.getElementById("task_required");
@@ -243,7 +245,7 @@ function handlePluginCheckboxes() {
             <td colspan="2">&nbsp;</td>
           </tr>
           <tr>
-            <td colspan="2" height="50" align="center">{$forms.groupForm.btn_save.control}</td>
+            <td colspan="2" height="50" align="center">{$forms.groupForm.btn_save.control} {$forms.groupForm.btn_delete.control}</td>
           </tr>
         </table>
       </td>
diff --git a/group_delete.php b/group_delete.php
index 65875fad..6aa0d11d 100644
--- a/group_delete.php
+++ b/group_delete.php
@@ -28,17 +28,22 @@
 
 require_once('initialize.php');
 import('form.Form');
+import('ttAdmin');
 
 // Access checks.
 if (!ttAccessAllowed('delete_group')) {
   header('Location: access_denied.php');
   exit();
 }
-// End of access checks.
-
-// TODO: refactor this... and the template.
 $group_id = (int)$request->getParameter('id');
+if ($user->group_id != $group_id) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
+// Note: reuse ttAdmin class here, simply because deleting a group
+// is a complicated task.
 $admin = new ttAdmin();
 $group_details = $admin->getGroupDetails($group_id);
 $group_name = $group_details['group_name'];
@@ -50,16 +55,17 @@ $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get(
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    $result = $admin->markGroupDeleted($group_id);
-    if ($result) {
-      header('Location: admin_groups.php');
+    if ($admin->markGroupDeleted($group_id)) {
+      $auth->doLogout();
+      session_unset();
+      header('Location: login.php');
       exit();
     } else
       $err->add($i18n->get('error.db'));
   }
 
   if ($request->getParameter('btn_cancel')) {
-    header('Location: admin_groups.php');
+    header('Location: group_edit.php');
     exit();
   }
 } // isPost
@@ -67,5 +73,5 @@ if ($request->isPost()) {
 $smarty->assign('group_to_delete', $group_name);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->get('title.delete_group'));
-$smarty->assign('content_page_name', 'admin_group_delete.tpl');
+$smarty->assign('content_page_name', 'group_delete.tpl');
 $smarty->display('index.tpl');
diff --git a/group_edit.php b/group_edit.php
index 2b876493..91b2b68c 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -208,8 +208,16 @@ $form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,
 $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+if ($user->can('delete_group')) $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('button.delete')));
 
 if ($request->isPost()) {
+
+  if ($request->getParameter('btn_delete')) {
+    // Delete button pressed, redirect.
+    header('Location: group_delete.php?id='.$user->group_id);
+    exit();
+  }
+
   // Validate user input.
   if (!ttValidString($cl_group, true)) $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
   if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));