diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index 9aaca516518b1..a952426c45e67 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -19,9 +19,6 @@
$user = JFactory::getUser();
$info = $params->get('info_block_position', 0);
JHtml::_('behavior.caption');
-$useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
- || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author'));
-
?>
@@ -35,6 +32,11 @@
echo $this->item->pagination;
}
?>
+
+
+ get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
+ || $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') ); ?>
+
print) : ?>
item, $params); ?>
@@ -76,81 +78,7 @@
-
-
-
-
- get('show_author') && !empty($this->item->author )) : ?>
- -
- item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?>
- ' . $author . ''; ?>
- item->contact_link) && $params->get('link_author') == true) : ?>
- item->contact_link, $author, array('itemprop' => 'url'))); ?>
-
-
-
-
-
- get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
- -
- escape($this->item->parent_title); ?>
- get('link_parent_category') && !empty($this->item->parent_slug)) : ?>
- item->parent_slug)) . '" itemprop="genre">' . $title . ''; ?>
-
-
- ' . $title . ''); ?>
-
-
-
- get('show_category')) : ?>
- -
- escape($this->item->category_title); ?>
- get('link_category') && $this->item->catslug) : ?>
- item->catslug)) . '" itemprop="genre">' . $title . ''; ?>
-
-
- ' . $title . ''); ?>
-
-
-
-
- get('show_publish_date')) : ?>
- -
-
-
-
-
-
-
- get('show_modify_date')) : ?>
- -
-
-
-
-
- get('show_create_date')) : ?>
- -
-
-
-
-
-
- get('show_hits')) : ?>
- -
-
-
- item->hits); ?>
-
-
-
-
-
+ $this->item, 'params' => $params, 'position' => 'above')); ?>
get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
@@ -188,84 +116,8 @@
-
-
-
-
-
- get('show_author') && !empty($this->item->author )) : ?>
- -
- item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?>
- ' . $author . ''; ?>
- item->contact_link) && $params->get('link_author') == true) : ?>
- item->contact_link, $author, array('itemprop' => 'url'))); ?>
-
-
-
-
-
- get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
- -
- escape($this->item->parent_title); ?>
- get('link_parent_category') && $this->item->parent_slug) : ?>
- item->parent_slug)) . '" itemprop="genre">' . $title . ''; ?>
-
-
- ' . $title . ''); ?>
-
-
-
- get('show_category')) : ?>
- -
- escape($this->item->category_title); ?>
- get('link_category') && $this->item->catslug) : ?>
- item->catslug)) . '" itemprop="genre">' . $title . ''; ?>
-
-
- ' . $title . ''); ?>
-
-
-
- get('show_publish_date')) : ?>
- -
-
-
-
-
-
-
- get('show_create_date')) : ?>
- -
-
-
-
-
- get('show_modify_date')) : ?>
- -
-
-
-
-
- get('show_hits')) : ?>
- -
-
-
- item->hits); ?>
-
-
-
- get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
- item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
- item->tagLayout->render($this->item->tags->itemTags); ?>
-
-
-
+ $this->item, 'params' => $params, 'position' => 'below')); ?>
+
item->pagination) && $this->item->pagination && $this->item->paginationposition && !$this->item->paginationrelative):
diff --git a/components/com_content/views/featured/tmpl/default_item.php b/components/com_content/views/featured/tmpl/default_item.php
index 3b635e1ea9056..a186b133a6315 100644
--- a/components/com_content/views/featured/tmpl/default_item.php
+++ b/components/com_content/views/featured/tmpl/default_item.php
@@ -52,86 +52,8 @@
get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') ); ?>
-
-
- -
-
-
-
- get('show_author') && !empty($this->item->author )) : ?>
- -
- item->created_by_alias) ? $this->item->created_by_alias : $this->item->author; ?>
- ' . $author . ''; ?>
- item->contact_link) && $params->get('link_author') == true) : ?>
- item->contact_link, $author, array('itemprop' => 'url'))); ?>
-
-
-
-
-
-
- get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
- -
- escape($this->item->parent_title); ?>
- get('link_parent_category') && !empty($this->item->parent_slug)) : ?>
- item->parent_slug)) . '" itemprop="genre">' . $title . ''; ?>
-
-
- ' . $title . ''); ?>
-
-
-
-
- get('show_category')) : ?>
- -
- escape($this->item->category_title); ?>
- get('link_category') && $this->item->catslug) : ?>
- item->catslug)) . '" itemprop="genre">' . $title . ''; ?>
-
-
- ' . $title . ''); ?>
-
-
-
-
- get('show_publish_date')) : ?>
- -
-
-
-
-
-
-
- get('show_modify_date')) : ?>
- -
-
-
-
-
-
- get('show_create_date')) : ?>
- -
-
-
-
-
-
- get('show_hits')) : ?>
- -
-
-
- item->hits); ?>
-
-
-
-
-
+
+ $this->item, 'params' => $params, 'position' => 'above')); ?>
image_intro) && !empty($images->image_intro)) : ?>
@@ -148,90 +70,9 @@
item->event->beforeDisplayContent; ?> item->introtext; ?>
-
-
- -
-
-
-
- get('show_author') && !empty($this->item->author )) : ?>
- -
- item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?>
- ' . $author . ''; ?>
- item->contact_link) && $params->get('link_author') == true) : ?>
- item->contact_link, $author, array('itemprop' => 'url'))); ?>
-
-
-
-
-
-
- get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
- -
- escape($this->item->parent_title); ?>
- get('link_parent_category') && $this->item->parent_slug) : ?>
- item->parent_slug)) . '" itemprop="genre">' . $title . ''; ?>
-
-
- ' . $title . ''); ?>
-
-
-
-
- get('show_category')) : ?>
- -
- escape($this->item->category_title); ?>
- get('link_category') && $this->item->catslug) : ?>
- item->catslug)) . '" itemprop="genre">' . $title . ''; ?>
-
-
- ' . $title . ''); ?>
-
-
-
-
- get('show_publish_date')) : ?>
- -
-
-
-
-
-
-
- get('show_create_date')) : ?>
- -
-
-
-
-
-
- get('show_modify_date')) : ?>
- -
-
-
-
-
-
- get('show_hits')) : ?>
- -
-
-
- item->hits); ?>
-
-
-
- params->get('show_tags', 1)) : ?>
- item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
- item->tagLayout->render($this->item->tags->itemTags); ?>
-
-
-
+
+ $this->item, 'params' => $params, 'position' => 'below')); ?>
+
get('show_readmore') && $this->item->readmore) :
if ($params->get('access-view')) :
diff --git a/layouts/joomla/content/info_block/block.php b/layouts/joomla/content/info_block/block.php
index a9102d9559f16..e2810d1d2d17c 100644
--- a/layouts/joomla/content/info_block/block.php
+++ b/layouts/joomla/content/info_block/block.php
@@ -12,7 +12,7 @@
$blockPosition = $displayData['params']->get('info_block_position', 0);
?>
-
+