From a26a0989ad93cce9de9f45312990da9610e53045 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Wed, 24 Apr 2019 19:59:30 +0000 Subject: [PATCH] Configirable option whether to show Week menu. --- WEB-INF/resources/ca.lang.php | 2 ++ WEB-INF/resources/cs.lang.php | 2 ++ WEB-INF/resources/da.lang.php | 3 +++ WEB-INF/resources/de.lang.php | 3 +++ WEB-INF/resources/en.lang.php | 2 ++ WEB-INF/resources/es.lang.php | 2 ++ WEB-INF/resources/et.lang.php | 3 +++ WEB-INF/resources/fa.lang.php | 3 +++ WEB-INF/resources/fi.lang.php | 3 +++ WEB-INF/resources/fr.lang.php | 3 +++ WEB-INF/resources/gr.lang.php | 3 +++ WEB-INF/resources/he.lang.php | 2 ++ WEB-INF/resources/hu.lang.php | 2 ++ WEB-INF/resources/it.lang.php | 3 +++ WEB-INF/resources/ja.lang.php | 2 ++ WEB-INF/resources/ko.lang.php | 2 ++ WEB-INF/resources/nl.lang.php | 3 +++ WEB-INF/resources/no.lang.php | 2 ++ WEB-INF/resources/pl.lang.php | 3 +++ WEB-INF/resources/pt-br.lang.php | 3 +++ WEB-INF/resources/pt.lang.php | 2 ++ WEB-INF/resources/ro.lang.php | 2 ++ WEB-INF/resources/ru.lang.php | 2 ++ WEB-INF/resources/sk.lang.php | 2 ++ WEB-INF/resources/sl.lang.php | 2 ++ WEB-INF/resources/sr.lang.php | 3 +++ WEB-INF/resources/sv.lang.php | 3 +++ WEB-INF/resources/tr.lang.php | 2 ++ WEB-INF/resources/zh-cn.lang.php | 3 +++ WEB-INF/resources/zh-tw.lang.php | 2 ++ WEB-INF/templates/display_options.tpl | 10 ++++++++++ WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/header.tpl | 3 +++ WEB-INF/templates/time.tpl | 2 +- WEB-INF/templates/week.tpl | 2 ++ display_options.php | 12 ++++++++++-- time.php | 1 + week.php | 1 + 38 files changed, 103 insertions(+), 4 deletions(-) diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php index a49aef79..d7bccc80 100644 --- a/WEB-INF/resources/ca.lang.php +++ b/WEB-INF/resources/ca.lang.php @@ -53,6 +53,7 @@ $i18n_key_words = array( // 'menu.plugins' => 'Plugins', 'menu.time' => 'Temps', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'Informes', // TODO: translate the following. @@ -664,5 +665,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php index 662b382e..941a0ca5 100644 --- a/WEB-INF/resources/cs.lang.php +++ b/WEB-INF/resources/cs.lang.php @@ -54,6 +54,7 @@ $i18n_key_words = array( // 'menu.group' => 'Group', // 'menu.plugins' => 'Plugins', // 'menu.time' => 'Time', +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'Sestavy', // TODO: translate the following. @@ -677,5 +678,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php index 45d1790a..07a6ecdb 100644 --- a/WEB-INF/resources/da.lang.php +++ b/WEB-INF/resources/da.lang.php @@ -51,6 +51,8 @@ $i18n_key_words = array( // 'menu.group' => 'Group', 'menu.plugins' => 'Plugins', 'menu.time' => 'Tid', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Udgifter', 'menu.reports' => 'Rapporter', // TODO: translate the following. @@ -635,6 +637,7 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php index 41ab5a6e..b79a5276 100644 --- a/WEB-INF/resources/de.lang.php +++ b/WEB-INF/resources/de.lang.php @@ -49,6 +49,8 @@ $i18n_key_words = array( 'menu.group' => 'Gruppe', 'menu.plugins' => 'Erweiterungen', 'menu.time' => 'Zeiten', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Kosten', 'menu.reports' => 'Berichte', // TODO: translate the following. @@ -608,5 +610,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php index 4d1a1828..5814f811 100644 --- a/WEB-INF/resources/en.lang.php +++ b/WEB-INF/resources/en.lang.php @@ -50,6 +50,7 @@ $i18n_key_words = array( 'menu.subgroups' => 'Subgroups', 'menu.plugins' => 'Plugins', 'menu.time' => 'Time', +'menu.week' => 'Week', 'menu.expenses' => 'Expenses', 'menu.reports' => 'Reports', 'menu.timesheets' => 'Timesheets', @@ -590,5 +591,6 @@ $i18n_key_words = array( 'form.timesheet_view.disapprove_body' => "Your timesheet %s was not approved.

%s", // Display Options form. See example at https://timetracker.anuko.com/display_options.php. +'form.display_options.menu' => 'Menu', 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php index b29bf324..dd8cfa58 100644 --- a/WEB-INF/resources/es.lang.php +++ b/WEB-INF/resources/es.lang.php @@ -52,6 +52,7 @@ $i18n_key_words = array( // 'menu.plugins' => 'Plugins', 'menu.time' => 'Tiempo', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'Reportes', // TODO: translate the following. @@ -679,5 +680,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php index 5c69d6b7..95e863f5 100644 --- a/WEB-INF/resources/et.lang.php +++ b/WEB-INF/resources/et.lang.php @@ -51,6 +51,8 @@ $i18n_key_words = array( 'menu.group' => 'Grupp', 'menu.plugins' => 'Lisad', 'menu.time' => 'Ajaarvestus', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Kulud', 'menu.reports' => 'Raportid', // TODO: translate the following. @@ -637,5 +639,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php index a77c13c6..bf8e7189 100644 --- a/WEB-INF/resources/fa.lang.php +++ b/WEB-INF/resources/fa.lang.php @@ -52,6 +52,8 @@ $i18n_key_words = array( // 'menu.group' => 'Group', 'menu.plugins' => 'پلاگین ها', 'menu.time' => 'زمان', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'هزينه ها', 'menu.reports' => 'گزارشات', // TODO: translate the following. @@ -659,5 +661,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php index e0b60349..2c4d08f6 100644 --- a/WEB-INF/resources/fi.lang.php +++ b/WEB-INF/resources/fi.lang.php @@ -51,6 +51,8 @@ $i18n_key_words = array( // 'menu.group' => 'Group', 'menu.plugins' => 'Lisäosat', 'menu.time' => 'Tunnit', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Kulut', 'menu.reports' => 'Raportit', // TODO: translate the following. @@ -641,5 +643,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php index 2fa1a4af..fdb2ec30 100644 --- a/WEB-INF/resources/fr.lang.php +++ b/WEB-INF/resources/fr.lang.php @@ -51,6 +51,8 @@ $i18n_key_words = array( // 'menu.group' => 'Group', 'menu.plugins' => 'Plugins', 'menu.time' => 'Temps', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Dépenses', 'menu.reports' => 'Rapports', // TODO: translate the following. @@ -631,5 +633,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php index 3094dabd..80624179 100644 --- a/WEB-INF/resources/gr.lang.php +++ b/WEB-INF/resources/gr.lang.php @@ -49,6 +49,8 @@ $i18n_key_words = array( 'menu.group' => 'Ομάδα', 'menu.plugins' => 'Πρόσθετα', 'menu.time' => 'Χρόνος', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Έξοδα', 'menu.reports' => 'Αναφορές', // TODO: translate the following. @@ -620,5 +622,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php index 820da036..e344a28b 100644 --- a/WEB-INF/resources/he.lang.php +++ b/WEB-INF/resources/he.lang.php @@ -53,6 +53,7 @@ $i18n_key_words = array( 'menu.plugins' => 'תוספים', 'menu.time' => 'זמן', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'דוחות', // TODO: translate the following. @@ -663,5 +664,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php index fdc0d027..aceb3524 100644 --- a/WEB-INF/resources/hu.lang.php +++ b/WEB-INF/resources/hu.lang.php @@ -53,6 +53,7 @@ $i18n_key_words = array( // 'menu.plugins' => 'Plugins', 'menu.time' => 'Munkaidő', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'Riportok', // TODO: translate the following. @@ -669,5 +670,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php index 1340e251..55754834 100644 --- a/WEB-INF/resources/it.lang.php +++ b/WEB-INF/resources/it.lang.php @@ -51,6 +51,8 @@ $i18n_key_words = array( 'menu.group' => 'Gruppo', 'menu.plugins' => 'Plugin', 'menu.time' => 'Tempo', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Spese', 'menu.reports' => 'Rapporti', // TODO: translate the following. @@ -634,5 +636,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php index 43364278..4536cc59 100644 --- a/WEB-INF/resources/ja.lang.php +++ b/WEB-INF/resources/ja.lang.php @@ -53,6 +53,7 @@ $i18n_key_words = array( // 'menu.plugins' => 'Plugins', 'menu.time' => '時間', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'レポート', // TODO: translate the following. @@ -672,5 +673,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php index e34f25f5..693c86be 100644 --- a/WEB-INF/resources/ko.lang.php +++ b/WEB-INF/resources/ko.lang.php @@ -53,6 +53,7 @@ $i18n_key_words = array( // 'menu.plugins' => 'Plugins', 'menu.time' => '시간', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => '보고서', // TODO: translate the following. @@ -670,5 +671,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php index bf4f3d54..4db86bc8 100644 --- a/WEB-INF/resources/nl.lang.php +++ b/WEB-INF/resources/nl.lang.php @@ -49,6 +49,8 @@ $i18n_key_words = array( 'menu.group' => 'Groep', 'menu.plugins' => 'Plugins', 'menu.time' => 'Tijden', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Kosten', 'menu.reports' => 'Rapporten', 'menu.timesheets' => 'Tijdenoverzichten', @@ -589,5 +591,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php index 91de93ed..9076c0f8 100644 --- a/WEB-INF/resources/no.lang.php +++ b/WEB-INF/resources/no.lang.php @@ -54,6 +54,7 @@ $i18n_key_words = array( // 'menu.plugins' => 'Plugins', 'menu.time' => 'Tid', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'Rapporter', // TODO: translate the following. @@ -669,5 +670,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php index 3bfbf556..ffa3ca32 100644 --- a/WEB-INF/resources/pl.lang.php +++ b/WEB-INF/resources/pl.lang.php @@ -51,6 +51,8 @@ $i18n_key_words = array( // 'menu.group' => 'Group', 'menu.plugins' => 'Moduły', 'menu.time' => 'Czas', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Wydatki', 'menu.reports' => 'Raporty', // TODO: translate the following. @@ -644,5 +646,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php index 829b3ec1..b39801f2 100644 --- a/WEB-INF/resources/pt-br.lang.php +++ b/WEB-INF/resources/pt-br.lang.php @@ -51,6 +51,8 @@ $i18n_key_words = array( // 'menu.group' => 'Group', 'menu.plugins' => 'Plugins', 'menu.time' => 'Tempo', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Gastos', 'menu.reports' => 'Relatórios', // TODO: translate the following. @@ -639,5 +641,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php index 3985b216..2cc4f33d 100644 --- a/WEB-INF/resources/pt.lang.php +++ b/WEB-INF/resources/pt.lang.php @@ -55,6 +55,7 @@ $i18n_key_words = array( // 'menu.plugins' => 'Plugins', 'menu.time' => 'Tempo', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'Relatórios', // TODO: translate the following. @@ -651,5 +652,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php index 79aa92a9..9bdbdac7 100644 --- a/WEB-INF/resources/ro.lang.php +++ b/WEB-INF/resources/ro.lang.php @@ -55,6 +55,7 @@ $i18n_key_words = array( // 'menu.plugins' => 'Plugins', 'menu.time' => 'Timpul', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'Rapoarte', // TODO: translate the following. @@ -672,5 +673,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php index 4b240dbd..191cab62 100644 --- a/WEB-INF/resources/ru.lang.php +++ b/WEB-INF/resources/ru.lang.php @@ -49,6 +49,7 @@ $i18n_key_words = array( 'menu.group' => 'Группа', 'menu.plugins' => 'Плагины', 'menu.time' => 'Время', +'menu.week' => 'Неделя', 'menu.expenses' => 'Расходы', 'menu.reports' => 'Отчёты', 'menu.timesheets' => 'Табели', @@ -581,5 +582,6 @@ $i18n_key_words = array( 'form.timesheet_view.disapprove_body' => "Ваш табель %s не одобрен.

%s", // Display Options form. See example at https://timetracker.anuko.com/display_options.php. +'form.display_options.menu' => 'Меню', 'form.display_options.note_on_separate_row' => 'Комментарий в отдельном ряду', ); diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php index b2dfe352..51b4bedb 100644 --- a/WEB-INF/resources/sk.lang.php +++ b/WEB-INF/resources/sk.lang.php @@ -52,6 +52,7 @@ $i18n_key_words = array( 'menu.plugins' => 'Moduly', 'menu.time' => 'Časový záznam', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'Zostavy', // TODO: translate the following. @@ -652,5 +653,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php index cd4a17db..d275e10a 100644 --- a/WEB-INF/resources/sl.lang.php +++ b/WEB-INF/resources/sl.lang.php @@ -54,6 +54,7 @@ $i18n_key_words = array( // 'menu.group' => 'Group', // 'menu.plugins' => 'Plugins', // 'menu.time' => 'Time', +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'Poročila', // TODO: translate the following. @@ -646,5 +647,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php index 05d32a68..be1acb9e 100644 --- a/WEB-INF/resources/sr.lang.php +++ b/WEB-INF/resources/sr.lang.php @@ -51,6 +51,8 @@ $i18n_key_words = array( // 'menu.group' => 'Group', 'menu.plugins' => 'Dodaci', 'menu.time' => 'Vreme', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Troškovi', 'menu.reports' => 'Izveštaji', // TODO: translate the following. @@ -642,5 +644,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php index 9f1a0972..701c62c7 100644 --- a/WEB-INF/resources/sv.lang.php +++ b/WEB-INF/resources/sv.lang.php @@ -49,6 +49,8 @@ $i18n_key_words = array( 'menu.group' => 'Grupp', 'menu.plugins' => 'Tillägg', 'menu.time' => 'Tider', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => 'Kostnader', 'menu.reports' => 'Rapporter', // TODO: translate the following. @@ -639,5 +641,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php index 241c40d9..d158ada9 100644 --- a/WEB-INF/resources/tr.lang.php +++ b/WEB-INF/resources/tr.lang.php @@ -55,6 +55,7 @@ $i18n_key_words = array( // 'menu.plugins' => 'Plugins', 'menu.time' => 'Zaman', // TODO: translate the following. +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => 'Raporlar', // TODO: translate the following. @@ -685,5 +686,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php index acda53b8..2c17bd65 100644 --- a/WEB-INF/resources/zh-cn.lang.php +++ b/WEB-INF/resources/zh-cn.lang.php @@ -51,6 +51,8 @@ $i18n_key_words = array( // 'menu.group' => 'Group', // 'menu.plugins' => 'Plugins', 'menu.time' => '时间记录', +// TODO: translate the following. +// 'menu.week' => 'Week', 'menu.expenses' => '费用', 'menu.reports' => '报告', // TODO: translate the following. @@ -655,5 +657,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php index 334551bc..28cbddc4 100644 --- a/WEB-INF/resources/zh-tw.lang.php +++ b/WEB-INF/resources/zh-tw.lang.php @@ -51,6 +51,7 @@ $i18n_key_words = array( // 'menu.group' => 'Group', // 'menu.plugins' => 'Plugins', // 'menu.time' => 'Time', +// 'menu.week' => 'Week', // 'menu.expenses' => 'Expenses', 'menu.reports' => '報告', // TODO: translate the following. @@ -662,5 +663,6 @@ $i18n_key_words = array( // Display Options form. See example at https://timetracker.anuko.com/display_options.php. // TODO: translate the following. +// 'form.display_options.menu' => 'Menu', // 'form.display_options.note_on_separate_row' => 'Note on separate row', ); diff --git a/WEB-INF/templates/display_options.tpl b/WEB-INF/templates/display_options.tpl index a4fe69e3..d11b0888 100644 --- a/WEB-INF/templates/display_options.tpl +++ b/WEB-INF/templates/display_options.tpl @@ -1,5 +1,15 @@ {$forms.displayOptionsForm.open} +{if $show_week_menu} + + + + + + +{/if} + + diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 1ad5a721..c5d29d85 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
 
{$i18n.form.display_options.menu}
{$forms.displayOptionsForm.menu_week.control} {$i18n.label.what_is_it}
 
{$i18n.title.time}
-
 Anuko Time Tracker 1.19.3.4983 | Copyright © Anuko | +  Anuko Time Tracker 1.19.3.4984 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl index 2c5fa617..0862523a 100644 --- a/WEB-INF/templates/header.tpl +++ b/WEB-INF/templates/header.tpl @@ -108,6 +108,9 @@   {if $user->exists() && ($user->can('track_own_time') || $user->can('track_time'))} {$i18n.menu.time} + {if $user->isPluginEnabled('wv') && $user->getConfigOption('menu_week')} + {$i18n.menu.week} + {/if} {/if} {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))} {$i18n.menu.expenses} diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index e32140a9..0dcfd107 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -8,7 +8,7 @@ {$forms.timeRecordForm.open} -{if $user->isPluginEnabled('wv')} +{if $show_navigation}
{$i18n.label.day_view} / {$i18n.label.week_view} diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl index 33a218a3..cd45a3b1 100644 --- a/WEB-INF/templates/week.tpl +++ b/WEB-INF/templates/week.tpl @@ -23,11 +23,13 @@ function fillDropdowns() { {$forms.weekTimeForm.open} +{if $show_navigation} +{/if}
{$i18n.label.day_view} / {$i18n.label.week_view}
diff --git a/display_options.php b/display_options.php index 222cc25d..a7426aaa 100644 --- a/display_options.php +++ b/display_options.php @@ -40,14 +40,20 @@ if (!ttAccessAllowed('manage_basic_settings')) { $config = new ttConfigHelper($user->getConfig()); if ($request->isPost()) { - $cl_time_note_on_separate_row = trim($request->getParameter('time_note_on_separate_row')); - $cl_report_note_on_separate_row = trim($request->getParameter('report_note_on_separate_row')); + $cl_menu_week = $request->getParameter('menu_week'); + $cl_time_note_on_separate_row = $request->getParameter('time_note_on_separate_row'); + $cl_report_note_on_separate_row = $request->getParameter('report_note_on_separate_row'); } else { + $cl_menu_week = $config->getDefinedValue('menu_week'); $cl_time_note_on_separate_row = $config->getDefinedValue('time_note_on_separate_row'); $cl_report_note_on_separate_row = $config->getDefinedValue('report_note_on_separate_row'); } $form = new Form('displayOptionsForm'); +// Menu. +$form->addInput(array('type'=>'checkbox','name'=>'menu_week','value'=>$cl_menu_week)); + +// Time page. // $form->addInput(array('type'=>'checkbox','name'=>'time_client','value'=>$cl_time_client)); // $form->addInput(array('type'=>'checkbox','name'=>'time_cf_1','value'=>$cl_time_cf_1)); // $form->addInput(array('type'=>'checkbox','name'=>'time_project','value'=>$cl_time_project)); @@ -68,6 +74,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('b if ($request->isPost()){ if ($err->no()) { // Update config. + $config->setDefinedValue('menu_week', $cl_menu_week); $config->setDefinedValue('time_note_on_separate_row', $cl_time_note_on_separate_row); $config->setDefinedValue('report_note_on_separate_row', $cl_report_note_on_separate_row); if ($user->updateGroup(array('config' => $config->getConfig()))) { @@ -79,6 +86,7 @@ if ($request->isPost()){ } $smarty->assign('forms', array($form->getName()=>$form->toArray())); +$smarty->assign('show_week_menu', $user->isPluginEnabled('wv')); $smarty->assign('title', $i18n->get('title.display_options')); $smarty->assign('content_page_name', 'display_options.tpl'); $smarty->display('index.tpl'); diff --git a/time.php b/time.php index d05f0c59..e7ff10ae 100644 --- a/time.php +++ b/time.php @@ -448,6 +448,7 @@ $smarty->assign('selected_date', $selected_date); $smarty->assign('week_total', $week_total); $smarty->assign('day_total', ttTimeHelper::getTimeForDay($cl_date)); $smarty->assign('time_records', $timeRecords); +$smarty->assign('show_navigation', $user->isPluginEnabled('wv') && !$user->getConfigOption('menu_week')); $smarty->assign('show_client', $showClient); $smarty->assign('show_cf_1', $user->isPluginEnabled('cf')); $smarty->assign('show_project', $showProject); diff --git a/week.php b/week.php index 879d960e..af5b9eb0 100644 --- a/week.php +++ b/week.php @@ -508,6 +508,7 @@ $smarty->assign('forms', array($form->getName()=>$form->toArray())); $smarty->assign('onload', 'onLoad="fillDropdowns()"'); $smarty->assign('timestring', $startDate->toString($user->date_format).' - '.$endDate->toString($user->date_format)); $smarty->assign('time_records', $records); +$smarty->assign('show_navigation', !$user->getConfigOption('menu_week')); $smarty->assign('show_files', $showFiles); $smarty->assign('title', $i18n->get('title.time')); $smarty->assign('content_page_name', 'week.tpl'); -- 2.20.1