diff --git a/components/com_content/tmpl/category/blog.php b/components/com_content/tmpl/category/blog.php index 7d7cc376df773..156a8583cea8e 100644 --- a/components/com_content/tmpl/category/blog.php +++ b/components/com_content/tmpl/category/blog.php @@ -84,7 +84,7 @@ - + intro_items)) : ?>
intro_items as $key => &$item) : ?> -
-
- item = & $item; - echo $this->loadTemplate('item'); - ?> -
+
+
+ item = & $item; + echo $this->loadTemplate('item'); + ?>
-
- + +
+ link_items)) : ?>
diff --git a/components/com_content/tmpl/featured/default.php b/components/com_content/tmpl/featured/default.php index d277a7b053bed..ea4859b6ed780 100644 --- a/components/com_content/tmpl/featured/default.php +++ b/components/com_content/tmpl/featured/default.php @@ -16,80 +16,64 @@ // If the page class is defined, add to class as suffix. // It will be a separate class if the user starts it with a space ?> -
-params->get('show_page_heading') != 0) : ?> - - +
+ params->get('show_page_heading') != 0) : ?> + + - -lead_items)) : ?> -
- lead_items as &$item) : ?> -
- item = &$item; - echo $this->loadTemplate('item'); - ?> + + lead_items)) : ?> +
+ lead_items as &$item) : ?> +
+
+ item = & $item; + echo $this->loadTemplate('item'); + ?> +
+
+ +
- - -
- -intro_items); - $counter = 0; -?> -intro_items)) : ?> - intro_items as $key => &$item) : ?> - - columns) + 1; - $row = $counter / $this->columns; - - if ($rowcount === 1) : ?> + -
- -
intro_items)) : ?> +
+ intro_items as $key => &$item) : ?> +
- item = &$item; +
+ item = & $item; echo $this->loadTemplate('item'); - ?> + ?> +
- - - columns) or ($counter == $introcount)) : ?> - +
- + - - - -link_items)) : ?> -
- loadTemplate('links'); ?> -
- + link_items)) : ?> +
+ loadTemplate('links'); ?> +
+ -params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->pagesTotal > 1)) : ?> -
- params->def('show_pagination_results', 1)) : ?> -

- pagination->getPagesCounter(); ?> -

- - pagination->getPagesLinks(); ?> -
- + params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2 && $this->pagination->pagesTotal > 1)) : ?> +
+ params->def('show_pagination_results', 1)) : ?> +

+ pagination->getPagesCounter(); ?> +

+ + pagination->getPagesLinks(); ?> +
+
diff --git a/components/com_content/tmpl/featured/default.xml b/components/com_content/tmpl/featured/default.xml index fa865e2aeccf2..a44ac0c266856 100644 --- a/components/com_content/tmpl/featured/default.xml +++ b/components/com_content/tmpl/featured/default.xml @@ -37,6 +37,22 @@ class="text" /> + + + + - - - - + get('show_associations')); ?> -item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate()) - || ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ?> -
+image_intro) && !empty($images->image_intro)) : ?> + item); ?> -get('show_title')) : ?> -

- get('link_titles') && $params->get('access-view')) : ?> -

- -item->state == 0) : ?> - - -item->publish_up) > strtotime(JFactory::getDate())) : ?> - - -item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate()) : ?> - - + item->state == 0) : ?> + + + item->publish_up) > strtotime(JFactory::getDate())) : ?> + + + item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate()) : ?> + + -get('show_print_icon') || $params->get('show_email_icon')) : ?> - $params, 'item' => $this->item, 'print' => false)); ?> - + get('show_print_icon') || $params->get('show_email_icon')) : ?> + $params, 'item' => $this->item, 'print' => false)); ?> + - -item->event->afterDisplayTitle; ?> + + item->event->afterDisplayTitle; ?> - -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') || $assocParam); ?> + + 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') || $assocParam); ?> - - - $this->item, 'params' => $params, 'position' => 'above')); ?> - get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> - item->tags->itemTags); ?> + + + $this->item, 'params' => $params, 'position' => 'above')); ?> + get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> + item->tags->itemTags); ?> + - - -image_intro) && !empty($images->image_intro)) : ?> - item); ?> - - -item->event->beforeDisplayContent; ?> + + item->event->beforeDisplayContent; ?> -item->introtext; ?> + item->introtext; ?> - - - $this->item, 'params' => $params, 'position' => 'below')); ?> - get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> - item->tags->itemTags); ?> + + + $this->item, 'params' => $params, 'position' => 'below')); ?> + get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> + item->tags->itemTags); ?> + - -get('show_readmore') && $this->item->readmore) : - if ($params->get('access-view')) : - $link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); - else : - $menu = JFactory::getApplication()->getMenu(); - $active = $menu->getActive(); - $itemId = $active->id; - $link = new JUri(JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId, false)); - $link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language))); - endif; ?> + get('show_readmore') && $this->item->readmore) : + if ($params->get('access-view')) : + $link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); + else : + $menu = JFactory::getApplication()->getMenu(); + $active = $menu->getActive(); + $itemId = $active->id; + $link = new JUri(JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId, false)); + $link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language))); + endif; ?> - $this->item, 'params' => $params, 'link' => $link)); ?> + $this->item, 'params' => $params, 'link' => $link)); ?> - + -item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate()) - || ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != $this->db->getNullDate() )) : ?> -
- + item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate()) + || ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != $this->db->getNullDate() )) : ?> +
+ + +
item->event->afterDisplayContent; ?>