From ecc682e98e39b54fced921429177df85483c8010 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Wed, 30 Mar 2016 16:02:15 +0200 Subject: [PATCH 1/2] Use advancedSelect for mod_languages and finder --- components/com_finder/helpers/html/filter.php | 6 +++--- components/com_finder/views/search/tmpl/default.php | 2 +- modules/mod_finder/tmpl/default.php | 2 +- modules/mod_languages/tmpl/default.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/com_finder/helpers/html/filter.php b/components/com_finder/helpers/html/filter.php index 8584475b0acd0..01fb03f77423c 100644 --- a/components/com_finder/helpers/html/filter.php +++ b/components/com_finder/helpers/html/filter.php @@ -383,7 +383,7 @@ public static function select($idxQuery, $options) $html .= ''; $html .= '
'; $html .= JHtml::_( - 'select.genericlist', $branches[$bk]->nodes, 't[]', 'class="inputbox"', 'id', 'title', $active, + 'select.genericlist', $branches[$bk]->nodes, 't[]', 'class="inputbox advancedSelect"', 'id', 'title', $active, 'tax-' . JFilterOutput::stringUrlSafe($bv->title) ); $html .= ''; @@ -438,7 +438,7 @@ public static function dates($idxQuery, $options) $html .= ''; $html .= '
'; $html .= JHtml::_( - 'select.genericlist', $operators, 'w1', 'class="inputbox filter-date-operator"', 'value', 'text', $idxQuery->when1, 'finder-filter-w1' + 'select.genericlist', $operators, 'w1', 'class="inputbox filter-date-operator advancedSelect"', 'value', 'text', $idxQuery->when1, 'finder-filter-w1' ); $html .= JHtml::calendar($idxQuery->date1, 'd1', 'filter_date1', '%Y-%m-%d', $attribs); $html .= ''; @@ -450,7 +450,7 @@ public static function dates($idxQuery, $options) $html .= ''; $html .= '
'; $html .= JHtml::_( - 'select.genericlist', $operators, 'w2', 'class="inputbox filter-date-operator"', 'value', 'text', $idxQuery->when2, 'finder-filter-w2' + 'select.genericlist', $operators, 'w2', 'class="inputbox filter-date-operator advancedSelect"', 'value', 'text', $idxQuery->when2, 'finder-filter-w2' ); $html .= JHtml::calendar($idxQuery->date2, 'd2', 'filter_date2', '%Y-%m-%d', $attribs); $html .= ''; diff --git a/components/com_finder/views/search/tmpl/default.php b/components/com_finder/views/search/tmpl/default.php index 9ae57d3682f57..592636ee80d4d 100644 --- a/components/com_finder/views/search/tmpl/default.php +++ b/components/com_finder/views/search/tmpl/default.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; JHtml::_('behavior.core'); -JHtml::_('formbehavior.chosen', 'select'); +JHtml::_('formbehavior.chosen'); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::stylesheet('com_finder/finder.css', false, true, false); ?> diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php index e6cc2b007f99c..75d8760226d26 100644 --- a/modules/mod_finder/tmpl/default.php +++ b/modules/mod_finder/tmpl/default.php @@ -12,7 +12,7 @@ JHtml::addIncludePath(JPATH_SITE . '/components/com_finder/helpers/html'); JHtml::_('jquery.framework'); -JHtml::_('formbehavior.chosen', 'select'); +JHtml::_('formbehavior.chosen'); JHtml::_('bootstrap.tooltip'); // Load the smart search component language file. diff --git a/modules/mod_languages/tmpl/default.php b/modules/mod_languages/tmpl/default.php index 83e5f2a2f6f40..414d18e3473cc 100644 --- a/modules/mod_languages/tmpl/default.php +++ b/modules/mod_languages/tmpl/default.php @@ -12,7 +12,7 @@ JHtml::_('stylesheet', 'mod_languages/template.css', array(), true); if ($params->get('dropdown', 1)) { - JHtml::_('formbehavior.chosen', 'select'); + JHtml::_('formbehavior.chosen'); } ?>
@@ -22,7 +22,7 @@ get('dropdown', 1)) : ?>
- From 12edab7e21e8dd9758cdd0c23d2aa6dfcd7fd002 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Wed, 30 Mar 2016 16:51:27 +0200 Subject: [PATCH 2/2] cs --- components/com_finder/helpers/html/filter.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/components/com_finder/helpers/html/filter.php b/components/com_finder/helpers/html/filter.php index 01fb03f77423c..bd74202362c77 100644 --- a/components/com_finder/helpers/html/filter.php +++ b/components/com_finder/helpers/html/filter.php @@ -383,7 +383,8 @@ public static function select($idxQuery, $options) $html .= ''; $html .= '
'; $html .= JHtml::_( - 'select.genericlist', $branches[$bk]->nodes, 't[]', 'class="inputbox advancedSelect"', 'id', 'title', $active, + 'select.genericlist', + $branches[$bk]->nodes, 't[]', 'class="inputbox advancedSelect"', 'id', 'title', $active, 'tax-' . JFilterOutput::stringUrlSafe($bv->title) ); $html .= '
'; @@ -438,7 +439,8 @@ public static function dates($idxQuery, $options) $html .= ''; $html .= '
'; $html .= JHtml::_( - 'select.genericlist', $operators, 'w1', 'class="inputbox filter-date-operator advancedSelect"', 'value', 'text', $idxQuery->when1, 'finder-filter-w1' + 'select.genericlist', + $operators, 'w1', 'class="inputbox filter-date-operator advancedSelect"', 'value', 'text', $idxQuery->when1, 'finder-filter-w1' ); $html .= JHtml::calendar($idxQuery->date1, 'd1', 'filter_date1', '%Y-%m-%d', $attribs); $html .= ''; @@ -450,7 +452,8 @@ public static function dates($idxQuery, $options) $html .= ''; $html .= '
'; $html .= JHtml::_( - 'select.genericlist', $operators, 'w2', 'class="inputbox filter-date-operator advancedSelect"', 'value', 'text', $idxQuery->when2, 'finder-filter-w2' + 'select.genericlist', + $operators, 'w2', 'class="inputbox filter-date-operator advancedSelect"', 'value', 'text', $idxQuery->when2, 'finder-filter-w2' ); $html .= JHtml::calendar($idxQuery->date2, 'd2', 'filter_date2', '%Y-%m-%d', $attribs); $html .= '';