From 41f81ee3b33d478435965891f9e5280b42158289 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= <vasary@elgekko.net>
Date: Fri, 1 Mar 2024 23:44:25 +0100
Subject: [PATCH] Reoved not used styles

---
 .../src/main/resources/application-dev.yaml   | 10 +++----
 .../src/main/resources/metainfo/zk/zk.xml     | 26 +++++++++----------
 .../src/main/resources/web/associates.zul     |  2 +-
 .../resources/web/editor/project-editor.zul   |  2 +-
 .../resources/web/import-invoices-approve.zul |  2 +-
 .../resources/web/import-invoices-assign.zul  |  2 +-
 .../web/import-invoices-suspended.zul         |  2 +-
 sly-crm-ui/src/main/resources/web/index.zul   | 14 +++++-----
 .../main/resources/web/invoice-payment.zul    |  2 +-
 .../src/main/resources/web/invoices.zul       |  2 +-
 .../src/main/resources/web/partners.zul       |  7 ++---
 .../src/main/resources/web/projects.zul       |  2 +-
 .../main/resources/web/service-records.zul    |  2 +-
 .../src/main/resources/web/settings.zul       |  2 +-
 14 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/sly-crm-app/src/main/resources/application-dev.yaml b/sly-crm-app/src/main/resources/application-dev.yaml
index 1b0d776..8345dc9 100644
--- a/sly-crm-app/src/main/resources/application-dev.yaml
+++ b/sly-crm-app/src/main/resources/application-dev.yaml
@@ -20,12 +20,12 @@ spring:
       enabled: always
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    #    url: jdbc:db2://localhost:50000/slycrm
-    #    username: db2admin
-    #    password: password
-    url: jdbc:db2://db2.in.useribm.hu:50000/slycrm
+    url: jdbc:db2://localhost:50000/slycrm
     username: db2admin
-    password: Passw@rd01
+    password: password
+#    url: jdbc:db2://db2.in.useribm.hu:50000/slycrm
+#    username: db2admin
+#    password: Passw@rd01
 camunda.bpm:
   generic-properties.properties:
     telemetry-reporter-activate: false
diff --git a/sly-crm-ui/src/main/resources/metainfo/zk/zk.xml b/sly-crm-ui/src/main/resources/metainfo/zk/zk.xml
index 332dd06..b42202a 100644
--- a/sly-crm-ui/src/main/resources/metainfo/zk/zk.xml
+++ b/sly-crm-ui/src/main/resources/metainfo/zk/zk.xml
@@ -6,20 +6,20 @@
         <timeout-uri>/timeout</timeout-uri>
     </session-config>
     <client-config>
-        <data-handler>
-            <name>mask</name><!-- the attribute name, i.e. data-mask -->
-            <script src="http://igorescobar.github.io/jQuery-Mask-Plugin/js/jquery.mask.min.js"/>
-            <script>
-                function (wgt, dataValue) {
-                jq(wgt.$n()).mask(dataValue);
+        <!--        <data-handler>-->
+        <!--            <name>mask</name>&lt;!&ndash; the attribute name, i.e. data-mask &ndash;&gt;-->
+        <!--            <script src="http://igorescobar.github.io/jQuery-Mask-Plugin/js/jquery.mask.min.js"/>-->
+        <!--            <script>-->
+        <!--                function (wgt, dataValue) {-->
+        <!--                jq(wgt.$n()).mask(dataValue);-->
 
-                // unformat after onChange event.
-                wgt.listen({onChange: function (event) {
-                event.data.value = jq(this.$n()).cleanVal();
-                }});
-                }
-            </script>
-        </data-handler>
+        <!--                // unformat after onChange event.-->
+        <!--                wgt.listen({onChange: function (event) {-->
+        <!--                event.data.value = jq(this.$n()).cleanVal();-->
+        <!--                }});-->
+        <!--                }-->
+        <!--            </script>-->
+        <!--        </data-handler>-->
         <error-reload>
             <device-type>ajax</device-type>
             <error-code>403</error-code>
diff --git a/sly-crm-ui/src/main/resources/web/associates.zul b/sly-crm-ui/src/main/resources/web/associates.zul
index 3263382..e899edf 100644
--- a/sly-crm-ui/src/main/resources/web/associates.zul
+++ b/sly-crm-ui/src/main/resources/web/associates.zul
@@ -6,7 +6,7 @@
     <!--    </style>-->
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.AssociatesViewModel')">
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Munkatársak" sclass="list-title"/>
                 <toolbar align="end">
                     <toolbarbutton label="Új" iconSclass="z-icon-plus"
