diff --git a/language/en-GB/en-GB.mod_articles_news.ini b/language/en-GB/en-GB.mod_articles_news.ini
index 5c311cb9653d9..cdfa3cc2d46dd 100644
--- a/language/en-GB/en-GB.mod_articles_news.ini
+++ b/language/en-GB/en-GB.mod_articles_news.ini
@@ -7,8 +7,10 @@ MOD_ARTICLES_NEWS="Articles - Newsflash"
MOD_ARTICLES_NEWS_FIELD_FEATURED_DESC="Show or hide articles marked as featured."
MOD_ARTICLES_NEWS_FIELD_FEATURED_LABEL="Featured Articles"
MOD_ARTICLES_NEWS_FIELD_CATEGORY_DESC="Select Articles from a specific Category or a set of Categories. If no selection will show all categories as default."
-MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC="Display Article images."
-MOD_ARTICLES_NEWS_FIELD_IMAGES_LABEL="Show Images"
+MOD_ARTICLES_NEWS_FIELD_IMAGES_ARTICLE_DESC="Display the intro or full image."
+MOD_ARTICLES_NEWS_FIELD_IMAGES_ARTICLE_LABEL="Show Intro/Full Image"
+MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC="Show the images that are inside the text of the article."
+MOD_ARTICLES_NEWS_FIELD_IMAGES_LABEL="Show Article Images"
MOD_ARTICLES_NEWS_FIELD_ITEMS_DESC="The number of Articles to display within this module."
MOD_ARTICLES_NEWS_FIELD_ITEMS_LABEL="Number of Articles"
MOD_ARTICLES_NEWS_FIELD_LINKTITLE_DESC="Link the Article titles to Articles."
@@ -30,6 +32,8 @@ MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_DESC="Triggers additional plugin events to
MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_LABEL="Trigger Plugin Events"
MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_DESC="Show or hide the article intro text."
MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_LABEL="Show Intro Text"
+MOD_ARTICLES_NEWS_OPTION_FULLIMAGE="Full Image"
+MOD_ARTICLES_NEWS_OPTION_INTROIMAGE="Intro Image"
MOD_ARTICLES_NEWS_READMORE="Read more ..."
MOD_ARTICLES_NEWS_READMORE_REGISTER="Register to Read More"
MOD_ARTICLES_NEWS_TITLE_HEADING="Header Level"
diff --git a/modules/mod_articles_news/helper.php b/modules/mod_articles_news/helper.php
index e0597f0f27b62..2d4633f0d5370 100644
--- a/modules/mod_articles_news/helper.php
+++ b/modules/mod_articles_news/helper.php
@@ -119,11 +119,42 @@ public static function getList(&$params)
$item->introtext = JHtml::_('content.prepare', $item->introtext, '', 'mod_articles_news.content');
+ // Remove any images belongs to the text
if (!$params->get('image'))
{
$item->introtext = preg_replace('/]*>/', '', $item->introtext);
}
+ // Show the Intro/Full image field of the article
+ if ($params->get('img_intro_full') !== 'none')
+ {
+ $images = json_decode($item->images);
+ $item->imageSrc = '';
+ $item->imageAlt = '';
+ $item->imageCaption = '';
+
+ if ($params->get('img_intro_full') === 'intro' && !empty($images->image_intro))
+ {
+ $item->imageSrc = htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8');
+ $item->imageAlt = htmlspecialchars($images->image_intro_alt, ENT_COMPAT, 'UTF-8');
+
+ if ($images->image_intro_caption)
+ {
+ $item->imageCaption = htmlspecialchars($images->image_intro_caption, ENT_COMPAT, 'UTF-8');
+ }
+ }
+ elseif ($params->get('img_intro_full') === 'full' && !empty($images->image_fulltext))
+ {
+ $item->imageSrc = htmlspecialchars($images->image_fulltext, ENT_COMPAT, 'UTF-8');
+ $item->imageAlt = htmlspecialchars($images->image_fulltext_alt, ENT_COMPAT, 'UTF-8');
+
+ if ($images->image_intro_caption)
+ {
+ $item->imageCaption = htmlspecialchars($images->image_fulltext_caption, ENT_COMPAT, 'UTF-8');
+ }
+ }
+ }
+
if ($triggerEvents)
{
$item->text = '';
diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
index a862bd543e34f..cbaa918526642 100644
--- a/modules/mod_articles_news/mod_articles_news.xml
+++ b/modules/mod_articles_news/mod_articles_news.xml
@@ -56,6 +56,18 @@
+
+
+
+
+
+
>
+get('img_intro_full') !== 'none' && !empty($item->imageSrc)) : ?>
+
+
+
get('intro_only')) : ?>
afterDisplayTitle; ?>