diff options
| author | Simon Rettberg | 2020-01-13 15:51:36 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2020-01-13 15:51:36 +0100 |
| commit | 1500f1a8c753776ae483ad240fe2e355bea5c2ee (patch) | |
| tree | 47684d503971b2e8ed101f78fe466bb70994b1d1 | |
| parent | [rebootcontrol] Add missing closing tag (diff) | |
| download | slx-admin-1500f1a8c753776ae483ad240fe2e355bea5c2ee.tar.gz slx-admin-1500f1a8c753776ae483ad240fe2e355bea5c2ee.tar.xz slx-admin-1500f1a8c753776ae483ad240fe2e355bea5c2ee.zip | |
[locationinfo] SLX_BROWSER_INTERACTIVE handled for slx-browser
No bookmark support for slx-browser
| -rw-r--r-- | modules-available/locationinfo/inc/locationinfohooks.inc.php | 9 | ||||
| -rw-r--r-- | modules-available/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 @@ </div> </div> - <div class="list-group-item" id="bookmarks"> + <div class="list-group-item b0-h" id="bookmarks"> <div class="row"> <div class="col-sm-3"> <label for="bookmarks">{{lang_bookmarks}}</label> @@ -245,7 +245,6 @@ function browserChange() { $('.b0-h').show(); } else { $('.b0-h').hide(); - $('#interactive').prop('checked', false); } } |