From cd6e56567b0a5f6fbfe8f36f851d23d284698c06 Mon Sep 17 00:00:00 2001
From: IlhemEssaadi <93516534+IlhemEssaadi@users.noreply.github.com>
Date: Fri, 25 Aug 2023 16:57:40 +0100
Subject: [PATCH] feat: Configure Images portlet into news page template -
 EXO-65514 - Meeds-io/MIPs#68 (#922)

---
 webapp/pom.xml                                |  1 -
 .../conf/portal/template/pages/news/page.xml  | 25 +++++++--------
 .../main/webapp/WEB-INF/gatein-resources.xml  |  7 ----
 .../webapp/skin/less/newsPageTemplate.less    | 32 -------------------
 4 files changed, 11 insertions(+), 54 deletions(-)
 delete mode 100644 webapp/src/main/webapp/skin/less/newsPageTemplate.less

diff --git a/webapp/pom.xml b/webapp/pom.xml
index 76211f5612..1170ea2bc3 100644
--- 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
index 74ec544f60..711511dff8 100644
--- 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>
\ No newline at end of file
diff --git a/webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml
index 20522f9d0d..7a4230323f 100644
--- 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
deleted file mode 100644
index f731386c49..0000000000
--- a/webapp/src/main/webapp/skin/less/newsPageTemplate.less
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#topNewsPage {
-  margin-bottom: 10px;
-}
-
-#newsBodyPageChildren {
-  display: flex;
-  .newsBodyPageLeftColumn {
-    width: 75%;
-    margin-left: 15px ~'; /** orientation=rt */ ';
-    margin-right: 15px ~'; /** orientation=lt */ ';
-  }
-  .newsBodyPageRightColumn {
-    width: 25%;
-    margin-left: 15px ~'; /** orientation=lt */ ';
-    margin-right: 15px ~'; /** orientation=rt */ ';
-  }
-}
-
-@media (max-width: 768px) {
-  #newsBodyPageChildren {
-    display: block;
-    .newsBodyPageLeftColumn {
-      width: auto;
-      margin: 0 ;
-    }
-    .newsBodyPageRightColumn {
-      width: auto;
-      margin: 0 ;
-    }
-  }
-}
\ No newline at end of file