diff --git a/sly-crm-ui/src/main/resources/web/editor/project-editor.zul b/sly-crm-ui/src/main/resources/web/editor/project-editor.zul
index 565d4f5..9fa18b9 100644
--- a/sly-crm-ui/src/main/resources/web/editor/project-editor.zul
+++ b/sly-crm-ui/src/main/resources/web/editor/project-editor.zul
@@ -3,7 +3,7 @@
     <window id="projectEditor" hflex="true" vflex="true"
             viewModel="@id('vm') @init('hu.user.lis.ui.editor.ProjectEditorModel')">
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Projekt szerkesztés" sclass="list-title"/>
             </hbox>
         </caption>
diff --git a/sly-crm-ui/src/main/resources/web/import-invoices-approve.zul b/sly-crm-ui/src/main/resources/web/import-invoices-approve.zul
index 5ca445d..5718788 100644
--- a/sly-crm-ui/src/main/resources/web/import-invoices-approve.zul
+++ b/sly-crm-ui/src/main/resources/web/import-invoices-approve.zul
@@ -2,7 +2,7 @@
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.ApproveInvoicesViewModel')">
         <!--        <timer id="timer" delay="1000" repeats="true" onTimer="@command('uiTick')"/>-->
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Számla import - Jóváhagyás" sclass="list-title"/>
                 <toolbar align="end">
                     <toolbarbutton label="Frissít" iconSclass="z-icon-refresh" onClick="@command('onRefresh')"/>
diff --git a/sly-crm-ui/src/main/resources/web/import-invoices-assign.zul b/sly-crm-ui/src/main/resources/web/import-invoices-assign.zul
index 8f577ef..3dab7e9 100644
--- a/sly-crm-ui/src/main/resources/web/import-invoices-assign.zul
+++ b/sly-crm-ui/src/main/resources/web/import-invoices-assign.zul
@@ -2,7 +2,7 @@
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.AssignInvoicesViewModel')">
         <!--        <timer id="timer" delay="1000" repeats="true" onTimer="@command('uiTick')"/>-->
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Számla import - Csatolás" sclass="list-title"/>
                 <toolbar align="end">
                     <toolbarbutton label="Frissít" iconSclass="z-icon-refresh" onClick="@command('onRefresh')"/>
diff --git a/sly-crm-ui/src/main/resources/web/import-invoices-suspended.zul b/sly-crm-ui/src/main/resources/web/import-invoices-suspended.zul
index f4e3464..6183e54 100644
--- a/sly-crm-ui/src/main/resources/web/import-invoices-suspended.zul
+++ b/sly-crm-ui/src/main/resources/web/import-invoices-suspended.zul
@@ -2,7 +2,7 @@
 <zk>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.ImportInvoicesSuspendedViewModel')">
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Számla parkoló" sclass="list-title"/>
                 <toolbar align="end">
                     <toolbarbutton label="Iktatás" iconSclass="z-icon-forward" onClick="@command('onStartAssignment')"
diff --git a/sly-crm-ui/src/main/resources/web/index.zul b/sly-crm-ui/src/main/resources/web/index.zul
index 47c48ac..9ce151b 100644
--- a/sly-crm-ui/src/main/resources/web/index.zul
+++ b/sly-crm-ui/src/main/resources/web/index.zul
@@ -35,16 +35,16 @@
     </script>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.IndexViewModel')">
         <caption sclass="header">
-            <div style="display: block">
-                <div style="display: inline; float: left">
+            <hlayout>
+                <hbox pack="stretch" hflex="true" align="start">
                     <hlayout valign="middle">
                         <image width="24px" height="24px" src="~./static/images/logo.png"/>
                         <label value="@load(vm.buildInformation.name)"/>
                         <separator orient="vertical"/>
                         <label style="font-size: 0.8em" value="@load(vm.buildInformation.buildVersion)"/>
                     </hlayout>
-                </div>
-                <div style="display: inline; float: right">
+                </hbox>
+                <hbox pack="stretch" hflex="min" align="end">
                     <menubar autodrop="true" hflex="true">
                         <menu iconSclass="z-icon-user" label="@load(vm.currentProfile.associate.name)">
                             <menupopup>
