From ecd35a98406864e762969e3932bfae874446e57c Mon Sep 17 00:00:00 2001
From: elgekko <vasary@elgekko.net>
Date: Fri, 10 Mar 2023 15:57:43 +0100
Subject: [PATCH] 3.9.1 Tema alapu CSS kezeles

---
 .../css/mediacube-silvertail.css              | 35 ++++++++++++++++++
 .../css/mediacube-userdark.css                | 36 +++++++++++++++++++
 server/user.mediacube.gui/index.zul           |  6 +---
 server/user.mediacube.gui/pages/login.zul     | 30 ++++++++--------
 server/user.mediacube.gui/pages/menu.zul      |  6 ++--
 .../resources/i3-label_hu.properties          | 10 +-----
 .../user/jobengine/zk/model/IndexModel.java   |  4 +--
 .../user/jobengine/zk/model/LoginModel.java   |  1 +
 .../user/jobengine/zk/model/MenuModel.java    |  1 +
 .../user/jobengine/zk/util/AuthInitiator.java | 12 +++----
 .../user/jobengine/zk/util/SessionUtil.java   | 11 ------
 11 files changed, 98 insertions(+), 54 deletions(-)
 create mode 100644 server/user.mediacube.gui/css/mediacube-silvertail.css
 create mode 100644 server/user.mediacube.gui/css/mediacube-userdark.css

diff --git a/server/user.mediacube.gui/css/mediacube-silvertail.css b/server/user.mediacube.gui/css/mediacube-silvertail.css
new file mode 100644
index 00000000..139faf5a
--- /dev/null
+++ b/server/user.mediacube.gui/css/mediacube-silvertail.css
@@ -0,0 +1,35 @@
+body {
+    margin: 0;
+    padding: 0;
+}
+body *:not([class*="z-icon-"]) {
+	font-family: Verdana;
+}
+.loginWindow {
+ 	background-color: #212121;
+}
+.loginMessage {
+	color: red;
+}
+.loginTitle {
+	font-size:14px;
+	font-weight:bold;
+	color:#008AC8;
+}
+.loginVersion {
+	font-size:10px;
+	font-weight:bold;
+	color:#e3e3e3;
+}
+.z-loading { 
+	top: 50% !important; 
+	left: 45% !important; 
+	align: center; 
+	vertical-align: middle; 
+	font-size: 18px;
+    font-weight: bold;
+	padding: 5px;
+}
+.z-notification-pointer ~ .z-notification-content {
+	height: 50px;
+}
diff --git a/server/user.mediacube.gui/css/mediacube-userdark.css b/server/user.mediacube.gui/css/mediacube-userdark.css
new file mode 100644
index 00000000..cc84ef3e
--- /dev/null
+++ b/server/user.mediacube.gui/css/mediacube-userdark.css
@@ -0,0 +1,36 @@
+body {
+    margin: 0;
+    padding: 0;
+}
+body *:not([class*="z-icon-"]) {
+	font-family: Verdana;
+}
+.loginWindow {
+ 	background-color: #212121;
+}
+.loginMessage {
+	color: yellow;
+}
+.loginTitle {
+	font-size:14px;
+	font-weight:bold;
+	color:#008AC8;
+}
+.loginVersion {
+	font-size:10px;
+	font-weight:bold;
+	color:#e3e3e3;
+}
+.z-loading { 
+	top: 50% !important; 
+	left: 45% !important; 
+	align: center; 
+	vertical-align: middle; 
+	font-size: 18px;
+    font-weight: bold;
+	padding: 5px;
+}
+.z-notification-pointer ~ .z-notification-content {
+	height: 50px;
+}
+
diff --git a/server/user.mediacube.gui/index.zul b/server/user.mediacube.gui/index.zul
index f6735660..5118d838 100644
--- a/server/user.mediacube.gui/index.zul
+++ b/server/user.mediacube.gui/index.zul
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <?init class="user.jobengine.zk.util.AuthInitiator"?>
-
 <?component name="sidewindow" inline="true" macroURI="pages/sidewindow.zul"?>
-
-<!DOCTYPE xml>
 <zk xmlns:w="http://www.zkoss.org/2005/zk/client">
-	<style src="/css/archivum.css" />
+	<style src="/css/mediacube-${sessionScope.theme}.css"/>
 	<style src="/css/toast.css" />
 	<script src="/js/toast.min.js" />
 	<script>
