diff --git a/lib/Controller/MainController.php b/lib/Controller/MainController.php index 44e38c1..256e9f0 100644 --- a/lib/Controller/MainController.php +++ b/lib/Controller/MainController.php @@ -60,13 +60,15 @@ class MainController extends Controller $params['youtube_installed'] = $this->youtube->isInstalled(); $params['youtube_bin'] = $this->youtube->getBin(); $params['youtube_executable'] = $this->youtube->isExecutable(); - $params['ncd_hide_errors'] = $this->settings->get("ncd_hide_errors",null); - - + $params['ncd_hide_errors'] = $this->settings->get("ncd_hide_errors", false); $params['counter'] = $this->counters->getCounters(); - $params['settings_url'] = $this->urlGenerator->linkToRoute("settings.PersonalSettings.index", ['section' => 'ncdownloader']); - $params['admin_settings_url'] = $this->urlGenerator->linkToRoute("settings.AdminSettings.index", ['section' => 'ncdownloader']); - $params['is_admin'] = \OC_User::isAdminUser($this->uid); + + $params['settings'] = json_encode([ + 'is_admin' =>\OC_User::isAdminUser($this->uid), + 'admin_url' => $this->urlGenerator->linkToRoute("settings.AdminSettings.index", ['section' => 'ncdownloader']), + 'personal_url' => $this->urlGenerator->linkToRoute("settings.PersonalSettings.index", ['section' => 'ncdownloader']), + 'ncd_hide_errors' => $params['ncd_hide_errors'], + ]); $response = new TemplateResponse($this->appName, 'Index', $params); return $response; diff --git a/src/components/toggleButton.vue b/src/components/toggleButton.vue index 342eb15..55c4400 100644 --- a/src/components/toggleButton.vue +++ b/src/components/toggleButton.vue @@ -15,6 +15,7 @@ + + diff --git a/src/utils/helper.js b/src/utils/helper.js index b4bbf0b..fc00b92 100644 --- a/src/utils/helper.js +++ b/src/utils/helper.js @@ -187,6 +187,23 @@ const helper = { helper.message(msg, 20000); }) }, + str2Boolean: function (string) { + + switch (string.toLowerCase().trim()) { + case "true": + case "yes": + case "1": + return true; + + case "false": + case "no": + case "0": + case null: + return false; + default: + return Boolean(string); + } + } } export default helper diff --git a/templates/Navigation.php b/templates/Navigation.php index 118ee8d..8c90758 100644 --- a/templates/Navigation.php +++ b/templates/Navigation.php @@ -108,5 +108,16 @@ if ($youtube_installed && !$youtube_executable) { - inc('settings/Settings'));?> +
+
+ +
+
+
\ No newline at end of file diff --git a/templates/settings/Settings.php b/templates/settings/Settings.php deleted file mode 100644 index 10995bf..0000000 --- a/templates/settings/Settings.php +++ /dev/null @@ -1,36 +0,0 @@ - -
-
- -
-
- -
-
\ No newline at end of file