feat: Configure Images portlet into news page template - EXO-65514 - M…

…eeds-io/MIPs#68 (#922)
exoplatform · Aug 25, 2023 · cd6e565 · cd6e565
1 parent 6924393
commit cd6e565
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 54 deletions.
diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -107,7 +107,6 @@
                 <include>newsDetails.less</include>
                 <include>newsExtensions.less</include>
                 <include>newsPublishTargetsManagement.less</include>
-                <include>newsPageTemplate.less</include>
               </includes>
             </configuration>
             <goals>

diff --git a/webapp/src/main/webapp/WEB-INF/conf/portal/template/pages/news/page.xml b/webapp/src/main/webapp/WEB-INF/conf/portal/template/pages/news/page.xml
@@ -27,17 +27,17 @@
     <access-permissions>Everyone</access-permissions>
     <container id="newsPageSimpleRowContainer" template='system:/groovy/portal/webui/container/UISimpleRowContainer.gtmpl'>
       <access-permissions>Everyone</access-permissions>
-      <container id="newsPage"
-        template="system:/groovy/portal/webui/container/UIContainer.gtmpl"
-        cssClass="border-box-sizing">
+      <portlet-application>
+        <portlet>
+          <application-ref>layout-management</application-ref>
+          <portlet-ref>ImagesPortlet</portlet-ref>
+        </portlet>
         <access-permissions>Everyone</access-permissions>
-        <container id="topNewsPage" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-          <access-permissions>*:/platform/users</access-permissions>
-        </container>
-        <container id="newsBodyPage" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
-          <access-permissions>Everyone</access-permissions>
-          <container cssClass="newsBodyPageLeftColumn"
-                     template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
+        <show-info-bar>false</show-info-bar>
+      </portlet-application>
+      <container template="system:/groovy/portal/webui/container/UIResponsiveColumnGroupContainer.gtmpl">
+        <access-permissions>Everyone</access-permissions>
+        <container template="system:/groovy/portal/webui/container/UISimpleColumnContainer.gtmpl">
             <access-permissions>*:/platform/users</access-permissions>
             <portlet-application>
               <portlet>
@@ -56,8 +56,7 @@
               <show-info-bar>false</show-info-bar>
             </portlet-application>
           </container>
-          <container cssClass="newsBodyPageRightColumn"
-                     template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
+        <container template="system:/groovy/portal/webui/container/UISimpleColumnContainer.gtmpl" width="400px">
             <access-permissions>*:/platform/users</access-permissions>
             <portlet-application>
               <portlet>
@@ -76,9 +75,7 @@
               <show-info-bar>false</show-info-bar>
             </portlet-application>
           </container>
-        </container>
       </container>
     </container>
   </container>
-
 </page>
diff --git a/webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -28,13 +28,6 @@
     <css-priority>11</css-priority>
   </portal-skin>
 
-  <portal-skin>
-    <skin-name>Enterprise</skin-name>
-    <skin-module>newsPageTemplate</skin-module>
-    <css-path>/skin/css/newsPageTemplate.css</css-path>
-    <css-priority>11</css-priority>
-  </portal-skin>
-
   <portlet-skin>
     <application-name>news</application-name>
     <portlet-name>News</portlet-name>

diff --git a/webapp/src/main/webapp/skin/less/newsPageTemplate.less b/webapp/src/main/webapp/skin/less/newsPageTemplate.less