Merge branch '4.0-dev' into 390-merge14

joomla · Apr 11, 2019 · 703a359 · 703a359
2 parents 9b8ba0a + 874b8a2
commit 703a359
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 37 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -931,6 +931,7 @@ public function deleteUnexistingFiles()
 			'/administrator/components/com_languages/helpers/languages.php',
 			'/administrator/components/com_languages/helpers/multilangstatus.php',
 			'/administrator/components/com_languages/languages.php',
+			'/administrator/components/com_languages/layouts/joomla/searchtools/default/bar.php',
 			'/administrator/components/com_languages/models/forms/filter_installed.xml',
 			'/administrator/components/com_languages/models/forms/filter_languages.xml',
 			'/administrator/components/com_languages/models/forms/language.xml',

diff --git a/...ts/com_languages/Field/Languageclient.php → ...m_languages/Field/LanguageclientField.php b/...ts/com_languages/Field/Languageclient.php → ...m_languages/Field/LanguageclientField.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\Component\Languages\Administrator\Model;
+namespace Joomla\Component\Languages\Administrator\Field;
 
 defined('JPATH_BASE') or die;
 
@@ -20,7 +20,7 @@
  *
  * @since  3.9.0
  */
-class Languageclient extends ListField
+class LanguageclientField extends ListField
 {
 	/**
 	 * The form field type.
@@ -61,12 +61,12 @@ protected function getOptions()
 		// Create a single array of them.
 		foreach ($site_languages as $tag => $language)
 		{
-			$languages[$tag . '0'] = Text::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM', $language['name'], JText::_('JSITE'));
+			$languages[$tag . '0'] = Text::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM', $language['name'], Text::_('JSITE'));
 		}
 
 		foreach ($admin_languages as $tag => $language)
 		{
-			$languages[$tag . '1'] = Text::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM', $language['name'], JText::_('JADMINISTRATOR'));
+			$languages[$tag . '1'] = Text::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM', $language['name'], Text::_('JADMINISTRATOR'));
 		}
 
 		// Sort it by language tag and by client after that.

diff --git a/administrator/components/com_languages/Model/OverridesModel.php b/administrator/components/com_languages/Model/OverridesModel.php
@@ -11,7 +11,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Language\LanguageHelper;
@@ -37,9 +36,15 @@ class OverridesModel extends ListModel
 	 */
 	public function __construct($config = array(), MVCFactoryInterface $factory = null)
 	{
-		parent::__construct($config, $factory);
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'key',
+				'text',
+			);
+		}
 
