From 43a672559f603047fecca00ab41ba9095d25c731 Mon Sep 17 00:00:00 2001
From: GouadriaHanen <49310007+GouadriaHanen@users.noreply.github.com>
Date: Tue, 21 Nov 2023 15:18:53 +0100
Subject: [PATCH] feat: Implement site layout for mycraft, engage and intranet
 sites - EXO-67424 - Meeds-io/MIPs#88 (#88)

---
 digital-workplace-webapps/pom.xml             |  1 +
 .../portal-configuration.xml                  |  6 +-
 .../portal/dw/navigation.xml                  |  3 -
 .../portal/engage/navigation.xml              |  6 --
 .../portal/engage/portal.xml                  | 74 ++++++++++++++-----
 .../portal/intranet/navigation.xml            |  3 -
 .../portal/intranet/portal.xml                | 74 ++++++++++++++-----
 .../portal/mycraft/navigation.xml             |  4 -
 .../portal/mycraft/portal.xml                 | 74 ++++++++++++++-----
 .../main/webapp/WEB-INF/gatein-resources.xml  |  6 ++
 .../src/main/webapp/skin/less/siteLayout.less |  8 ++
 11 files changed, 189 insertions(+), 70 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 @@
               <compress>false</compress>
               <includes>
                 <include>digital-workplace.less</include>
+                <include>siteLayout.less</include>
               </includes>
             </configuration>
             <goals>
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 @@
               <string>portal</string>
             </field>
             <field name="importMode">
-              <string>${exo.mycraft.portalConfig.metadata.importmode:insert}</string>
+              <string>${exo.mycraft.portalConfig.metadata.importmode:overwrite}</string>
             </field>
             <field name="templateLocation">
               <string>war:/conf/digital-workplace/</string>
@@ -106,7 +106,7 @@
               <string>portal</string>
             </field>
             <field name="importMode">
-              <string>${exo.intranet.portalConfig.metadata.importmode:insert}</string>
+              <string>${exo.intranet.portalConfig.metadata.importmode:overwrite}</string>
             </field>
             <field name="templateLocation">
               <string>war:/conf/digital-workplace/</string>
@@ -141,7 +141,7 @@
               <string>portal</string>
             </field>
             <field name="importMode">
-              <string>${exo.engage.portalConfig.metadata.importmode:insert}</string>
+              <string>${exo.engage.portalConfig.metadata.importmode:overwrite}</string>
             </field>
             <field name="templateLocation">
               <string>war:/conf/digital-workplace/</string>
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 @@
       <name>stream</name>
       <label>#{portal.dw.stream}</label>
       <icon>fas fa-stream</icon>
-      <visibility>DISPLAYED</visibility>
       <page-reference>portal::global::stream</page-reference>
     </node>
     <node>
       <name>spaces</name>
       <label>#{portal.dw.spaces}</label>
       <icon>fas fa-people-arrows</icon>
-      <visibility>DISPLAYED</visibility>
       <page-reference>portal::global::all-spaces</page-reference>
     </node>
     <node>
       <name>people</name>
       <label>#{portal.dw.people}</label>
       <icon>fas fa-users</icon>
-      <visibility>DISPLAYED</visibility>
       <page-reference>portal::global::all-people</page-reference>
     </node>
   </page-nodes>
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 @@
         <name>overview</name>
         <label>#{portal.engage.overview}</label>
         <icon>fas fa-award</icon>
-        <visibility>DISPLAYED</visibility>
         <page-reference>portal::global::overview</page-reference>
         <node>
           <name>contributions</name>
           <label>#{portal.engage.contributions}</label>
-          <visibility>DISPLAYED</visibility>
           <node>
             <name>programs</name>
             <label>#{portal.engage.programs}</label>
             <icon>fas fa-chalkboard</icon>
-            <visibility>DISPLAYED</visibility>
             <page-reference>portal::global::programs</page-reference>
           </node>
           <node>
             <name>actions</name>
             <label>#{portal.engage.actions}</label>
             <icon>fas fa-list-alt</icon>
-            <visibility>DISPLAYED</visibility>
             <page-reference>portal::global::actions</page-reference>
           </node>
           <node>
             <name>achievements</name>
             <label>#{portal.engage.achievements}</label>
             <icon>fas fa-chart-pie</icon>
-            <visibility>DISPLAYED</visibility>
             <page-reference>portal::global::achievements</page-reference>
           </node>
         </node>
@@ -59,7 +54,6 @@
           <name>perkstore</name>
           <label>#{portal.engage.perkstore}</label>
           <icon>fas fa-shopping-cart</icon>
-          <visibility>DISPLAYED</visibility>
           <page-reference>portal::global::perkstore</page-reference>
         </node>
       </node>
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..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,21 +17,61 @@
  *
 -->
 <portal-config
