Merge Space Templates - Meeds-io/MIPs#150 (#2517)

Meeds-io · Nov 4, 2024 · 9cf5b4d · 9cf5b4d
2 parents 7fd0f39 + d84e2dc
commit 9cf5b4d
Show file tree

Hide file tree

Showing 44 changed files with 3,057 additions and 477 deletions.
diff --git a/packaging/plf-dependencies/pom.xml b/packaging/plf-dependencies/pom.xml
@@ -94,19 +94,13 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <!-- Social -->
     <dependency>
       <groupId>io.meeds.social</groupId>
-      <artifactId>social-webapp-portlet</artifactId>
+      <artifactId>social-webapp</artifactId>
       <type>war</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>io.meeds.social</groupId>
-      <artifactId>social-extension-war</artifactId>
-      <type>war</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.meeds.social</groupId>
-      <artifactId>social-extension-war</artifactId>
+      <artifactId>social-webapp</artifactId>
       <type>pom</type>
       <scope>import</scope>
       <exclusions>

diff --git a/services/plf-configuration/src/main/resources/conf/platform/configuration.properties b/services/plf-configuration/src/main/resources/conf/platform/configuration.properties
@@ -614,7 +614,6 @@ wiki.editPage.livingTime=${exo.wiki.editPage.livingTime:1800000}
 #
 # Disable space activity and activity for relation ship
 exo.activity-type.USER_ACTIVITIES_FOR_RELATIONSHIP.enabled=${exo.activity-type.USER_ACTIVITIES_FOR_RELATIONSHIP.enabled:false}
-exo.activity-type.SPACE_ACTIVITY.enabled=${exo.activity-type.SPACE_ACTIVITY.enabled:false}
 exo.activity-type.USER_PROFILE_ACTIVITY.enabled=${exo.activity-type.USER_PROFILE_ACTIVITY.enabled:false}
 
 # Spaces super managers groups

diff --git a/services/plf-configuration/src/main/resources/conf/platform/configuration.xml b/services/plf-configuration/src/main/resources/conf/platform/configuration.xml
@@ -77,10 +77,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                   <string>cometd</string>
                </value>
                <value>
-                  <string>social-extension</string>
-               </value>
-               <value>
-                  <string>social-portlet</string>
+                  <string>social</string>
                </value>
             </collection>
           </field>

diff --git a/services/plf-configuration/src/main/resources/conf/platform/exo-sample.properties b/services/plf-configuration/src/main/resources/conf/platform/exo-sample.properties
@@ -201,8 +201,6 @@
 # by default all activity Type are activated.
 #
 # exo.activity-type.DEFAULT_ACTIVITY.enabled=true
-# exo.activity-type.SPACE_ACTIVITY.enabled=false
-# exo.activity-type.USER_ACTIVITIES_FOR_SPACE.enabled=true
 # exo.activity-type.exosocial\:relationship.enabled=true
 # exo.activity-type.LINK_ACTIVITY.enabled=true
 # exo.activity-type.USER_PROFILE_ACTIVITY.enabled=false

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
@@ -26,7 +26,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <properties-param>
         <name>MeedsFeatureProperties</name>
         <property name="exo.feature.pwa.enabled" value="${exo.feature.pwa.enabled:true}" />
-        <property name="exo.feature.SpaceHomeLayoutReset.enabled" value="${exo.feature.SpaceHomeLayoutReset.enabled:true}" />
         <property name="exo.feature.EditorAttachImage.enabled" value="${exo.feature.EditorAttachImage.enabled:true}" />
         <property name="exo.feature.customStylesheet.enabled" value="${exo.feature.customStylesheet.enabled:false}" />
       </properties-param>

diff --git a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/configuration.xml b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -24,6 +24,5 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <import>war:/conf/meeds/portal-configuration.xml</import>
   <import>war:/conf/meeds/portal-upgrade-configuration.xml</import>
   <import>war:/conf/meeds/resources-bundle-configuration.xml</import>
-  <import>war:/conf/meeds/space-template-configuration.xml</import>
 
 </configuration>
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
@@ -49,10 +49,10 @@
               </collection>
             </field>
             <field name="override">
-              <boolean>${meeds.portalConfig.metadata.override:true}</boolean>
+              <boolean>${io.meeds.meeds.portalConfig.metadata.override:true}</boolean>
             </field>
             <field name="importMode">
-              <string>${meeds.portalConfig.metadata.importmode:insert}</string>
+              <string>${io.meeds.meeds.portalConfig.metadata.importmode:insert}</string>
             </field>
             <field name="location">
               <string>war:/conf/meeds/</string>

diff --git a/...s/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/space-template-configuration.xml b/...s/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/space-template-configuration.xml
diff --git a/...ion/src/main/webapp/WEB-INF/conf/social-extension/social/crowdFundingBanner.png b/...ion/src/main/webapp/WEB-INF/conf/social-extension/social/crowdFundingBanner.png
diff --git a/...n/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml b/...n/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml
diff --git a/...-sites-extension/src/main/resources/locale/navigation/portal/administration_en.properties b/...-sites-extension/src/main/resources/locale/navigation/portal/administration_en.properties
@@ -43,3 +43,4 @@ portal.administration.template=Templates
 portal.administration.pages=Pages
 portal.administration.portlets=Portlets
 portal.administration.pwaSettings=Mobile or Desktop App
+portal.administration.spaceTemplates=Spaces
diff --git a/webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/global_en.properties b/webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/global_en.properties
@@ -45,6 +45,14 @@ portal.global.layout-editor=Layout Editor
 portal.global.portlet-editor=Portlet Editor
 portal.global.portlet-viewer=Portlet Viewer
 portal.global.organizationalChart=Organizational Chart
+portal.global.spaceHome=Home
+portal.global.spaceNotes=Notes
+portal.global.spaceTasks=Tasks
+portal.global.spaceWallet=Wallet
+portal.global.spaceMembers=Members
+portal.global.spaceSettings=Settings
+portal.global.more=More
+portal.global.apps=Apps
 news.navigation.node.label=News
 portal.global.newsEditor=News editor
 portal.global.newsDetail=News details