feat: Upgrade Portal and Pages Layout Due to Site Layout Changes - ME…

…ED-8266 - Meeds-io/MIPs#175
Meeds-io · Feb 6, 2025 · faad35a · faad35a
1 parent 0c7e6a2
commit faad35a
Show file tree

Hide file tree

Showing 6 changed files with 126 additions and 26 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
@@ -2196,7 +2196,7 @@
       </init-params>
     </component-plugin>
     <component-plugin>
-      <name>AdministrationSitePortalConfigUpgrade.3</name>
+      <name>AdministrationSitePortalConfigUpgrade.11</name>
       <set-method>addUpgradePlugin</set-method>
       <type>io.meeds.social.upgrade.LayoutUpgradePlugin</type>
       <description>An upgrade plugin to delete some recognition administration navigations</description>
@@ -2240,7 +2240,7 @@
       </init-params>
     </component-plugin>
     <component-plugin profiles="layout">
-      <name>PublicSitePortalConfigUpgrade.3</name>
+      <name>PublicSitePortalConfigUpgrade.11</name>
       <set-method>addUpgradePlugin</set-method>
       <type>io.meeds.social.upgrade.LayoutUpgradePlugin</type>
       <init-params>
@@ -2280,7 +2280,7 @@
       </init-params>
     </component-plugin>
     <component-plugin profiles="layout">
-      <name>PublicSiteTemplatePortalConfigUpgrade.3</name>
+      <name>PublicSiteTemplatePortalConfigUpgrade.11</name>
       <set-method>addUpgradePlugin</set-method>
       <type>io.meeds.social.upgrade.LayoutUpgradePlugin</type>
       <init-params>
@@ -2320,7 +2320,7 @@
       </init-params>
     </component-plugin>
     <component-plugin profiles="layout">
-      <name>SpacePublicSiteTemplatePortalConfigUpgrade.3</name>
+      <name>SpacePublicSiteTemplatePortalConfigUpgrade.11</name>
       <set-method>addUpgradePlugin</set-method>
       <type>io.meeds.social.upgrade.LayoutUpgradePlugin</type>
       <init-params>
@@ -2360,7 +2360,7 @@
       </init-params>
     </component-plugin>
     <component-plugin>
-      <name>LayoutEditorsPagesUpgrade.3</name>
+      <name>LayoutEditorsPagesUpgrade.11</name>
       <set-method>addUpgradePlugin</set-method>
       <type>io.meeds.social.upgrade.LayoutUpgradePlugin</type>
       <init-params>
@@ -2412,6 +2412,65 @@
                 <value>
                   <string>portlet-editor</string>
                 </value>
+                <value>
+                  <string>portlet-viewer</string>
+                </value>
+                <value>
+                  <string>news</string>
+                </value>
+                <value>
+                  <string>terms-and-conditions</string>
+                </value>
+              </collection>
+            </field>
+          </object>
+        </object-param>
+      </init-params>
+    </component-plugin>
+    <component-plugin>
+      <name>MycraftMyteamPageUpgrade.11</name>
+      <set-method>addUpgradePlugin</set-method>
+      <type>io.meeds.social.upgrade.LayoutUpgradePlugin</type>
+      <init-params>
+        <value-param>
+          <name>product.group.id</name>
+          <value>org.exoplatform.social</value>
+        </value-param>
+        <value-param>
+          <name>plugin.execution.order</name>
+          <value>120</value>
+        </value-param>
+        <value-param>
+          <name>plugin.upgrade.execute.once</name>
+          <value>true</value>
+        </value-param>
+        <value-param>
+          <name>enabled</name>
+          <value>true</value>
+        </value-param>
+        <object-param>
+          <name>mycraft.upgrade</name>
+          <object type="io.meeds.social.upgrade.model.LayoutUpgrade">
+            <field name="updatePageLayout">
+              <boolean>true</boolean>
+            </field>
+            <field name="configPath">
+              <string>war:/conf/sites/</string>
+            </field>
+            <field name="portalType">
+              <string>portal</string>
+            </field>
+            <field name="portalName">
+              <string>mycraft</string>
+            </field>
+            <field name="importMode">
+              <string>merge</string>
+            </field>
+            <field name="pageNames">
+              <collection type="java.util.ArrayList" item-type="java.lang.String">
+                <value>
+                  <string>myteam</string>
+                </value>
               </collection>
             </field>
           </object>

diff --git a/...s/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/portal.xml b/...s/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/portal.xml
@@ -37,6 +37,9 @@
   <portal-layout template="system:/groovy/portal/webui/container/UISiteLayout.gtmpl">
     <section-sidebar>
       <sidebar-cell>
+        <css-style>
+          <mobile-hidden>true</mobile-hidden>
+        </css-style>
         <portlet-application>
           <portlet>
             <application-ref>social</application-ref>

diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml
@@ -1674,11 +1674,9 @@
     <edit-permission>manager:/platform/administrators</edit-permission>
     <show-max-window>true</show-max-window>
     <hide-shared-layout>true</hide-shared-layout>
