[sysconfig] Screensaver: Add default texts and minor bug fix

author: Jannik Schönartz 2020-01-22 14:05:56 +0100
committer: Jannik Schönartz 2020-01-22 14:05:56 +0100
commit: 8c7c5a14dae1038b0ccf0001fee7020a47e34b6f (patch)
tree: b5a2075d06441d191c54b7ee8277850dcac4b170
parent: [sysconfig] fix german (diff)
download: slx-admin-8c7c5a14dae1038b0ccf0001fee7020a47e34b6f.tar.gz
slx-admin-8c7c5a14dae1038b0ccf0001fee7020a47e34b6f.tar.xz
slx-admin-8c7c5a14dae1038b0ccf0001fee7020a47e34b6f.zip
5 files changed, 36 insertions, 16 deletions
diff --git a/modules-available/sysconfig/addmodule_screensaver.inc.php b/modules-available/sysconfig/addmodule_screensaver.inc.php
index 63146a71..889a94e5 100644
--- a/modules-available/sysconfig/addmodule_screensaver.inc.php
+++ b/modules-available/sysconfig/addmodule_screensaver.inc.php
@@ -25,22 +25,22 @@ class Screensaver_Start extends AddModule_Base
 		} else {
 			$this->session_data = array(
 				'title' => '',
-				'qss' => '',
+				'qss' => Dictionary::translateFileModule('sysconfig', 'template-tags', 'lang_screenQssDefault', true),
 				'messages' => array(
 					'General' => array(
-						'shutdown' => '',
-						'shutdown-locked' => '',
-						'idle-kill' => '',
-						'idle-kill-locked' => '',
-						'no-timeout' => '',
-						'no-timeout-locked' => '',
+						'shutdown' => Dictionary::translateFileModule('sysconfig', 'template-tags', 'lang_screenMessageDefaultShutdown', true),
+						'shutdown-locked' => Dictionary::translateFileModule('sysconfig', 'template-tags', 'lang_screenMessageDefaultShutdownLocked', true),
+						'idle-kill' => Dictionary::translateFileModule('sysconfig', 'template-tags', 'lang_screenMessageDefaultIdleKill', true),
+						'idle-kill-locked' => Dictionary::translateFileModule('sysconfig', 'template-tags', 'lang_screenMessageDefaultIdleKillLocked', true),
+						'no-timeout' => Dictionary::translateFileModule('sysconfig', 'template-tags', 'lang_screenMessageDefaultNoTimeout', true),
+						'no-timeout-locked' => Dictionary::translateFileModule('sysconfig', 'template-tags', 'lang_screenMessageDefaultNoTimeoutLocked', true),
 					)
 				),
 				'texts' => array(
-					'text-shutdown' => '',
+					'text-shutdown' => Dictionary::translateFileModule('sysconfig', 'template-tags', 'lang_screenTextDefaultShutdown', true),
 					'text-shutdown-locked' => '',
-					'text-idle-kill' => '',
-					'text-idle-kill-locked' => '',
+					'text-idle-kill' => Dictionary::translateFileModule('sysconfig', 'template-tags', 'lang_screenTextDefaultIdleKill', true),
+					'text-idle-kill-locked' => Dictionary::translateFileModule('sysconfig', 'template-tags', 'lang_screenTextDefaultIdleKillLocked', true),
 					'text-no-timeout' => '',
 					'text-no-timeout-locked' => '',
 				),
diff --git a/modules-available/sysconfig/lang/de/template-tags.json b/modules-available/sysconfig/lang/de/template-tags.json
index 92e15f2e..0acdb8a7 100644
--- a/modules-available/sysconfig/lang/de/template-tags.json
+++ b/modules-available/sysconfig/lang/de/template-tags.json
@@ -113,12 +113,22 @@
     "lang_screenHeader": "Header",
     "lang_screenLabel": "Label",
     "lang_screenLocked": "Sperrbildschirm",
+    "lang_screenMessageDefaultIdleKill": "Diese Sitzung wird bei Inaktivität in %1 beendet.",
+    "lang_screenMessageDefaultIdleKillLocked": "Diese Sitzung wird in %1 beendet, wenn sie nicht entsperrt wird.",
+    "lang_screenMessageDefaultNoTimeout": "Dieser Bildschirm wird gerade geschont.",
+    "lang_screenMessageDefaultNoTimeoutLocked": "Dieser Rechner ist gesperrt.",
+    "lang_screenMessageDefaultShutdown": "Achtung: Rechner wird in %1 heruntergefahren!",
+    "lang_screenMessageDefaultShutdownLocked": "Achtung: Rechner wird in %1 heruntergefahren!",
     "lang_screenQss": "QSS",
+    "lang_screenQssDefault": "#Saver {\n  background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #443, stop:1 #000)\n}\n\nQLabel {\n  color: #f64;\n}\n\n#lblClock {\n  color: #999;\n  font-size: 20pt;\n}\n\n#lblHeader {\n  font-size: 20pt;\n}\n",
     "lang_screenSize": "Gr\u00f6ße",
     "lang_screenTitleIdleKill": "Idle Kill",
     "lang_screenTitleNoTimeout": "Ohne Timeout",
     "lang_screenTitleShutdown": "Herunterfahren",
-    "lang_screenText": "Text",
+    "lang_screenText": "Inhaltstext Bearbeiten",
+    "lang_screenTextDefaultIdleKill": "<html><body>Keine Nutzeraktivität festgestellt. <br>Zum oben angegebenen Zeitpunkt wird die aktuell laufende Sitzung beendet, wenn der Rechner nicht mehr verwendet wird. <br>Alle noch laufenden Programme <br>werden ohne Nachfrage geschlossen. Stellen Sie daher sicher, bis zum angegebenen Zeitpunkt <br>sämtliche sich in Bearbeitung befindlichen Daten abzuspeichern. <br><br>Dies dient dazu zu vermeiden, dass ein Rechner stundenlang gesperrt wird und somit <br>anderen Nutzern nicht zur Verfügung steht.</body></html>",
+    "lang_screenTextDefaultIdleKillLocked": "<html><body><br>Zum oben angegebenen Zeitpunkt wird die aktuell laufende Sitzung beendet, wenn sie zuvor nicht wieder entsperrt wird. <br>Alle noch laufenden Programme werden ohne Nachfrage geschlossen. <br>Stellen Sie daher sicher, bis zum angegebenen Zeitpunkt <br>sämtliche sich in Bearbeitung befindlichen Daten abzuspeichern, bzw. die Sitzung wieder zu entsperren. <br><br>Dies dient dazu zu vermeiden, dass ein Rechner stundenlang gesperrt wird und somit<br>anderen Nutzern nicht zur Verfügung steht.</body></html>",
+    "lang_screenTextDefaultShutdown": "<html><body>Achtung: Zum oben angegebenen Zeitpunkt wird der Computer heruntergefahren bzw. neugestartet. <br>Alle noch laufenden Programme werden ohne Nachfrage beendet. Stellen Sie daher sicher, bis <br>zum angegebenen Zeitpunkt sämtliche Daten abzuspeichern und die Sitzung zu verlassen.</body></html>",
     "lang_screenTextInherit": "Werte Erben",
     "lang_screenUnlocked": "Bildschirmschoner",
     "lang_searchBase": "Suchbasis",
diff --git a/modules-available/sysconfig/lang/en/template-tags.json b/modules-available/sysconfig/lang/en/template-tags.json
index 9aeb6e0a..40484b5a 100644
--- a/modules-available/sysconfig/lang/en/template-tags.json
+++ b/modules-available/sysconfig/lang/en/template-tags.json
@@ -113,12 +113,22 @@
     "lang_screenHeader": "Header",
     "lang_screenLabel": "Label",
     "lang_screenLocked": "Lockscreen",
+    "lang_screenMessageDefaultIdleKill": "This session will end in %1 when inactive.",
+    "lang_screenMessageDefaultIdleKillLocked": "This session will end in %1 if the session is not unlocked.",
+    "lang_screenMessageDefaultNoTimeout": "This screen is in saving mode.",
+    "lang_screenMessageDefaultNoTimeoutLocked": "This computer is locked.",
+    "lang_screenMessageDefaultShutdown": "Caution: Computer will shutdown in %1!",
+    "lang_screenMessageDefaultShutdownLocked": "Caution: Computer will shutdown in %1!",
     "lang_screenQss": "QSS",
+    "lang_screenQssDefault": "#Saver {\n  background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #443, stop:1 #000)\n}\n\nQLabel {\n  color: #f64;\n}\n\n#lblClock {\n  color: #999;\n  font-size: 20pt;\n}\n\n#lblHeader {\n  font-size: 20pt;\n}\n",
     "lang_screenSize": "Size",
     "lang_screenTitleIdleKill": "Idle Kill",
     "lang_screenTitleNoTimeout": "No Timeout",
     "lang_screenTitleShutdown": "Shutdown",
-    "lang_screenText": "Text",
+    "lang_screenText": "Edit Contenttext",
+    "lang_screenTextDefaultIdleKill": "<html><body>No user activity detected. <br>If the computer is not used until the time specified above, the session will end. <br> All running applications <br>will be closed without further requests. Make sure that all files and changes are saved <br> before the time runs out. <br><br>It prevents computers from beeing locked for hours and <br>not beeing available for other users.</body></html>",
+    "lang_screenTextDefaultIdleKillLocked": "<html><body><br>The current session will end by the time specified above if the computer isn't unlocked before. <br>All running applications will be closed without further requests. <br>Make sure that all files and changes are saved <br>or the session is unlocked before the time runs out. <br><br>It prevents computers from beeing locked for hours and <br>not beeing available for other users.</body></html>",
+    "lang_screenTextDefaultShutdown": "<html><body>Caution: The computer will shutdown or restart respectively at the specified time above. <br>All running applications will be closed without further requests. Make sure to save all files and changes and leave the session<br>before the time runs out.</body></html>",
     "lang_screenTextInherit": "Inherit Values",
     "lang_screenUnlocked": "Screensaver",
     "lang_searchBase": "Search Base",
diff --git a/modules-available/sysconfig/templates/screensaver-start.html b/modules-available/sysconfig/templates/screensaver-start.html
index 38610365..96be0cd5 100644
--- a/modules-available/sysconfig/templates/screensaver-start.html
+++ b/modules-available/sysconfig/templates/screensaver-start.html
@@ -14,7 +14,7 @@
 	<input type="hidden" id="helper-mode" name="helper_mode" value="false">
 	<div class="form-group">
 		<div class="input-group btn-group">
-			<span class="input-group-addon">{{lang_mode}}</span>
+			<span class="input-group-addon slx-ga"">{{lang_mode}}</span>
 			<a class="btn btn-default" tabindex="2" id="btn-easy-mode" type="button" onclick="switchMode(1)">
 				<span class="glyphicon glyphicon-user"></span>
 				{{lang_modeEasy}}
@@ -28,7 +28,7 @@
 
 	<div class="form-group" id="advanced-mode">
 		<div class="input-group">
-			<span class="input-group-addon">{{lang_screenQss}}</span>
+			<span class="input-group-addon slx-ga">{{lang_screenQss}}</span>
 			<textarea tabindex="4" name="qss" rows="20" class="form-control">{{qss}}</textarea>
 		</div>
 	</div>
diff --git a/modules-available/sysconfig/templates/screensaver-text.html b/modules-available/sysconfig/templates/screensaver-text.html
index 68adc8f7..acf39cc5 100644
--- a/modules-available/sysconfig/templates/screensaver-text.html
+++ b/modules-available/sysconfig/templates/screensaver-text.html
@@ -21,10 +21,10 @@
 	</div>
 	<hr>
 	<h4>{{lang_screenLocked}}</h4>
-	<input type="hidden" id="inherit_locked" name="inherit_locked" value="{{inherit_locked}}">
+	<input type="hidden" class="slx-ga" id="inherit_locked" name="inherit_locked" value="{{inherit_locked}}">
 	<div class="form-group">
 		<div class="input-group btn-group">
-			<span class="input-group-addon">{{lang_screenTextInherit}}</span>
+			<span class="input-group-addon slx-ga">{{lang_screenTextInherit}}</span>
 			<a class="btn btn-default" id="btn-inherit-on" type="button" onclick="switchMode(true)" tabindex="2">
 				<span class="glyphicon glyphicon-ok"></span>
 			</a>
author	Jannik Schönartz	2020-01-22 14:05:56 +0100
committer	Jannik Schönartz	2020-01-22 14:05:56 +0100
commit	8c7c5a14dae1038b0ccf0001fee7020a47e34b6f (patch)
tree	b5a2075d06441d191c54b7ee8277850dcac4b170
parent	[sysconfig] fix german (diff)
download	slx-admin-8c7c5a14dae1038b0ccf0001fee7020a47e34b6f.tar.gz slx-admin-8c7c5a14dae1038b0ccf0001fee7020a47e34b6f.tar.xz slx-admin-8c7c5a14dae1038b0ccf0001fee7020a47e34b6f.zip