From a028b0adf0f9d07d90d266162014c1c581f76959 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Tue, 3 Dec 2024 14:34:10 +0100 Subject: [PATCH] feat: Display Full Company Name in Standalone Sites independently from Topbar Settings - MEED-7889 - Meeds-io/MIPs#159 (#4220) This change will ensure to display full company name and logo in standalone sites independently from what is configured for shared layout based sites. --- .../portlet/GeneralSettings_en.properties | 9 +++++- .../topbar/NavigationSettingsTopbar.vue | 30 ++++++++++++++++--- .../components/list/SidebarListHeader.vue | 2 +- .../components/SpaceFormInviteEmailDrawer.vue | 1 - .../top-bar-logo/components/CompanyName.vue | 2 +- .../components/space/SpaceLogoBanner.vue | 2 +- .../main/webapp/vue-apps/top-bar-logo/main.js | 14 +++++---- 7 files changed, 45 insertions(+), 15 deletions(-) diff --git a/webapp/src/main/resources/locale/portlet/GeneralSettings_en.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_en.properties index 9212bfc0c80..03d39ad8124 100644 --- a/webapp/src/main/resources/locale/portlet/GeneralSettings_en.properties +++ b/webapp/src/main/resources/locale/portlet/GeneralSettings_en.properties @@ -175,7 +175,7 @@ generalSettings.defaultLanguageSettingError=Error while saving default language generalSettings.navigationCharacteristics=Topbar & Sidebar generalSettings.subtitle.navigationCharacteristics=Customize the navigation experience -generalSettings.topbar=Topbar +generalSettings.topbar={0}Topbar{1} generalSettings.brandingInfos=Branding Infos generalSettings.displayCompanyName=Company Name generalSettings.displaySiteName=Site Name @@ -260,3 +260,10 @@ generalSettings.sidebar.linkDescriptionPlaceHolder=Add a description to display generalSettings.sidebar.linkDescriptionDrawerTitle=Add the description translations generalSettings.sidebar.invalidLink=Invalid link generalSettings.sidebar.exceedsMaxLength=Input exceeds max length +generalSettings.topbar.helpTooltip=What can I customize? +generalSettings.topbar.helpDescription1=Below, find options you can customize for the topbar. +generalSettings.topbar.helpDescription2=FYI, public site topbar will not get those customization. +generalSettings.topbar.helpDescription3=- Decide to display platform logo and/or name when the menu is hidden +generalSettings.topbar.helpDescription4=- Hide or not the site name or the space name. Icon or logo will be displayed no matter you decided to hide the name +generalSettings.topbar.helpDescription5=- Identify which options can be listed for users in the topbar +generalSettings.topbar.helpDescription6=- Precise which one can be accessed using a mobile device diff --git a/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/topbar/NavigationSettingsTopbar.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/topbar/NavigationSettingsTopbar.vue index 7a6900997c3..512b6a58e83 100644 --- a/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/topbar/NavigationSettingsTopbar.vue +++ b/webapp/src/main/webapp/vue-apps/general-settings/components/navigation/topbar/NavigationSettingsTopbar.vue @@ -21,13 +21,35 @@ -->