From f705383ecf055b977a7ba9a083536b980e450321 Mon Sep 17 00:00:00 2001 From: milan Date: Thu, 21 Nov 2024 14:03:53 +0100 Subject: [PATCH] addressbook view sidemenu contact data styling changes --- addressbook/js/app.ts | 2 +- addressbook/templates/default/view.xet | 6 +++--- pixelegg/css/fancy.css | 7 +++++++ pixelegg/css/pixelegg.css | 7 +++++++ pixelegg/css/pixelegg.less | 8 ++++++++ 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/addressbook/js/app.ts b/addressbook/js/app.ts index 318817b970..ca6e130601 100644 --- a/addressbook/js/app.ts +++ b/addressbook/js/app.ts @@ -300,7 +300,7 @@ class AddressbookApp extends EgwApp extras.crm_list = egw.preference('crm_list', 'addressbook'); } const title_app = extras.crm_list == "tracker" ? " (" + egw.lang(extras.crm_list) + ")" : ""; - extras.title = ((_action.id.match(/\-organisation/) || extras.crm_list.endsWith("-organisation")) && data.org_name != "") + extras.title = ((_action.id.match(/\-organisation/) || extras.crm_list?.endsWith("-organisation")) && data.org_name != "") ? data.org_name : data.n_fn + title_app; extras.icon = data.photo; diff --git a/addressbook/templates/default/view.xet b/addressbook/templates/default/view.xet index fe2a04472f..3e370f3851 100644 --- a/addressbook/templates/default/view.xet +++ b/addressbook/templates/default/view.xet @@ -51,10 +51,10 @@ - - + + - + diff --git a/pixelegg/css/fancy.css b/pixelegg/css/fancy.css index 9f3387e04e..00614d8ed0 100644 --- a/pixelegg/css/fancy.css +++ b/pixelegg/css/fancy.css @@ -6869,6 +6869,13 @@ table.egwGridView_grid img.et2_appicon { border-top-color: #003366; border-top-width: 4px !important; } +/** +Addressbook sidebox grid table + */ +#egw_fw_sidemenu table.addressbook_view { + table-layout: fixed; + width: 100%; +} #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #admin_sidebox_header.egw_fw_ui_sidemenu_entry_header_active { background-color: rgba(51, 51, 51, 0.3); border-left: 4px solid #333333 !important; diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index aadc59de94..36dca91728 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -6862,6 +6862,13 @@ table.egwGridView_grid img.et2_appicon { border-top-color: #003366; border-top-width: 4px !important; } +/** +Addressbook sidebox grid table + */ +#egw_fw_sidemenu table.addressbook_view { + table-layout: fixed; + width: 100%; +} #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #admin_sidebox_header.egw_fw_ui_sidemenu_entry_header_active { background-color: rgba(51, 51, 51, 0.3); border-left: 4px solid #333333 !important; diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less index bd98e61e38..782bd83806 100644 --- a/pixelegg/css/pixelegg.less +++ b/pixelegg/css/pixelegg.less @@ -131,6 +131,14 @@ border-top-color: @addressbook-color; border-top-width: 4px !important; } + +/** +Addressbook sidebox grid table + */ +#egw_fw_sidemenu table.addressbook_view{ + table-layout: fixed; + width: 100%; +} // Admin #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #admin_sidebox_header.egw_fw_ui_sidemenu_entry_header_active { background-color: fade(@admin-color, 30%);