"$type": "UNCSource",\r
"filter": "avi,wav,mxf",\r
"local": {\r
- "address": "file://10.10.1.100/BRAAVOS/TQC/CHECK",\r
+ "address": "file://c:/_video",\r
"userName": "mediacube",\r
"password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
"timeout": 1000\r
"disableFileVersioning": true,\r
"enableOverride": true,\r
"remote": {\r
- "address": "ftp://10.10.1.100/ARCHIVE",\r
+ "address": "file://10.10.1.100/BRAAVOS/ARCHIVE",\r
"userName": "mediacube",\r
"password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
"timeout": 1000\r
// You can specify all the values or you can default the Build and Revision Numbers\r
// by using the '*' as shown below:\r
// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.8.2")]\r
-[assembly: AssemblyFileVersion("2.0.8.2")]\r
+[assembly: AssemblyVersion("2.0.8.3")]\r
+[assembly: AssemblyFileVersion("2.0.8.3")]\r
// You can specify all the values or you can default the Build and Revision Numbers\r
// by using the '*' as shown below:\r
// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.7.8")]\r
-[assembly: AssemblyFileVersion("2.0.7.8")]\r
+[assembly: AssemblyVersion("2.0.8.3")]\r
+[assembly: AssemblyFileVersion("2.0.8.3")]\r
FtpReply reply = targetFTP.GetReply();\r
if (!reply.Success || !_226.Equals(reply.Code))\r
throw new Exception(UPLOAD_ERROR);\r
- long sourceSize = inputFile.Length;\r
- long uploadedSize = targetFTP.GetFileSize(OutputName);\r
- if (sourceSize != uploadedSize)\r
- throw new Exception(UPLOAD_SIZE_ERROR);\r
+ //long sourceSize = inputFile.Length;\r
+ //long uploadedSize = targetFTP.GetFileSize(OutputName);\r
+ //if (sourceSize != uploadedSize)\r
+ // throw new Exception(UPLOAD_SIZE_ERROR);\r
}\r
\r
protected override void UploadContent(string outputPath, byte[] content) {\r
protected virtual void UploadFile() {\r
int pbCancel = 0;\r
Win32File.CopyFileEx(Input, Output, new CopyProgressRoutine(this.CopyProgressHandler), IntPtr.Zero, ref pbCancel, CopyFileFlags.COPY_FILE_RESTARTABLE);\r
- long sourceSize = inputFile.Length;\r
- long uploadedSize = new FileInfo(Output).Length;\r
- if (sourceSize != uploadedSize)\r
- throw new Exception(COPY_SIZE_ERROR);\r
+ //long sourceSize = inputFile.Length;\r
+ //long uploadedSize = new FileInfo(Output).Length;\r
+ //if (sourceSize != uploadedSize)\r
+ // throw new Exception(COPY_SIZE_ERROR);\r
}\r
\r
protected virtual string GetOutputFilePath(string path, string fileName) {\r
-<%@ page import="java.util.*, java.io.*, java.net.*, user.jobengine.zk.util.SessionUtil"%>\r
+<%@ page import="java.util.*, java.io.*, java.net.*, user.jobengine.zk.util.SessionUtil, org.apache.logging.log4j.*"%>\r
<link rel="shortcut icon" href="/img/mediacube_logo_small.ico">\r
<%\r
- String action = request.getParameter("action");\r
- pageContext.forward("/pages/index.zul?action=" + action);\r
+ String targetPath = "/pages/index.zul";\r
+ String queryString = request.getQueryString();\r
+ if (queryString != null)\r
+ targetPath += "?" + queryString;\r
+ LogManager.getLogger().info("Forwaring to {}", targetPath);\r
+ pageContext.forward(targetPath);\r
%>
\ No newline at end of file
}\r
}\r
]]></zscript>\r
- \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
return result;\r
}\r
});//zk.override\r
+ \r
});//zk.afterLoad\r
zk.afterLoad('zul.sel,zkmax', function() {\r
var xListbox = {};\r
<custom-attributes org.zkoss.zul.image.preload="true" />\r
<borderlayout width="${myWidth}" height="${myHeight}">\r
<north border="0">\r
- <div id="divMenu">\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
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" ?>\r
<?init class="user.jobengine.zk.util.AdminAuthInitiator"?>\r
<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:ca="client/attribute">\r
- <script>\r
- window.history.pushState(null, "Folyamatok", "/actions/jobs"); \r
- </script>\r
<style>\r
.z-progressmeter { height: 16px; border: 1px solid #cfcfcf; background: #fff 0 0 repeat-x; text-align: left; overflow: hidden; // background-image:\r
url(/zkau/web/1bf94a1d/zul/img/misc/prgmeter-anim.gif); }\r
-<%@ page import="java.util.*, java.io.*, java.net.*, user.jobengine.zk.util.SessionUtil"%>\r
+<%@ page import="java.util.*, java.io.*, java.net.*, user.jobengine.zk.util.SessionUtil, org.apache.logging.log4j.*"%>\r
<%\r
//do login ++++\r
+ String targetPath = null;\r
if (SessionUtil.isAuthenticated())\r
- pageContext.forward("/pages/index.zul");\r
+ targetPath = "/pages/index.zul";\r
else\r
- pageContext.forward("/pages/login.zul");\r
+ targetPath = "/pages/login.zul";\r
+ \r
+ String queryString = request.getQueryString();\r
+ if (queryString != null)\r
+ targetPath += "?" + queryString;\r
+ LogManager.getLogger().info("Forwaring to {}", targetPath);\r
+ pageContext.forward(targetPath);\r
+ \r
%>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>\r
<?init class="user.jobengine.zk.util.AuthInitiator"?>\r
<zk>\r
-<style>\r
-.redmenubar{\r
- background: #aaaaaa;\r
- padding: 0px;\r
-}\r
-\r
-.whitemenu .z-menuitem-text, .whitemenu .z-menu-text {\r
- color: #FFFFFF;\r
-}\r
-\r
-.rozsda .z-menu-text, .rozsda .z-menuitem-text{\r
- color: #222222;\r
-}\r
-\r
-.z-menu-text, .z-menuitem-text{\r
- text-shadow: none; \r
-}\r
-\r
-.whitemenu .z-menu-content, .z-menuitem-content {\r
- padding-left: 5px;\r
- padding-right: 18px;\r
- padding-top: 0px;\r
- padding-bottom: 0px;\r
-}\r
-\r
-.z-menu-content:hover, .z-menu-content:active, .z-menu-content:focus{\r
- background: #a3b8cc;\r
-}\r
-\r
-.z-menuitem-content:hover, .z-menuitem-content:active, .z-menuitem-content:focus{\r
- background: #a3b8cc;\r
-}\r
-\r
-.z-menu-icon {\r
- position: absolute;\r
- top: 2px;\r
- right: 5px;\r
-}\r
-\r
-.z-menu-icon, .z-menu-icon:hover, .z-menu-icon:active {\r
- color: #f1ffdc;\r
- vertical-align: text-bottom;\r
-}\r
-\r
-.z-menu-selected > .z-menu-content{\r
- background: #a3b8cc;\r
- color: black;\r
-}\r
-</style>\r
-<div apply="org.zkoss.bind.BindComposer" viewModel="@id('lm') @init('user.jobengine.zk.model.MenuModel')">\r
- <menubar id="menubar" hflex="max" sclass="redmenubar">\r
- <menu sclass="whitemenu" label="Archívum" >\r
- <menupopup>\r
- <menuitem sclass="rozsda" label="Keresés" onClick='includeContent.src="/pages/searchitems.zul"' disabled="false" />\r
- <menuitem sclass="rozsda" label="Folyamatok" onClick='includeContent.src="/pages/joblist.zul"' disabled="${not sessionScope.userPrincipal.admin or sessionScope.userPrincipal.anonymous}" />\r
- <menuitem sclass="rozsda" label="Hiányzó anyagok" onClick='includeContent.src="/pages/missingmaterials.zul"' disabled="${not sessionScope.userPrincipal.submitter or sessionScope.userPrincipal.anonymous}" />\r
-<!-- <menuitem sclass="rozsda" label="Test" onClick='includeContent.src="/pages/database.zul"' disabled="${not sessionScope.userPrincipal.jobSubmitter or sessionScope.userPrincipal.anonymous}" /> -->\r
- </menupopup>\r
- </menu>\r
- <menu sclass="whitemenu" label="Statisztikák">\r
- <menupopup>\r
- <menuitem sclass="rozsda" label="Folyamat tevékenységek" onClick='includeContent.src="/pages/statistics.zul"' disabled="${not sessionScope.userPrincipal.admin or sessionScope.userPrincipal.anonymous}" />\r
- <menuitem sclass="rozsda" label="Híranyag gyártás" onClick='includeContent.src="/pages/newshistory.zul"' disabled="${not sessionScope.userPrincipal.admin or sessionScope.userPrincipal.anonymous}" />\r
- </menupopup>\r
- </menu>\r
-\r
- <menu sclass="whitemenu" label="${labels.menu_help}" >\r
- <menupopup>\r
- <menuitem sclass="rozsda" label="${labels.menu_content}" href="http://10.10.1.27:90/docs" target="_blank" />\r
- <menuitem sclass="rozsda" label="${labels.menu_version}" href="/resource/help.html" target="_blank" />\r
- </menupopup>\r
- </menu>\r
- <menuitem id="basketIMenuItem" image="/img/ic_shopping_cart_black_24dp.png" sclass="whitemenu" style="float: right" label="@load(lm.basketMenuLabel)" onClick="@command('showBasket')" disabled="false" />\r
- <menuitem sclass="whitemenu" style="float: right" label="Kilépés" onClick="@command('doLogout')" disabled="false" />\r
- </menubar>\r
-</div>\r
+ <style>\r
+ .redmenubar{\r
+ background: #aaaaaa;\r
+ padding: 0px;\r
+ }\r
+ \r
+ .whitemenu .z-menuitem-text, .whitemenu .z-menu-text {\r
+ color: #FFFFFF;\r
+ }\r
+ \r
+ .rozsda .z-menu-text, .rozsda .z-menuitem-text{\r
+ color: #222222;\r
+ }\r
+ \r
+ .z-menu-text, .z-menuitem-text{\r
+ text-shadow: none; \r
+ }\r
+ \r
+ .whitemenu .z-menu-content, .z-menuitem-content {\r
+ padding-left: 5px;\r
+ padding-right: 18px;\r
+ padding-top: 0px;\r
+ padding-bottom: 0px;\r
+ }\r
+ \r
+ .z-menu-content:hover, .z-menu-content:active, .z-menu-content:focus{\r
+ background: #a3b8cc;\r
+ }\r
+ \r
+ .z-menuitem-content:hover, .z-menuitem-content:active, .z-menuitem-content:focus{\r
+ background: #a3b8cc;\r
+ }\r
+ \r
+ .z-menu-icon {\r
+ position: absolute;\r
+ top: 2px;\r
+ right: 5px;\r
+ }\r
+ \r
+ .z-menu-icon, .z-menu-icon:hover, .z-menu-icon:active {\r
+ color: #f1ffdc;\r
+ vertical-align: text-bottom;\r
+ }\r
+ \r
+ .z-menu-selected > .z-menu-content{\r
+ background: #a3b8cc;\r
+ color: black;\r
+ }\r
+ </style>\r
+ <div apply="org.zkoss.bind.BindComposer" viewModel="@id('lm') @init('user.jobengine.zk.model.MenuModel')">\r
+ <menubar id="menubar" hflex="max" sclass="redmenubar">\r
+ <menu sclass="whitemenu" label="Archívum" >\r
+ <menupopup>\r
+ <menuitem sclass="rozsda" label="Keresés" onClick="@command('navigate', action='')" disabled="false" />\r
+ <menuitem sclass="rozsda" label="Folyamatok" onClick="@command('navigate', action='jobs')" disabled="${not sessionScope.userPrincipal.admin or sessionScope.userPrincipal.anonymous}" />\r
+ <menuitem sclass="rozsda" label="Hiányzó anyagok" onClick="@command('navigate', action='missingmaterials')" disabled="${not sessionScope.userPrincipal.submitter or sessionScope.userPrincipal.anonymous}" />\r
+ </menupopup>\r
+ </menu>\r
+ <menu sclass="whitemenu" label="Statisztikák">\r
+ <menupopup>\r
+ <menuitem sclass="rozsda" label="Folyamat tevékenységek" onClick="@command('navigate', action='statistics')" disabled="${not sessionScope.userPrincipal.admin or sessionScope.userPrincipal.anonymous}" />\r
+ <menuitem sclass="rozsda" label="Híranyag gyártás" onClick="@command('navigate', action='newshistory')" disabled="${not sessionScope.userPrincipal.admin or sessionScope.userPrincipal.anonymous}" />\r
+ </menupopup>\r
+ </menu>\r
+ \r
+ <menu sclass="whitemenu" label="${labels.menu_help}" >\r
+ <menupopup>\r
+ <menuitem sclass="rozsda" label="${labels.menu_content}" href="http://10.10.1.27:90/docs" target="_blank" />\r
+ <menuitem sclass="rozsda" label="${labels.menu_version}" href="/resource/help.html" target="_blank" />\r
+ </menupopup>\r
+ </menu>\r
+ <menuitem id="basketIMenuItem" image="/img/ic_shopping_cart_black_24dp.png" sclass="whitemenu" style="float: right" label="@load(lm.basketMenuLabel)" onClick="@command('showBasket')" disabled="false" />\r
+ <menuitem sclass="whitemenu" style="float: right" label="Kilépés" onClick="@command('doLogout')" disabled="false" />\r
+ </menubar>\r
+ </div>\r
</zk>\r
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" ?>\r
<?init class="user.jobengine.zk.util.SubmitterAuthInitiator"?>\r
<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:ca="client/attribute">\r
- <script>\r
- window.history.pushState(null, "Hiányzó anyagok", "/actions/missingmaterials"); \r
- </script>\r
<custom-attributes org.zkoss.zul.listbox.rod="true" />\r
<custom-attributes org.zkoss.zul.listbox.initRodSize="50" />\r
<custom-attributes org.zkoss.zul.listbox.preloadSize="50" />\r
<?xml version="1.0" encoding="UTF-8"?>\r
<zk xmlns="http://www.zkoss.org/2005/zul">\r
<script>\r
-\r
function frameToTC(value) {\r
//console.log('frameToTC ' + value)\r
var reminder = value;\r
https://git.useribm.hu / mediacube.git / commitdiff