@@ -62,11 +62,9 @@
                             </menupopup>
                         </menu>
                     </menubar>
-                </div>
-
-            </div>
+                </hbox>
+            </hlayout>
         </caption>
-
         <borderlayout>
             <north border="none" hflex="true">
                 <vlayout>
diff --git a/sly-crm-ui/src/main/resources/web/invoice-payment.zul b/sly-crm-ui/src/main/resources/web/invoice-payment.zul
index b2ad8ac..16e2122 100644
--- a/sly-crm-ui/src/main/resources/web/invoice-payment.zul
+++ b/sly-crm-ui/src/main/resources/web/invoice-payment.zul
@@ -10,7 +10,7 @@
     </style>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoicePaymentViewModel')">
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Számla kiegyenlítés" sclass="list-title"/>
             </hbox>
         </caption>
diff --git a/sly-crm-ui/src/main/resources/web/invoices.zul b/sly-crm-ui/src/main/resources/web/invoices.zul
index 1dd314b..3addacf 100644
--- a/sly-crm-ui/src/main/resources/web/invoices.zul
+++ b/sly-crm-ui/src/main/resources/web/invoices.zul
@@ -6,7 +6,7 @@
     </zscript>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoicesViewModel')">
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Számlák" sclass="list-title"/>
                 <toolbar align="end">
                     <toolbarbutton label="Szerkeszt" iconSclass="z-icon-edit" onClick="@command('onEdit')"
diff --git a/sly-crm-ui/src/main/resources/web/partners.zul b/sly-crm-ui/src/main/resources/web/partners.zul
index 7c54a3e..9a98246 100644
--- a/sly-crm-ui/src/main/resources/web/partners.zul
+++ b/sly-crm-ui/src/main/resources/web/partners.zul
@@ -1,7 +1,7 @@
 <zk>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.PartnersViewModel')">
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Partnerek" sclass="list-title"/>
                 <toolbar align="end">
                     <toolbarbutton label="Új" iconSclass="z-icon-plus"
@@ -60,10 +60,7 @@
                             </listitem>
                         </template>
                     </listbox>
-                    <!--                                <div style="width: 100%; height: 10px; background: red"></div>
-                    sclass="hboxRemoveWhiteStrips"
-                    -->
-                    <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+                    <hbox pack="stretch" hflex="true">
                         <toolbar align="end">
                             <toolbarbutton label="Export" iconSclass="z-icon-file-excel-o"
                                            onClick="@command('onExport')"/>
diff --git a/sly-crm-ui/src/main/resources/web/projects.zul b/sly-crm-ui/src/main/resources/web/projects.zul
index 012746e..08ccc30 100644
--- a/sly-crm-ui/src/main/resources/web/projects.zul
+++ b/sly-crm-ui/src/main/resources/web/projects.zul
@@ -1,7 +1,7 @@
 <zk>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.ProjectsViewModel')">
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Projektek" sclass="list-title"/>
                 <toolbar align="end">
                     <toolbarbutton label="Új" iconSclass="z-icon-plus"
diff --git a/sly-crm-ui/src/main/resources/web/service-records.zul b/sly-crm-ui/src/main/resources/web/service-records.zul
index 7e4af83..fd9f02e 100644
--- a/sly-crm-ui/src/main/resources/web/service-records.zul
+++ b/sly-crm-ui/src/main/resources/web/service-records.zul
@@ -2,7 +2,7 @@
 <zk>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.ServiceRecordsViewModel')">
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Munkalapok" sclass="list-title"/>
                 <toolbar align="end">
                     <toolbarbutton label="Új" iconSclass="z-icon-plus"
diff --git a/sly-crm-ui/src/main/resources/web/settings.zul b/sly-crm-ui/src/main/resources/web/settings.zul
index d067e5a..5528cf2 100644
--- a/sly-crm-ui/src/main/resources/web/settings.zul
+++ b/sly-crm-ui/src/main/resources/web/settings.zul
@@ -1,7 +1,7 @@
 <zk>
     <window id="centerPanel" vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.SettingsViewModel')">
         <caption>
-            <hbox pack="stretch" sclass="hboxRemoveWhiteStrips" hflex="true">
+            <hbox pack="stretch" hflex="true">
                 <label value="Beállítások" sclass="list-title"/>
             </hbox>
         </caption>
-- 
2.54.0