-		$this->filter_fields = array('key', 'text');
+		parent::__construct($config, $factory);
 	}
 
 	/**

diff --git a/administrator/components/com_languages/View/Override/HtmlView.php b/administrator/components/com_languages/View/Override/HtmlView.php
@@ -63,13 +63,13 @@ public function display($tpl = null)
 		$this->item  = $this->get('Item');
 		$this->state = $this->get('State');
 
-		$app = JFactory::getApplication();
+		$app = Factory::getApplication();
 
 		$languageClient = $app->getUserStateFromRequest('com_languages.overrides.language_client', 'language_client');
 
 		if ($languageClient == null)
 		{
-			$app->enqueueMessage(JText::_('COM_LANGUAGES_OVERRIDE_FIRST_SELECT_MESSAGE'), 'warning');
+			$app->enqueueMessage(Text::_('COM_LANGUAGES_OVERRIDE_FIRST_SELECT_MESSAGE'), 'warning');
 
 			$app->redirect('index.php?option=com_languages&view=overrides');
 		}
@@ -119,7 +119,7 @@ protected function addToolbar()
 		if ($canDo->get('core.edit'))
 		{
 			ToolbarHelper::apply('override.apply');
-				
+
 			$toolbarButtons[] = ['save', 'override.save'];
 		}
 

diff --git a/administrator/components/com_languages/View/Overrides/HtmlView.php b/administrator/components/com_languages/View/Overrides/HtmlView.php
@@ -13,7 +13,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;

diff --git a/administrator/components/com_languages/forms/filter_overrides.xml b/administrator/components/com_languages/forms/filter_overrides.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<form addfieldprefix="Joomla\Component\Language\Administrator\Field">
+<form>
 	<field
 		name="language_client"
 		type="languageclient"
 		onchange="this.form.submit();"
+		filtermode="selector"
+		addfieldprefix="Joomla\Component\Languages\Administrator\Field"
 	>
 		<option value="">COM_LANGUAGES_OVERRIDE_SELECT_LANGUAGE</option>
 	</field>
@@ -17,11 +19,24 @@
 		/>
 	</fields>
 	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="key DESC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="constant ASC">COM_LANGUAGES_VIEW_OVERRIDES_CONSTANT_ASC</option>
+			<option value="constant DESC">COM_LANGUAGES_VIEW_OVERRIDES_CONSTANT_DESC</option>
+			<option value="key ASC">COM_LANGUAGES_VIEW_OVERRIDES_KEY_ASC</option>
+			<option value="key DESC">COM_LANGUAGES_VIEW_OVERRIDES_KEY_DESC</option>
+		</field>
+
 		<field
 			name="limit"
 			type="limitbox"
 			label="JGLOBAL_LIMIT"
-			class="input-mini"
 			default="25"
 			onchange="this.form.submit();"
 		/>

diff --git a/administrator/components/com_languages/layouts/joomla/searchtools/default.php b/administrator/components/com_languages/layouts/joomla/searchtools/default.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Layout\LayoutHelper;
+
+/** @var  array  $displayData */
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+
+if ($data['view'] instanceof \Joomla\Component\Languages\Administrator\View\Overrides\HtmlView)
+{
+	// Client selector doesn't have to activate the filter bar.
+	unset($data['view']->activeFilters['language_client']);
+}
+
+// Set some basic options
+$customOptions = array(
+	'filtersHidden'       => $data['options']['filtersHidden'] ?? empty($data['view']->activeFilters),
+	'defaultLimit'        => $data['options']['defaultLimit'] ?? Factory::getApplication()->get('list_limit', 20),
+	'searchFieldSelector' => '#filter_search',
+	'orderFieldSelector'  => '#list_fullordering',
+);
+
+$data['options'] = array_merge($customOptions, $data['options']);
+
+$formSelector = !empty($data['options']['formSelector']) ? $data['options']['formSelector'] : '#adminForm';
+
+// Load search tools
+HTMLHelper::_('searchtools.form', $formSelector, $data['options']);
+
+$filtersClass = isset($data['view']->activeFilters) && $data['view']->activeFilters ? ' js-stools-container-filters-visible' : '';
+?>
+<div class="js-stools" role="search">
+	<?php if ($data['view'] instanceof \Joomla\Component\Languages\Administrator\View\Overrides\HtmlView) : ?>
+		<?php $langClient = $data['view']->filterForm->getField('language_client'); ?>
+		<div class="js-stools-container-selector">
+			<div class="js-stools-field-selector js-stools-langClient">
+				<?php echo $langClient->input; ?>
+			</div>
+		</div>
+	<?php endif; ?>
+	<div class="js-stools-container-bar">
+		<?php echo LayoutHelper::render('joomla.searchtools.default.bar', $data); ?>
+	</div>
+	<!-- Filters div -->
+	<div class="js-stools-container-filters clearfix<?php echo $filtersClass; ?>">
+		<?php echo LayoutHelper::render('joomla.searchtools.default.list', $data); ?>
+		<?php echo LayoutHelper::render('joomla.searchtools.default.filters', $data); ?>
+	</div>
+</div>
diff --git a/administrator/components/com_languages/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_languages/layouts/joomla/searchtools/default/bar.php
diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini
@@ -110,8 +110,12 @@ COM_LANGUAGES_VIEW_INSTALLED_SITE_TITLE="Languages: Installed (Site)"
 COM_LANGUAGES_VIEW_LANGUAGES_TITLE="Languages: Content"
 COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE="Languages: Edit Content Language"
 COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE="Languages: New Content Language"
+COM_LANGUAGES_VIEW_OVERRIDES_CONSTANT_ASC="Constant ascending"
+COM_LANGUAGES_VIEW_OVERRIDES_CONSTANT_DESC="Constant descending"
 COM_LANGUAGES_VIEW_OVERRIDES_FILTER_SEARCH_DESC="Search constant or text."
 COM_LANGUAGES_VIEW_OVERRIDES_KEY="Constant"
+COM_LANGUAGES_VIEW_OVERRIDES_KEY_ASC="Text ascending"
+COM_LANGUAGES_VIEW_OVERRIDES_KEY_DESC="Text descending"
 COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM="%1$s - %2$s"
 COM_LANGUAGES_VIEW_OVERRIDES_NO_ITEM_SELECTED="You haven't selected any overrides."
 COM_LANGUAGES_VIEW_OVERRIDES_N_ITEMS_DELETED="%d language overrides were deleted."
@@ -121,6 +125,7 @@ COM_LANGUAGES_VIEW_OVERRIDES_PURGE_SUCCESS="Overrider cache table cleared."
 COM_LANGUAGES_VIEW_OVERRIDES_TEXT="Text"
 COM_LANGUAGES_VIEW_OVERRIDES_TITLE="Languages: Overrides"
 COM_LANGUAGES_VIEW_OVERRIDE_CLIENT_SITE="Site"
+COM_LANGUAGES_VIEW_OVERRIDE_CLIENT_ADMINISTRATOR="Administrator"
 COM_LANGUAGES_VIEW_OVERRIDE_EDIT_EDIT_OVERRIDE_LEGEND="Edit this Override"
 COM_LANGUAGES_VIEW_OVERRIDE_EDIT_NEW_OVERRIDE_LEGEND="Create a New Override"
 COM_LANGUAGES_VIEW_OVERRIDE_EDIT_TITLE="Languages: Edit Override"