From d078ecc3d16643c427fbb8ac23f667c01ef921c8 Mon Sep 17 00:00:00 2001 From: andrei Date: Mon, 5 Aug 2019 16:03:57 +0200 Subject: [PATCH] checkbox from advanced options removed --- Controller/OfflineController.php | 7 +------ Locale/de_DE/translations.php | 3 +-- Locale/ru_RU/translations.php | 3 +-- Plugin.php | 9 +++++---- docker-compose.yml | 9 --------- 5 files changed, 8 insertions(+), 23 deletions(-) diff --git a/Controller/OfflineController.php b/Controller/OfflineController.php index ac793ee..c9b1ffd 100644 --- a/Controller/OfflineController.php +++ b/Controller/OfflineController.php @@ -29,9 +29,6 @@ public function js() $store_remake = $this->configModel->get('store_remake'); $requests = ($store_remake == 1) ? 'true' : 'false'; - $monitor_requests = $this->configModel->get('monitor_requests'); - $interceptRequests = ($monitor_requests == 1) ? 'true' : 'false'; - $snake_game = $this->configModel->get('snake_game'); $snake = ($snake_game == 1) ? 'true' : 'false'; @@ -41,14 +38,13 @@ public function js() $data = 'Offline.options = { checkOnLoad: ' . $checkOnLoad . ', requests: ' . $requests . ', - interceptRequests: ' . $interceptRequests . ', reconnect: { initialDelay:' . $initialDelay . ', delay: ' . $delay . ' }, game: ' . $snake . ' };'; - $this->response->js($data); + $this->response->js($data, 200); } /** @@ -65,7 +61,6 @@ public function save() 'snake_game' => 0, 'check_connection' => 0, 'store_remake' => 0, - 'monitor_requests' => 0, ); break; } diff --git a/Locale/de_DE/translations.php b/Locale/de_DE/translations.php index 8cf4283..8b800d8 100644 --- a/Locale/de_DE/translations.php +++ b/Locale/de_DE/translations.php @@ -7,10 +7,9 @@ 'Enable "Snake" game, while waiting for the connection.' => 'Aktivieren Sie "Schlangenspiel" um zu spielen, während Sie auf die Verbindung warten.', 'Check connection status on page load.' => 'Überprüfen den Verbindungsstatus beim Laden der Seite.', 'Store and attempt to remake requests which fail while the connection is down.' => 'Anfragen speichern, die bei unterbrochener Verbindung fehlschlagen, und versuchen, sie erneut zu erstellen.', - 'Monitor AJAX requests to help decide if we have a connection.' => 'Überwachen AJAX-Anfragen, ob eine Verbindung besteht.', 'Reconnection options' => 'Wiederverbindungsoptionen', 'Connection recheck in seconds.' => 'Die Verbindung Überfrüfung in Sekunden.', 'How many seconds should we wait before rechecking.' => 'Wie viele Sekunden sollen wir warten, bevor wir es erneut überprüfen.', 'Seconds between retries.' => 'Sekunden zwischen Wiederholungsversuchen', 'How long should we wait between retries.' => 'Wie lange sollen wir zwischen den Wiederholungsversuchen warten.', -); \ No newline at end of file +); diff --git a/Locale/ru_RU/translations.php b/Locale/ru_RU/translations.php index 8efb66e..33e5b38 100644 --- a/Locale/ru_RU/translations.php +++ b/Locale/ru_RU/translations.php @@ -7,10 +7,9 @@ 'Enable "Snake" game, while waiting for the connection.' => 'Активируйте "Змейку", пока Вы ждёте интренет-подключение.', 'Check connection status on page load.' => 'Проверить статус подключения при загрузке страницы.', 'Store and attempt to remake requests which fail while the connection is down.' => 'Сохранить и попытаться отправить запросы, которые завершились неудачей пока не было связи.', - 'Monitor AJAX requests to help decide if we have a connection.' => 'Отслеживать AJAX-запросы для определения интернет-подключения.', 'Reconnection options' => 'Варианты переподключения', 'Connection recheck in seconds.' => 'Перепроверка связи в секундах', 'How many seconds should we wait before rechecking.' => 'Сколько должно быть секунд ожидания перед повторной проверкой.', 'Seconds between retries.' => 'Секунды между попытками', 'How long should we wait between retries.' => 'Сколько должно быть секунд ожидания между попытками.', -); \ No newline at end of file +); diff --git a/Plugin.php b/Plugin.php index 2c0a748..7d34a2a 100644 --- a/Plugin.php +++ b/Plugin.php @@ -68,12 +68,13 @@ public function initialize() $this->route->addRoute('settings/offline', 'OfflineController', 'index', 'OfflineKanboardPlugin'); + $this->route->addRoute('jscript/off-line?', 'OfflineController', 'js', + 'OfflineKanboardPlugin'); + $this->hook->on("template:layout:js", array("template" => "plugins/OfflineKanboardPlugin/Asset/js/offline.min.js")); - $this->route->addRoute('js/offline?', 'OfflineController', 'js', - 'OfflineKanboardPlugin'); - $this->hook->on("template:layout:js", array("template" => "js/offline")); + $this->hook->on("template:layout:js", array("template" => "jscript/off-line")); $this->hook->on("template:layout:js", array("template" => "plugins/OfflineKanboardPlugin/Asset/js/snake.js")); @@ -131,4 +132,4 @@ public function getPluginHomepage() { return 'https://www.ipunkt.biz/unternehmen/opensource'; } -} \ No newline at end of file +} diff --git a/docker-compose.yml b/docker-compose.yml index b91783d..b904435 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,6 @@ services: - "80:80" volumes: - .:/var/www/app/plugins/OfflineKanboardPlugin - - .:/usr/share/php7 environment: DATABASE_URL: mysql://kb:kb-secret@db/kanboard db: @@ -17,11 +16,3 @@ services: MYSQL_DATABASE: kanboard MYSQL_USER: kb MYSQL_PASSWORD: kb-secret - rights: - image: busybox - command: sh -c 'while true ; do chown -R $${USER_ID}.$${GROUP_ID} /target ; sleep 2s ; done' - volumes: - - .:/target - environment: - - USER_ID=10017 - - GROUP_ID=10003 \ No newline at end of file