diff --git a/packaging/plf-dependencies/pom.xml b/packaging/plf-dependencies/pom.xml index 2c5aec0bb..8a15b640f 100644 --- 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. io.meeds.social - social-webapp-portlet + social-webapp war runtime io.meeds.social - social-extension-war - war - runtime - - - io.meeds.social - social-extension-war + social-webapp pom import diff --git a/services/plf-configuration/src/main/resources/conf/platform/configuration.properties b/services/plf-configuration/src/main/resources/conf/platform/configuration.properties index 2de8f9bc8..b3e171b8a 100644 --- 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 index 507980cd7..49d4f8c98 100644 --- 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. cometd - social-extension - - - social-portlet + social 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 index f9414f202..1d18f5a92 100644 --- 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 index 2769f80d9..58f95950a 100644 --- 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. MeedsFeatureProperties - 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 index 88872729b..97a003f40 100644 --- 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. war:/conf/meeds/portal-configuration.xml war:/conf/meeds/portal-upgrade-configuration.xml war:/conf/meeds/resources-bundle-configuration.xml - war:/conf/meeds/space-template-configuration.xml 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 index d29ae8a51..765deb552 100644 --- 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 @@ - ${meeds.portalConfig.metadata.override:true} + ${io.meeds.meeds.portalConfig.metadata.override:true} - ${meeds.portalConfig.metadata.importmode:insert} + ${io.meeds.meeds.portalConfig.metadata.importmode:insert} war:/conf/meeds/ diff --git a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/space-template-configuration.xml b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/space-template-configuration.xml deleted file mode 100644 index 0e8c4b4df..000000000 --- a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/meeds/space-template-configuration.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - org.exoplatform.social.core.space.spi.SpaceTemplateService - org.exoplatform.social.core.space.impl.SpaceTemplateServiceImpl - - - defaultSpaceTemplate - ${exo.social.template.default:crowdFunding} - - - - - - org.exoplatform.social.core.space.spi.SpaceTemplateService - - Space Template Extension - extendSpaceTemplatePlugin - org.exoplatform.social.core.space.SpaceTemplateConfigPlugin - - - template - Space Wallet - - crowdFunding - - - - - - wallet - - - SpaceWallet - - - SpaceWallet - - - false - - - 500 - - - SpaceWallet - - - fas fa-wallet - - - wallet - - - - - - - - - - - diff --git a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/crowdFundingBanner.png b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/crowdFundingBanner.png deleted file mode 100644 index 4164dea5d..000000000 Binary files a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/crowdFundingBanner.png and /dev/null differ diff --git a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml b/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml deleted file mode 100644 index 6e27915d3..000000000 --- a/webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - org.exoplatform.social.core.space.spi.SpaceTemplateService - - DefaultSpaceApplicationHandler - registerSpaceApplicationHandler - org.exoplatform.social.core.space.impl.DefaultSpaceApplicationHandler - - - templateName - ${exo.social.template.default:crowdFunding} - - - - - Space Template Configuration - registerSpaceTemplatePlugin - org.exoplatform.social.core.space.SpaceTemplateConfigPlugin - - - template - Space Template - - - crowdFunding - - - private - - - open - - - war:/conf/social-extension/social/crowdFundingBanner.png - - - ${exo.social.space.template.crowdFunding.permissions:*:/platform/users} - - - ${exo.social.space.template.crowdFunding.invitees:} - - - - - social-portlet - - - SpaceActivityStreamPortlet - - - Home - - - fas fa-stream - - - - - - - - - social-portlet - - - MembersPortlet - - - Members - - - false - - - 100 - - - members - - - fas fa-users - - - - - - - task-management - - - TasksManagement - - - Tasks - - - true - - - 200 - - - tasks - - - fas fa-tasks - - - task - - - - - - - notes - - - Notes - - - notes - - - true - - - 300 - - - notes - - - fas fa-clipboard - - - notes - - - - - - - social-portlet - - - SpaceSettingPortlet - - - Space Settings - - - false - - - 1000 - - - settings - - - fas fa-cog - - - - - manager - - - - - - - - - - - - - diff --git a/webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/administration_en.properties b/webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/administration_en.properties index 5ae74269e..19b757ea8 100644 --- a/webapps/plf-sites-extension/src/main/resources/locale/navigation/portal/administration_en.properties +++ b/webapps/plf-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 index 438553535..5124b7f30 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 @@ -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 diff --git a/webapps/plf-sites-extension/src/main/resources/space-templates.json b/webapps/plf-sites-extension/src/main/resources/space-templates.json new file mode 100644 index 000000000..cd0466a4d --- /dev/null +++ b/webapps/plf-sites-extension/src/main/resources/space-templates.json @@ -0,0 +1,85 @@ +{ + "descriptors":[ + { + "id":"announcement", + "names":{ + "en":"space.template.announcement.title" + }, + "descriptions":{ + "en":"space.template.announcement.description" + }, + "bannerPath":"war:/../images/defaultSpaceBanner.webp", + "icon": "fa-bullhorn", + "enabled": true, + "system": true, + "layout": "announcement", + "spaceFields": ["name", "properties"], + "permissions": ["*:/platform/administrators","*:/platform/web-contributors"], + "spaceLayoutPermissions": ["*:/platform/administrators"], + "spaceDeletePermissions": ["*:/platform/administrators"], + "spaceDefaultVisibility": "private", + "spaceDefaultRegistration": "open", + "spaceAllowContentCreation": true + }, { + "id":"circle", + "names":{ + "en":"space.template.circle.title" + }, + "descriptions":{ + "en":"space.template.circle.description" + }, + "bannerPath":"war:/../images/defaultSpaceBanner.webp", + "icon": "fa-circle-notch", + "enabled": true, + "system": true, + "layout": "circle", + "spaceFields": ["invitation"], + "permissions": ["*:/platform/users"], + "spaceLayoutPermissions": ["*:/platform/administrators"], + "spaceDeletePermissions": ["spaceAdmin"], + "spaceDefaultVisibility": "hidden", + "spaceDefaultRegistration": "closed", + "spaceAllowContentCreation": false + }, { + "id":"community", + "names":{ + "en":"space.template.community.title" + }, + "descriptions":{ + "en":"space.template.community.description" + }, + "bannerPath":"war:/../images/defaultSpaceBanner.webp", + "icon": "fa-users", + "enabled": true, + "system": true, + "layout": "community", + "spaceFields": ["name", "properties", "invitation"], + "permissions": ["*:/platform/users"], + "spaceLayoutPermissions": ["*:/platform/administrators"], + "spaceDeletePermissions": ["spaceAdmin"], + "spaceDefaultVisibility": "private", + "spaceDefaultRegistration": "validation", + "spaceAllowContentCreation": false + }, { + "id":"project", + "names":{ + "en":"space.template.project.title" + }, + "descriptions":{ + "en":"space.template.project.description" + }, + "bannerPath":"war:/../images/defaultSpaceBanner.webp", + "icon": "fa-tasks", + "enabled": true, + "system": true, + "layout": "project", + "spaceFields": ["name", "properties", "access", "invitation"], + "permissions": ["*:/platform/users"], + "spaceLayoutPermissions": ["*:/platform/administrators"], + "spaceDeletePermissions": ["spaceAdmin"], + "spaceDefaultVisibility": "private", + "spaceDefaultRegistration": "closed", + "spaceAllowContentCreation": false + } + ] +} \ No newline at end of file diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/group.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/group.xml new file mode 100644 index 000000000..8f21af2bf --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/group.xml @@ -0,0 +1,35 @@ + + + + @owner@ + false + en + member:@owner@ + *:/platform/administrators + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/navigation.xml new file mode 100644 index 000000000..6e06cea06 --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/navigation.xml @@ -0,0 +1,65 @@ + + + + 3 + + + home + + fas fa-home + group::@owner@::home + + members + + fas fa-users + group::@owner@::members + + + more + + fas fa-ellipsis-h + + tasks + + fas fa-tasks + group::@owner@::tasks + + + notes + + far fa-clipboard + group::@owner@::notes + + + settings + + fas fa-cog + group::@owner@::settings + + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/pages.xml new file mode 100644 index 000000000..4bf8028c5 --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/pages.xml @@ -0,0 +1,198 @@ + + + + + home + Home + member:@owner@ + *:/platform/administrators + + + + + + social + SpaceBannerPortlet + + Space Banner + + + + + + + + content + NewsListView + + News List + + + + social + SpaceActivityStreamPortlet + + Space Activity Stream + + + + + + content + NewsListView + + News List + + + + social + SpaceWidgetDescription + + Space Description + + + space-home-widgets-announcement-container + addonContainer + + + + + + + + tasks + Tasks + member:@owner@ + *:/platform/administrators + + + + + top-space-task-announcement-container + addonContainer + + + + task-management + TasksManagement + + Space Tasks + + + bottom-space-tasks-announcement-container + addonContainer + + + + + + + + notes + Notes + member:@owner@ + *:/platform/administrators + + + + + top-space-notes-announcement-container + addonContainer + + + + notes + Notes + + Space Notes + + + bottom-space-notes-announcement-container + addonContainer + + + + + + + + members + Space Members + member:@owner@ + *:/platform/administrators + + + + + top-space-members-announcement-container + addonContainer + + + + social + MembersPortlet + + Space Settings + + + bottom-space-members-announcement-container + addonContainer + + + + + + + + settings + Space Settings + manager:@owner@ + *:/platform/administrators + + + + + top-space-settings-announcement-container + addonContainer + + + + social + SpaceSettingPortlet + + Space Settings + + + bottom-space-settings-announcement-container + addonContainer + + + + + + + \ No newline at end of file diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/circle/group.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/circle/group.xml new file mode 100644 index 000000000..8f21af2bf --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/circle/group.xml @@ -0,0 +1,35 @@ + + + + @owner@ + false + en + member:@owner@ + *:/platform/administrators + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/circle/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/circle/navigation.xml new file mode 100644 index 000000000..dfa11665b --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/circle/navigation.xml @@ -0,0 +1,59 @@ + + + + 3 + + + home + + fas fa-home + group::@owner@::home + + members + + fas fa-users + group::@owner@::members + + + apps + + fas fa-ellipsis-h + + tasks + + fas fa-tasks + group::@owner@::tasks + + + notes + + far fa-clipboard + group::@owner@::notes + + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/circle/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/circle/pages.xml new file mode 100644 index 000000000..a2824a64f --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/circle/pages.xml @@ -0,0 +1,152 @@ + + + + + home + Home + member:@owner@ + *:/platform/administrators + + + + + + social + SpaceActivityStreamPortlet + + Space Activity Stream + + + + + + social + WhoIsOnLinePortlet + + Who is on Line + + + + social + SpaceWidgetMembers + + Space Members + + + space-home-widgets-circle-container + addonContainer + + + + + + + + tasks + Tasks + member:@owner@ + *:/platform/administrators + + + + + top-space-task-circle-container + addonContainer + + + + task-management + TasksManagement + + Space Tasks + + + bottom-space-tasks-circle-container + addonContainer + + + + + + + + notes + Notes + member:@owner@ + *:/platform/administrators + + + + + top-space-notes-circle-container + addonContainer + + + + notes + Notes + + Space Notes + + + bottom-space-notes-circle-container + addonContainer + + + + + + + + members + Space Members + member:@owner@ + *:/platform/administrators + + + + + top-space-members-circle-container + addonContainer + + + + social + MembersPortlet + + Space Settings + + + bottom-space-members-circle-container + addonContainer + + + + + + + \ No newline at end of file diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/community/group.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/community/group.xml new file mode 100644 index 000000000..8f21af2bf --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/community/group.xml @@ -0,0 +1,35 @@ + + + + @owner@ + false + en + member:@owner@ + *:/platform/administrators + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/community/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/community/navigation.xml new file mode 100644 index 000000000..0c66a78b7 --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/community/navigation.xml @@ -0,0 +1,65 @@ + + + + 3 + + + home + + fas fa-home + group::@owner@::home + + notes + + far fa-clipboard + group::@owner@::notes + + + more + + fas fa-ellipsis-h + + wallet + + fas fa-wallet + group::@owner@::wallet + + + members + + fas fa-users + group::@owner@::members + + + settings + + fas fa-cog + group::@owner@::settings + + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/community/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/community/pages.xml new file mode 100644 index 000000000..6b6266ee6 --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/community/pages.xml @@ -0,0 +1,268 @@ + + + + + home + Home + member:@owner@ + *:/platform/administrators + + + + + + gamification-portlets + topChallengers + + + topChallengersPeriod + week + + + topChallengersCurrentPosition + true + + + + Leaderboard + 360 + + + + + + gamification-portlets + programsOverview + + + limit + 4 + + + programsSortBy + modifiedDate + + + + Programs Overview + 360 + + + + + + gamification-portlets + challengesOverview + + + endingRulesLimit + 0 + + + lockedRulesLimit + 0 + + + availableRulesLimit + 4 + + + upcomingRulesLimit + 0 + + + rulesSortBy + modifiedDate + + + + Actions overview + 360 + + + + + + + + social + SpaceActivityStreamPortlet + + Space Activity Stream + + + + + + social + WhoIsOnLinePortlet + + Who is on Line + + + + social + SpaceWidgetDescription + + Space Description + + + + social + SpaceWidgetManagers + + Space Managers + + + + social + SpaceWidgetMembers + + Space Members + + + space-home-widgets-community-container + addonContainer + + + + + + + + wallet + Wallet + member:@owner@ + *:/platform/administrators + + + + + top-space-wallet-community-container + addonContainer + + + + wallet + SpaceWallet + + Space Wallet + + + bottom-space-wallet-community-container + addonContainer + + + + + + + + notes + Notes + member:@owner@ + *:/platform/administrators + + + + + top-space-notes-community-container + addonContainer + + + + notes + Notes + + Space Notes + + + bottom-space-notes-community-container + addonContainer + + + + + + + + members + Space Members + member:@owner@ + *:/platform/administrators + + + + + top-space-members-community-container + addonContainer + + + + social + MembersPortlet + + Space Settings + + + bottom-space-members-community-container + addonContainer + + + + + + + + settings + Space Settings + manager:@owner@ + *:/platform/administrators + + + + + top-space-settings-community-container + addonContainer + + + + social + SpaceSettingPortlet + + Space Settings + + + bottom-space-settings-community-container + addonContainer + + + + + + + \ No newline at end of file diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/project/group.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/project/group.xml new file mode 100644 index 000000000..8f21af2bf --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/project/group.xml @@ -0,0 +1,35 @@ + + + + @owner@ + false + en + member:@owner@ + *:/platform/administrators + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/project/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/project/navigation.xml new file mode 100644 index 000000000..78e42e804 --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/project/navigation.xml @@ -0,0 +1,65 @@ + + + + 3 + + + home + + fas fa-home + group::@owner@::home + + tasks + + fas fa-tasks + group::@owner@::tasks + + + more + + fas fa-ellipsis-h + + members + + fas fa-users + group::@owner@::members + + + notes + + far fa-clipboard + group::@owner@::notes + + + settings + + fas fa-cog + group::@owner@::settings + + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/project/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/project/pages.xml new file mode 100644 index 000000000..ab890a8f0 --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/project/pages.xml @@ -0,0 +1,256 @@ + + + + + home + Home + member:@owner@ + *:/platform/administrators + + + + + + content + NewsListView + + News List + + + + social + SpaceActivityStreamPortlet + + Space Activity Stream + + + + + + social + Links + + + data.init + + + + + + + Project Resources + + + + social + WhoIsOnLinePortlet + + Who is on Line + + + + social + SpaceWidgetDescription + + Space Description + + + + social + SpaceWidgetManagers + + Space Managers + + + + social + SpaceWidgetMembers + + Space Members + + + space-home-widgets-project-container + addonContainer + + + + + + + + tasks + Tasks + member:@owner@ + *:/platform/administrators + + + + + top-space-task-project-container + addonContainer + + + + task-management + TasksManagement + + Space Tasks + + + bottom-space-tasks-project-container + addonContainer + + + + + + + + notes + Notes + member:@owner@ + *:/platform/administrators + + + + + top-space-notes-project-container + addonContainer + + + + notes + Notes + + Space Notes + + + bottom-space-notes-project-container + addonContainer + + + + + + + + members + Space Members + member:@owner@ + *:/platform/administrators + + + + + top-space-members-project-container + addonContainer + + + + social + MembersPortlet + + Space Settings + + + bottom-space-members-project-container + addonContainer + + + + + + + + settings + Space Settings + manager:@owner@ + *:/platform/administrators + + + + + top-space-settings-project-container + addonContainer + + + + social + SpaceSettingPortlet + + Space Settings + + + bottom-space-settings-project-container + addonContainer + + + + + + + \ No newline at end of file diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/space/group.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/space/group.xml new file mode 100644 index 000000000..8f21af2bf --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/space/group.xml @@ -0,0 +1,35 @@ + + + + @owner@ + false + en + member:@owner@ + *:/platform/administrators + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/space/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/space/navigation.xml new file mode 100644 index 000000000..c74b452e9 --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/space/navigation.xml @@ -0,0 +1,71 @@ + + + + 3 + + + home + + fas fa-home + group::@owner@::home + + notes + + far fa-clipboard + group::@owner@::notes + + + tasks + + fas fa-tasks + group::@owner@::tasks + + + more + + fas fa-ellipsis-h + + members + + fas fa-users + group::@owner@::members + + + wallet + + fas fa-wallet + group::@owner@::wallet + + + settings + + fas fa-cog + group::@owner@::settings + + + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/space/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/space/pages.xml new file mode 100644 index 000000000..768cc5cf5 --- /dev/null +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/space/pages.xml @@ -0,0 +1,233 @@ + + + + + home + Home + Everyone + manager:@owner@ + + + + + + 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-container + addonContainer + + + + + + + + wallet + Wallet + member:@owner@ + *:/platform/administrators + + + + + top-space-wallet-container + addonContainer + + + + wallet + SpaceWallet + + Space Wallet + + + bottom-space-wallet-container + addonContainer + + + + + + + + tasks + Tasks + member:@owner@ + *:/platform/administrators + + + + + top-space-task-container + addonContainer + + + + task-management + TasksManagement + + Space Tasks + + + bottom-space-tasks-container + addonContainer + + + + + + + + notes + Notes + member:@owner@ + *:/platform/administrators + + + + + top-space-notes-container + addonContainer + + + + notes + Notes + + Space Notes + + + bottom-space-notes-container + addonContainer + + + + + + + + members + Space Members + member:@owner@ + *:/platform/administrators + + + + + top-space-members-container + addonContainer + + + + social + MembersPortlet + + Space Settings + + + bottom-space-members-container + addonContainer + + + + + + + + settings + Space Settings + manager:@owner@ + *:/platform/administrators + + + + + top-space-settings-container + addonContainer + + + + social + SpaceSettingPortlet + + Space Settings + + + bottom-space-settings-container + addonContainer + + + + + + + \ No newline at end of file diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/pages.xml index 0d3edf188..5a0f68b40 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/pages.xml @@ -33,7 +33,7 @@ - social-portlet + social Image @@ -51,7 +51,7 @@ - social-portlet + social Links diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/portal.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/portal.xml index 8be6d29c1..a4417a43e 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/portal.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/portal.xml @@ -38,7 +38,7 @@ Everyone - social-portlet + social VerticalMenu Site Vertical Menu @@ -54,7 +54,7 @@ Everyone - social-portlet + social Breadcrumb Site Breadcrumb application diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/pages.xml index 29d4f343b..10576d586 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/pages.xml @@ -33,7 +33,7 @@ - social-portlet + social SpaceBannerPortlet @@ -43,7 +43,7 @@ - social-portlet + social SpaceWidgetDescription @@ -51,13 +51,13 @@ - social-portlet + social SpaceWidgetManagers - social-portlet + social SpaceWidgetMembers diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/portal.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/portal.xml index b23f98f96..a9b017317 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/portal.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/portal.xml @@ -28,22 +28,18 @@ en - Everyone - Everyone - social-portlet + social TopBarLogo Space Logo - Everyone false false - *:/platform/administrators layout @@ -54,24 +50,20 @@ MiddleToolBar - Everyone addonContainer - Everyone - social-portlet + social TopBarLogin Login Button - Everyone false false - *:/platform/users;*:/platform/externals diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/spaceHomePage/page.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/spaceHomePage/page.xml deleted file mode 100644 index 6d80d33e4..000000000 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/spaceHomePage/page.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - social-portlet - Image - - Image - - true - - - - - - - - - social-portlet - SpaceActivityStreamPortlet - - Space Activity Stream - - - - - - social-portlet - SpaceWidgetDescription - - Space Description - - - - social-portlet - SpaceWidgetManagers - - Space Managers - - - - social-portlet - SpaceWidgetMembers - - Space Members - - - - social-portlet - WhoIsOnLinePortlet - - Who is on Line - - - space-home-widgets-container - addonContainer - - - - - diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-configuration.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-configuration.xml index 58adc7fe6..34fab749c 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-configuration.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal-configuration.xml @@ -78,27 +78,8 @@ navigationWebsite - - spacePublic - - - - - - - user.configuration - description - - - - - user - - - war:/conf/portal - 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 c0eabae91..4cc896d62 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 @@ -263,7 +263,7 @@ - LayoutEditorPageUpgrade + LayoutEditorPagePermissionUpgrade addUpgradePlugin io.meeds.social.upgrade.LayoutUpgradePlugin @@ -622,7 +622,7 @@ true - ExternalSpacesList + SocialPortletExternalSpacesList remove @@ -632,6 +632,17 @@ + + SocialExternalSpacesList + + + remove + + + social/ExternalSpacesList + + + @@ -695,7 +706,24 @@ true - SpaceInfos + SocialSpaceInfos + + + remove + + + social/SpaceInfos + + + false + + + true + + + + + SocialPortletSpaceInfos remove @@ -734,7 +762,7 @@ true - SpacesOverview + SocialPortletSpacesOverview remove @@ -750,6 +778,1133 @@ + + SocialSpacesOverview + + + remove + + + social/SpacesOverview + + + false + + + true + + + + + + + SocialPortletToSocialUpgradePlugin + addUpgradePlugin + io.meeds.layout.plugin.upgrade.LayoutApplicationReferenceUpgradePlugin + + + product.group.id + The groupId of the product + org.exoplatform.social + + + plugin.execution.order + The plugin execution order + 500 + + + plugin.upgrade.execute.once + Execute only once, not each version change + true + + + SpaceAccessPortlet + + + update + + + social-portlet/SpaceAccessPortlet + + + social/SpaceAccessPortlet + + + true + + + true + + + + + PageNotFound + + + update + + + social-portlet/PageNotFound + + + social/PageNotFound + + + true + + + true + + + + + IDMUsersManagement + + + update + + + social-portlet/IDMUsersManagement + + + social/IDMUsersManagement + + + true + + + true + + + + + IDMGroupsManagement + + + update + + + social-portlet/IDMGroupsManagement + + + social/IDMGroupsManagement + + + true + + + true + + + + + IDMMembershipTypesManagement + + + update + + + social-portlet/IDMMembershipTypesManagement + + + social/IDMMembershipTypesManagement + + + true + + + true + + + + + WhoIsOnLinePortlet + + + update + + + social-portlet/WhoIsOnLinePortlet + + + social/WhoIsOnLinePortlet + + + true + + + true + + + + + SpaceInfos + + + update + + + social-portlet/SpaceInfos + + + social/SpaceInfos + + + true + + + true + + + + + SpaceWidgetDescription + + + update + + + social-portlet/SpaceWidgetDescription + + + social/SpaceWidgetDescription + + + true + + + true + + + + + SpaceWidgetManagers + + + update + + + social-portlet/SpaceWidgetManagers + + + social/SpaceWidgetManagers + + + true + + + true + + + + + SpaceWidgetMembers + + + update + + + social-portlet/SpaceWidgetMembers + + + social/SpaceWidgetMembers + + + true + + + true + + + + + MembersPortlet + + + update + + + social-portlet/MembersPortlet + + + social/MembersPortlet + + + true + + + true + + + + + SpaceBannerPortlet + + + update + + + social-portlet/SpaceBannerPortlet + + + social/SpaceBannerPortlet + + + true + + + true + + + + + SpaceActivityStreamPortlet + + + update + + + social-portlet/SpaceActivityStreamPortlet + + + social/SpaceActivityStreamPortlet + + + true + + + true + + + + + UserActivityStreamPortlet + + + update + + + social-portlet/UserActivityStreamPortlet + + + social/UserActivityStreamPortlet + + + true + + + true + + + + + UserSettingLanguage + + + update + + + social-portlet/UserSettingLanguage + + + social/UserSettingLanguage + + + true + + + true + + + + + UserSettingNotifications + + + update + + + social-portlet/UserSettingNotifications + + + social/UserSettingNotifications + + + true + + + true + + + + + UserSettingSecurity + + + update + + + social-portlet/UserSettingSecurity + + + social/UserSettingSecurity + + + true + + + true + + + + + HamburgerMenu + + + update + + + social-portlet/HamburgerMenu + + + social/HamburgerMenu + + + true + + + true + + + + + SpaceSettingPortlet + + + update + + + social-portlet/SpaceSettingPortlet + + + social/SpaceSettingPortlet + + + true + + + true + + + + + SpacesAdministration + + + update + + + social-portlet/SpacesAdministration + + + social/SpacesAdministration + + + true + + + true + + + + + TopBarLogo + + + update + + + social-portlet/TopBarLogo + + + social/TopBarLogo + + + true + + + true + + + + + TopBarPreview + + + update + + + social-portlet/TopBarPreview + + + social/TopBarPreview + + + true + + + true + + + + + TopBarLogin + + + update + + + social-portlet/TopBarLogin + + + social/TopBarLogin + + + true + + + true + + + + + TopBarPublishSite + + + update + + + social-portlet/TopBarPublishSite + + + social/TopBarPublishSite + + + true + + + true + + + + + ProfileHeader + + + update + + + social-portlet/ProfileHeader + + + social/ProfileHeader + + + true + + + true + + + + + ProfileContactInformation + + + update + + + social-portlet/ProfileContactInformation + + + social/ProfileContactInformation + + + true + + + true + + + + + ProfileWorkExperience + + + update + + + social-portlet/ProfileWorkExperience + + + social/ProfileWorkExperience + + + true + + + true + + + + + ProfileAboutMe + + + update + + + social-portlet/ProfileAboutMe + + + social/ProfileAboutMe + + + true + + + true + + + + + TopBarNotification + + + update + + + social-portlet/TopBarNotification + + + social/TopBarNotification + + + true + + + true + + + + + TopBarFavorites + + + update + + + social-portlet/TopBarFavorites + + + social/TopBarFavorites + + + true + + + true + + + + + GettingStarted + + + update + + + social-portlet/GettingStarted + + + social/GettingStarted + + + true + + + true + + + + + ExternalSpacesList + + + update + + + social-portlet/ExternalSpacesList + + + social/ExternalSpacesList + + + true + + + true + + + + + SpacesList + + + update + + + social-portlet/SpacesList + + + social/SpacesList + + + true + + + true + + + + + SpacesOverview + + + update + + + social-portlet/SpacesOverview + + + social/SpacesOverview + + + true + + + true + + + + + PeopleList + + + update + + + social-portlet/PeopleList + + + social/PeopleList + + + true + + + true + + + + + PeopleOverview + + + update + + + social-portlet/PeopleOverview + + + social/PeopleOverview + + + true + + + true + + + + + SuggestionsPeopleAndSpace + + + update + + + social-portlet/SuggestionsPeopleAndSpace + + + social/SuggestionsPeopleAndSpace + + + true + + + true + + + + + Search + + + update + + + social-portlet/Search + + + social/Search + + + true + + + true + + + + + GeneralSettings + + + update + + + social-portlet/GeneralSettings + + + social/GeneralSettings + + + true + + + true + + + + + Popover + + + update + + + social-portlet/Popover + + + social/Popover + + + true + + + true + + + + + TopBarMenu + + + update + + + social-portlet/TopBarMenu + + + social/TopBarMenu + + + true + + + true + + + + + ProfileSettingsPortlet + + + update + + + social-portlet/ProfileSettingsPortlet + + + social/ProfileSettingsPortlet + + + true + + + true + + + + + Image + + + update + + + social-portlet/Image + + + social/Image + + + true + + + true + + + + + Links + + + update + + + social-portlet/Links + + + social/Links + + + true + + + true + + + + + DrawersOverlay + + + update + + + social-portlet/DrawersOverlay + + + social/DrawersOverlay + + + true + + + true + + + + + NotificationAdministration + + + update + + + social-portlet/NotificationAdministration + + + social/NotificationAdministration + + + true + + + true + + + + + VerticalMenu + + + update + + + social-portlet/VerticalMenu + + + social/VerticalMenu + + + true + + + true + + + + + Breadcrumb + + + update + + + social-portlet/Breadcrumb + + + social/Breadcrumb + + + true + + + true + + + + + PlatformSettings + + + update + + + social-portlet/PlatformSettings + + + social/PlatformSettings + + + true + + + true + + + + + OrganizationalChart + + + update + + + social-portlet/OrganizationalChart + + + social/OrganizationalChart + + + true + + + true + + + + + SpaceHeaderPortlet + + + update + + + social-portlet/SpaceHeaderPortlet + + + social/SpaceBannerPortlet + + + true + + + true + + + + + SpaceMenuPortlet + + + remove + + + social-portlet/SpaceMenuPortlet + + + true + + + true + + + + + SpaceMenuPortletSocialRenamed + + + remove + + + social/SpaceMenuPortlet + + + true + + + true + + + + + SpaceTopbarMenu + + + remove + + + social-portlet/SpaceTopbarMenu + + + true + + + true + + + + + SpaceTopbarMenuSocialRenamed + + + remove + + + social/SpaceTopbarMenu + + + true + + + true + + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/navigation.xml index 412f3b62a..1e568a783 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/navigation.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/navigation.xml @@ -158,6 +158,12 @@ template fas fa-columns + + spaceTemplates + + fas fa-users-cog + portal::administration::spaceTemplates + pages diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/pages.xml index 694ffd568..dea9f890c 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/pages.xml @@ -33,7 +33,7 @@ - social-portlet + social GeneralSettings General Settings Portlet @@ -53,7 +53,7 @@ - social-portlet + social NotificationAdministration Notifications Administration @@ -100,7 +100,7 @@ - social-portlet + social IDMUsersManagement Users Management @@ -120,7 +120,7 @@ - social-portlet + social IDMGroupsManagement Groups Management @@ -140,7 +140,7 @@ - social-portlet + social ProfileSettingsPortlet Profile Settings Management @@ -161,7 +161,7 @@ - social-portlet + social SpacesAdministration @@ -373,6 +373,26 @@ + + spaceTemplates + Space Templates + *:/platform/administrators + manager:/platform/administrators + + + + + + social + SpaceTemplateManagement + + Space Templates Management + + + + + + pwaSettings PWA Settings diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/portal.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/portal.xml index 4ed6f8deb..528d25e5d 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/portal.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/administration/portal.xml @@ -42,7 +42,7 @@ *:/platform/users - social-portlet + social VerticalMenu Site Vertical Menu @@ -58,7 +58,7 @@ *:/platform/users - social-portlet + social Breadcrumb diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml index 3a798f5aa..5104655cc 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/contribute/pages.xml @@ -34,7 +34,7 @@ - social-portlet + social Image diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/navigation.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/navigation.xml index 3f82d2aa0..08b282ec7 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/navigation.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/navigation.xml @@ -331,5 +331,34 @@ portal::global::analytics-contents + + home + + SYSTEM + + tasks + + SYSTEM + portal::global::tasks + + + notes + + SYSTEM + portal::global::notes + + + members + + SYSTEM + portal::global::space-members + + + settings + + SYSTEM + portal::global::space-settings + + diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml index 254206d4d..5291a845c 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/global/pages.xml @@ -37,7 +37,7 @@ - social-portlet + social PeopleList All People @@ -46,14 +46,14 @@ - social-portlet + social PeopleOverview People Overview Portlet - social-portlet + social SuggestionsPeopleAndSpace @@ -85,7 +85,7 @@ - social-portlet + social SpacesList All Spaces @@ -105,7 +105,7 @@ - social-portlet + social UserActivityStreamPortlet User Activity Stream @@ -132,7 +132,7 @@ - social-portlet + social SpaceAccessPortlet space-access @@ -152,7 +152,7 @@ - social-portlet + social PageNotFound Page Not Found @@ -172,21 +172,21 @@ - social-portlet + social UserSettingLanguage User Setting Language - social-portlet + social UserSettingNotifications User Setting Notifications - social-portlet + social UserSettingSecurity User Setting Security @@ -210,7 +210,7 @@ - social-portlet + social ProfileHeader Profile Header Portlet @@ -227,7 +227,7 @@ - social-portlet + social ProfileAboutMe Profile AboutMe Portlet @@ -242,7 +242,7 @@ - social-portlet + social ProfileContactInformation Profile contact information Portlet @@ -257,7 +257,7 @@ - social-portlet + social ProfileWorkExperience Profile Work Experience Portlet @@ -1609,7 +1609,7 @@ layout-editor Layout Editor - *:/platform/users + Everyone manager:/platform/administrators true true @@ -1633,7 +1633,7 @@ template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> - social-portlet + social DrawersOverlay Drawers Overlay @@ -1684,7 +1684,7 @@ template="system:/groovy/portal/webui/container/UIContainer.gtmpl"> - social-portlet + social DrawersOverlay Drawers Overlay @@ -1751,7 +1751,7 @@ - social-portlet + social OrganizationalChart @@ -1983,4 +1983,95 @@ + + + notes + Notes + *:/platform/users;*:/platform/externals + manager:/platform/administrators + + + + + top-space-notes-container + *:/platform/users;*:/platform/externals + addonContainer + + + + notes + Notes + + Space Notes + + + bottom-space-notes-container + *:/platform/users;*:/platform/externals + addonContainer + + + + + + + + space-settings + Space Settings + *:/platform/users;*:/platform/externals + manager:/platform/administrators + + + + + top-space-settings-container + *:/platform/users;*:/platform/externals + addonContainer + + + + social + SpaceSettingPortlet + + Space Settings + + + bottom-space-settings-container + *:/platform/users;*:/platform/externals + addonContainer + + + + + + + + space-members + Space Members + *:/platform/users;*:/platform/externals + manager:/platform/administrators + + + + + top-space-members-container + *:/platform/users;*:/platform/externals + addonContainer + + + + social + MembersPortlet + + Space Settings + + + bottom-space-members-container + *:/platform/users;*:/platform/externals + addonContainer + + + + + + \ No newline at end of file diff --git a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml index 2e1a4b1e2..e5ca96031 100644 --- a/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml +++ b/webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/portal/mycraft/pages.xml @@ -37,7 +37,7 @@ - social-portlet + social UserActivityStreamPortlet User Activity Stream @@ -46,7 +46,7 @@ - social-portlet + social WhoIsOnLinePortlet Who is on line @@ -134,7 +134,7 @@ Everyone - social-portlet + social OrganizationalChart