From 1500f1a8c753776ae483ad240fe2e355bea5c2ee Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 13 Jan 2020 15:51:36 +0100 Subject: [locationinfo] SLX_BROWSER_INTERACTIVE handled for slx-browser No bookmark support for slx-browser --- modules-available/locationinfo/inc/locationinfohooks.inc.php | 9 ++++++--- .../locationinfo/templates/page-config-panel-url.html | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules-available/locationinfo/inc/locationinfohooks.inc.php b/modules-available/locationinfo/inc/locationinfohooks.inc.php index b7bdda14..d6559788 100644 --- a/modules-available/locationinfo/inc/locationinfohooks.inc.php +++ b/modules-available/locationinfo/inc/locationinfohooks.inc.php @@ -46,17 +46,20 @@ class LocationInfoHooks ConfigHolder::add('SLX_AUTOLOGIN', '1', 1000); ConfigHolder::add('SLX_ADDONS', '', 1000); } - if (isset($data['interactive']) && $data['interactive']) { - ConfigHolder::add('SLX_BROWSER_INTERACTIVE', '1', 1000); - } if (!empty($data['browser'])) { if ($data['browser'] === 'chromium') { $browser = 'chromium chrome'; } else { $browser = 'slxbrowser slx-browser'; + if (isset($data['split-login']) && $data['split-login']) { + $data['interactive'] = 1; + } } ConfigHolder::add('SLX_BROWSER', $browser, 1000); } + if (isset($data['interactive']) && $data['interactive']) { + ConfigHolder::add('SLX_BROWSER_INTERACTIVE', '1', 1000); + } if (!empty($data['bookmarks'])) { ConfigHolder::add('SLX_BROWSER_BOOKMARKS', $data['bookmarks'], 1000); } diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html index 7b82199e..86915729 100644 --- a/modules-available/locationinfo/templates/page-config-panel-url.html +++ b/modules-available/locationinfo/templates/page-config-panel-url.html @@ -165,7 +165,7 @@ -
+
@@ -245,7 +245,6 @@ function browserChange() { $('.b0-h').show(); } else { $('.b0-h').hide(); - $('#interactive').prop('checked', false); } } -- cgit v1.2.3-55-g7522