Skip to content

Commit

Permalink
Merge Contribute Site Review - Meeds-io/MIPs#155 (#2346)
Browse files Browse the repository at this point in the history
  • Loading branch information
@boubaker
boubaker authored Sep 5, 2024
2 parents 9c9e233 + 6e98c1f commit b7f7e9c
Show file tree
Hide file tree
Showing 9 changed files with 468 additions and 124 deletions.
6 changes: 0 additions & 6 deletions webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/portal/meeds/navigation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@
xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_7">
<priority>4</priority>
<page-nodes>
<node>
<name>stream</name>
<label>#{portal.meeds.stream}</label>
<icon>fas fa-stream</icon>
<page-reference>portal::global::stream</page-reference>
</node>
<node>
<name>external-stream</name>
<label>#{portal.meeds.stream}</label>
Expand Down
2 changes: 2 additions & 0 deletions .../plf-sites-extension/src/main/resources/locale/navigation/portal/contribute_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#

portal.contribute.overview=Overview
portal.contribute.actions=Actions
portal.contribute.programs=Programs
portal.contribute.perks=Perks
portal.contribute.wallet=Wallet
47 changes: 47 additions & 0 deletions ...s/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-upgrade-configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,53 @@
</object-param>
</init-params>
</component-plugin>
<component-plugin>
<name>sites/contribute/7.0-cleanActionsNavigation</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>contribute.site.upgrade</name>
<object type="io.meeds.social.upgrade.model.LayoutUpgrade">
<field name="updateNavigation">
<boolean>true</boolean>
</field>
<field name="configPath">
<string>war:/conf/sites/</string>
</field>
<field name="portalType">
<string>portal</string>
</field>
<field name="portalName">
<string>contribute</string>
</field>
<field name="deleteNavigations">
<collection type="java.util.ArrayList" item-type="java.lang.String">
<value>
<string>actions</string>
</value>
</collection>
</field>
</object>
</object-param>
</init-params>
</component-plugin>
</external-component-plugins>

</configuration>
22 changes: 14 additions & 8 deletions ...s/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/navigation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,28 @@
<priority>1</priority>
<page-nodes>
<node>
<name>actions</name>
<label>#{portal.contribute.actions}</label>
<name>home</name>
<label>#{portal.contribute.overview}</label>
<icon>fa fa-rocket</icon>
<page-reference>portal::contribute::actions</page-reference>
<page-reference>portal::contribute::overview</page-reference>
<node>
<name>programs</name>
<label>#{portal.contribute.programs}</label>
<icon>fa fa-puzzle-piece</icon>
<page-reference>portal::contribute::programs</page-reference>
</node>
<node>
<name>perks</name>
<label>#{portal.contribute.perks}</label>
<icon>fa fa-shopping-cart</icon>
<page-reference>portal::contribute::perks</page-reference>
<name>actions</name>
<label>#{portal.contribute.actions}</label>
<icon>fa fa-trophy</icon>
<page-reference>portal::contribute::actions</page-reference>
</node>
<node>
<name>wallet</name>
<label>#{portal.contribute.wallet}</label>
<icon>fa fa-credit-card</icon>
<page-reference>portal::contribute::wallet</page-reference>
</node>
</node>
</page-nodes>
</node-navigation>
</node-navigation>
197 changes: 197 additions & 0 deletions webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,183 @@
xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_objects_1_12 http://www.exoplatform.org/xml/ns/gatein_objects_1_12"
xmlns="http://www.exoplatform.org/xml/ns/gatein_objects_1_12">

