From c7e77e8bd765f7e87e09603493092522de5abb43 Mon Sep 17 00:00:00 2001
From: Jannik Schönartz
Date: Fri, 17 Jan 2020 01:20:13 +0100
Subject: [sysconfig] Screensaver: Pagereload (lang change) and small ui bugfix

---
 modules-available/sysconfig/addmodule_screensaver.inc.php   | 11 ++++++-----
 modules-available/sysconfig/templates/screensaver-text.html |  9 ++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules-available/sysconfig/addmodule_screensaver.inc.php b/modules-available/sysconfig/addmodule_screensaver.inc.php
index b8e5d3cd..63146a71 100644
--- a/modules-available/sysconfig/addmodule_screensaver.inc.php
+++ b/modules-available/sysconfig/addmodule_screensaver.inc.php
@@ -46,7 +46,7 @@ class Screensaver_Start extends AddModule_Base
 				),
 			);
 		}
-
+		$this->session_data['next'] = 'idle-kill';
 		Session::set('data', $this->session_data);
 		Session::save();
 	}
@@ -85,12 +85,13 @@ class Screensaver_Text extends AddModule_Base
 			Screensaver_Helper::processScreensaverText($this->session_data, $this->id);
 		}
 
+		$next = Request::post('next', $this->session_data['next'], 'string');
+		$this->session_data['next'] = $next;
 		Session::set('data', $this->session_data);
 		Session::save();
 
-		$next = Request::post('next', '', 'string');
 
-		if ($next === '')
+		if ($next === 'finish')
 			Util::redirect('?do=SysConfig&action=addmodule&step=Screensaver_Finish');
 		elseif ($next === 'start')
 			Util::redirect('?do=SysConfig&action=addmodule&step=Screensaver_Start&back=true');
@@ -100,7 +101,7 @@ class Screensaver_Text extends AddModule_Base
 	{
 		/* Load summernote module if available */
 		$this->hasSummernote = Module::isAvailable('summernote');
-		$next = Request::post('next', '', 'string');
+		$next = $this->session_data['next'];
 
 		$data = array(
 			'edit' => $this->edit ? $this->edit->id() : 0,
@@ -132,7 +133,7 @@ class Screensaver_Text extends AddModule_Base
 			$data['next'] = 'shutdown';
 			$data['prev'] = 'idle-kill';
 		} elseif ($next === 'shutdown') {
-			$data['next'] = '';
+			$data['next'] = 'finish';
 			$data['prev'] = 'no-timeout';
 			$data['lastStep'] = true;
 		}
diff --git a/modules-available/sysconfig/templates/screensaver-text.html b/modules-available/sysconfig/templates/screensaver-text.html
index 9fd0cea4..68adc8f7 100644
--- a/modules-available/sysconfig/templates/screensaver-text.html
+++ b/modules-available/sysconfig/templates/screensaver-text.html
@@ -10,7 +10,7 @@
 
 		<h4>{{lang_screenUnlocked}}</h4>
 		<div class="input-group">
-			<span class="input-group-addon slx-ga3">{{lang_title}}</span>
+			<span class="input-group-addon slx-ga">{{lang_title}}</span>
 			<input type="text" tabindex="1" name="msg_value" value="{{msg_value}}" class="form-control">
 		</div>
 	</div>
@@ -36,7 +36,7 @@
 
 	<div class="form-group">
 		<div class="input-group">
-			<span class="input-group-addon slx-ga3">{{lang_title}}</span>
+			<span class="input-group-addon slx-ga">{{lang_title}}</span>
 			<input type="text" id="msg-locked-id" tabindex="4" name="msg_locked_value" value="{{msg_locked_value}}" class="form-control">
 		</div>
 	</div>
@@ -104,11 +104,6 @@
 </script>
 
 <style>
-	.slx-ga3 {
-		min-width: 16em;
-		text-align: left;
-	}
-
 	.top-addon {
 		border-right: 1px solid #ccc !important;
 		border-top-right-radius: 4px !important;
-- 
cgit v1.2.3-55-g7522