-        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">
-    <portal-name>engage</portal-name>
-    <label>Engagement</label>
-    <description>Easily onboard contributors, drive initiatives, and keep everyone motivated.</description>
-    <display-order>2</display-order>
-    <locale>en</locale>
-    <access-permissions>member:/platform/users</access-permissions>
-    <edit-permission>manager:/platform/administrators</edit-permission>
-    <properties>
-        <entry key="sessionAlive">onDemand</entry>
-        <entry key="showPortletInfo">0</entry>
-    </properties>
-    <portal-layout>
-        <page-body> </page-body>
-    </portal-layout>
+  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">
+  <portal-name>engage</portal-name>
+  <label>Engagement</label>
+  <description>Easily onboard contributors, drive initiatives, and keep everyone motivated.</description>
+  <display-order>2</display-order>
+  <locale>en</locale>
+  <access-permissions>member:/platform/users</access-permissions>
+  <edit-permission>manager:/platform/administrators</edit-permission>
+  <properties>
+    <entry key="sessionAlive">onDemand</entry>
+    <entry key="showPortletInfo">0</entry>
+  </properties>
+  <portal-layout>
+    <container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
+      <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
+      <container id="left-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+        <access-permissions>Everyone</access-permissions>
+        <portlet-application>
+          <portlet>
+            <application-ref>social-portlet</application-ref>
+            <portlet-ref>TopBarLogo</portlet-ref>
+          </portlet>
+          <title>Company Logo</title>
+          <access-permissions>Everyone</access-permissions>
+          <show-info-bar>false</show-info-bar>
+          <show-application-state>false</show-application-state>
+        </portlet-application>
+        <portlet-application>
+          <portlet>
+            <application-ref>layout-management</application-ref>
+            <portlet-ref>SiteNavigation</portlet-ref>
+          </portlet>
+          <title>site navigation</title>
+          <access-permissions>Everyone</access-permissions>
+          <show-info-bar>false</show-info-bar>
+          <show-application-state>false</show-application-state>
+        </portlet-application>
+      </container>
+      <container id="middle-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+        <portlet-application>
+          <portlet>
+            <application-ref>social-portlet</application-ref>
+            <portlet-ref>TopBarMenu</portlet-ref>
+          </portlet>
+          <title>Top Bar Menu </title>
+          <access-permissions>Everyone</access-permissions>
+          <show-info-bar>false</show-info-bar>
+          <show-application-state>false</show-application-state>
+        </portlet-application>
+      </container>
+      <container id="right-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+      </container>
+    </container>
+    <page-body> </page-body>
+  </portal-layout>
 </portal-config>
\ No newline at end of file
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 @@
         <name>homepage</name>
         <label>#{portal.intranet.homepage}</label>
         <icon>fas fa-newspaper</icon>
-        <visibility>DISPLAYED</visibility>
         <page-reference>portal::dw::homepage</page-reference>
         <node>
           <name>news</name>
           <label>#{portal.intranet.news}</label>
           <icon>far fa-newspaper</icon>
-          <visibility>DISPLAYED</visibility>
           <page-reference>portal::intranet::news</page-reference>
         </node>
         <node>
           <name>people</name>
           <label>#{portal.intranet.people}</label>
           <icon>fas fa-users</icon>
-          <visibility>DISPLAYED</visibility>
           <page-reference>portal::global::all-people</page-reference>
         </node>
       </node>
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..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,21 +17,61 @@
  *
 -->
 <portal-config
-        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">
-    <portal-name>intranet</portal-name>
-    <label>Intranet</label>
-    <description>Develop your communication with a modern intranet</description>
-    <display-order>1</display-order>
-    <locale>en</locale>
-    <access-permissions>member:/platform/users;member:/platform/externals</access-permissions>
-    <edit-permission>manager:/platform/administrators</edit-permission>
-    <properties>
-        <entry key="sessionAlive">onDemand</entry>
-        <entry key="showPortletInfo">0</entry>
-    </properties>
-    <portal-layout>
-        <page-body> </page-body>
-    </portal-layout>
+  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">
+  <portal-name>intranet</portal-name>
+  <label>Intranet</label>
+  <description>Develop your communication with a modern intranet</description>
+  <display-order>1</display-order>
+  <locale>en</locale>
+  <access-permissions>member:/platform/users;member:/platform/externals</access-permissions>
+  <edit-permission>manager:/platform/administrators</edit-permission>
+  <properties>
+    <entry key="sessionAlive">onDemand</entry>
+    <entry key="showPortletInfo">0</entry>
+  </properties>
+  <portal-layout>
+    <container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
+      <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
+      <container id="left-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+        <access-permissions>Everyone</access-permissions>
+        <portlet-application>
+          <portlet>
+            <application-ref>social-portlet</application-ref>
+            <portlet-ref>TopBarLogo</portlet-ref>
+          </portlet>
+          <title>Company Logo</title>
+          <access-permissions>Everyone</access-permissions>
+          <show-info-bar>false</show-info-bar>
+          <show-application-state>false</show-application-state>
+        </portlet-application>
+        <portlet-application>
+          <portlet>
+            <application-ref>layout-management</application-ref>
+            <portlet-ref>SiteNavigation</portlet-ref>
+          </portlet>
+          <title>site navigation</title>
+          <access-permissions>Everyone</access-permissions>
+          <show-info-bar>false</show-info-bar>
+          <show-application-state>false</show-application-state>
+      </portlet-application>
+      </container>
+      <container id="middle-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+        <portlet-application>
+          <portlet>
+            <application-ref>social-portlet</application-ref>
+            <portlet-ref>TopBarMenu</portlet-ref>
+          </portlet>
+          <title>Top Bar Menu </title>
+          <access-permissions>Everyone</access-permissions>
+          <show-info-bar>false</show-info-bar>
+          <show-application-state>false</show-application-state>
+        </portlet-application>
+      </container>
+      <container id="right-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+      </container>
+    </container>
+    <page-body> </page-body>
+  </portal-layout>
 </portal-config>