-    <container template="system:/groovy/portal/webui/container/UIPageLayout.gtmpl">
-      <container template="system:/groovy/portal/webui/container/UIAddOnColumnContainer.gtmpl">
-        <name>portlet-viewer</name>
-        <factory-id>addonContainer</factory-id>
-      </container>
+    <container template="system:/groovy/portal/webui/container/UIAddOnColumnContainer.gtmpl">
+      <name>portlet-viewer</name>
+      <factory-id>addonContainer</factory-id>
     </container>
   </page>
 
@@ -1984,13 +1982,17 @@
     <edit-permission>manager:/platform/administrators</edit-permission>
     <hide-shared-layout>true</hide-shared-layout>
     <container template="system:/groovy/portal/webui/container/UIPageLayout.gtmpl">
-      <portlet-application>
-        <portlet>
-          <application-ref>notes</application-ref>
-          <portlet-ref>TermsAndConditionsView</portlet-ref>
-        </portlet>
-        <title>Terms And Conditions</title>
-      </portlet-application>
+      <section-columns>
+        <column col-span="12">
+          <portlet-application>
+            <portlet>
+              <application-ref>notes</application-ref>
+              <portlet-ref>TermsAndConditionsView</portlet-ref>
+            </portlet>
+            <title>Terms And Conditions</title>
+          </portlet-application>
+        </column>
+      </section-columns>
     </container>
   </page>
 

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
@@ -3,7 +3,7 @@
 
   This file is part of the Meeds project (https://meeds.io/).
 
-  Copyright (C) 2023 Meeds Association contact@meeds.io
+  Copyright (C) 2020 - 2025 Meeds Association contact@meeds.io
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -98,8 +98,12 @@
         <!-- Begin: Middle -->
         <banner-cell />
         <banner-cell
-          h-align="left"
-          v-align="bottom">
+          h-align="center"
+          v-align="center">
+          <css-style>
+            <margin-right>40</margin-right>
+            <margin-left>40</margin-left>
+          </css-style>
           <portlet-application>
             <portlet>
               <application-ref>social</application-ref>

diff --git a/...s-extension/src/main/webapp/WEB-INF/conf/sites/portal_template/public/portal_template.xml b/...s-extension/src/main/webapp/WEB-INF/conf/sites/portal_template/public/portal_template.xml
@@ -96,8 +96,12 @@
         <!-- Begin: Middle -->
         <banner-cell />
         <banner-cell
-          h-align="left"
-          v-align="bottom">
+          h-align="center"
+          v-align="center">
+          <css-style>
+            <margin-right>40</margin-right>
+            <margin-left>40</margin-left>
+          </css-style>
           <portlet-application>
             <portlet>
               <application-ref>social</application-ref>
@@ -114,6 +118,10 @@
           width="fit-content"
           h-align="center"
           v-align="center">
+          <css-style>
+            <margin-right>20</margin-right>
+            <margin-left>20</margin-left>
+          </css-style>
           <portlet-application>
             <portlet>
               <application-ref>social</application-ref>

diff --git a/...ension/src/main/webapp/WEB-INF/conf/sites/portal_template/spacePublic/portal_template.xml b/...ension/src/main/webapp/WEB-INF/conf/sites/portal_template/spacePublic/portal_template.xml
@@ -37,8 +37,14 @@
         height="57"
         sticky-beahvior="true"
         top-bar="true">
+        <css-style>
+          <background-color>#FFFFFFFF</background-color>
+        </css-style>
         <!-- Begin: Left -->
-        <banner-cell width="fit-content">
+        <banner-cell
+          width="fit-content"
+          h-align="center"
+          v-align="center">
           <portlet-application>
             <portlet>
               <application-ref>social</application-ref>
@@ -47,7 +53,10 @@
             <title>Space Logo</title>
           </portlet-application>
         </banner-cell>
-        <banner-cell width="fit-content">
+        <banner-cell
+          width="fit-content"
+          h-align="center"
+          v-align="center">
           <portlet-application>
             <portlet>
               <application-ref>layout</application-ref>
@@ -59,7 +68,14 @@
         <!-- End: Left -->
 
         <!-- Begin: Middle -->
-        <banner-cell>
+        <banner-cell />
+        <banner-cell
+          h-align="center"
+          v-align="center">
+          <css-style>
+            <margin-right>40</margin-right>
+            <margin-left>40</margin-left>
+          </css-style>
           <portlet-application>
             <portlet>
               <application-ref>social</application-ref>
@@ -68,10 +84,18 @@
             <title>Top Bar Menu</title>
           </portlet-application>
         </banner-cell>
+        <banner-cell />
         <!-- End: Middle -->
 
         <!-- Begin: Right -->
-        <banner-cell width="fit-content">
+        <banner-cell
+          width="fit-content"
+          h-align="center"
+          v-align="center">
+          <css-style>
+            <margin-right>20</margin-right>
+            <margin-left>20</margin-left>
+          </css-style>
           <portlet-application>
             <portlet>
               <application-ref>social</application-ref>