Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Configure Images portlet into news page template - EXO-65514 - Meeds-io/MIPs#68 #917

Merged
merged 3 commits into from
Aug 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packaging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>news</artifactId>
<groupId>org.exoplatform.addons.news</groupId>
<version>2.5.x-SNAPSHOT</version>
<version>2.5.x-experience-SNAPSHOT</version>
</parent>
<artifactId>news-packaging</artifactId>
<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</parent>
<groupId>org.exoplatform.addons.news</groupId>
<artifactId>news</artifactId>
<version>2.5.x-SNAPSHOT</version>
<version>2.5.x-experience-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo Add-on:: News</name>
<description>News</description>
Expand All @@ -40,7 +40,7 @@
</modules>

<properties>
<addon.exo.ecms.version>6.5.x-SNAPSHOT</addon.exo.ecms.version>
<addon.exo.ecms.version>6.5.x-experience-SNAPSHOT</addon.exo.ecms.version>
<pitest.version>1.4.10</pitest.version>

<sonar.organization>exoplatform</sonar.organization>
Expand Down
2 changes: 1 addition & 1 deletion services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>news</artifactId>
<groupId>org.exoplatform.addons.news</groupId>
<version>2.5.x-SNAPSHOT</version>
<version>2.5.x-experience-SNAPSHOT</version>
</parent>
<artifactId>news-services</artifactId>
<packaging>jar</packaging>
Expand Down
3 changes: 1 addition & 2 deletions webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>news</artifactId>
<groupId>org.exoplatform.addons.news</groupId>
<version>2.5.x-SNAPSHOT</version>
<version>2.5.x-experience-SNAPSHOT</version>
</parent>
<artifactId>news-webapp</artifactId>
<packaging>war</packaging>
Expand Down Expand Up @@ -107,7 +107,6 @@
<include>newsDetails.less</include>
<include>newsExtensions.less</include>
<include>newsPublishTargetsManagement.less</include>
<include>newsPageTemplate.less</include>
</includes>
</configuration>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -76,9 +75,7 @@
<show-info-bar>false</show-info-bar>
</portlet-application>
</container>
</container>
</container>
</container>
</container>

</page>
7 changes: 0 additions & 7 deletions webapp/src/main/webapp/WEB-INF/gatein-resources.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
32 changes: 0 additions & 32 deletions webapp/src/main/webapp/skin/less/newsPageTemplate.less

This file was deleted.