From 080203ef5a9a863c4a969cc2d7e5a3e276682251 Mon Sep 17 00:00:00 2001 From: GouadriaHanen Date: Fri, 17 Nov 2023 12:13:10 +0100 Subject: [PATCH 1/4] 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 From d5e9cdec7fd75e3f9a1af7d8096807325cb7dcaf Mon Sep 17 00:00:00 2001 From: GouadriaHanen Date: Fri, 17 Nov 2023 17:11:17 +0100 Subject: [PATCH 2/4] remove displayed visibility properties from sites navigations --- .../WEB-INF/conf/digital-workplace/portal/dw/navigation.xml | 3 --- .../conf/digital-workplace/portal/engage/navigation.xml | 6 ------ .../conf/digital-workplace/portal/intranet/navigation.xml | 3 --- .../conf/digital-workplace/portal/mycraft/navigation.xml | 4 ---- 4 files changed, 16 deletions(-) diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/dw/navigation.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/dw/navigation.xml index 201017fa5..93f514531 100644 --- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/dw/navigation.xml +++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/dw/navigation.xml @@ -14,21 +14,18 @@ stream fas fa-stream - DISPLAYED portal::global::stream spaces fas fa-people-arrows - DISPLAYED portal::global::all-spaces people fas fa-users - DISPLAYED portal::global::all-people diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/engage/navigation.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/engage/navigation.xml index 6cddd77b9..6e1f59d9e 100644 --- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/engage/navigation.xml +++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/engage/navigation.xml @@ -27,31 +27,26 @@ overview fas fa-award - DISPLAYED portal::global::overview contributions - DISPLAYED programs fas fa-chalkboard - DISPLAYED portal::global::programs actions fas fa-list-alt - DISPLAYED portal::global::actions achievements fas fa-chart-pie - DISPLAYED portal::global::achievements @@ -59,7 +54,6 @@ perkstore fas fa-shopping-cart - DISPLAYED portal::global::perkstore diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/navigation.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/navigation.xml index 2bb08d87e..f3ec17ba6 100644 --- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/navigation.xml +++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/intranet/navigation.xml @@ -27,20 +27,17 @@ homepage fas fa-newspaper - DISPLAYED portal::dw::homepage news far fa-newspaper - DISPLAYED portal::intranet::news people fas fa-users - DISPLAYED portal::global::all-people diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/navigation.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/navigation.xml index 4fb5ebca5..483642a22 100644 --- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/navigation.xml +++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/navigation.xml @@ -27,27 +27,23 @@ dashboard fas fa-briefcase - DISPLAYED portal::global::drives tasks fas fa-tasks - DISPLAYED portal::global::tasks agenda fas fa-calendar-alt - DISPLAYED portal::global::agenda processes fas fa-file-invoice - DISPLAYED portal::global::processes From 304870c59771d1afeba14f856bf2b1af8604d76d Mon Sep 17 00:00:00 2001 From: GouadriaHanen Date: Tue, 21 Nov 2023 14:32:28 +0100 Subject: [PATCH 3/4] refactor code --- .../portal/engage/portal.xml | 14 ++-- .../portal/intranet/portal.xml | 76 +++++++++---------- .../portal/mycraft/portal.xml | 76 +++++++++---------- .../src/main/webapp/skin/less/siteLayout.less | 5 +- 4 files changed, 86 insertions(+), 85 deletions(-) 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 2e8907bfd..18699a263 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 @@ -34,12 +34,12 @@ *:/platform/users;*:/platform/externals - + Everyone - social-portlet - TopBarLogo + social-portlet + TopBarLogo Company Logo Everyone @@ -48,8 +48,8 @@ - layout-management - SiteNavigation + layout-management + SiteNavigation site navigation Everyone @@ -60,8 +60,8 @@ - social-portlet - TopBarMenu + social-portlet + TopBarMenu Top Bar Menu Everyone 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 999d3c55b..0e3cd4dd5 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 @@ -33,45 +33,45 @@ - *:/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 - - - - + *:/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 2e67cf5c7..5066e2bfb 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 @@ -33,45 +33,45 @@ - *:/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 - - - - + *:/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/skin/less/siteLayout.less b/digital-workplace-webapps/src/main/webapp/skin/less/siteLayout.less index dec962d3e..4dae5b00c 100644 --- a/digital-workplace-webapps/src/main/webapp/skin/less/siteLayout.less +++ b/digital-workplace-webapps/src/main/webapp/skin/less/siteLayout.less @@ -1,7 +1,8 @@ -#left-topBar-containerChildren{ +#left-topBar-containerChildren { display: flex !important; } -.left-topBar-containerTDContainer{ + +.left-topBar-containerTDContainer { margin-left: 0 ~'!important; /** orientation=lt */ '; margin-right: 0 ~'!important; /** orientation=rt */ '; } \ No newline at end of file From 309c1eae2861f999df8b16dd21f334b5d57d70ee Mon Sep 17 00:00:00 2001 From: GouadriaHanen Date: Tue, 21 Nov 2023 14:57:38 +0100 Subject: [PATCH 4/4] format code --- .../portal/engage/portal.xml | 110 +++++++++--------- .../portal/intranet/portal.xml | 110 +++++++++--------- .../portal/mycraft/portal.xml | 110 +++++++++--------- 3 files changed, 165 insertions(+), 165 deletions(-) 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 18699a263..d8e25ffbf 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 @@ -17,61 +17,61 @@ * --> - engage - - Easily onboard contributors, drive initiatives, and keep everyone motivated. - 2 - en - member:/platform/users - manager:/platform/administrators - - onDemand - 0 - - - - *:/platform/users;*:/platform/externals - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_10 http://www.gatein.org/xml/ns/gatein_objects_1_10" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_10"> + engage + + Easily onboard contributors, drive initiatives, and keep everyone motivated. + 2 + en + member:/platform/users + manager:/platform/administrators + + onDemand + 0 + + + + *:/platform/users;*:/platform/externals + + Everyone + + + social-portlet + TopBarLogo + + Company Logo 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 - - - - + 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 0e3cd4dd5..d7b1c05d0 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 @@ -17,61 +17,61 @@ * --> - intranet - - Develop your communication with a modern intranet - 1 - en - member:/platform/users;member:/platform/externals - manager:/platform/administrators - - onDemand - 0 - - - - *:/platform/users;*:/platform/externals - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_10 http://www.gatein.org/xml/ns/gatein_objects_1_10" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_10"> + intranet + + Develop your communication with a modern intranet + 1 + en + member:/platform/users;member:/platform/externals + manager:/platform/administrators + + onDemand + 0 + + + + *:/platform/users;*:/platform/externals + + Everyone + + + social-portlet + TopBarLogo + + Company Logo 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 - - - - + 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 5066e2bfb..04ff705c6 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 @@ -17,61 +17,61 @@ * --> - mycraft - - My personal workspace - 3 - en - member:/platform/users;member:/platform/externals - manager:/platform/administrators - - onDemand - 0 - - - - *:/platform/users;*:/platform/externals - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_10 http://www.gatein.org/xml/ns/gatein_objects_1_10" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_10"> + mycraft + + My personal workspace + 3 + en + member:/platform/users;member:/platform/externals + manager:/platform/administrators + + onDemand + 0 + + + + *:/platform/users;*:/platform/externals + + Everyone + + + social-portlet + TopBarLogo + + Company Logo 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 - - - - + 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