From f570b4fae3fa073ef4028708c289caf3d76b4df3 Mon Sep 17 00:00:00 2001
From: Jannik Schönartz
Date: Thu, 16 Jan 2020 20:16:03 +0100
Subject: [sysconfig] Screensaver: Add save instead off next to the last step &
 tm success check

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

diff --git a/modules-available/sysconfig/addmodule_screensaver.inc.php b/modules-available/sysconfig/addmodule_screensaver.inc.php
index 3d4fa68e..4fd8f17d 100644
--- a/modules-available/sysconfig/addmodule_screensaver.inc.php
+++ b/modules-available/sysconfig/addmodule_screensaver.inc.php
@@ -122,6 +122,7 @@ class Screensaver_Text extends AddModule_Base
 			$data['step'] = 'Screensaver_Text';
 		} elseif ($next === 'shutdown') {
 			$data['step'] = 'Screensaver_Finish';
+			$data['lastStep'] = true;
 		}
 
 		Render::addDialog(Dictionary::translateFile('config-module', 'screensaver_title'), false, 'screensaver-text', $data);
@@ -161,12 +162,12 @@ class Screensaver_Finish extends AddModule_Base
 		else
 			$module->insert($session_data['title']);
 
-		$module->generate($this->edit === false);
+		$task = $module->generate($this->edit === false);
 
 		// Yay
-		if ($this->edit !== false)
+		if ($task !== false && $this->edit !== false)
 			Message::addSuccess('module-edited');
-		else
+		elseif ($task !== false)
 			Message::addSuccess('module-added');
 		Util::redirect('?do=SysConfig');
 	}
diff --git a/modules-available/sysconfig/templates/screensaver-text.html b/modules-available/sysconfig/templates/screensaver-text.html
index c6516b80..1fdea34b 100644
--- a/modules-available/sysconfig/templates/screensaver-text.html
+++ b/modules-available/sysconfig/templates/screensaver-text.html
@@ -50,7 +50,13 @@
 		<a class="btn btn-default" onclick="window.history.back()">{{lang_back}}</a>
 	</div>
 	<div class="btn-group pull-right">
-		<button type="submit" class="btn btn-primary">{{lang_next}} &raquo;</button>
+		<button type="submit" class="btn btn-primary">
+			{{#lastStep}}
+			<span class="glyphicon glyphicon-floppy-disk"></span>
+			{{lang_save}}
+			{{/lastStep}}
+			{{^lastStep}}{{lang_next}} &raquo;{{/lastStep}}
+		</button>
 	</div>
 	<div class="clearfix"></div>
 </form>
-- 
cgit v1.2.3-55-g7522