<page profiles="gamification">
<name>overview</name>
<title>Overview</title>
<access-permissions>Everyone</access-permissions>
<edit-permission>*:/platform/rewarding</edit-permission>
<container template="system:/groovy/portal/webui/container/UIPageLayout.gtmpl">
<section-columns>
<column col-span="12">
<portlet-application>
<portlet>
<application-ref>social-portlet</application-ref>
<portlet-ref>Image</portlet-ref>
<preferences>
<preference>
<name>name</name>
<value>contributeOverivewPageBanner</value>
</preference>
<preference>
<name>image-path</name>
<value>war:/../images/pages/banner/dashboard-banner.png</value>
<read-only>false</read-only>
</preference>
</preferences>
</portlet>
<title>Banner</title>
<css-style>
<mobile-hidden>true</mobile-hidden>
</css-style>
</portlet-application>
</column>
</section-columns>
<section-columns mobile-columns-style="true">
<column col-span="4">
<portlet-application>
<portlet>
<application-ref>gamification-portlets</application-ref>
<portlet-ref>topChallengers</portlet-ref>
<preferences>
<preference>
<name>topChallengersPeriod</name>
<value>week</value>
</preference>
<preference>
<name>topChallengersCurrentPosition</name>
<value>true</value>
</preference>
</preferences>
</portlet>
<title>Leaderboard</title>
<height>350</height>
</portlet-application>
</column>
<column col-span="4">
<portlet-application>
<portlet>
<application-ref>gamification-portlets</application-ref>
<portlet-ref>programsOverview</portlet-ref>
<preferences>
<preference>
<name>limit</name>
<value>4</value>
</preference>
<preference>
<name>programsSortBy</name>
<value>modifiedDate</value>
</preference>
</preferences>
</portlet>
<title>Programs Overview</title>
<height>350</height>
</portlet-application>
</column>
<column col-span="4">
<portlet-application>
<portlet>
<application-ref>gamification-portlets</application-ref>
<portlet-ref>challengesOverview</portlet-ref>
<preferences>
<preference>
<name>endingRulesLimit</name>
<value>0</value>
</preference>
<preference>
<name>lockedRulesLimit</name>
<value>0</value>
</preference>
<preference>
<name>availableRulesLimit</name>
<value>4</value>
</preference>
<preference>
<name>upcomingRulesLimit</name>
<value>0</value>
</preference>
<preference>
<name>rulesSortBy</name>
<value>modifiedDate</value>
</preference>
</preferences>
</portlet>
<title>Actions overview</title>
<height>350</height>
</portlet-application>
</column>
</section-columns>
<section-grid cols="12" rows="4">
<cell col-span="4" row-span="4">
<portlet-application>
<portlet>
<application-ref>gamification-portlets</application-ref>
<portlet-ref>myContributions</portlet-ref>
<preferences>
<preference>
<name>myContributionsPeriod</name>
<value>week</value>
</preference>
<preference>
<name>myContributionsDisplayLegend</name>
<value>true</value>
</preference>
<preference>
<name>myContributionsProgramLimit</name>
<value>4</value>
</preference>
</preferences>
</portlet>
<title>User Contributions</title>
</portlet-application>
</cell>
<cell col-span="8" row-span="2">
<portlet-application>
<portlet>
<application-ref>gamification-portlets</application-ref>
<portlet-ref>BadgesOverview</portlet-ref>
</portlet>
<title>Badges Overview</title>
</portlet-application>
</cell>
<cell col-span="4" row-span="2">
<portlet-application profiles="kudos">
<portlet>
<application-ref>kudos</application-ref>
<portlet-ref>KudosOverview</portlet-ref>
</portlet>
<title>Kudos Overview</title>
</portlet-application>
</cell>
<cell col-span="4" row-span="2">
<portlet-application profiles="wallet">
<portlet>
<application-ref>wallet</application-ref>
<portlet-ref>myRewards</portlet-ref>
</portlet>
<title>User Rewards</title>
</portlet-application>
</cell>
</section-grid>
<section-columns>
<column col-span="12">
<portlet-application>
<portlet>
<application-ref>gamification-portlets</application-ref>
<portlet-ref>EngagementCenterAchievements</portlet-ref>
<preferences>
<preference>
<name>hideOwnedTab</name>
<value>true</value>
</preference>
</preferences>
</portlet>
<title>Achievements</title>
</portlet-application>
</column>
</section-columns>
</container>
</page>

<page profiles="gamification">
<name>actions</name>
<title>Actions</title>
Expand Down Expand Up @@ -84,4 +261,24 @@
</container>
</page>

<page profiles="wallet">
<name>wallet</name>
<title>Wallet</title>
<access-permissions>Everyone</access-permissions>
<edit-permission>*:/platform/administrators</edit-permission>
<container template="system:/groovy/portal/webui/container/UIPageLayout.gtmpl">
<section-columns>
<column col-span="12">
<portlet-application>
<portlet>
<application-ref>wallet</application-ref>
<portlet-ref>Wallet</portlet-ref>
</portlet>
<title>Wallet</title>
</portlet-application>
</column>
</section-columns>
</container>
</page>

</page-set>
8 changes: 4 additions & 4 deletions webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,12 +469,12 @@
</portlet-application>
</column>
<column col-span="4">
<portlet-application>
<portlet-application profiles="kudos">
<portlet>
<application-ref>gamification-portlets</application-ref>
<portlet-ref>myReputation</portlet-ref>
<application-ref>kudos</application-ref>
<portlet-ref>KudosOverview</portlet-ref>
</portlet>
<title>User reputation</title>
<title>Kudos Overview</title>
</portlet-application>
</column>
<column col-span="4">
Expand Down
2 changes: 1 addition & 1 deletion webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/navigation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<name>dashboard</name>
<label>#{portal.mycraft.dashboard}</label>
<icon>fa fa-briefcase</icon>
<page-reference>portal::mycraft::dashboard</page-reference>
<page-reference>portal::global::stream</page-reference>
<node>
<name>tasks</name>
<label>#{portal.mycraft.tasks}</label>
Expand Down
Loading

0 comments on commit b7f7e9c

Please sign in to comment.