Reoved not used styles

diff --git a/sly-crm-app/src/main/resources/application-dev.yaml b/sly-crm-app/src/main/resources/application-dev.yaml
index 1b0d77691ee5e88e0da92554a56b0728f5d5cedf..8345dc98d5c0fd53b4ec0be234cab57740021503 100644 (file)
--- 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 332dd06405f0f6618be7fab6f82970c942adf5cb..b42202aab6d5dc67ec892d017e18899b9d5b7a9d 100644 (file)
--- 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 32633826de776338c852836883cb3528db6c9cb9..e899edf29725239c786ab5f89ae6cf60618c97da 100644 (file)
--- 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 565d4f5467aa86bf3216503e3d8a32de0baafaab..9fa18b91909da7c5e6e708e2931b89375ace8dc6 100644 (file)
--- 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 5ca445d5a4a94baaf9896cb38502b38f06a024cf..571878861b0822cf4efd964ead938ea4bc51ad62 100644 (file)
--- 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 8f577ef9b10fa00823ba2199642e2cb1801abc1a..3dab7e9c4c06a5f4eee6c9a02a363fdc27336e78 100644 (file)
--- 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 f4e3464cb02ef57bd5f0e6cd7cd9938b6204ec0e..6183e54f9cb928867b6402d634fa9951485be9ff 100644 (file)
--- 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 47c48acfff93cd749f6bfc74b872eb869120ba7a..9ce151b1b0a1b7e240e66ac651eb92e4c88e3a81 100644 (file)
--- 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 b2ad8acf5be7928dc32e824ce84e83740b4e88ae..16e212217bde4f315f419847ee17edc82365e77f 100644 (file)
--- 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 1dd314bf2858c72e67d98dbf8ee5aa8df3beb4cc..3addacf778a142a5bb5a6c5e25d09ba739cb2d38 100644 (file)
--- 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 7c54a3e28111ff68c01a5b8cfc727a42c1b84eeb..9a98246fcd04eba21977d77eb2410f1baadba5f4 100644 (file)
--- 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 012746ec3186baef2c23bb4dc8976acf431f751d..08ccc30ede737504a51c135a4a1d23e5f244e261 100644 (file)
--- 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 7e4af83208c5add531028cf7a95b02c6a3c40ccb..fd9f02e14e5634d88588b19ec4905f8a4665d524 100644 (file)
--- 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 d067e5a260c3de6e873fecfbf78e2d7dc6aa4444..5528cf28ae78c158760fe31354e25eeb3ab5fb2a 100644 (file)
--- 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>