Skip to content

Commit a5e768e

Browse files
Single Article Readtime + Related Count + Bug Fixes from 2.3.0 list
1 parent 2195624 commit a5e768e

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

astroid/astroid-framework/assets/css/astroid-framework.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

astroid/astroid-framework/assets/css/astroid-framework.css.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

astroid/astroid-framework/framework/article.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,16 @@ public function showReadTime()
150150
}
151151

152152
$view = JFactory::getApplication()->input->get('view', '');
153-
$menu_level = $this->params->get('astroid_readtime', '');
154153
if ($view === 'article') {
155-
$article_level = $this->article->params->get('astroid_article_readtime', '');
154+
// for single
155+
$article_level = $this->article->params->get('astroid_readtime', ''); // from article
156+
$astroid_level = $this->template->params->get('astroid_article_readtime', 1);
156157
} else {
157-
$article_level = $this->article->params->get('astroid_readtime', '');
158+
// for listing
159+
$article_level = $this->params->get('astroid_readtime', ''); // from menu
160+
$astroid_level = $this->template->params->get('astroid_readtime', 1);
158161
}
159-
$astroid_level = $this->template->params->get('astroid_readtime', 1);
160-
return $this->checkPriority($menu_level, $article_level, $astroid_level);
162+
return $this->checkPriority('', $article_level, $astroid_level);
161163
}
162164

163165
// Social Share
@@ -210,7 +212,7 @@ public function renderRelatedPosts()
210212
$article_relatedposts_count = $this->article->params->get('article_relatedposts_count', '');
211213

212214
if (!empty($article_relatedposts_count) && $article_relatedposts_count == 1) {
213-
$count = $this->template->params->get('article_relatedposts_count_custom', 4);
215+
$count = $this->article->params->get('article_relatedposts_count_custom', 4);
214216
} else {
215217
$count = $this->template->params->get('article_relatedposts_count', 4);
216218
}

astroid/astroid-framework/framework/layouts/fields/astroidlayout.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</span>
120120
<div class="col-12">
121121
<div class="row" ng-sortable="{draggable: '.ezlb-col',animation: 100}">
122-
<div ng-repeat="column in row.cols track by $index" class="ezlb-col col-{{ column.size}} ezlb-col-{{ sectionIndex}}-{{ rowIndex}}-{{ columnIndex}} {{ column.elements.length == 0 ? 'ezlb-col-empty' : '' }}" ng-init="columnIndex = $index; column.type='column'">
122+
<div data-label="col-lg-{{ column.size}}" ng-repeat="column in row.cols track by $index" class="ezlb-col col-{{ column.size}} ezlb-col-{{ sectionIndex}}-{{ rowIndex}}-{{ columnIndex}} {{ column.elements.length == 0 ? 'ezlb-col-empty' : '' }}" ng-init="columnIndex = $index; column.type='column'">
123123
<div ng-if="column.elements.length != 0" class="ezlb-col-overlay"></div>
124124
<div ng-if="column.elements.length == 0" ng-click="addingElement(columnIndex, rowIndex, sectionIndex, null)" class="ezlb-add-element">
125125
</div>

0 commit comments

Comments
 (0)