From 97d2da7469e6ed5f50735191f0ec092429a15459 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Thu, 31 Oct 2024 12:12:40 +0100 Subject: [PATCH] feat: Add Contribute Page in Community Space Template - MEED-7726 - Meeds-io/meeds#2545 (#2553) This change will update Home Page of Community Space to use the default one an will move contributions widgets into a dedicated 'contribute' page. --- .../navigation/portal/global_en.properties | 1 + .../group_template/community/navigation.xml | 6 + .../sites/group_template/community/pages.xml | 144 ++++++++++++------ .../sites/portal-upgrade-configuration.xml | 56 +++++++ 4 files changed, 160 insertions(+), 47 deletions(-) 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 index 5124b7f30..39840399c 100644 --- 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 @@ -51,6 +51,7 @@ portal.global.spaceTasks=Tasks portal.global.spaceWallet=Wallet portal.global.spaceMembers=Members portal.global.spaceSettings=Settings +portal.global.spaceContribute=Contribute portal.global.more=More portal.global.apps=Apps news.navigation.node.label=News diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/community/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/community/navigation.xml index 2f776d461..a0edba86f 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/community/navigation.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/community/navigation.xml @@ -31,6 +31,12 @@ fas fa-home group_template::community::home + + contribute + + fas fa-rocket + group_template::community::contribute + apps diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/community/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/community/pages.xml index be65d706c..3378a1b30 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/community/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/community/pages.xml @@ -28,6 +28,73 @@ Home member:@owner_id@ *:/platform/administrators + + + + + + social + SpaceBannerPortlet + + Space Banner + + + + + + + + social + SpaceActivityStreamPortlet + + Space Activity Stream + + + + + + social + SpaceWidgetDescription + + Space Description + + + + social + SpaceWidgetManagers + + Space Managers + + + + social + SpaceWidgetMembers + + Space Members + + + + social + WhoIsOnLinePortlet + + Who is on Line + + + space-home-widgets-community-container + addonContainer + + + + + + + + contribute + Contribute + member:@owner_id@ + *:/platform/administrators @@ -47,7 +114,29 @@ Leaderboard - 360 + 300 + + + + gamification-portlets + myContributions + + + myContributionsPeriod + week + + + myContributionsDisplayLegend + true + + + myContributionsProgramLimit + 4 + + + + Contributions + 400 @@ -58,7 +147,7 @@ limit - 4 + 3 programsSortBy @@ -67,10 +156,8 @@ Programs Overview - 360 + 300 - - gamification-portlets @@ -99,55 +186,18 @@ Actions overview - 360 - - - - - - - - social - SpaceActivityStreamPortlet - - Space Activity Stream + 400 - social - WhoIsOnLinePortlet - - Who is on Line - - - - social - SpaceWidgetDescription - - Space Description - - - - social - SpaceWidgetManagers - - Space Managers - - - - social - SpaceWidgetMembers + gamification-portlets + UsersLeaderboard - Space Members + Actions overview + 720 - - space-home-widgets-community-container - addonContainer - diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml index 25517e40e..e85c7f2a6 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml @@ -1957,5 +1957,61 @@ + + CommunitySpaceTemplateLayoutUpgrade + addUpgradePlugin + io.meeds.social.upgrade.LayoutUpgradePlugin + + + product.group.id + org.exoplatform.social + + + plugin.execution.order + 130 + + + plugin.upgrade.execute.once + true + + + enabled + true + + + CommunitySpaceTemplate.upgrade + + + true + + + true + + + war:/conf/sites/ + + + group_template + + + community + + + merge + + + + + home + + + contribute + + + + + + + \ No newline at end of file