diff --git a/components/com_tags/views/tag/tmpl/default.php b/components/com_tags/views/tag/tmpl/default.php index 46b9649fd1729..8e5026162bc4d 100644 --- a/components/com_tags/views/tag/tmpl/default.php +++ b/components/com_tags/views/tag/tmpl/default.php @@ -12,6 +12,7 @@ // Note that there are certain parts of this layout used only when there is exactly one tag. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); $isSingleTag = count($this->item) === 1; + ?>
params->get('show_page_heading')) : ?> @@ -29,7 +30,7 @@
item[0]->images); ?> params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?> - <?php echo htmlspecialchars($images->image_fulltext_alt); ?> + <?php echo htmlspecialchars($images->image_fulltext_alt); ?> params->get('tag_list_show_tag_description') == 1 && $this->item[0]->description) : ?> item[0]->description, '', 'com_tags.tag'); ?> @@ -40,19 +41,19 @@ params->get('tag_list_show_tag_description', 1) || $this->params->get('show_description_image', 1)) : ?> params->get('show_description_image', 1) == 1 && $this->params->get('tag_list_image')) : ?> - + params->get('tag_list_description', '') > '') : ?> params->get('tag_list_description'), '', 'com_tags.tag'); ?> - - loadTemplate('items'); ?> params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?> diff --git a/components/com_tags/views/tag/tmpl/default_items.php b/components/com_tags/views/tag/tmpl/default_items.php index bb3207c6d9212..60d7cdd972661 100644 --- a/components/com_tags/views/tag/tmpl/default_items.php +++ b/components/com_tags/views/tag/tmpl/default_items.php @@ -19,93 +19,91 @@ // Check if user is allowed to add/edit based on tags permissions. // Do we really have to make it so people can see unpublished tags??? -$canEdit = $user->authorise('core.edit', 'com_tags'); -$canCreate = $user->authorise('core.create', 'com_tags'); +$canEdit = $user->authorise('core.edit', 'com_tags'); +$canCreate = $user->authorise('core.create', 'com_tags'); $canEditState = $user->authorise('core.edit.state', 'com_tags'); -$items = $this->items; -$n = count($this->items); +$items = $this->items; +$n = count($this->items); + JFactory::getDocument()->addScriptDeclaration(" var resetFilter = function() { document.getElementById('filter-search').value = ''; } "); + ?>
params->get('show_headings') || $this->params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?> -
- params->get('filter_field')) : ?> -
- - - - -
- - params->get('show_pagination_limit')) : ?> -
- - pagination->getLimitBox(); ?> -
- - - - - - -
-
+
+ params->get('filter_field')) : ?> +
+ + + + +
+ + params->get('show_pagination_limit')) : ?> +
+ + pagination->getLimitBox(); ?> +
+ + + + + +
+
- items === false || $n === 0) : ?> -

+

- -
    - $item) : ?> - core_state == 0) : ?> -
  • - -
  • - type_alias === 'com_users.category') || ($item->type_alias === 'com_banners.category')) : ?> -

    - escape($item->core_title); ?> -

    +
      + $item) : ?> + core_state == 0) : ?> +
    • -

      - +
    • + type_alias === 'com_users.category') || ($item->type_alias === 'com_banners.category')) : ?> +

      escape($item->core_title); ?> - -

      +

      • + +

      + + escape($item->core_title); ?> + +

      + + + + event->afterDisplayTitle; ?> + core_images); ?> + params->get('tag_list_show_item_image', 1) == 1 && !empty($images->image_intro)) : ?> + + <?php echo htmlspecialchars($images->image_intro_alt); ?> + + + params->get('tag_list_show_item_description', 1)) : ?> + + event->beforeDisplayContent; ?> + + core_body, $this->params->get('tag_list_item_maximum_characters')); ?> + + + event->afterDisplayContent; ?> - - - event->afterDisplayTitle; ?> - core_images); ?> - params->get('tag_list_show_item_image', 1) == 1 && !empty($images->image_intro)) : ?> - - <?php echo htmlspecialchars($images->image_intro_alt); ?> - - - params->get('tag_list_show_item_description', 1)) : ?> - - event->beforeDisplayContent; ?> - - core_body, $this->params->get('tag_list_item_maximum_characters')); ?> - - - event->afterDisplayContent; ?> -
      • - -
    - + +
