Merge Sidebar and Topbar Review - Meeds-io/MIPs#159 (#2651)

Meeds-io · Dec 9, 2024 · 2bf8a12 · 2bf8a12
2 parents 666909b + 78705f6
commit 2bf8a12
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal/meeds/navigation.xml b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal/meeds/navigation.xml
@@ -30,11 +30,5 @@
       <icon>fas fa-users</icon>
       <page-reference>portal::global::all-people</page-reference>
     </node>
-    <node>
-      <name>spaces</name>
-      <label>#{portal.meeds.spaces}</label>
-      <icon>fas fa-people-arrows</icon>
-      <page-reference>portal::global::all-spaces</page-reference>
-    </node>
   </page-nodes>
 </node-navigation>
diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml
@@ -32,8 +32,8 @@
       <name>left-topNavigation-container</name>
       <factory-id>addonContainer</factory-id>
     </container>
-    <container id="hamburger-menu-items-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
-      <name>hamburger-menu-items-container</name>
+    <container id="sidebar-items-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+      <name>sidebar-items-container</name>
       <factory-id>addonContainer</factory-id>
     </container>
     <container id="top-bar-logo-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
@@ -44,21 +44,12 @@
       <name>right-topNavigation-container</name>
       <factory-id>addonContainer</factory-id>
     </container>
-    <container id="right-topNavigation-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
-      <name>right-topNavigation-container</name>
-      <factory-id>addonContainer</factory-id>
-    </container>
     <container id="MiddleToolBar" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
       <name>MiddleToolBar</name>
       <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
       <factory-id>addonContainer</factory-id>
     </container>
-    <container id="SearchPortlet" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
-      <name>SearchPortlet</name>
-      <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
-      <factory-id>addonContainer</factory-id>
-    </container>
-    <container id="middle-topNavigation-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+    <container id="middle-topNavigation-container" template="groovy/social/webui/UITopbarApplicationsContainer.gtmpl">
       <name>middle-topNavigation-container</name>
       <factory-id>addonContainer</factory-id>
     </container>

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
@@ -1208,7 +1208,7 @@
           </object>
         </object-param>
         <object-param>
-          <name>HamburgerMenu</name>
+          <name>Sidebar</name>
           <object type="io.meeds.layout.model.ApplicationReferenceUpgrade">
             <field name="modificationType">
               <string>update</string>
@@ -1217,7 +1217,7 @@
               <string>social-portlet/HamburgerMenu</string>
             </field>
             <field name="newContentId">
-              <string>social/HamburgerMenu</string>
+              <string>social/Sidebar</string>
             </field>
             <field name="upgradePages">
               <boolean>true</boolean>