From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Thu, 12 Sep 2019 07:30:55 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=0c1742b6723f720605e2cb4a76a785b6fd3d055d;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31519
---

diff --git a/server/hu.user.mediacube.indexer/generatorConfig.xml b/server/hu.user.mediacube.indexer/generatorConfig.xml
new file mode 100644
index 00000000..306a381a
--- /dev/null
+++ b/server/hu.user.mediacube.indexer/generatorConfig.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<generatorConfiguration>
+  <context id="context1">
+    <jdbcConnection connectionURL="???" driverClass="???" password="???" userId="???" />
+    <javaModelGenerator targetPackage="???" targetProject="???" />
+    <sqlMapGenerator targetPackage="???" targetProject="???" />
+    <javaClientGenerator targetPackage="???" targetProject="???" type="XMLMAPPER" />
+    <table schema="???" tableName="???">
+      <columnOverride column="???" property="???" />
+    </table>
+  </context>
+</generatorConfiguration>
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.server/WEB-INF/web.xml b/server/user.jobengine.osgi.server/WEB-INF/web.xml
index 5d7d95a8..cc052fb4 100644
--- a/server/user.jobengine.osgi.server/WEB-INF/web.xml
+++ b/server/user.jobengine.osgi.server/WEB-INF/web.xml
@@ -60,14 +60,13 @@
 	</session-config>
 
 	<welcome-file-list>
+		<welcome-file>index.zul</welcome-file>
 		<welcome-file>index.html</welcome-file>
 		<welcome-file>index.htm</welcome-file>
 		<welcome-file>index.jsp</welcome-file>
 		<welcome-file>default.html</welcome-file>
 		<welcome-file>default.htm</welcome-file>
 		<welcome-file>default.jsp</welcome-file>
-
-		<welcome-file>index.zul</welcome-file>
 		<welcome-file>index.zhtml</welcome-file>
 	</welcome-file-list>
 <!-- Enable http to https redirect -->
diff --git a/server/user.jobengine.osgi.server/index.zul b/server/user.jobengine.osgi.server/index.zul
new file mode 100644
index 00000000..fbb56375
--- /dev/null
+++ b/server/user.jobengine.osgi.server/index.zul
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?init class="user.jobengine.zk.util.AuthInitiator"?>
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client">
+	<style src="/css/archivum.css" />
+	<zscript><![CDATA[
+	// Chrome F5 bug workaround (miscalculates 100% width on second refresh)
+	void onClientInfo(ClientInfoEvent evt) {
+    	int myHeight = evt.getScreenHeight();
+        int myWidth = evt.getScreenWidth();
+    }
+	
+	void resizeComp(org.zkoss.zk.ui.Component toResize){
+		org.zkoss.zk.ui.util.Clients.resize(toResize);
+	}
+	
+	public void clearErrorMsg(Component comp){
+		if(comp!=null&&comp.getErrorMessage()!=null){
+        	//comp.setErrorMessage(comp.getErrorMessage().replaceAll("aaaa.nn.jj","éééé.hh.nn"));
+        	comp.setErrorMessage("Hibás érték! (ÉÉÉÉ.HH.NN)");
+		}
+ 	}
+	]]></zscript>
+	<!-- ZKOSS chrome listbox scroll bug workaround: http://tracker.zkoss.org/browse/ZK-3263 -->
+	<script>
+		window.onpopstate = function(event) {
+			//console.log("location: " + document.location + ", state: " + JSON.stringify(event.state));
+			console.log("location: " + document.location);
+			var param = {
+				location: document.location,
+				state: event.state
+			};
+			zk.Widget.$('$divMenu').fire('onPopHistory', param, {toServer:true});
+		}
+		
+		zk.afterLoad(function() {
+			//pushHistory("Keresés", "");
+		});
+		zk.afterLoad('zul.grid,zkmax', function() {
+			var xGrid = {};
+			zk.override(zul.grid.Grid.prototype, xGrid, {
+				_setPadSize : function() {
+					var scrollTopBefore = this.ebody.scrollTop;
+					var result = xGrid._setPadSize.apply(this, arguments);
+					this.ebody.scrollTop = scrollTopBefore;
+					return result;
+				}
+			});//zk.override
+			
+		});//zk.afterLoad
+		zk.afterLoad('zul.sel,zkmax', function() {
+			var xListbox = {};
+			zk.override(zul.sel.Listbox.prototype, xListbox, {
+				_setPadSize : function() {
+					var scrollTopBefore = this.ebody.scrollTop;
+					var result = xListbox._setPadSize.apply(this, arguments);
+					this.ebody.scrollTop = scrollTopBefore;
+					return result;
+				}
+			});//zk.override
+		});//zk.afterLoad
+	</script>
+	
+	<window id="zkwindow" border="none" width="100%" height="100%" contentStyle="padding:0;" onClientInfo="onClientInfo(event)" 
+		apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.IndexModel')">
+ 		<custom-attributes org.zkoss.zul.image.preload="true" />
+		<borderlayout width="${myWidth}" height="${myHeight}">
+			<north border="0">
+				<div id="divMenu" onPopHistory="@command('popHistory')">
+					<borderlayout height="50px">
+						<west border="0">
+							<hbox height="100%" width="100%" align="center" pack="center" style="background: #008AC8;">
+								<image src="/img/mediacube_logo_v2_50x50.png" />
+								<label style="color:#e3e3e3;font-size:26px;font-weight:bold" value="MediaCube" />
+								<label style="color:#e3e3e3;font-size:12px;font-weight:bold" value="v${labels.version}" /> 
+							</hbox>
+						</west>
+						<center border="0">
+							<hbox height="100%" width="100%" align="bottom" pack="start" style="background: #008AC8;">
+							</hbox>
+						</center>
+						<east border="0">
+							<hbox height="100%" width="100%" align="bottom" pack="center" style="background: #008AC8;">
+								<div style="margin-right: 10px">
+									<label style="color:#e3e3e3; font-size:12px; font-weight:bold; cursor: help;" value="Bejelentkezve: ${sessionScope.userPrincipal.displayName}" /> 
+									<attribute name="tooltip" if="${not empty sessionScope.userPrincipal.email}">
+										emailPopup, at_pointer
+									</attribute>												
+									<popup id="emailPopup">
+								        <vlayout>
+								            <label value="${sessionScope.userPrincipal.email}"/>
+								        </vlayout>
+								    </popup>									
+								</div>
+							</hbox>
+						</east>
+					</borderlayout>
+					<include src="/pages/menu.zul" />
+				</div>
+			</north>
+			<center border="0">
+				<include style="background: #e3e3e3;" id="includeContent" src="@load(vm.page)" />
+			</center>
+		</borderlayout>
+	</window>
+</zk>