diff --git a/components/com_tags/views/tag/tmpl/list.php b/components/com_tags/views/tag/tmpl/list.php index 459ae3dc6588d..bfe7e2f615097 100644 --- a/components/com_tags/views/tag/tmpl/list.php +++ b/components/com_tags/views/tag/tmpl/list.php @@ -13,6 +13,7 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); $n = count($this->items); + ?>
params->get('show_page_heading')) : ?> @@ -46,8 +47,6 @@ params->get('tag_list_description', '') > '') : ?> params->get('tag_list_description'), '', 'com_tags.tag'); ?> - - loadTemplate('items'); ?>
diff --git a/components/com_tags/views/tag/tmpl/list_items.php b/components/com_tags/views/tag/tmpl/list_items.php index 1edc29899ed8e..b7333152262f5 100644 --- a/components/com_tags/views/tag/tmpl/list_items.php +++ b/components/com_tags/views/tag/tmpl/list_items.php @@ -15,78 +15,76 @@ $n = count($this->items); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); + JFactory::getDocument()->addScriptDeclaration(" var resetFilter = function() { document.getElementById('filter-search').value = ''; } "); -?> +?>
params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?> -
- params->get('filter_field')) : ?> -
- - - - -
- - params->get('show_pagination_limit')) : ?> -
- - pagination->getLimitBox(); ?> -
- - - - - - -
-
+
+ params->get('filter_field')) : ?> +
+ + + + +
+ + params->get('show_pagination_limit')) : ?> +
+ + pagination->getLimitBox(); ?> +
+ + + + + +
+
- items === false || $n === 0) : ?> -

+

params->get('show_headings')) : ?> - - - - params->get('tag_list_show_date')) : ?> - + + - - - - + params->get('tag_list_show_date')) : ?> + + + + items as $i => $item) : ?> items[$i]->core_state == 0) : ?> - + - + -
- - - - - - - - - +
+
+ + + + + + + +
params->get('show_headings')) echo "headers=\"categorylist_header_title\""; ?> class="list-title"> @@ -107,26 +105,22 @@ ); ?>
- - -items)) : ?> - params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?> - -
diff --git a/components/com_tags/views/tags/tmpl/default.php b/components/com_tags/views/tags/tmpl/default.php index d93f37a860534..e458fc2a1cf9d 100644 --- a/components/com_tags/views/tags/tmpl/default.php +++ b/components/com_tags/views/tags/tmpl/default.php @@ -12,8 +12,9 @@ // Note that there are certain parts of this layout used only when there is exactly one tag. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); -$description = $this->params->get('all_tags_description'); +$description = $this->params->get('all_tags_description'); $descriptionImage = $this->params->get('all_tags_description_image'); + ?>
params->get('show_page_heading')) : ?> @@ -22,12 +23,14 @@ params->get('all_tags_show_description_image') && !empty($descriptionImage)) : ?> -
'; ?>
+
+ +
-
+
+ +
- loadTemplate('items'); ?> -
diff --git a/components/com_tags/views/tags/tmpl/default_items.php b/components/com_tags/views/tags/tmpl/default_items.php index 81e0b6d320912..ec8c73ecccdd0 100644 --- a/components/com_tags/views/tags/tmpl/default_items.php +++ b/components/com_tags/views/tags/tmpl/default_items.php @@ -18,8 +18,8 @@ $user = JFactory::getUser(); // Check if user is allowed to add/edit based on tags permissions. -$canEdit = $user->authorise('core.edit', 'com_tags'); -$canCreate = $user->authorise('core.create', 'com_tags'); +$canEdit = $user->authorise('core.edit', 'com_tags'); +$canCreate = $user->authorise('core.create', 'com_tags'); $canEditState = $user->authorise('core.edit.state', 'com_tags'); $columns = $this->params->get('tag_columns', 1); @@ -38,14 +38,15 @@ } $bscolumns = min($columns, floor(12 / $bsspans)); -$n = count($this->items); +$n = count($this->items); + JFactory::getDocument()->addScriptDeclaration(" var resetFilter = function() { document.getElementById('filter-search').value = ''; } "); -?> +?>
params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?>
@@ -71,7 +72,6 @@ pagination->getLimitBox(); ?>
- @@ -79,7 +79,6 @@
- items == false || $n === 0) : ?>

@@ -88,62 +87,58 @@ - - items)) : ?> - params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?> - + params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?> + + - +