\ No newline at end of file
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 @@
         <name>dashboard</name>
         <label>#{portal.mycraft.drives}</label>
         <icon>fas fa-briefcase</icon>
-        <visibility>DISPLAYED</visibility>
         <page-reference>portal::global::drives</page-reference>
         <node>
           <name>tasks</name>
           <label>#{portal.mycraft.tasks}</label>
           <icon>fas fa-tasks</icon>
-          <visibility>DISPLAYED</visibility>
           <page-reference>portal::global::tasks</page-reference>
         </node>
         <node>
           <name>agenda</name>
           <label>#{portal.mycraft.agenda}</label>
           <icon>fas fa-calendar-alt</icon>
-          <visibility>DISPLAYED</visibility>
           <page-reference>portal::global::agenda</page-reference>
           </node>
         <node>
           <name>processes</name>
           <label>#{portal.mycraft.processes}</label>
           <icon>fas fa-file-invoice</icon>
-          <visibility>DISPLAYED</visibility>
           <page-reference>portal::global::processes</page-reference>
         </node>
       </node>
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..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,21 +17,61 @@
  *
 -->
 <portal-config
-        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">
-    <portal-name>mycraft</portal-name>
-    <label>My Craft</label>
-    <description>My personal workspace</description>
-    <display-order>3</display-order>
-    <locale>en</locale>
-    <access-permissions>member:/platform/users;member:/platform/externals</access-permissions>
-    <edit-permission>manager:/platform/administrators</edit-permission>
-    <properties>
-        <entry key="sessionAlive">onDemand</entry>
-        <entry key="showPortletInfo">0</entry>
-    </properties>
-    <portal-layout>
-        <page-body> </page-body>
-    </portal-layout>
+  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">
+  <portal-name>mycraft</portal-name>
+  <label>My Craft</label>
+  <description>My personal workspace</description>
+  <display-order>3</display-order>
+  <locale>en</locale>
+  <access-permissions>member:/platform/users;member:/platform/externals</access-permissions>
+  <edit-permission>manager:/platform/administrators</edit-permission>
+  <properties>
+    <entry key="sessionAlive">onDemand</entry>
+    <entry key="showPortletInfo">0</entry>
+  </properties>
+  <portal-layout>
+    <container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
+      <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
+      <container id="left-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+        <access-permissions>Everyone</access-permissions>
+        <portlet-application>
+          <portlet>
+            <application-ref>social-portlet</application-ref>
+            <portlet-ref>TopBarLogo</portlet-ref>
+          </portlet>
+          <title>Company Logo</title>
+          <access-permissions>Everyone</access-permissions>
+          <show-info-bar>false</show-info-bar>
+          <show-application-state>false</show-application-state>
+        </portlet-application>
+        <portlet-application>
+          <portlet>
+            <application-ref>layout-management</application-ref>
+            <portlet-ref>SiteNavigation</portlet-ref>
+          </portlet>
+          <title>site navigation</title>
+          <access-permissions>Everyone</access-permissions>
+          <show-info-bar>false</show-info-bar>
+          <show-application-state>false</show-application-state>
+        </portlet-application>
+      </container>
+      <container id="middle-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+        <portlet-application>
+          <portlet>
+            <application-ref>social-portlet</application-ref>
+            <portlet-ref>TopBarMenu</portlet-ref>
+          </portlet>
+          <title>Top Bar Menu </title>
+          <access-permissions>Everyone</access-permissions>
+          <show-info-bar>false</show-info-bar>
+          <show-application-state>false</show-application-state>
+        </portlet-application>
+      </container>
+      <container id="right-topBar-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+      </container>
+    </container>
+    <page-body> </page-body>
+  </portal-layout>
 </portal-config>
\ 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 @@
     <css-path>/skin/css/digital-workplace.css</css-path>
     <css-priority>11</css-priority>
   </portal-skin>
+  <portal-skin>
+    <skin-name>Enterprise</skin-name>
+    <skin-module>siteLayout</skin-module>
+    <css-path>/skin/css/siteLayout.css</css-path>
+    <css-priority>11</css-priority>
+  </portal-skin>
   
 </gatein-resources>
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..4dae5b00c
--- /dev/null
+++ b/digital-workplace-webapps/src/main/webapp/skin/less/siteLayout.less
@@ -0,0 +1,8 @@
+#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