From 080203ef5a9a863c4a969cc2d7e5a3e276682251 Mon Sep 17 00:00:00 2001 From: GouadriaHanen Date: Fri, 17 Nov 2023 12:13:10 +0100 Subject: [PATCH] feat: Implement top bar container for sites : mycraft , engage and intranet - EXO-67424 - Meeds-io/MIPs#88 --- digital-workplace-webapps/pom.xml | 1 + .../portal-configuration.xml | 6 +-- .../portal/engage/portal.xml | 42 ++++++++++++++++++- .../portal/intranet/portal.xml | 42 ++++++++++++++++++- .../portal/mycraft/portal.xml | 42 ++++++++++++++++++- .../main/webapp/WEB-INF/gatein-resources.xml | 6 +++ .../src/main/webapp/skin/less/siteLayout.less | 7 ++++ 7 files changed, 140 insertions(+), 6 deletions(-) create mode 100644 digital-workplace-webapps/src/main/webapp/skin/less/siteLayout.less diff --git a/digital-workplace-webapps/pom.xml b/digital-workplace-webapps/pom.xml index 7729e55ab..4da7544e7 100644 --- a/digital-workplace-webapps/pom.xml +++ b/digital-workplace-webapps/pom.xml @@ -81,6 +81,7 @@ false digital-workplace.less + siteLayout.less diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal-configuration.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal-configuration.xml index ac6493bb9..23508b314 100644 --- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal-configuration.xml +++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal-configuration.xml @@ -71,7 +71,7 @@ portal - ${exo.mycraft.portalConfig.metadata.importmode:insert} + ${exo.mycraft.portalConfig.metadata.importmode:overwrite} war:/conf/digital-workplace/ @@ -106,7 +106,7 @@ portal - ${exo.intranet.portalConfig.metadata.importmode:insert} + ${exo.intranet.portalConfig.metadata.importmode:overwrite} war:/conf/digital-workplace/ @@ -141,7 +141,7 @@ portal - ${exo.engage.portalConfig.metadata.importmode:insert} + ${exo.engage.portalConfig.metadata.importmode:overwrite} war:/conf/digital-workplace/ diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/engage/portal.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/engage/portal.xml index 91e1ad571..2e8907bfd 100644 --- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/engage/portal.xml +++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/engage/portal.xml @@ -32,6 +32,46 @@ 0 - + + *:/platform/users;*:/platform/externals + + Everyone + + + social-portlet + TopBarLogo + + Company Logo + Everyone + false + false + + + + layout-management + SiteNavigation + + site navigation + Everyone + false + false + + + + + + social-portlet + TopBarMenu + + Top Bar Menu + Everyone + false + false + + + + + + \ No newline at end of file diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/portal.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/portal.xml index 7719627d4..999d3c55b 100644 --- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/portal.xml +++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/portal.xml @@ -32,6 +32,46 @@ 0 - + + *:/platform/users;*:/platform/externals + + Everyone + + + social-portlet + TopBarLogo + + Company Logo + Everyone + false + false + + + + layout-management + SiteNavigation + + site navigation + Everyone + false + false + + + + + + social-portlet + TopBarMenu + + Top Bar Menu + Everyone + false + false + + + + + + \ No newline at end of file diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/portal.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/portal.xml index 622d03789..2e67cf5c7 100644 --- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/portal.xml +++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/portal.xml @@ -32,6 +32,46 @@ 0 - + + *:/platform/users;*:/platform/externals + + Everyone + + + social-portlet + TopBarLogo + + Company Logo + Everyone + false + false + + + + layout-management + SiteNavigation + + site navigation + Everyone + false + false + + + + + + social-portlet + TopBarMenu + + Top Bar Menu + Everyone + false + false + + + + + + \ No newline at end of file diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/gatein-resources.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/gatein-resources.xml index caccafb6e..a971b49a2 100644 --- a/digital-workplace-webapps/src/main/webapp/WEB-INF/gatein-resources.xml +++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/gatein-resources.xml @@ -8,5 +8,11 @@ /skin/css/digital-workplace.css 11 + + Enterprise + siteLayout + /skin/css/siteLayout.css + 11 + diff --git a/digital-workplace-webapps/src/main/webapp/skin/less/siteLayout.less b/digital-workplace-webapps/src/main/webapp/skin/less/siteLayout.less new file mode 100644 index 000000000..dec962d3e --- /dev/null +++ b/digital-workplace-webapps/src/main/webapp/skin/less/siteLayout.less @@ -0,0 +1,7 @@ +#left-topBar-containerChildren{ + display: flex !important; +} +.left-topBar-containerTDContainer{ + margin-left: 0 ~'!important; /** orientation=lt */ '; + margin-right: 0 ~'!important; /** orientation=rt */ '; +} \ No newline at end of file