feat: Update Public Site Structure to use new Site Layout Structure - M…

…EED-8202 - Meeds-io/MIPs#175 (#2817) This change will enhance the definition of Public site by using new Site Layout sections.
Meeds-io · Feb 6, 2025 · 73a173d · 73a173d
1 parent f5aa701
commit 73a173d
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 70 deletions.
diff --git a/...s/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml b/...s/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml
@@ -743,7 +743,7 @@
       </init-params>
     </component-plugin>
     <component-plugin profiles="layout">
-      <name>PublicSiteLayoutUpgrade</name>
+      <name>PublicSitePortalConfigUpgrade</name>
       <set-method>addUpgradePlugin</set-method>
       <type>io.meeds.social.upgrade.LayoutUpgradePlugin</type>
       <init-params>

diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/public/portal.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/public/portal.xml
@@ -9,6 +9,7 @@
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
   version 3 of the License, or (at your option) any later version.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -34,74 +35,79 @@
     <entry key="removable">false</entry>
     <entry key="icon">fa-info-circle</entry>
   </properties>
-  <portal-layout>
-    <container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
-      <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-        <portlet-application>
-          <portlet>
-            <application-ref>social</application-ref>
-            <portlet-ref>TopBarLogo</portlet-ref>
-          </portlet>
-          <title>Company Logo</title>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-      </container>
-      <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl" profiles="layout">
-        <portlet-application>
-          <portlet>
-            <application-ref>layout</application-ref>
-            <portlet-ref>SiteNavigation</portlet-ref>
-          </portlet>
-          <title>Site navigation</title>
-        </portlet-application>
-      </container>
-      <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-        <access-permissions>*:/platform/administrators;publisher:/platform/web-contributors</access-permissions>
-        <portlet-application>
-          <portlet>
-            <application-ref>social</application-ref>
-            <portlet-ref>TopBarPreview</portlet-ref>
-          </portlet>
-          <title>Preview Site Button</title>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-      </container>
-      <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-        <access-permissions>*:/platform/administrators</access-permissions>
-        <portlet-application>
-          <portlet>
-            <application-ref>social</application-ref>
-            <portlet-ref>TopBarPublishSite</portlet-ref>
-          </portlet>
-          <title>Publish Site Button</title>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-      </container>
-      <container id="MiddleToolBar" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
-        <name>MiddleToolBar</name>
-        <factory-id>addonContainer</factory-id>
-      </container>
-      <container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-        <portlet-application>
-          <portlet>
-            <application-ref>social</application-ref>
-            <portlet-ref>TopBarLogin</portlet-ref>
-          </portlet>
-          <title>Login Button</title>
-          <show-info-bar>false</show-info-bar>
-          <show-application-state>false</show-application-state>
-        </portlet-application>
-      </container>
-      <container id="TopbarLoadingContainer" template="system:/groovy/portal/webui/container/UITopbarLoadingContainer.gtmpl">
-      </container>
-    </container>
-    <page-body />
-    <container id="bottom-all-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
-      <name>bottom-all-container</name>
-      <factory-id>addonContainer</factory-id>
-    </container>
+  <portal-layout template="system:/groovy/portal/webui/container/UISiteLayout.gtmpl">
+    <site-middle-section>
+      <section-banner
+        height="57"
+        sticky-beahvior="true">
+        <!-- Begin: Left -->
+        <banner-cell width="fit-content">
+          <portlet-application>
+            <portlet>
+              <application-ref>social</application-ref>
+              <portlet-ref>TopBarLogo</portlet-ref>
+            </portlet>
+            <title>Company Logo</title>
+            <show-info-bar>false</show-info-bar>
+            <show-application-state>false</show-application-state>
+          </portlet-application>
+        </banner-cell>
+        <banner-cell width="fit-content">
+          <portlet-application>
+            <portlet>
+              <application-ref>layout</application-ref>
+              <portlet-ref>SiteNavigation</portlet-ref>
+            </portlet>
+            <title>Site navigation</title>
+          </portlet-application>
+        </banner-cell>
+        <banner-cell width="fit-content">
+          <access-permissions>*:/platform/administrators;publisher:/platform/web-contributors</access-permissions>
+          <portlet-application>
+            <portlet>
+              <application-ref>social</application-ref>
+              <portlet-ref>TopBarPreview</portlet-ref>
+            </portlet>
+            <title>Preview Site Button</title>
+            <show-info-bar>false</show-info-bar>
+            <show-application-state>false</show-application-state>
+          </portlet-application>
+        </banner-cell>
+        <banner-cell width="fit-content">
+          <access-permissions>*:/platform/administrators</access-permissions>
+          <portlet-application>
+            <portlet>
+              <application-ref>social</application-ref>
+              <portlet-ref>TopBarPublishSite</portlet-ref>
+            </portlet>
+            <title>Publish Site Button</title>
+            <show-info-bar>false</show-info-bar>
+            <show-application-state>false</show-application-state>
+          </portlet-application>
+        </banner-cell>
+        <!-- End: Left -->
+
+        <!-- Begin: Spacer -->
+        <banner-cell /><!-- Banner Cell for spacing between left and right -->
+        <!-- End: Spacer -->
+
+        <!-- Begin: Right -->
+        <banner-cell width="fit-content">
+          <portlet-application>
+            <portlet>
+              <application-ref>social</application-ref>
+              <portlet-ref>TopBarLogin</portlet-ref>
+            </portlet>
+            <title>Login Button</title>
+            <show-info-bar>false</show-info-bar>
+            <show-application-state>false</show-application-state>
+          </portlet-application>
+        </banner-cell>
+        <!-- End: Right -->
+      </section-banner>
+      <site-middle-center-section>
+        <page-body />
+      </site-middle-center-section>
+    </site-middle-section>
   </portal-layout>
 </portal-config>