feat: Define MyCraft and Contribute Site layouts - MEED-3024 - #1351 (#…

…1368) This change will add the definition of MyCraft and Engage sites. At the same time, the sharedlayout has been moved from gatein-portal in order to centralize layout management in this extension. In addition, this change will bring some page templates definition from gatein-portal.
Meeds-io · Dec 1, 2023 · e1f76c2 · e1f76c2
1 parent 40359e8
commit e1f76c2
Showing 29 changed files with 1,023 additions and 194 deletions.
diff --git a/translations.properties b/translations.properties
@@ -25,3 +25,5 @@ Login.properties=webapps/plf-meeds-extension/src/main/resources/locale/portlet/L
 public.properties=webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/public_en.properties
 global.properties=webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/global_en.properties
 administration.properties=webapps/plf-meeds-extension/src/main/resources/locale/navigation/portal/administration_en.properties
+mycraft.properties=webapps/plf-meeds-extension/src/main/resources/locale/navigation/portal/mycraft_en.properties
+contribute.properties=webapps/plf-meeds-extension/src/main/resources/locale/navigation/portal/contribute_en.properties
diff --git a/webapps/plf-meeds-extension/src/main/webapp/META-INF/exo-conf/configuration.xml b/webapps/plf-meeds-extension/src/main/webapp/META-INF/exo-conf/configuration.xml
@@ -31,6 +31,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <property name="io.meeds.groups.portalConfig.metadata.importmode" value="OVERWRITE" />
         <!-- administration site -->
         <property name="io.meeds.administration.portalConfig.metadata.importmode" value="MERGE" />
+        <!-- My Craft site -->
+        <property name="io.meeds.mycraft.portalConfig.metadata.importmode" value="OVERWRITE" />
+        <!-- administration site -->
+        <property name="io.meeds.contribute.portalConfig.metadata.importmode" value="OVERWRITE" />
         <!-- Disable WebUI for Meeds -->
         <property name="io.meeds.useWebuiResources" value="false" />
         <!-- Enable Posting to network -->

diff --git a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal-configuration.xml b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal-configuration.xml
@@ -30,7 +30,7 @@
       <description>This listener creates a page for Meeds site</description>
       <init-params>
         <value-param>
-          <name>default.portal</name>
+          <name>meta.portal</name>
           <description>The default portal</description>
           <value>meeds</value>
         </value-param>

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
@@ -24,37 +24,6 @@
   xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_7">
   <priority>4</priority>
   <page-nodes>
-    <node>
-      <name>overview</name>
-      <label>#{portal.meeds.overview}</label>
-      <icon>fas fa-trophy</icon>
-      <page-reference>portal::global::overview</page-reference>
-      <node>
-        <name>contributions</name>
-        <label>#{portal.meeds.contributions}</label>
-        <page-reference>portal::global::programs</page-reference>
-        <node>
-          <name>programs</name>
-          <label>#{portal.meeds.programs}</label>
-          <page-reference>portal::global::programs</page-reference>
-        </node>
-        <node>
-          <name>actions</name>
-          <label>#{portal.meeds.actions}</label>
-          <page-reference>portal::global::actions</page-reference>
-        </node>
-        <node>
-          <name>achievements</name>
-          <label>#{portal.meeds.achievements}</label>
-          <page-reference>portal::global::achievements</page-reference>
-        </node>
-      </node>
-      <node>
-        <name>perkstore</name>
-        <label>#{portal.meeds.perks}</label>
-        <page-reference>portal::global::perkstore</page-reference>
-      </node>
-    </node>
     <node>
       <name>stream</name>
       <label>#{portal.meeds.stream}</label>

diff --git a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal/meeds/portal.xml b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal/meeds/portal.xml
@@ -21,7 +21,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     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>meeds</portal-name>
-    <display-order>1</display-order>
+    <display-order>30</display-order>
     <locale>en</locale>
     <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
     <edit-permission>*:/platform/administrators</edit-permission>

