Removed show holidays config option.

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index c6693be..2a5eb1d 100644 (file)
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -41,7 +41,6 @@ class ttGroup {
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.
-  var $show_holidays = 0;       // Whether to show holidays in calendar.
   var $tracking_mode = 0;       // Tracking mode.
   var $project_required = 0;    // Whether project selection is required on time entires.
   var $task_required = 0;       // Whether task selection is required on time entires.
@@ -114,7 +113,6 @@ class ttGroup {
       $this->config = $val['config'];
       $this->configHelper = new ttConfigHelper($val['config']);
       // Set user config options.
-      $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index a40a5fd..14e7007 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -55,7 +55,6 @@ class ttUser {
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.
-  var $show_holidays = 0;       // Whether to show holidays in calendar.
   var $tracking_mode = 0;       // Tracking mode.
   var $project_required = 0;    // Whether project selection is required on time entires.
   var $task_required = 0;       // Whether task selection is required on time entires.
@@ -148,7 +147,6 @@ class ttUser {
       $this->configHelper = new ttConfigHelper($val['config']);
 
       // Set user config options.
-      $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 435e3eb..e24a13d 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -582,7 +582,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index e8c0322..2aa9ebb 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -595,7 +595,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 08109ba..aa4e97b 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -554,7 +554,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 timers',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Registrerings tilstand',
 'form.group_edit.mode_time' => 'Tid',

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 57a755a..4983758 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -530,8 +530,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 Stunden',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Zeige Feiertage',
-// TODO: translate the following.
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Nachverfolgung',
 'form.group_edit.mode_time' => 'Zeit',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index da27233..f7d8ac4 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -516,7 +516,6 @@ $i18n_key_words = array(
 'form.group_edit.12_hours' => '12 hours',
 'form.group_edit.24_hours' => '24 hours',
 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Show holidays',
 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tracking mode',
 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index bbbc3f0..97d3c50 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -596,7 +596,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 horas',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 5ea9211..41fe752 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -559,8 +559,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 tundi',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Näita pühi',
-// TODO: translate the following.
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Jälgimise režiim',
 'form.group_edit.mode_time' => 'ajaarvestus',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 823f1b7..c383122 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -577,7 +577,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 ساعت',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'حالت رهگیری',
 'form.group_edit.mode_time' => 'زمان',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 74a8b64..0575033 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -560,7 +560,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24-tuntinen',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Seurantamuoto',
 'form.group_edit.mode_time' => 'aika',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index d5067b5..b8eb0d5 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -551,7 +551,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 heures',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Mode suivi',
 'form.group_edit.mode_time' => 'Heures',

diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 9960f1c..49ab0a1 100644 (file)
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -539,8 +539,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 ώρες',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Προβολή διακοπών',
-// TODO: translate the following.
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Λειτουργία καταγραφής',
 'form.group_edit.mode_time' => 'χρόνος',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 8c9ba6a..d8e99d6 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -581,7 +581,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 שעות',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'סוג מעקב',
 'form.group_edit.mode_time' => 'זמן',

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index f956210..441db3f 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -587,7 +587,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index dc339b8..4b76fef 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -553,8 +553,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 ore',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Mostra vacanze',
-// TODO: translate the following.
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Modalità di registrazione',
 'form.group_edit.mode_time' => 'tempo',

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index ba1abff..6db1741 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -590,7 +590,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index dc8ef51..d8ed7b8 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -588,7 +588,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 0a25f8b..859741a 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -515,8 +515,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 uurs',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-'form.group_edit.show_holidays' => 'Toon vakantiedagen',
-// TODO: translate the following.
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Bijhouden',
 'form.group_edit.mode_time' => 'tijd',

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index b5fa206..5a108fc 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -587,7 +587,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index c6d1af1..60f5e1a 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -563,7 +563,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 godziny',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Tryb śledzenia',
 'form.group_edit.mode_time' => 'czas',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 544a495..5013cde 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -558,7 +558,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 horas',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Modo de acompanhamento',
 'form.group_edit.mode_time' => 'tempo',

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 2d8298f..cc44e6f 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -569,7 +569,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 9a03b84..94690cd 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -590,7 +590,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 7caf38e..22d9a2b 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -507,7 +507,6 @@ $i18n_key_words = array(
 'form.group_edit.12_hours' => '12 часов',
 'form.group_edit.24_hours' => '24 часа',
 'form.group_edit.display_options' => 'Опции отображения',
-'form.group_edit.show_holidays' => 'Показывать праздники',
 'form.group_edit.holidays' => 'Праздники',
 'form.group_edit.tracking_mode' => 'Режим работы',
 'form.group_edit.mode_time' => 'время',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 76bfaaa..664c26f 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -570,7 +570,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24-hodinový',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Režim sledovania',
 'form.group_edit.mode_time' => 'čas',

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 14ab000..d9001b1 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -564,7 +564,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index f742c1c..79769f9 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -561,7 +561,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24 časova',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Način evidencije',
 'form.group_edit.mode_time' => 'vreme',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index d500722..a442a6e 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -558,7 +558,6 @@ $i18n_key_words = array(
 'form.group_edit.24_hours' => '24-timmars',
 // TODO: translate the following.
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 'form.group_edit.tracking_mode' => 'Spårningsmetod',
 'form.group_edit.mode_time' => 'Endast tid',

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 05b99c5..2ed0eef 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -603,7 +603,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 795b491..868bf16 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -574,7 +574,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 7d19a6e..fa8d4a0 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -580,7 +580,6 @@ $i18n_key_words = array(
 // 'form.group_edit.12_hours' => '12 hours',
 // 'form.group_edit.24_hours' => '24 hours',
 // 'form.group_edit.display_options' => 'Display options',
-// 'form.group_edit.show_holidays' => 'Show holidays',
 // 'form.group_edit.holidays' => 'Holidays',
 // 'form.group_edit.tracking_mode' => 'Tracking mode',
 // 'form.group_edit.mode_time' => 'time',

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 343a4d0..b303ed9 100644 (file)
--- 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.19.4.4996 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.19.4.4997 | 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_edit.tpl b/WEB-INF/templates/group_edit.tpl
index a68e28e..0da797f 100644 (file)
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -74,13 +74,9 @@ function handleTaskRequiredCheckbox() {
             <td align="right" nowrap>{$i18n.form.group_edit.display_options}:</td>
             <td><a href="display_options.php">{$i18n.label.configure}</a></td>
           </tr>
-          <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.show_holidays}:</td>
-            <td>{$forms.groupForm.show_holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.holidays}:</td>
-            <td>{$forms.groupForm.holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+            <td>{$forms.groupForm.holidays.control} <a href="https://www.anuko.com/lp/tt_36.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>

diff --git a/group_edit.php b/group_edit.php
index 2855de8..894546e 100644 (file)
--- a/group_edit.php
+++ b/group_edit.php
@@ -85,7 +85,6 @@ if ($request->isPost() && !$groupChanged) {
   $cl_date_format = $request->getParameter('date_format');
   $cl_time_format = $request->getParameter('time_format');
   $cl_start_week = $request->getParameter('start_week');
-  $cl_show_holidays = $request->getParameter('show_holidays');
   $cl_holidays = trim($request->getParameter('holidays'));
   $cl_tracking_mode = $request->getParameter('tracking_mode');
   $cl_project_required = $request->getParameter('project_required');
@@ -107,7 +106,6 @@ if ($request->isPost() && !$groupChanged) {
   $cl_date_format = $group['date_format'];
   $cl_time_format = $group['time_format'];
   $cl_start_week = $group['week_start'];
-  $cl_show_holidays = $config->getDefinedValue('show_holidays');
   $cl_holidays = $group['holidays'];
   $cl_tracking_mode = $group['tracking_mode'];
   $cl_project_required = $group['project_required'];
@@ -181,8 +179,7 @@ foreach ($i18n->weekdayNames as $id => $week_dn) {
 }
 $form->addInput(array('type'=>'combobox','name'=>'start_week','style'=>'width: 150px;','data'=>$week_start_options,'datakeys'=>array('id','name'),'value'=>$cl_start_week));
 
-// Show holidays checkbox.
-$form->addInput(array('type'=>'checkbox','name'=>'show_holidays','value'=>$cl_show_holidays));
+// Show holidays control.
 $form->addInput(array('type'=>'text','name'=>'holidays','value'=>$cl_holidays));
 
 // Prepare tracking mode choices.
@@ -249,7 +246,6 @@ if ($request->isPost()) {
 
     if ($err->no()) {
       // Update config.
-      $config->setDefinedValue('show_holidays', $cl_show_holidays);
       $config->setDefinedValue('punch_mode', $cl_punch_mode);
       $config->setDefinedValue('allow_overlap', $cl_allow_overlap);
       $config->setDefinedValue('future_entries', $cl_future_entries);