From: elgekko Date: Thu, 9 Mar 2023 09:08:30 +0000 (+0100) Subject: Uzenetek egysegesitese X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=358c27aa445bbc82e709f2c5e7aaf7e622e21bc6;p=mediacube.git Uzenetek egysegesitese --- diff --git a/.gitignore b/.gitignore index 6f073bf0..ca7490ac 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ ################################################################################ /server +/server - 230225/ diff --git a/server/-configuration/run-mediacube-server-local.launch b/server/-configuration/run-mediacube-server-local.launch index 0fd2f9a6..f5f6d7dd 100644 --- a/server/-configuration/run-mediacube-server-local.launch +++ b/server/-configuration/run-mediacube-server-local.launch @@ -50,7 +50,6 @@ - @@ -107,9 +106,9 @@ + - diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index af41a7e8..d5b74467 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -86,6 +86,7 @@ + win32 diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 6fd60f09..72f7b90a 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -66,7 +66,6 @@ jar - @@ -93,10 +91,9 @@ default-cli - org.apache.felix:org.apache.felix.gogo.command:0.12.0 diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index 0dbfa50f..f73529bf 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -38,7 +38,6 @@ - @@ -105,6 +104,7 @@ + diff --git a/server/-product/production/LOCAL/settings/mediacube.yaml b/server/-product/production/LOCAL/settings/mediacube.yaml index 3861350f..58e1653d 100644 --- a/server/-product/production/LOCAL/settings/mediacube.yaml +++ b/server/-product/production/LOCAL/settings/mediacube.yaml @@ -1,4 +1,4 @@ -theme: userdark +#theme: userdark jobQueuePollInterval: 1000 searchResultsListCacheSize: 200 disableHelp: true diff --git a/server/user.commons.zk/pom.xml b/server/user.commons.zk/pom.xml index 944ecb30..e6253a68 100644 --- a/server/user.commons.zk/pom.xml +++ b/server/user.commons.zk/pom.xml @@ -13,6 +13,57 @@ 8.0.3 + + org.apache.maven.plugins + maven-install-plugin + 2.4 + + + install_0 + package + + install-file + + + lib/zk.jar + org.zkoss.zk + zk + ${version} + jar + + + + install_1 + package + + install-file + + + lib/zul.jar + org.zkoss.zk + zul + ${version} + jar + + + + install_2 + package + + install-file + + + lib/zkmax.jar + org.zkoss.zk + zkmax + ${version} + jar + + + + + + org.apache.maven.plugins maven-resources-plugin @@ -41,4 +92,6 @@ - \ No newline at end of file + + + diff --git a/server/user.mediacube.gui/META-INF/MANIFEST.MF b/server/user.mediacube.gui/META-INF/MANIFEST.MF index 42408eb0..77da9444 100644 --- a/server/user.mediacube.gui/META-INF/MANIFEST.MF +++ b/server/user.mediacube.gui/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0", user.commons.zk;bundle-version="1.0.0", org.apache.servicemix.bundles.quartz;bundle-version="2.3.0", user.jobengine.osgi.server, - hu.user.theme.userdark;bundle-version="1.0.0" + user.theme.userdark;bundle-version="1.0.0" Export-Package: user.jobengine.gui DynamicImport-Package: * Bundle-ClassPath: . diff --git a/server/user.mediacube.gui/css/toast.css b/server/user.mediacube.gui/css/toast.css index b2618312..b1cc2645 100644 --- a/server/user.mediacube.gui/css/toast.css +++ b/server/user.mediacube.gui/css/toast.css @@ -1,8 +1,8 @@ .toastjs-container { position: absolute; /* Fallback */ position: fixed; - top: 200px; - left: 30px; + top: 5px; + left: 300px; width: calc(100% - 60px); max-width: 400px; diff --git a/server/user.mediacube.gui/index.zul b/server/user.mediacube.gui/index.zul index f1bb3a30..f6735660 100644 --- a/server/user.mediacube.gui/index.zul +++ b/server/user.mediacube.gui/index.zul @@ -7,6 +7,14 @@