diff --git a/server/user.mediacube.gui/pages/login.zul b/server/user.mediacube.gui/pages/login.zul
index fc7f58f4..9de0df77 100644
--- a/server/user.mediacube.gui/pages/login.zul
+++ b/server/user.mediacube.gui/pages/login.zul
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE xml>
 <zk>
-<style>
-input:-webkit-autofill,
-input:-webkit-autofill:hover, 
-input:-webkit-autofill:focus, 
-input:-webkit-autofill:active{
-    -webkit-box-shadow: 0 0 0 30px yellow inset !important;
-}
-</style>
-<hbox self="@define(content)" vflex="1" hflex="1" align="center" pack="center" spacing="20px">
+	<style>
+	input:-webkit-autofill,
+	input:-webkit-autofill:hover, 
+	input:-webkit-autofill:focus, 
+	input:-webkit-autofill:active{
+	    -webkit-box-shadow: 0 0 0 30px yellow inset !important;
+	}
+	</style>
+	<style src="/css/mediacube-${sessionScope.theme}.css"/>
+	<hbox self="@define(content)" vflex="1" hflex="1" align="center" pack="center" spacing="20px">
         <vlayout>
+        	<label value="${sessionScope.theme}"/>
             <window id="loginWin" viewModel="@id('jlm') @init('user.jobengine.zk.model.LoginModel')"
-                border="normal" hflex="min" >
+                border="normal" hflex="min" sclass="loginWindow">
 				<caption>
 					<hbox>
 						<image src="/img/mediacube_logo_v2_50x50.png" width="20px" height="20px" />
-						<label style="font-size:14px;font-weight:bold;color:#008AC8" value="MediaCube" />
-						<label style="font-size:10px;font-weight:bold;color:#e3e3e3;" value="v${labels.version}" /> 
+						<label sclass="loginTitle" value="MediaCube" />
+						<label sclass="loginVersion" value="v${labels.version}" /> 
 					</hbox>
         		</caption>                
                 <vbox hflex="min" align="center">
