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

diff --git a/server/hu.user.mediacube.indexer/generatorConfig.xml b/server/hu.user.mediacube.indexer/generatorConfig.xml
new file mode 100644 (file)
index 0000000..306a381
--- /dev/null
+++ b/server/hu.user.mediacube.indexer/generatorConfig.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">\r
+<generatorConfiguration>\r
+  <context id="context1">\r
+    <jdbcConnection connectionURL="???" driverClass="???" password="???" userId="???" />\r
+    <javaModelGenerator targetPackage="???" targetProject="???" />\r
+    <sqlMapGenerator targetPackage="???" targetProject="???" />\r
+    <javaClientGenerator targetPackage="???" targetProject="???" type="XMLMAPPER" />\r
+    <table schema="???" tableName="???">\r
+      <columnOverride column="???" property="???" />\r
+    </table>\r
+  </context>\r
+</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 5d7d95a8962114767810c31faa2082666aaf31d2..cc052fb43d97db1bd64c6731c749e634ed8396f5 100644 (file)
--- 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>\r
 \r
        <welcome-file-list>\r
+               <welcome-file>index.zul</welcome-file>\r
                <welcome-file>index.html</welcome-file>\r
                <welcome-file>index.htm</welcome-file>\r
                <welcome-file>index.jsp</welcome-file>\r
                <welcome-file>default.html</welcome-file>\r
                <welcome-file>default.htm</welcome-file>\r
                <welcome-file>default.jsp</welcome-file>\r
-\r
-               <welcome-file>index.zul</welcome-file>\r
                <welcome-file>index.zhtml</welcome-file>\r
        </welcome-file-list>\r
 <!-- Enable http to https redirect -->\r

diff --git a/server/user.jobengine.osgi.server/index.zul b/server/user.jobengine.osgi.server/index.zul
new file mode 100644 (file)
index 0000000..fbb5637
--- /dev/null
+++ b/server/user.jobengine.osgi.server/index.zul
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+\r
+<?init class="user.jobengine.zk.util.AuthInitiator"?>\r
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client">\r
+       <style src="/css/archivum.css" />\r
+       <zscript><![CDATA[\r
+       // Chrome F5 bug workaround (miscalculates 100% width on second refresh)\r
+       void onClientInfo(ClientInfoEvent evt) {\r
+       int myHeight = evt.getScreenHeight();\r
+        int myWidth = evt.getScreenWidth();\r
+    }\r
+       \r
+       void resizeComp(org.zkoss.zk.ui.Component toResize){\r
+               org.zkoss.zk.ui.util.Clients.resize(toResize);\r
+       }\r
+       \r
+       public void clearErrorMsg(Component comp){\r
+               if(comp!=null&&comp.getErrorMessage()!=null){\r
+               //comp.setErrorMessage(comp.getErrorMessage().replaceAll("aaaa.nn.jj","éééé.hh.nn"));\r
+               comp.setErrorMessage("Hibás érték! (ÉÉÉÉ.HH.NN)");\r
+               }\r
+       }\r
+       ]]></zscript>\r
+       <!-- ZKOSS chrome listbox scroll bug workaround: http://tracker.zkoss.org/browse/ZK-3263 -->\r
+       <script>\r
+               window.onpopstate = function(event) {\r
+                       //console.log("location: " + document.location + ", state: " + JSON.stringify(event.state));\r
+                       console.log("location: " + document.location);\r
+                       var param = {\r
+                               location: document.location,\r
+                               state: event.state\r
+                       };\r
+                       zk.Widget.$('$divMenu').fire('onPopHistory', param, {toServer:true});\r
+               }\r
+               \r
+               zk.afterLoad(function() {\r
+                       //pushHistory("Keresés", "");\r
+               });\r
+               zk.afterLoad('zul.grid,zkmax', function() {\r
+                       var xGrid = {};\r
+                       zk.override(zul.grid.Grid.prototype, xGrid, {\r
+                               _setPadSize : function() {\r
+                                       var scrollTopBefore = this.ebody.scrollTop;\r
+                                       var result = xGrid._setPadSize.apply(this, arguments);\r
+                                       this.ebody.scrollTop = scrollTopBefore;\r
+                                       return result;\r
+                               }\r
+                       });//zk.override\r
+                       \r
+               });//zk.afterLoad\r
+               zk.afterLoad('zul.sel,zkmax', function() {\r
+                       var xListbox = {};\r
+                       zk.override(zul.sel.Listbox.prototype, xListbox, {\r
+                               _setPadSize : function() {\r
+                                       var scrollTopBefore = this.ebody.scrollTop;\r
+                                       var result = xListbox._setPadSize.apply(this, arguments);\r
+                                       this.ebody.scrollTop = scrollTopBefore;\r
+                                       return result;\r
+                               }\r
+                       });//zk.override\r
+               });//zk.afterLoad\r
+       </script>\r
+       \r
+       <window id="zkwindow" border="none" width="100%" height="100%" contentStyle="padding:0;" onClientInfo="onClientInfo(event)" \r
+               apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.IndexModel')">\r
+               <custom-attributes org.zkoss.zul.image.preload="true" />\r
+               <borderlayout width="${myWidth}" height="${myHeight}">\r
+                       <north border="0">\r
+                               <div id="divMenu" onPopHistory="@command('popHistory')">\r
+                                       <borderlayout height="50px">\r
+                                               <west border="0">\r
+                                                       <hbox height="100%" width="100%" align="center" pack="center" style="background: #008AC8;">\r
+                                                               <image src="/img/mediacube_logo_v2_50x50.png" />\r
+                                                               <label style="color:#e3e3e3;font-size:26px;font-weight:bold" value="MediaCube" />\r
+                                                               <label style="color:#e3e3e3;font-size:12px;font-weight:bold" value="v${labels.version}" /> \r
+                                                       </hbox>\r
+                                               </west>\r
+                                               <center border="0">\r
+                                                       <hbox height="100%" width="100%" align="bottom" pack="start" style="background: #008AC8;">\r
+                                                       </hbox>\r
+                                               </center>\r
+                                               <east border="0">\r
+                                                       <hbox height="100%" width="100%" align="bottom" pack="center" style="background: #008AC8;">\r
+                                                               <div style="margin-right: 10px">\r
+                                                                       <label style="color:#e3e3e3; font-size:12px; font-weight:bold; cursor: help;" value="Bejelentkezve: ${sessionScope.userPrincipal.displayName}" /> \r
+                                                                       <attribute name="tooltip" if="${not empty sessionScope.userPrincipal.email}">\r
+                                                                               emailPopup, at_pointer\r
+                                                                       </attribute>                                                                                            \r
+                                                                       <popup id="emailPopup">\r
+                                                                       <vlayout>\r
+                                                                           <label value="${sessionScope.userPrincipal.email}"/>\r
+                                                                       </vlayout>\r
+                                                                   </popup>                                                                    \r
+                                                               </div>\r
+                                                       </hbox>\r
+                                               </east>\r
+                                       </borderlayout>\r
+                                       <include src="/pages/menu.zul" />\r
+                               </div>\r
+                       </north>\r
+                       <center border="0">\r
+                               <include style="background: #e3e3e3;" id="includeContent" src="@load(vm.page)" />\r
+                       </center>\r
+               </borderlayout>\r
+       </window>\r
+</zk>\r