From 005a1847e843eab219bb33e10909ac07de371cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Tak=C3=A1cs?= <93127072+PeterTakacs300@users.noreply.github.com> Date: Fri, 9 Sep 2022 08:55:54 +0200 Subject: [PATCH] IDEMPIERE-5412 - Improve Dashboard Theme Look (#1471) * IDEMPIERE-5412 - Improve Dashboard Theme Look * IDEMPIERE-5412 - added message: NoDataAvailable * IDEMPIERE-5412 - update default theme version --- .../oracle/202209080926_IDEMPIERE-5412.sql | 18 ++++++++++++++++++ .../postgresql/202209080926_IDEMPIERE-5412.sql | 15 +++++++++++++++ .../WEB-INF/src/metainfo/zk/lang-addon.xml | 2 +- .../webui/apps/graph/WDocumentStatusPanel.java | 1 + .../theme/default/css/fragment/gadget.css.dsp | 13 ++++++------- .../theme/default/zul/calendar/calendar.css | 5 +++++ 6 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 migration/iD10/oracle/202209080926_IDEMPIERE-5412.sql create mode 100644 migration/iD10/postgresql/202209080926_IDEMPIERE-5412.sql diff --git a/migration/iD10/oracle/202209080926_IDEMPIERE-5412.sql b/migration/iD10/oracle/202209080926_IDEMPIERE-5412.sql new file mode 100644 index 0000000000..24d86cfd24 --- /dev/null +++ b/migration/iD10/oracle/202209080926_IDEMPIERE-5412.sql @@ -0,0 +1,18 @@ +-- IDEMPIERE-5412 +SELECT register_migration_script('202209080926_IDEMPIERE-5412.sql') FROM dual; + +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Sep 8, 2022, 9:26:00 AM CEST +UPDATE PA_DocumentStatus SET Name_PrintFont_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_TIMESTAMP('2022-09-08 09:26:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200001 +; + +-- Sep 8, 2022, 9:26:06 AM CEST +UPDATE PA_DocumentStatus SET Name_PrintFont_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_TIMESTAMP('2022-09-08 09:26:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200000 +; + +-- Sep 8, 2022, 4:19:56 PM CEST +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','No Data Available',0,0,'Y',TO_TIMESTAMP('2022-09-08 16:19:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2022-09-08 16:19:56','YYYY-MM-DD HH24:MI:SS'),100,200781,'NoDataAvailable','D','fe21c31e-2932-461c-a4bf-02eba321f509') +; + diff --git a/migration/iD10/postgresql/202209080926_IDEMPIERE-5412.sql b/migration/iD10/postgresql/202209080926_IDEMPIERE-5412.sql new file mode 100644 index 0000000000..e1f27b1960 --- /dev/null +++ b/migration/iD10/postgresql/202209080926_IDEMPIERE-5412.sql @@ -0,0 +1,15 @@ +-- IDEMPIERE-5412 +SELECT register_migration_script('202209080926_IDEMPIERE-5412.sql') FROM dual; + +-- Sep 8, 2022, 9:26:00 AM CEST +UPDATE PA_DocumentStatus SET Name_PrintFont_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_TIMESTAMP('2022-09-08 09:26:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200001 +; + +-- Sep 8, 2022, 9:26:06 AM CEST +UPDATE PA_DocumentStatus SET Name_PrintFont_ID=NULL, Number_PrintFont_ID=NULL,Updated=TO_TIMESTAMP('2022-09-08 09:26:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE PA_DocumentStatus_ID=200000 +; + +-- Sep 8, 2022, 4:19:56 PM CEST +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','No Data Available',0,0,'Y',TO_TIMESTAMP('2022-09-08 16:19:56','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2022-09-08 16:19:56','YYYY-MM-DD HH24:MI:SS'),100,200781,'NoDataAvailable','D','fe21c31e-2932-461c-a4bf-02eba321f509') +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml index 8810bf93e2..b93ab9b25c 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml +++ b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml @@ -57,6 +57,6 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI). - + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusPanel.java index 2d5bd74714..d2a041d799 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WDocumentStatusPanel.java @@ -92,6 +92,7 @@ public class WDocumentStatusPanel extends Panel { grid.setWidth("100%"); grid.makeNoStrip(); grid.setOddRowSclass("even"); + grid.setStyle("border: none;"); Rows rows = new Rows(); grid.appendChild(rows); diff --git a/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/gadget.css.dsp b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/gadget.css.dsp index 3eb95fd9b2..5b31c97a3e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/gadget.css.dsp +++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/gadget.css.dsp @@ -14,7 +14,7 @@ position: absolute; top: 1; z-index: 1; - width: calc(100% - 8px); + width: calc(100% - 10px); } .dashboard-widget > .z-panel-body { @@ -32,9 +32,8 @@ } .z-panel { - border-radius: 5px; - border: 1px solid #d8d8d8; - border-bottom-width: 1px; + border-radius: 3px; + box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px, rgba(0, 0, 0, 0.08) 0px 0px 0px 1px; } .z-panel-noborder { @@ -334,6 +333,6 @@ white-space: normal; } -.dashboard-row { - padding-bottom: 5px; -} \ No newline at end of file +.desktop-home-tabpanel .z-hlayout-inner { + padding: 5px !important; +} diff --git a/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar.css b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar.css index 1954391852..2f4d489807 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar.css +++ b/org.adempiere.ui.zk/WEB-INF/src/web/theme/default/zul/calendar/calendar.css @@ -216,3 +216,8 @@ .z-calendars-month-header .z-calendars-day-of-week { color: #000000 !important; } + +/*notes: without this fix calendar increases repeatedly height when switching between home and window tab in dashboard row orientation*/ +.z-calendars-month-cnt { + height: 300px !important; +}