Merge Space Templates Layout - Meeds-io/MIPs#165

packaging/plf-packaging-resources/src/main/resources/controller.xml

@@ -241,6 +241,19 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     </path-param>
   </route>
 
+  <!-- The site template handler -->
+  <route path="/t/{gtn:siteid}/{gtn:path}">
+    <route-param qname="gtn:handler">
+      <value>portal-template</value>
+    </route-param>
+    <request-param qname="gtn:lang" name="lang" value-mapping="never-empty">
+      <pattern>(ar|ar-AE|ar-BH|ar-DZ|ar-EG|ar-IQ|ar-JO|ar-KW|ar-LB|ar-LY|ar-MA|ar-OM|ar-QA|ar-SA|ar-SD|ar-SY|ar-TN|ar-YE|be|be-BY|bg|bg-BG|ca|ca-ES|cs|cs-CZ|da|da-DK|de|de-AT|de-CH|de-DE|de-GR|de-LU|el|el-CY|el-GR|en|en-AU|en-CA|en-GB|en-IE|en-IN|en-MT|en-NZ|en-PH|en-SG|en-US|en-ZA|es|es-AR|es-BO|es-CL|es-CO|es-CR|es-CU|es-DO|es-EC|es-ES|es-GT|es-HN|es-MX|es-NI|es-PA|es-PE|es-PR|es-PY|es-SV|es-US|es-UY|es-VE|et|et-EE|fa|fi|fi-FI|fil|fr|fr-BE|fr-CA|fr-CH|fr-FR|fr-LU|ga|ga-IE|hi|hi-IN|hr|hr-HR|hu|hu-HU|in|in-ID|is|is-IS|it|it-CH|it-IT|iw|iw-IL|ja|ja-JP|ja-JP-JP-#u-ca-japanese|ko|ko-KR|lt|lt-LT|lv|lv-LV|mk|mk-MK|ms|ms-MY|mt|mt-MT|nl|nl-BE|nl-NL|no|no-NO|no-NO-NY|pl|pl-PL|pt|pt-BR|pt-PT|ro|ro-RO|ru|ru-RU|sk|sk-SK|sl|sl-SI|sq|sq-AL|sr|sr-BA|sr-BA-#Latn|sr-CS|sr-ME|sr-ME-#Latn|sr-RS|sr-RS-#Latn|sr--#Latn|sv|sv-SE|th|th-TH|th-TH-TH-#u-nu-thai|tr|tr-TR|uk|uk-UA|vi|vi-VN|zh|zh-CN|zh-HK|zh-SG|zh-TW)?</pattern>
+    </request-param>
+    <path-param qname="gtn:path" encoding="preserve-path">
+      <pattern>.*</pattern>
+    </path-param>
+  </route>
+
   <route path="/">
 
     <!-- The portal handler -->

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

webapps/plf-sites-extension/src/main/resources/space-templates.json

@@ -14,9 +14,10 @@
          "system": true,
          "layout": "announcement",
          "spaceFields": ["name", "properties"],
-         "permissions": ["*:/platform/administrators","*:/platform/web-contributors"],
+         "permissions": ["/platform/web-contributors"],
          "spaceLayoutPermissions": ["*:/platform/administrators"],
          "spaceDeletePermissions": ["*:/platform/administrators"],
+         "spacePublicSitePermissions": ["spaceAdmin"],
          "spaceDefaultVisibility": "private",
          "spaceDefaultRegistration": "open",
          "spaceAllowContentCreation": true
@@ -37,6 +38,7 @@
          "permissions": ["*:/platform/users"],
          "spaceLayoutPermissions": ["*:/platform/administrators"],
          "spaceDeletePermissions": ["spaceAdmin"],
+         "spacePublicSitePermissions": ["*:/platform/administrators"],
          "spaceDefaultVisibility": "hidden",
          "spaceDefaultRegistration": "closed",
          "spaceAllowContentCreation": false
@@ -57,6 +59,7 @@
          "permissions": ["*:/platform/users"],
          "spaceLayoutPermissions": ["*:/platform/administrators"],
          "spaceDeletePermissions": ["spaceAdmin"],
+         "spacePublicSitePermissions": ["spaceAdmin"],
          "spaceDefaultVisibility": "private",
          "spaceDefaultRegistration": "validation",
          "spaceAllowContentCreation": false
@@ -77,6 +80,7 @@
          "permissions": ["*:/platform/users"],
          "spaceLayoutPermissions": ["*:/platform/administrators"],
          "spaceDeletePermissions": ["spaceAdmin"],
+         "spacePublicSitePermissions": ["spaceAdmin"],
          "spaceDefaultVisibility": "private",
          "spaceDefaultRegistration": "closed",
          "spaceAllowContentCreation": false

webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/group.xml → webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/announcement/group_template.xml

@@ -24,10 +24,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_11 http://www.gatein.org/xml/ns/gatein_objects_1_11"
   xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_11">
-  <portal-name>@owner@</portal-name>
+  <portal-name>@owner_id@</portal-name>
   <displayed>false</displayed>
   <locale>en</locale>
-  <access-permissions>member:@owner@</access-permissions>
+  <access-permissions>member:@owner_id@</access-permissions>
   <edit-permission>*:/platform/administrators</edit-permission>
   <portal-layout>
     <page-body />

webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/project/navigation.xml → webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/announcement/navigation.xml

@@ -30,34 +30,34 @@
       <name>home</name>
       <label>#{portal.global.spaceHome}</label>
       <icon>fas fa-home</icon>
-      <page-reference>group::@owner@::home</page-reference>
+      <page-reference>group_template::announcement::home</page-reference>
       <node>
-        <name>tasks</name>
-        <label>#{portal.global.spaceTasks}</label>
-        <icon>fas fa-tasks</icon>
-        <page-reference>group::@owner@::tasks</page-reference>
-      </node>
-      <node>
-        <name>more</name>
-        <label>#{portal.global.more}</label>
+        <name>apps</name>
+        <label>#{portal.global.apps}</label>
         <icon>fas fa-ellipsis-h</icon>
-        <node>
-          <name>members</name>
-          <label>#{portal.global.spaceMembers}</label>
-          <icon>fas fa-users</icon>
-          <page-reference>group::@owner@::members</page-reference>
-        </node>
         <node>
           <name>notes</name>
           <label>#{portal.global.spaceNotes}</label>
           <icon>far fa-clipboard</icon>
-          <page-reference>group::@owner@::notes</page-reference>
+          <page-reference>group_template::announcement::notes</page-reference>
+        </node>
+        <node>
+          <name>tasks</name>
+          <label>#{portal.global.spaceTasks}</label>
+          <icon>fas fa-tasks</icon>
+          <page-reference>group_template::announcement::tasks</page-reference>
+        </node>
+        <node>
+          <name>members</name>
+          <label>#{portal.global.spaceMembers}</label>
+          <icon>fas fa-users</icon>
+          <page-reference>group_template::announcement::members</page-reference>
         </node>
         <node>
           <name>settings</name>
           <label>#{portal.global.spaceSettings}</label>
           <icon>fas fa-cog</icon>
-          <page-reference>group::@owner@::settings</page-reference>
+          <page-reference>group_template::announcement::settings</page-reference>
         </node>
       </node>
     </node>

webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/announcement/pages.xml → webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/announcement/pages.xml

@@ -26,20 +26,9 @@
   <page>
     <name>home</name>
     <title>Home</title>
-    <access-permissions>member:@owner@</access-permissions>
+    <access-permissions>member:@owner_id@</access-permissions>
     <edit-permission>*:/platform/administrators</edit-permission>
     <container template="system:/groovy/portal/webui/container/UIPageLayout.gtmpl"><!-- To be deleted once WebUI is cleaned from Meeds package -->
-      <section-columns>
-        <column col-span="12">
-          <portlet-application>
-            <portlet>
-              <application-ref>social</application-ref>
-              <portlet-ref>SpaceBannerPortlet</portlet-ref>
-            </portlet>
-            <title>Space Banner</title>
-          </portlet-application>
-        </column>
-      </section-columns>
       <section-columns
         sticky-beahvior="true"
         mobile-columns-style="true">
@@ -62,17 +51,17 @@
         <column col-span="4">
           <portlet-application>
             <portlet>
-              <application-ref>content</application-ref>
-              <portlet-ref>NewsListView</portlet-ref>
+              <application-ref>social</application-ref>
+              <portlet-ref>SpaceWidgetDescription</portlet-ref>
             </portlet>
-            <title>News List</title>
+            <title>Space Description</title>
           </portlet-application>
           <portlet-application>
             <portlet>
               <application-ref>social</application-ref>
-              <portlet-ref>SpaceWidgetDescription</portlet-ref>
+              <portlet-ref>Links</portlet-ref>
             </portlet>
-            <title>Space Description</title>
+            <title>Links</title>
           </portlet-application>
           <container id="space-home-widgets-announcement-container" template="system:/groovy/portal/webui/container/UIAddOnContainer.gtmpl">
             <name>space-home-widgets-announcement-container</name>
@@ -86,7 +75,7 @@
   <page profiles="task">
     <name>tasks</name>
     <title>Tasks</title>
-    <access-permissions>member:@owner@</access-permissions>
+    <access-permissions>member:@owner_id@</access-permissions>
     <edit-permission>*:/platform/administrators</edit-permission>
     <container template="system:/groovy/portal/webui/container/UIPageLayout.gtmpl">
       <section-columns>
@@ -114,7 +103,7 @@
   <page profiles="notes">
     <name>notes</name>
     <title>Notes</title>
-    <access-permissions>member:@owner@</access-permissions>
+    <access-permissions>member:@owner_id@</access-permissions>
     <edit-permission>*:/platform/administrators</edit-permission>
     <container template="system:/groovy/portal/webui/container/UIPageLayout.gtmpl">
       <section-columns>
@@ -142,7 +131,7 @@
   <page>
     <name>members</name>
     <title>Space Members</title>
-    <access-permissions>member:@owner@</access-permissions>
+    <access-permissions>member:@owner_id@</access-permissions>
     <edit-permission>*:/platform/administrators</edit-permission>
     <container template="system:/groovy/portal/webui/container/UIPageLayout.gtmpl">
       <section-columns>
@@ -170,7 +159,7 @@
   <page>
     <name>settings</name>
     <title>Space Settings</title>
-    <access-permissions>manager:@owner@</access-permissions>
+    <access-permissions>manager:@owner_id@</access-permissions>
     <edit-permission>*:/platform/administrators</edit-permission>
     <container template="system:/groovy/portal/webui/container/UIPageLayout.gtmpl">
       <section-columns>

webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/community/group.xml → webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/circle/group_template.xml

@@ -24,10 +24,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_11 http://www.gatein.org/xml/ns/gatein_objects_1_11"
   xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_11">
-  <portal-name>@owner@</portal-name>
+  <portal-name>@owner_id@</portal-name>
   <displayed>false</displayed>
   <locale>en</locale>
-  <access-permissions>member:@owner@</access-permissions>
+  <access-permissions>member:@owner_id@</access-permissions>
   <edit-permission>*:/platform/administrators</edit-permission>
   <portal-layout>
     <page-body />

webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/group/template/circle/navigation.xml → webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/sites/group_template/circle/navigation.xml

@@ -30,13 +30,7 @@
       <name>home</name>
       <label>#{portal.global.spaceHome}</label>
       <icon>fas fa-home</icon>
-      <page-reference>group::@owner@::home</page-reference>
-      <node>
-        <name>members</name>
-        <label>#{portal.global.spaceMembers}</label>
-        <icon>fas fa-users</icon>
-        <page-reference>group::@owner@::members</page-reference>
-      </node>
+      <page-reference>group_template::circle::home</page-reference>
       <node>
         <name>apps</name>
         <label>#{portal.global.apps}</label>
@@ -45,13 +39,13 @@
           <name>tasks</name>
           <label>#{portal.global.spaceTasks}</label>
           <icon>fas fa-tasks</icon>
-          <page-reference>group::@owner@::tasks</page-reference>
+          <page-reference>group_template::circle::tasks</page-reference>
         </node>
         <node>
           <name>notes</name>
           <label>#{portal.global.spaceNotes}</label>
           <icon>far fa-clipboard</icon>
-          <page-reference>group::@owner@::notes</page-reference>
+          <page-reference>group_template::circle::notes</page-reference>
         </node>
       </node>
     </node>