diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini index 91642dd0a9bef..485cbe83bd9d9 100644 --- a/administrator/language/en-GB/joomla.ini +++ b/administrator/language/en-GB/joomla.ini @@ -354,9 +354,11 @@ JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND="Can't find the destination row for this move." JGLOBAL_BATCH_PROCESS="Process" JGLOBAL_BATCH_WORKFLOW_STATE_ROW_NOT_FOUND="Can't find the destination row for this state change." JGLOBAL_BLOG="Blog" -JGLOBAL_BLOG_CLASS="Blog Class" +JGLOBAL_BLOG_CLASS_INTRO="Blog Class (Intro Articles)" JGLOBAL_BLOG_CLASS_LEADING="Blog Class (Leading Articles)" +JGLOBAL_BLOG_COLUMNS="Number of Columns" JGLOBAL_BLOG_LAYOUT_OPTIONS="Blog Layout" +JGLOBAL_BLOG_ORDER="Ordering direction down" JGLOBAL_CATEGORIES_OPTIONS="Categories" JGLOBAL_CATEGORY_LAYOUT_DESC="Layout" JGLOBAL_CATEGORY_LAYOUT_LABEL="Choose a Layout" diff --git a/components/com_content/tmpl/category/blog.php b/components/com_content/tmpl/category/blog.php index f8b4dbf01fbeb..a1a1a17bd927b 100644 --- a/components/com_content/tmpl/category/blog.php +++ b/components/com_content/tmpl/category/blog.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved. + * @copyright (C) 2006 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -29,6 +29,15 @@ $results = $app->triggerEvent('onContentAfterDisplay', array($this->category->extension . '.categories', &$this->category, &$this->params, 0)); $afterDisplayContent = trim(implode("\n", $results)); +$blogClassLeading = $this->params->get('blog_class_leading', ''); +$blogClassIntro = $this->params->get('blog_class_intro', ''); +$numCols = (int) $this->params->get('num_columns', 1); + +if ($this->params->get('multi_column_order', 0) && !empty($this->intro_items)) +{ + // Order articles in columns top down + $blogClassIntro = ''; +} ?>
params->get('show_page_heading')) : ?> @@ -73,7 +82,7 @@ lead_items)) : ?> -