diff --git a/administrator/components/com_content/models/forms/filter_featured.xml b/administrator/components/com_content/models/forms/filter_featured.xml index 72d975bb24635..58a81d02935a2 100644 --- a/administrator/components/com_content/models/forms/filter_featured.xml +++ b/administrator/components/com_content/models/forms/filter_featured.xml @@ -90,14 +90,14 @@ default="a.title ASC" > + + - - diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php index 5eb8e932d9e16..0ea47b5e3cabd 100644 --- a/administrator/components/com_content/views/featured/tmpl/default.php +++ b/administrator/components/com_content/views/featured/tmpl/default.php @@ -6,15 +6,11 @@ * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ - defined('_JEXEC') or die; - JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); - JHtml::_('bootstrap.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('formbehavior.chosen', 'select'); - $user = JFactory::getUser(); $userId = $user->get('id'); $listOrder = $this->escape($this->state->get('list.ordering')); @@ -23,29 +19,37 @@ $archived = $this->state->get('filter.published') == 2 ? true : false; $trashed = $this->state->get('filter.published') == -2 ? true : false; $saveOrder = $listOrder == 'fp.ordering'; +if ($saveOrder) +{ + $saveOrderingUrl = 'index.php?option=com_content&task=featured.saveOrderAjax&tmpl=component'; + JHtml::_('sortablelist.sortable', 'articleList', 'adminForm', strtolower($listDirn), $saveOrderingUrl); +} ?>
sidebar)) : ?> -
- sidebar; ?> -
-
- -
- - $this)); - ?> - items)) : ?> -
- -
+
+ sidebar; ?> +
+
- - +
+ + $this)); + ?> + items)) : ?> +
+ +
+ +
+ + @@ -55,12 +59,6 @@ - @@ -80,122 +78,123 @@ - - + + - - - items); ?> - items as $i => $item) : - $item->max_ordering = 0; - $ordering = ($listOrder == 'fp.ordering'); - $assetId = 'com_content.article.' . $item->id; - $canCreate = $user->authorise('core.create', 'com_content.category.' . $item->catid); - $canEdit = $user->authorise('core.edit', 'com_content.article.' . $item->id); - $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0; - $canChange = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin; - ?> - - - + items); ?> + items as $i => $item) : + $item->max_ordering = 0; + $ordering = ($listOrder == 'fp.ordering'); + $assetId = 'com_content.article.' . $item->id; + $canCreate = $user->authorise('core.create', 'com_content.category.' . $item->catid); + $canEdit = $user->authorise('core.edit', 'com_content.article.' . $item->id); + $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0; + $canChange = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin; + ?> + + - + + - + - - - - - - - + + + + + + + + - -
+ + - - - items, 'filesave.png', 'featured.saveorder'); ?> - -
pagination->getListFooter(); ?>
- id); ?> - -
- state, $i, 'articles.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> - featured, $i, $canChange); ?> + +
escape($item->title)); + $iconClass = ''; + if (!$canChange) + { + $iconClass = ' inactive'; + } + elseif (!$saveOrder) + { + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + } ?> - - -
- checked_out) : ?> - editor, $item->checked_out_time, 'articles.', $canCheckin); ?> + + + + + - language == '*') : ?> - - - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> - - - - escape($item->title); ?> - - escape($item->title); ?> - - - escape($item->alias)); ?> - -
- escape($item->category_title); ?> +
+ id); ?> + +
+ state, $i, 'articles.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> + featured, $i, $canChange); ?> + escape($item->title)); + ?>
- - 		- -
- - pagination->orderUpIcon($i, true, 'featured.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?> - pagination->orderDownIcon($i, $count, true, 'featured.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?> - - pagination->orderUpIcon($i, true, 'featured.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?> - pagination->orderDownIcon($i, $count, true, 'featured.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?> +
+
+ checked_out) : ?> + editor, $item->checked_out_time, 'articles.', $canCheckin); ?> + + language == '*') : ?> + + + language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> - + + + escape($item->title); ?> + + escape($item->title); ?> + + + escape($item->alias)); ?> + +
+ escape($item->category_title); ?> +
- - ordering; ?> - - 		- escape($item->access_level); ?> - - created_by_alias) : ?> - escape($item->author_name); ?> -

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

- - escape($item->author_name); ?> - - 		- language == '*'):?> - - - language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> - - - created, JText::_('DATE_FORMAT_LC4')); ?> - - hits; ?> - - id; ?> -
+ escape($item->access_level); ?> + + created_by_alias) : ?> + escape($item->author_name); ?> +

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

+ + escape($item->author_name); ?> + + 		+ language == '*'):?> + + + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + + + created, JText::_('DATE_FORMAT_LC4')); ?> + + hits; ?> + + id; ?> +
- + + + - - - - -
+ + + + +