From 5493321249611740592cd1fbf34b7537d8b5f64d Mon Sep 17 00:00:00 2001 From: elgekko Date: Thu, 30 Mar 2023 00:18:36 +0200 Subject: [PATCH] Sotet tema kesz --- server/-dependencies/jobengine.target | 2 + server/-dependencies/pom.xml | 18 +- server/-modules/pom.xml | 5 + server/-product/mediacube.product | 1 + .../LOCAL/settings/application.yaml | 4 +- server/hu.user.theme.userdark/pom.xml | 49 +- server/hu.user.theme.userdark/pomORIG.xml | 126 ++++ .../src/archive/META-INF/MANIFEST.MF | 36 +- .../archive/web/js/zul/grid/less/grid.less | 18 +- .../archive/web/js/zul/inp/less/combo.less | 10 +- .../archive/web/js/zul/menu/less/menu.less | 5 +- .../archive/web/js/zul/sel/less/listbox.less | 7 +- .../archive/web/js/zul/tab/less/tabbox.less | 22 +- .../archive/web/js/zul/wgt/less/button.less | 13 +- .../archive/web/js/zul/wgt/less/toolbar.less | 25 +- .../archive/web/js/zul/wnd/less/window.less | 3 +- .../web/zkmax/less/tablet/_borderlayout.less | 2 + .../archive/web/zul/less/_zkvariables.less | 85 ++- .../src/archive/web/zul/less/norm.less | 18 +- server/user.commons.zk/pom.xml | 1 - server/user.mediacube.gui/WEB-INF/zk-dev.xml | 42 ++ server/user.mediacube.gui/WEB-INF/zk.xml | 4 + server/user.mediacube.gui/css/searchitems.css | 85 +-- .../mediacube.css} | 14 + .../css/{ => silvertail}/tagify.css | 0 server/user.mediacube.gui/css/toast.css | 68 -- .../mediacube.css} | 20 +- .../css/userdark/tagify.css | 622 ++++++++++++++++++ server/user.mediacube.gui/index.zul | 48 +- server/user.mediacube.gui/js/toast.js | 113 ---- server/user.mediacube.gui/js/toast.min.js | 1 - server/user.mediacube.gui/pages/login.zul | 2 +- server/user.mediacube.gui/pages/menu.zul | 22 +- .../user.mediacube.gui/pages/searchitems.zul | 4 +- .../pages/searchitems/details.zul | 32 +- .../pages/searchitems/filters.zul | 2 +- .../jobengine/zk/model/GridSearchModel.java | 8 +- .../user/jobengine/zk/model/IndexModel.java | 3 +- .../user/jobengine/zk/model/MenuModel.java | 17 +- .../user/jobengine/zk/util/AuthInitiator.java | 19 +- .../user/jobengine/zk/util/SessionUtil.java | 11 + 41 files changed, 1161 insertions(+), 426 deletions(-) create mode 100644 server/hu.user.theme.userdark/pomORIG.xml create mode 100644 server/user.mediacube.gui/WEB-INF/zk-dev.xml rename server/user.mediacube.gui/css/{mediacube-silvertail.css => silvertail/mediacube.css} (70%) rename server/user.mediacube.gui/css/{ => silvertail}/tagify.css (100%) delete mode 100644 server/user.mediacube.gui/css/toast.css rename server/user.mediacube.gui/css/{mediacube-userdark.css => userdark/mediacube.css} (64%) create mode 100644 server/user.mediacube.gui/css/userdark/tagify.css delete mode 100644 server/user.mediacube.gui/js/toast.js delete mode 100644 server/user.mediacube.gui/js/toast.min.js diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index d5b74467..faec11d7 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -3,6 +3,7 @@ + @@ -87,6 +88,7 @@ + win32 diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 72f7b90a..240ef05a 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -66,20 +66,6 @@ jar - - install3 - package - - install-file - - - libs/userdark-1.0.0.jar - user.theme - userdark - 1.0.0 - jar - - @@ -91,8 +77,8 @@ default-cli - - user.theme:userdark:1.0.0 + + org.apache.felix:org.apache.felix.fileinstall:3.7.4 org.apache.felix:org.apache.felix.gogo.command:0.12.0 diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml index 82dc366c..a979c4de 100644 --- a/server/-modules/pom.xml +++ b/server/-modules/pom.xml @@ -43,6 +43,11 @@ p2 file:${project.basedir}/../-dependencies/target/repository/ + + theme + p2 + file:${project.basedir}/../hu.user.theme.userdark/target/repository/ + diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index f73529bf..ee07e555 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -53,6 +53,7 @@ + diff --git a/server/-product/production/LOCAL/settings/application.yaml b/server/-product/production/LOCAL/settings/application.yaml index ec8f844e..36d9dcda 100644 --- a/server/-product/production/LOCAL/settings/application.yaml +++ b/server/-product/production/LOCAL/settings/application.yaml @@ -1,6 +1,6 @@ datasource: mediacube: - url: jdbc:db2://localvm:50000/testmc + url: jdbc:db2://localvm:50000/mc user: db2admin password: password external-indexer: true @@ -8,7 +8,7 @@ datasource: login-timeout: 5 pool-size: 10 mediacube-nosql: - url: jdbc:db2://localvm:50000/testmc + url: jdbc:db2://localvm:50000/mc user: db2admin password: password schema: test diff --git a/server/hu.user.theme.userdark/pom.xml b/server/hu.user.theme.userdark/pom.xml index 552a6bd5..53733a8a 100644 --- a/server/hu.user.theme.userdark/pom.xml +++ b/server/hu.user.theme.userdark/pom.xml @@ -68,39 +68,24 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.5 - 1.5 - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - *;scope=provided|compile|runtime - - <_include>${project.basedir}/src/archive/META-INF/MANIFEST.MF - ${project.version} - ${project.groupId}.${project.artifactId} - ${project.artifactId} - * - * - - + org.reficio + p2-maven-plugin + 1.7.0 + + + default-cli + + + + user.theme:userdark:1.0.0 + false + + + + + - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - ../-dependencies/libs - - + diff --git a/server/hu.user.theme.userdark/pomORIG.xml b/server/hu.user.theme.userdark/pomORIG.xml new file mode 100644 index 00000000..dd7701c7 --- /dev/null +++ b/server/hu.user.theme.userdark/pomORIG.xml @@ -0,0 +1,126 @@ + + + + 4.0.0 + user.theme + userdark + jar + 1.0.0 + ZK User Dark + ZK User Dark Theme + + 8.0.3 + + + + zkmaven + ZK Maven Plugin Repository + http://mavensync.zkoss.org/maven2 + + + maven-bundle-plugin + bnd maven plugin + http://repo1.maven.org/maven2 + + + + + org.zkoss.zk + zk + ${zk.version} + + + org.zkoss.zk + zul + ${zk.version} + + + org.zkoss.zk + zkmax + ${zk.version} + + + + + ${project.basedir}/src/ + + + ${project.basedir}/src/archive + + + + + org.zkoss.maven + zkless-engine-maven-plugin + 1.0.0 + + + compile-less + + lessc + + + ${project.basedir}/src/archive + ${project.basedir}/target/classes + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.5 + 1.5 + + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + true + + *;scope=provided|compile|runtime + + <_include>${project.basedir}/src/archive/META-INF/MANIFEST.MF + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + ../-dependencies/libs + + + + + + diff --git a/server/hu.user.theme.userdark/src/archive/META-INF/MANIFEST.MF b/server/hu.user.theme.userdark/src/archive/META-INF/MANIFEST.MF index 59499bce..77f92a09 100644 --- a/server/hu.user.theme.userdark/src/archive/META-INF/MANIFEST.MF +++ b/server/hu.user.theme.userdark/src/archive/META-INF/MANIFEST.MF @@ -1,2 +1,36 @@ Manifest-Version: 1.0 - +Bundle-ManifestVersion: 2 +Bundle-Name: user.theme.userdark +Bundle-SymbolicName: user.theme.userdark +Bundle-Version: 1.0.0 +Created-By: 1.8.0_202 (Oracle Corporation) +Export-Package: metainfo.zk,org.zkoss.theme.___THEME_NAME___;uses:="or + g.zkoss.zk.ui,org.zkoss.zk.ui.util",org.zkoss.theme.userdark;uses:="o + rg.zkoss.zk.ui,org.zkoss.zk.ui.util",web.userdark.js.zkex.grid.css,we + b.userdark.js.zkex.inp.css,web.userdark.js.zkex.layout.css,web.userda + rk.js.zkex.menu.css,web.userdark.js.zkmax.big.css,web.userdark.js.zkm + ax.inp.css,web.userdark.js.zkmax.inp.ext,web.userdark.js.zkmax.layout + .css,web.userdark.js.zkmax.nav.css,web.userdark.js.zkmax.wgt.css,web. + userdark.js.zul.box.css,web.userdark.js.zul.db.css,web.userdark.js.zu + l.grid.css,web.userdark.js.zul.inp.css,web.userdark.js.zul.layout.css + ,web.userdark.js.zul.menu.css,web.userdark.js.zul.mesh.css,web.userda + rk.js.zul.sel.css,web.userdark.js.zul.tab.css,web.userdark.js.zul.wgt + .css,web.userdark.js.zul.wnd.css,web.userdark.zkex.img.colorbox,web.u + serdark.zkmax.css,web.userdark.zkmax.img.big,web.userdark.zkmax.img.i + np,web.userdark.zkmax.img.tablet,web.userdark.zkmax.img.tablet.big,we + b.userdark.zkmax.img.tablet.colorbox,web.userdark.zkmax.img.tablet.gr + id,web.userdark.zkmax.img.tablet.inp,web.userdark.zkmax.img.tablet.la + yout,web.userdark.zkmax.img.tablet.menu,web.userdark.zkmax.img.tablet + .paging,web.userdark.zkmax.img.tablet.popup,web.userdark.zkmax.img.ta + blet.tab,web.userdark.zkmax.img.tablet.tree,web.userdark.zkmax.img.ta + blet.wnd,web.userdark.zul.css,web.userdark.zul.img,web.userdark.zul.i + mg.button,web.userdark.zul.img.colorbox,web.userdark.zul.img.common,w + eb.userdark.zul.img.errbox,web.userdark.zul.img.grid,web.userdark.zul + .img.input,web.userdark.zul.img.layout,web.userdark.zul.img.menu,web. + userdark.zul.img.misc,web.userdark.zul.img.msgbox,web.userdark.zul.im + g.paging,web.userdark.zul.img.popup,web.userdark.zul.img.slider,web.u + serdark.zul.img.splt,web.userdark.zul.img.tab,web.userdark.zul.img.tr + ee,web.userdark.zul.img.wnd +Import-Package: org.zkoss.zk.ui;resolution:=optional,org.zkoss.zk.ui.u + til;resolution:=optional,org.zkoss.zul.theme;resolution:=optional +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.5))" \ No newline at end of file diff --git a/server/hu.user.theme.userdark/src/archive/web/js/zul/grid/less/grid.less b/server/hu.user.theme.userdark/src/archive/web/js/zul/grid/less/grid.less index 46c14c4a..ea546944 100644 --- a/server/hu.user.theme.userdark/src/archive/web/js/zul/grid/less/grid.less +++ b/server/hu.user.theme.userdark/src/archive/web/js/zul/grid/less/grid.less @@ -214,13 +214,15 @@ body:not(.gecko) { .z-footer-content { font-family: @baseContentFontFamily; font-size: @fontSizeMedium; + font-weight: normal; color: @textColorGrayLight; padding: 4px 5px; line-height: @baseButtonHeight; overflow: hidden; } .z-column-content { - font-weight: bold; +//@@@ + //font-weight: bold; padding: 4px 5px 3px; } .z-group-content, @@ -229,6 +231,15 @@ body:not(.gecko) { font-weight: bold; } } + +.z-grid-body { + background: @textColorDark; +} + +.z-grid-emptybody table { + height: 100%; +} + //Cell Content .z-grid-body .z-cell { font-family: @baseContentFontFamily; @@ -304,3 +315,8 @@ body:not(.gecko) { background: @meshGroupFooterBackgroundColorIE8; } } + +.z-paging-input { + color: @baseTextColor; + background: @textColorDark; +} \ No newline at end of file diff --git a/server/hu.user.theme.userdark/src/archive/web/js/zul/inp/less/combo.less b/server/hu.user.theme.userdark/src/archive/web/js/zul/inp/less/combo.less index 17464284..74c2312b 100644 --- a/server/hu.user.theme.userdark/src/archive/web/js/zul/inp/less/combo.less +++ b/server/hu.user.theme.userdark/src/archive/web/js/zul/inp/less/combo.less @@ -248,7 +248,10 @@ display: block; padding: 3px 2px; position: relative; - text-shadow: 0 1px #FFFFFF; +//@@@ +// text-shadow: 0 1px #FFFFFF; +//@@@ + color: @baseTextColor; min-height: 20px; //ZK-2783: give default height to empty item } .z-comboitem-inner, @@ -260,7 +263,6 @@ .z-comboitem a:visited { font-size: @fontSizeMedium; font-weight: normal; - color: @baseTextColor; text-decoration: none; } .z-comboitem:hover { @@ -318,7 +320,9 @@ border: 0; padding: 0; margin: 0; - background: transparent none repeat 0 0; +//@@@ +// background: transparent none repeat 0 0; + background: @popupBackgroundColor; position: relative; list-style-image: none; list-style-position: outside; diff --git a/server/hu.user.theme.userdark/src/archive/web/js/zul/menu/less/menu.less b/server/hu.user.theme.userdark/src/archive/web/js/zul/menu/less/menu.less index dee46815..00bbec2a 100644 --- a/server/hu.user.theme.userdark/src/archive/web/js/zul/menu/less/menu.less +++ b/server/hu.user.theme.userdark/src/archive/web/js/zul/menu/less/menu.less @@ -90,7 +90,8 @@ font-weight: normal; display: inline-block; line-height: @baseIconHeight; - text-shadow: 0 1px #FFFFFF; +//@@@ +/* text-shadow: 0 1px #FFFFFF;*/ // align for img + text img ~ & { @@ -105,7 +106,7 @@ margin-right: 3px; } &-content { - color: @textColorGray; + color: @baseTextColor; display: block; border: 1px solid transparent; .borderRadius(@baseBorderRadius); diff --git a/server/hu.user.theme.userdark/src/archive/web/js/zul/sel/less/listbox.less b/server/hu.user.theme.userdark/src/archive/web/js/zul/sel/less/listbox.less index 04950c2c..03aac01d 100644 --- a/server/hu.user.theme.userdark/src/archive/web/js/zul/sel/less/listbox.less +++ b/server/hu.user.theme.userdark/src/archive/web/js/zul/sel/less/listbox.less @@ -36,8 +36,12 @@ &-body { position: relative; overflow: hidden; + background: @meshStripeBackgroundColor; .resetTable(); } + &-emptybody { + height: 100%; + } &-emptybody td { .fontStyle(@baseContentFontFamily, @fontSizeMedium, normal, @disabledColor); font-style: italic; @@ -354,7 +358,8 @@ body:not(.gecko) { overflow: hidden; } .z-listheader-content { - font-weight: bold; +//@@@ +//font-weight: bold; padding: 4px 5px 3px; position: relative; } diff --git a/server/hu.user.theme.userdark/src/archive/web/js/zul/tab/less/tabbox.less b/server/hu.user.theme.userdark/src/archive/web/js/zul/tab/less/tabbox.less index be8c21dd..4cbf8906 100644 --- a/server/hu.user.theme.userdark/src/archive/web/js/zul/tab/less/tabbox.less +++ b/server/hu.user.theme.userdark/src/archive/web/js/zul/tab/less/tabbox.less @@ -41,7 +41,8 @@ } .z-tab-text { - font-weight: bold; +//@@@ +// font-weight: bold; cursor: default; white-space: nowrap; } @@ -332,7 +333,8 @@ width: 100%; border-collapse: separate; border-spacing: 0; - border-bottom: 1px solid @baseBorderColor; +//@@@ +// border-bottom: 1px solid @baseBorderColor; margin: 0; padding-left: 0; padding-top: 0; @@ -359,7 +361,8 @@ position: relative; cursor: pointer; float: left; - +//@@@ + background: @textColorDark; &-content { display: block; @@ -419,12 +422,15 @@ } &-selected { .resetGradient(); - background: @tabSelectedBackgroundColor; +//@@@ + +// background: @tabSelectedBackgroundColor; .boxShadow('0 1px 0 #FFFFFF'); - &:hover { - .resetGradient(); - background: @tabSelectedBackgroundColor; - } +//@@@ +// &:hover { +// .resetGradient(); +// background: @tabSelectedBackgroundColor; +// } .z-tab-button { .opacity(1); } diff --git a/server/hu.user.theme.userdark/src/archive/web/js/zul/wgt/less/button.less b/server/hu.user.theme.userdark/src/archive/web/js/zul/wgt/less/button.less index 450805c3..13304add 100644 --- a/server/hu.user.theme.userdark/src/archive/web/js/zul/wgt/less/button.less +++ b/server/hu.user.theme.userdark/src/archive/web/js/zul/wgt/less/button.less @@ -1,14 +1,19 @@ @import "~./zul/less/_header.less"; .z-button { + //@@@ .fontStyle(@baseTitleFontFamily, @fontSizeMedium, normal, @baseTextColor); min-height: @baseButtonHeight; - border: 1px solid @buttonBorderColor; + //@@@ + border: 1px solid transparent; .borderRadius(@baseBorderRadius); - padding: 3px 12px; - line-height: @baseLineHeight; + //@@@ + padding: 3px 6px 3px; + //@@@ + //line-height: @baseLineHeight; .verGradient(@buttonGradientStart, @buttonGradientEnd); - text-shadow: 0 1px #FFFFFF; + //@@@ + //text-shadow: 0 1px #FFFFFF; cursor: pointer; white-space: nowrap; diff --git a/server/hu.user.theme.userdark/src/archive/web/js/zul/wgt/less/toolbar.less b/server/hu.user.theme.userdark/src/archive/web/js/zul/wgt/less/toolbar.less index b574a1be..468449f7 100644 --- a/server/hu.user.theme.userdark/src/archive/web/js/zul/wgt/less/toolbar.less +++ b/server/hu.user.theme.userdark/src/archive/web/js/zul/wgt/less/toolbar.less @@ -16,7 +16,8 @@ .z-toolbar-tabs .z-toolbar-content, .z-toolbar-tabs .z-toolbar-content span, .z-toolbar-content, .z-toolbar-content span { - font-size: @fontSizeSmall; + font-size: @fontSizeMedium; +// font-size: @fontSizeSmall; } .z-toolbar-panel .z-toolbar-content, .z-toolbar-panel .z-toolbar-content span { @@ -59,9 +60,11 @@ display: inline-block; border: 1px solid transparent; .borderRadius(@borderRadiusSmall); - margin: 0 2px; - padding: 1px 0; - line-height: @baseLineHeight; +// @@@ +// margin: 0 2px; + padding: 3px 6px 3px; +// @@@ +// line-height: @baseLineHeight; position: relative; cursor: pointer; @@ -90,12 +93,18 @@ .verGradient(@checkedGradientStart, @checkedGradientEnd); } .z-toolbarbutton-content { - .fontStyle(@baseTitleFontFamily, @fontSizeSmall, normal, @baseTextColor); - padding: 2px; - line-height: @baseLineHeight + 6; // 20px for IE to v-align center + //@@@ + .fontStyle(@baseTitleFontFamily, @fontSizeMedium, normal, @baseTextColor); + //@@@ + //padding: 2px; + //@@@ + //line-height: @baseLineHeight + 6; // 20px for IE to v-align center + //line-height: @baseButtonHeight; + vertical-align: middle; position: relative; - text-shadow: 0 1px #FFFFFF; +//@@@ +/* text-shadow: 0 1px #FFFFFF;*/ white-space:nowrap; } diff --git a/server/hu.user.theme.userdark/src/archive/web/js/zul/wnd/less/window.less b/server/hu.user.theme.userdark/src/archive/web/js/zul/wnd/less/window.less index 23cdead4..3b34924b 100644 --- a/server/hu.user.theme.userdark/src/archive/web/js/zul/wnd/less/window.less +++ b/server/hu.user.theme.userdark/src/archive/web/js/zul/wnd/less/window.less @@ -8,7 +8,8 @@ .z-window { // ZK-2115: the style should apply [overflow: hidden] .defaultOverflowZoom(); - border: 1px solid @windowBorderColor; + //@@@ + //border: 1px solid @windowBorderColor; .borderRadius(@baseBorderRadius); padding: @windowFramePadding; background: @windowBackgroundColor; diff --git a/server/hu.user.theme.userdark/src/archive/web/zkmax/less/tablet/_borderlayout.less b/server/hu.user.theme.userdark/src/archive/web/zkmax/less/tablet/_borderlayout.less index 98c2c89f..b81675ea 100644 --- a/server/hu.user.theme.userdark/src/archive/web/zkmax/less/tablet/_borderlayout.less +++ b/server/hu.user.theme.userdark/src/archive/web/zkmax/less/tablet/_borderlayout.less @@ -9,6 +9,8 @@ .z-center-header, .z-east-header { font-size: @baseFontSize; + color: @textColorGray; + border-bottom: 0; line-height: 20px; } .z-east-splitter, diff --git a/server/hu.user.theme.userdark/src/archive/web/zul/less/_zkvariables.less b/server/hu.user.theme.userdark/src/archive/web/zul/less/_zkvariables.less index 03ecfa9d..36ec027b 100644 --- a/server/hu.user.theme.userdark/src/archive/web/zul/less/_zkvariables.less +++ b/server/hu.user.theme.userdark/src/archive/web/zul/less/_zkvariables.less @@ -2,7 +2,7 @@ // ------------------------------------- // Typography // ------------------------------------- -@baseFontSize: 14px; +@baseFontSize: 12px; @baseTitleFontFamily: Verdana; @baseContentFontFamily: Verdana; @baseLineHeight: 14px; @@ -40,20 +40,24 @@ // Component Basic Coloring for userdark (all gray colors are changed to blue) // ------------------------------------- // Font color -@baseTextColor: #e3e3e3; -@textColorGray: #e3e3e3; -@textColorGrayDark: #e3e3e3; -@textColorGrayLight: #e3e3e3; -@textColorBlue: #e3e3e3; -@textColorGreen: #e3e3e3; -@textColorOrange: #e3e3e3; +@baseTextColor: #e3e3e3; +@textColorGray: #808080; +//@@@ +@textColorDark: #212121; +@textColorGrayDark: #e3e3e3; +@textColorGrayLight: #e3e3e3; +@textColorBlue: #e3e3e3; +@textColorGreen: #e3e3e3; +@textColorOrange: #e3e3e3; // Border color @baseBorderColor: #1d1d1d; // Background color -@baseBackgroundColor: #303030; -//@baseBackgroundColor: red; +//#2c3135;//1c1f22 //333333 //#0d1117 +//@@@ +@baseBackgroundColor: #333333; +//2c3135 dracula // Gradient background @baseGradientStart: @baseBackgroundColor; @@ -70,30 +74,33 @@ // Button (used for button, combobutton) // ------------------------------------- @buttonBorderColor: @baseBorderColor; -@buttonGradientStart: #1c1c1c; -@buttonGradientEnd: #1c1c1c; +//@@@ button color +@buttonGradientStart: @baseBackgroundColor; +@buttonGradientEnd: @baseBackgroundColor; // ------------------------------------- // Input (used for textbox, intbox, spinner, ...) // ------------------------------------- @inputBorderColor: @baseBorderColor; -@inputBackgroundColor: #ffffff; +@inputBackgroundColor: @textColorDark; // ------------------------------------- // Mesh Table (used for grid, listbox, tree, biglistbox) // ------------------------------------- @meshTitleBorderColor: @baseBorderColor; @meshContentBorderColor: @baseBorderColor; -@meshBackgroundColor: transparent; -@meshStripeBackgroundColor: #1d1d1d; +//@@@ list, grid bg +@meshBackgroundColor: @textColorDark; +//@@@ odd color +@meshStripeBackgroundColor: @textColorDark; @meshFootBackgroundColor: #FAFAFA; //grid fejlec @meshTitleHoverStart: #000000; @meshTitleHoverEnd: #000000; @meshContentHoverStart: transparent; @meshContentHoverEnd: transparent; -@meshContentFocusStart: #82B1C7; -@meshContentFocusEnd: #82B1C7; +@meshContentFocusStart: #315463; +@meshContentFocusEnd: #315463; @meshAutoPagingRowHeight: 32px; // ------------------------------------- @@ -117,8 +124,8 @@ @hoverColor: #FFFFFF; @hoverBorderColor: #131313; @hoverBackgroundColor: transparent; -@hoverGradientStart: #000000; -@hoverGradientEnd: #000000; +@hoverGradientStart: #315463; +@hoverGradientEnd: #315463; // Disabled @disabledColor: #AAAAAA; @@ -143,8 +150,12 @@ @selectedHoverColor: #FFFFFF; @selectedHoverBorderColor: @baseBorderColor; @selectedHoverBackgroundColor: darken(@selectedGradientEnd, 3%); -@selectedHoverGradientStart: #548DA7; -@selectedHoverGradientEnd: #548DA7; +//@selectedHoverGradientStart: #548DA7; +//@selectedHoverGradientEnd: #548DA7; +//@@@ +@selectedHoverGradientStart: #315463; +//@@@ +@selectedHoverGradientEnd: #315463; // Selected Focus (used on listbox, tree, comboitem) @selectedFocusColor: @selectedColor; @@ -154,11 +165,15 @@ @selectedFocusGradientEnd: #315463; // Checked (used on menuitem, listbox, tree, toolbarbutton) -@checkedColor: #000000; +@checkedColor: @baseTextColor; @checkedBorderColor: #8E8F8F; -@checkedBackgroundColor: #000000; -@checkedGradientStart: #000000; -@checkedGradientEnd: #000000; +@checkedBackgroundColor: transparent; + +//@@@ checked toolbox button +//@checkedGradientStart: @baseTextColor; +@checkedGradientStart: transparent; +//@checkedGradientEnd: @baseTextColor; +@checkedGradientEnd: transparent; // Collapsed (used on Borderlayout) @collapsedBorderColor: @baseBorderColor; @@ -200,16 +215,22 @@ @calendarSelectedColor: #FFFFFF; @calendarSelectedHoverColor: #FFFFFF; @weekendColor: @textColorOrange; -@weekendBackgroundColor: #F2F2F2; +@weekendBackgroundColor: @baseBorderColor; @weekColor: @textColorGrayLight; @weekofyearColor: #FFFFFF; @weekofyearBackgroundColor: #636363; // popup @popupBorderColor: @baseBorderColor; -@popupBackgroundColor: @baseBackgroundColor; -@popupGradientStart: @baseBackgroundColor; -@popupGradientEnd: @baseBackgroundColor; +//@@@ +//@popupBackgroundColor: @baseBackgroundColor; +@popupBackgroundColor: @textColorDark; +//@@@ +//@popupGradientStart: @baseBackgroundColor; +@popupGradientStart: @textColorDark; +//@@@ +//@popupGradientEnd: @baseBackgroundColor; +@popupGradientEnd: @textColorDark; // group (group, listgroup) @groupGradientStart: #E7F6FD; @@ -266,8 +287,10 @@ @menuPopupBackground: @baseBackgroundColor; @menuSeparatorBorderColor: #838383; @menuSeparatorBackgroundColor: #B8B8B8; -@menuPopupSeparatorBorder: #D9F0FC; -@menuPopupSeparatorBackground: #A2C0CE; +//@@@ +@menuPopupSeparatorBorder: transparent; +//@@@ +@menuPopupSeparatorBackground: transparent; // navbar @navImageSize: 16px; diff --git a/server/hu.user.theme.userdark/src/archive/web/zul/less/norm.less b/server/hu.user.theme.userdark/src/archive/web/zul/less/norm.less index 0678fa1e..6fedc4f2 100644 --- a/server/hu.user.theme.userdark/src/archive/web/zul/less/norm.less +++ b/server/hu.user.theme.userdark/src/archive/web/zul/less/norm.less @@ -57,12 +57,18 @@ legend { } } - +//@@@ +// +//body { +// margin: 0; +// padding: 0 5px; +//} +// body { margin: 0; padding: 0 5px; + background: @baseBackgroundColor; } - //mobile .mobile * { @@ -184,7 +190,8 @@ input[type="checkbox"] { //label .z-label { line-height: normal; - color: green; +//@@@ + color: @baseTextColor; } .z-label, .z-radio-content, @@ -193,6 +200,8 @@ input[type="checkbox"] { font-family: @baseContentFontFamily; font-size: @fontSizeMedium; font-weight: normal; +//@@@ + color: @baseTextColor; } .z-temp, @@ -551,6 +560,7 @@ span.z-upload input { .z-selectbox { font-family: @baseContentFontFamily; font-size: @fontSizeMedium; + background-color: @textColorDark; } //scrollbar @@ -717,4 +727,4 @@ span.z-upload input { .z-macro { display: inline-block; min-width: 1px; -} \ No newline at end of file +} diff --git a/server/user.commons.zk/pom.xml b/server/user.commons.zk/pom.xml index e6253a68..42bffbdc 100644 --- a/server/user.commons.zk/pom.xml +++ b/server/user.commons.zk/pom.xml @@ -63,7 +63,6 @@ - org.apache.maven.plugins maven-resources-plugin diff --git a/server/user.mediacube.gui/WEB-INF/zk-dev.xml b/server/user.mediacube.gui/WEB-INF/zk-dev.xml new file mode 100644 index 00000000..ba155262 --- /dev/null +++ b/server/user.mediacube.gui/WEB-INF/zk-dev.xml @@ -0,0 +1,42 @@ + + + + + + + false + + + + true + + + org.zkoss.zk.ui.versionInfo.enabled + true + + + + org.zkoss.zk.ZUML.cache + false + + + org.zkoss.zk.WPD.cache + false + + + org.zkoss.zk.WCS.cache + false + + + org.zkoss.web.classWebResource.cache + false + + + org.zkoss.util.label.cache + false + + \ No newline at end of file diff --git a/server/user.mediacube.gui/WEB-INF/zk.xml b/server/user.mediacube.gui/WEB-INF/zk.xml index 14c7bb4d..2891b217 100644 --- a/server/user.mediacube.gui/WEB-INF/zk.xml +++ b/server/user.mediacube.gui/WEB-INF/zk.xml @@ -7,6 +7,10 @@ https://www.zkoss.org/wiki/ZK_Configuration_Reference/zk.xml + + org.zkoss.zk.config.path + /WEB-INF/zk-dev.xml + - - -
- - - - - - - -
- - -
-
- - - +
+ + +
- +
diff --git a/server/user.mediacube.gui/js/toast.js b/server/user.mediacube.gui/js/toast.js deleted file mode 100644 index 3b54a6b2..00000000 --- a/server/user.mediacube.gui/js/toast.js +++ /dev/null @@ -1,113 +0,0 @@ -'use strict'; - -function Toast(options) { - - if (!options.message) { - throw new Error('Toast.js - You need to set a message to display'); - return; - } - - this.options = options; - this.options.type = options.type || 'default'; - - this.toastContainerEl = document.querySelector('.toastjs-container'); - this.toastEl = document.querySelector('.toastjs'); - - this._init(); -} - -Toast.prototype._createElements = function () { - var _this = this; - - return new Promise(function (resolve, reject) { - - _this.toastContainerEl = document.createElement('div'); - _this.toastContainerEl.classList.add('toastjs-container'); - _this.toastContainerEl.setAttribute('role', 'alert'); - _this.toastContainerEl.setAttribute('aria-hidden', true); - - _this.toastEl = document.createElement('div'); - _this.toastEl.classList.add('toastjs'); - - _this.toastContainerEl.appendChild(_this.toastEl); - document.body.appendChild(_this.toastContainerEl); - - setTimeout(function () { - return resolve(); - }, 500); - }); -}; - -Toast.prototype._addEventListeners = function () { - var _this2 = this; - - document.querySelector('.toastjs-btn--close').addEventListener('click', function () { - _this2._close(); - }); - - if (this.options.customButtons) { - var customButtonsElArray = Array.prototype.slice.call(document.querySelectorAll('.toastjs-btn--custom')); - customButtonsElArray.map(function (el, index) { - el.addEventListener('click', function (event) { - return _this2.options.customButtons[index].onClick(event); - }); - }); - } -}; - -Toast.prototype._close = function () { - var _this3 = this; - - return new Promise(function (resolve, reject) { - _this3.toastContainerEl.setAttribute('aria-hidden', true); - setTimeout(function () { - - _this3.toastEl.innerHTML = ''; - _this3.toastEl.classList.remove('default', 'success', 'warning', 'danger'); - - if (_this3.focusedElBeforeOpen) { - _this3.focusedElBeforeOpen.focus(); - } - - resolve(); - }, 1000); - }); -}; - -Toast.prototype._open = function () { - - this.toastEl.classList.add(this.options.type); - this.toastContainerEl.setAttribute('aria-hidden', false); - - var customButtons = ''; - if (this.options.customButtons) { - customButtons = this.options.customButtons.map(function (customButton, index) { - return ''; - }); - customButtons = customButtons.join(''); - } - - this.toastEl.innerHTML = '\n

' + this.options.message + '

\n \n ' + customButtons + '\n '; - - this.focusedElBeforeOpen = document.activeElement; - document.querySelector('.toastjs-btn--close').focus(); -}; - -Toast.prototype._init = function () { - var _this4 = this; - - Promise.resolve().then(function () { - if (_this4.toastContainerEl) { - return Promise.resolve(); - } - return _this4._createElements(); - }).then(function () { - if (_this4.toastContainerEl.getAttribute('aria-hidden') == 'false') { - return _this4._close(); - } - return Promise.resolve(); - }).then(function () { - _this4._open(); - _this4._addEventListeners(); - }); -}; \ No newline at end of file diff --git a/server/user.mediacube.gui/js/toast.min.js b/server/user.mediacube.gui/js/toast.min.js deleted file mode 100644 index 1a0413ca..00000000 --- a/server/user.mediacube.gui/js/toast.min.js +++ /dev/null @@ -1 +0,0 @@ -"use strict";function Toast(t){if(!t.message)throw new Error("Toast.js - You need to set a message to display");this.options=t,this.options.type=t.type||"default",this.toastContainerEl=document.querySelector(".toastjs-container"),this.toastEl=document.querySelector(".toastjs"),this._init()}Toast.prototype._createElements=function(){var t=this;return new Promise(function(e,o){t.toastContainerEl=document.createElement("div"),t.toastContainerEl.classList.add("toastjs-container"),t.toastContainerEl.setAttribute("role","alert"),t.toastContainerEl.setAttribute("aria-hidden",!0),t.toastEl=document.createElement("div"),t.toastEl.classList.add("toastjs"),t.toastContainerEl.appendChild(t.toastEl),document.body.appendChild(t.toastContainerEl),setTimeout(function(){return e()},500)})},Toast.prototype._addEventListeners=function(){var t=this;if(document.querySelector(".toastjs-btn--close").addEventListener("click",function(){t._close()}),this.options.customButtons){var e=Array.prototype.slice.call(document.querySelectorAll(".toastjs-btn--custom"));e.map(function(e,o){e.addEventListener("click",function(e){return t.options.customButtons[o].onClick(e)})})}},Toast.prototype._close=function(){var t=this;return new Promise(function(e,o){t.toastContainerEl.setAttribute("aria-hidden",!0),setTimeout(function(){t.toastEl.innerHTML="",t.toastEl.classList.remove("default","success","warning","danger"),t.focusedElBeforeOpen&&t.focusedElBeforeOpen.focus(),e()},1e3)})},Toast.prototype._open=function(){this.toastEl.classList.add(this.options.type),this.toastContainerEl.setAttribute("aria-hidden",!1);var t="";this.options.customButtons&&(t=this.options.customButtons.map(function(t,e){return'"}),t=t.join("")),this.toastEl.innerHTML="\n

"+this.options.message+'

\n \n '+t+"\n ",this.focusedElBeforeOpen=document.activeElement,document.querySelector(".toastjs-btn--close").focus()},Toast.prototype._init=function(){var t=this;Promise.resolve().then(function(){return t.toastContainerEl?Promise.resolve():t._createElements()}).then(function(){return"false"==t.toastContainerEl.getAttribute("aria-hidden")?t._close():Promise.resolve()}).then(function(){t._open(),t._addEventListeners()})}; \ No newline at end of file diff --git a/server/user.mediacube.gui/pages/login.zul b/server/user.mediacube.gui/pages/login.zul index 05955a81..f67a3931 100644 --- a/server/user.mediacube.gui/pages/login.zul +++ b/server/user.mediacube.gui/pages/login.zul @@ -8,7 +8,7 @@ -webkit-box-shadow: 0 0 0 30px yellow inset !important; } - - + - - -