@@ -42,7 +42,7 @@ input:-webkit-autofill:active{
                             </row>
                         </rows>
                     </grid>
-                    <label value="@bind(jlm.message)" />
+                    <label sclass="loginMessage" value="@bind(jlm.message)" />
                     <button label="Bejelentkezés" onClick="@command('authenticate')"/>
                 </vbox>
             </window>
diff --git a/server/user.mediacube.gui/pages/menu.zul b/server/user.mediacube.gui/pages/menu.zul
index f24c03cc..0b2e971d 100644
--- a/server/user.mediacube.gui/pages/menu.zul
+++ b/server/user.mediacube.gui/pages/menu.zul
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?init class="user.jobengine.zk.util.AuthInitiator"?>
-
-<!DOCTYPE xml>
 <zk>
 <!-- 	<style src="/css/menu.css"/> -->
 	<div viewModel="@id('lm') @init('user.jobengine.zk.model.MenuModel')">
-		<menubar id="menubar" hflex="max" >
+		<menubar id="menubar" hflex="max">
 			<menuitem label="Keresés" onClick="@command('navigate', action='/')" disabled="false" />
 			<menuitem label="Folyamatok" onClick="@command('navigate', action='jobs')" 
 				disabled="${(not sessionScope.userPrincipal.pooler and not sessionScope.userPrincipal.submitter) or sessionScope.userPrincipal.anonymous}" />
@@ -35,7 +33,7 @@
 				</menupopup>
 			</menu>
 			<menuitem label="Mini monitor" onClick="@command('createFloatingJobMonitor')" />
-			<menu label="Megjelenés">
+			<menu label="Megjelenés" visible="false">
 				<menupopup>
 					<menuitem label="Világos" onClick="@command('applyTheme', name='silvertail')" />
 					<menuitem label="Sötét" onClick="@command('applyTheme', name='userdark')" />
diff --git a/server/user.mediacube.gui/resources/i3-label_hu.properties b/server/user.mediacube.gui/resources/i3-label_hu.properties
index e82c9922..532ce66d 100644
--- a/server/user.mediacube.gui/resources/i3-label_hu.properties
+++ b/server/user.mediacube.gui/resources/i3-label_hu.properties
@@ -1,12 +1,4 @@
-version=2.9.0
-#2.9.0 Eredeti kereses optimalizalva 
-#2.8.2 Kereses csoportos listazasa 
-#2.8.0 Keresofelulet modositas (hardkodolt)
-#2.7.9 Keresofelulet modositas (hardkodolt)
-#2.7.8 Classloader mechanizmus atalakitasa, metadata editor history
-#2.7.7 Folyamat inditas dblclik tiltas
-#2.7.6 TSM Metadata provider, javitott GroovyClassLoader
-#2.7.5 ArchiveItem disableProxy, MediaFile disableProxy
+version=2.9.1
 
 footer=2016-2023 © Copyright User Rendszerház Kft.
 
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java
index 7cd5f6e6..77068998 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java
@@ -93,8 +93,8 @@ public class IndexModel extends BaseModel {
 	}
 
 	@GlobalCommand()
-	public void showMessage(@BindingParam("msg") String msg, String type) {
-		Clients.showNotification(msg, type, appTitle, "end_center", 4000);
+	public void showMessage(@BindingParam("msg") String msg, @BindingParam("type") String type) {
+		Clients.showNotification(msg, type, appTitle, "end_center", 4000, true);
 		// Clients.evalJavaScript(String.format("showToast('%s')", "XXX"));
 	}
 }
\ No newline at end of file
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/LoginModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/LoginModel.java
index 52f8c6b2..09feb4ae 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/LoginModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/LoginModel.java
@@ -28,6 +28,7 @@ public class LoginModel extends BaseModel {
 		domain = authentication.getAdHost();
 		if (StringUtils.isNotEmpty(authentication.getDefaultUser()) && StringUtils.isNotBlank(authentication.getDefaultPassword()))
 			authenticate(authentication.getDefaultUser(), authentication.getDefaultPassword());
+
 	}
 
 	@Command
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/MenuModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/MenuModel.java
index fdb2a7b8..40a59d98 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/MenuModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/MenuModel.java
@@ -127,6 +127,7 @@ public class MenuModel extends BaseModel {
 	@Command
 	public void applyTheme(@BindingParam("name") String name) {
 		Themes.setTheme(Executions.getCurrent(), name);
+		SessionUtil.setAttribute("theme", name);
 		Executions.sendRedirect("");
 	}
 
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/util/AuthInitiator.java b/server/user.mediacube.gui/src/user/jobengine/zk/util/AuthInitiator.java
index 4842411f..8282361d 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/util/AuthInitiator.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/util/AuthInitiator.java
@@ -8,19 +8,15 @@ import org.zkoss.zk.ui.util.Initiator;
 import org.zkoss.zul.theme.Themes;
 
 /**
- * Ellenorzi, hogy van e beloginelt user, ha nincs, akkor -> login.zul Minden
- * oldal belinkeli ezt az ellenorzest.
+ * Ellenorzi, hogy van e beloginelt user, ha nincs, akkor -> login.zul Minden oldal belinkeli ezt az ellenorzest.
  */
 public class AuthInitiator implements Initiator {
 	@Override
 	public void doInit(Page page, Map<String, Object> args) throws Exception {
 		if (!SessionUtil.isAuthenticated()) {
-			String theme = SessionUtil.getMediaCubeConfig().getTheme();
-			if (theme == null)
-				Themes.setTheme(Executions.getCurrent(), "silvertail");
-			else
-				Themes.setTheme(Executions.getCurrent(), theme);
-
+			String theme = SessionUtil.getMediaCubeConfig().getTheme() == null ? "silvertail" : SessionUtil.getMediaCubeConfig().getTheme();
+			Themes.setTheme(Executions.getCurrent(), theme);
+			SessionUtil.setAttribute("theme", theme);
 			SessionUtil.redirect("/pages/login.zul");
 		}
 	}
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java b/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java
index 1673975d..98873c04 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java
@@ -60,17 +60,6 @@ public class SessionUtil implements GlobalConstants {
 	public static final String GUI_EDITOR_DISABLE = "gui.editor.disable";
 	private static final String FMT_NOTIF = "<div style='white-space:nowrap'>%s</div>";
 
-	// private static MediaCubeConfig mediaCubeConfig;
-	//
-	// static {
-	// try {
-	// mediaCubeConfig = JSONConfig.read(JOBENGINE_MEDIACUBE_CONFIG,
-	// MediaCubeConfig.class);
-	// } catch (Exception e) {
-	// logger.error("Critical error", e);
-	// }
-	// }
-
 	public static void consoleLog(String message) {
 		logger.info("Console log - {}", message);
 		Clients.evalJavaScript(String.format("logToClient('%s')", message));
-- 
2.54.0