diff --git a/.../plf-sites-extension/src/main/resources/locale/navigation/portal/contribute_en.properties b/.../plf-sites-extension/src/main/resources/locale/navigation/portal/contribute_en.properties
@@ -0,0 +1,22 @@
+#
+# This file is part of the Meeds project (https://meeds.io/).
+#
+# Copyright (C) 2023 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
+# 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+
+portal.contribute.actions=Actions
+portal.contribute.programs=Programs
+portal.contribute.perks=Perks
diff --git a/...pps/plf-sites-extension/src/main/resources/locale/navigation/portal/mycraft_en.properties b/...pps/plf-sites-extension/src/main/resources/locale/navigation/portal/mycraft_en.properties
@@ -0,0 +1,23 @@
+#
+# This file is part of the Meeds project (https://meeds.io/).
+#
+# Copyright (C) 2023 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
+# 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+
+portal.mycraft.dashboard=Dashboard
+portal.mycraft.tasks=Tasks
+portal.mycraft.achievements=Achievements
+portal.mycraft.wallet=Wallet
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
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2023 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
+  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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<container
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_6 http://www.gatein.org/xml/ns/gatein_objects_1_6"
+    xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_6"
+    id="ParentSiteContainer"
+    template="system:/groovy/portal/webui/workspace/UIParentSiteContainer.gtmpl">
+
+  <container id="UITopBarContainer" template="system:/groovy/portal/webui/container/UITopBarContainer.gtmpl">
+    <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
+    <container id="left-topNavigation-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl" attribute="">
+      <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>
+      <factory-id>addonContainer</factory-id>
+    </container>
+    <container id="top-bar-logo-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
+      <name>top-bar-logo-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="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">
+      <name>middle-topNavigation-container</name>
+      <factory-id>addonContainer</factory-id>
+    </container>
+    <container id="TopbarLoadingContainer" template="system:/groovy/portal/webui/container/UITopbarLoadingContainer.gtmpl">
+      <access-permissions>*:/platform/users;*:/platform/externals</access-permissions>
+    </container>
+  </container>
+  <site-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>
+</container>
diff --git a/...-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml b/...-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/navigation.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2023 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
+  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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<node-navigation
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_6 http://www.gatein.org/xml/ns/gatein_objects_1_6"
+    xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_6">
+  <priority>1</priority>
+
+  <page-nodes>
+    <node>
+      <name>home</name>
+      <label>Home</label>
+      <page-reference>portal::@owner@::homepage</page-reference>
+    </node>
+  </page-nodes>
+</node-navigation>
diff --git a/...s/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml b/...s/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/pages.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2023 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
+  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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<page-set
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_6 http://www.gatein.org/xml/ns/gatein_objects_1_6"
+    xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_6">
+
+  <page>
+    <name>homepage</name>
+    <title>Home Page</title>
+    <access-permissions>Everyone</access-permissions>
+    <edit-permission>*:/platform/administrators</edit-permission>
+  </page>
+
+</page-set>
diff --git a/.../plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml b/.../plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2023 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
+  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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<portal-config
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_6 http://www.gatein.org/xml/ns/gatein_objects_1_6"
+    xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_6">
+  <portal-name>@owner@</portal-name>
+  <label>Basic Portal</label>
+  <description>This is basic portal template</description>
+  <locale>en</locale>
+  <access-permissions>Everyone</access-permissions>
+  <edit-permission>*:/platform/administrators</edit-permission>
+  <properties>
+    <entry key="sessionAlive">onDemand</entry>
+  </properties>
+
+  <portal-layout>
+    <page-body></page-body>
+  </portal-layout>
+
+</portal-config>
diff --git a/...plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/analytics/page.xml b/...plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/analytics/page.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+
   This file is part of the Meeds project (https://meeds.io/).
-  Copyright (C) 2022 Meeds Association
-  contact@meeds.io
+
+  Copyright (C) 2023 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
   License as published by the Free Software Foundation; either
@@ -11,9 +13,11 @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Lesser General Public License for more details.
+
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, write to the Free Software Foundation,
   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_objects_1_8 http://www.exoplatform.org/xml/ns/gatein_objects_1_8" xmlns="http://www.exoplatform.org/xml/ns/gatein_objects_1_8">
   <name></name>

diff --git a/...-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/custom space/page.xml b/...-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/custom space/page.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2023 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
+  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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
 <page 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2"

diff --git a/...pps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml b/...pps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+  This file is part of the Meeds project (https://meeds.io/).
+
+  Copyright (C) 2023 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
+  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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+-->
+<page
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_6 http://www.gatein.org/xml/ns/gatein_objects_1_6"
+    xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_6">
+  <name></name>
+</page>