diff --git a/components/com_config/view/modules/tmpl/default.php b/components/com_config/view/modules/tmpl/default.php index 04f2e75711ba1..70416b0ec78ed 100644 --- a/components/com_config/view/modules/tmpl/default.php +++ b/components/com_config/view/modules/tmpl/default.php @@ -33,34 +33,25 @@ "); ?> -
- +
- -
-
+
-
-
- @@ -73,118 +64,117 @@ class="form-validate">
- item['title'] ?> + item['title'] ?>    - item['module'] ?> + item['module'] ?>
-
-
-
- form->getLabel('title'); ?> -
-
- form->getInput('title'); ?> -
-
-
-
- form->getLabel('showtitle'); ?> -
-
- form->getInput('showtitle'); ?> -
-
-
-
- form->getLabel('position'); ?> -
-
- loadTemplate('positions'); ?> -
-
- -
- - authorise('core.edit.state', 'com_modules.module.' . $this->item['id'])) : ?> -
-
- form->getLabel('published'); ?> -
-
- form->getInput('published'); ?> -
-
- - -
-
- form->getLabel('publish_up'); ?> -
-
- form->getInput('publish_up'); ?> -
-
-
-
- form->getLabel('publish_down'); ?> -
-
- form->getInput('publish_down'); ?> -
-
- -
-
- form->getLabel('access'); ?> -
-
- form->getInput('access'); ?> -
-
-
-
- form->getLabel('ordering'); ?> -
-
- form->getInput('ordering'); ?> -
-
- -
-
- form->getLabel('language'); ?> -
-
- form->getInput('language'); ?> -
-
-
-
- form->getLabel('note'); ?> -
-
- form->getInput('note'); ?> -
-
- -
- -
- loadTemplate('options'); ?> -
- - -
- form->getInput('content'); ?> -
- -
+ +
+
+ form->getLabel('title'); ?> +
+
+ form->getInput('title'); ?> +
+
+
+
+ form->getLabel('showtitle'); ?> +
+
+ form->getInput('showtitle'); ?> +
+
+
+
+ form->getLabel('position'); ?> +
+
+ loadTemplate('positions'); ?> +
+
+ +
+ + authorise('core.edit.state', 'com_modules.module.' . $this->item['id'])) : ?> +
+
+ form->getLabel('published'); ?> +
+
+ form->getInput('published'); ?> +
+
+ + +
+
+ form->getLabel('publish_up'); ?> +
+
+ form->getInput('publish_up'); ?> +
+
+
+
+ form->getLabel('publish_down'); ?> +
+
+ form->getInput('publish_down'); ?> +
+
+ +
+
+ form->getLabel('access'); ?> +
+
+ form->getInput('access'); ?> +
+
+
+
+ form->getLabel('ordering'); ?> +
+
+ form->getInput('ordering'); ?> +
+
+ +
+
+ form->getLabel('language'); ?> +
+
+ form->getInput('language'); ?> +
+
+
+
+ form->getLabel('note'); ?> +
+
+ form->getInput('note'); ?> +
+
+ +
+ +
+ loadTemplate('options'); ?> +
+ + +
+ form->getInput('content'); ?> +
+
@@ -195,7 +185,5 @@ class="form-validate">
-
- diff --git a/components/com_config/view/modules/tmpl/default_options.php b/components/com_config/view/modules/tmpl/default_options.php index cf6690acc2885..2d877c716ce2b 100644 --- a/components/com_config/view/modules/tmpl/default_options.php +++ b/components/com_config/view/modules/tmpl/default_options.php @@ -26,7 +26,7 @@ ?> -
    +
      form->getFieldset($name) as $field) : ?>
    • diff --git a/components/com_config/view/modules/tmpl/default_positions.php b/components/com_config/view/modules/tmpl/default_positions.php index c64981dbca822..da9cd0d5cb512 100644 --- a/components/com_config/view/modules/tmpl/default_positions.php +++ b/components/com_config/view/modules/tmpl/default_positions.php @@ -10,6 +10,8 @@ defined('_JEXEC') or die; $positions = $this->model->getPositions(); +JHtml::_('formbehavior.chosen', '#jform_position', null, array('disable_search_threshold' => 0 )); + // Add custom position to options $customGroupText = JText::_('COM_MODULES_CUSTOM_POSITION'); @@ -17,7 +19,7 @@ $attr = array( 'id' => 'jform_position', 'list.select' => $this->item['position'], - 'list.attr' => 'class="chzn-custom-value" ' + 'list.attr' => 'class="chzn-custom-value custom-select" ' . 'data-custom_group_text="' . $customGroupText . '" ' . 'data-no_results_text="' . JText::_('COM_MODULES_ADD_CUSTOM_POSITION') . '" ' . 'data-placeholder="' . JText::_('COM_MODULES_TYPE_OR_SELECT_POSITION') . '" ' diff --git a/components/com_config/view/templates/tmpl/default.php b/components/com_config/view/templates/tmpl/default.php index 85a2875acc088..945ef7d8ba928 100644 --- a/components/com_config/view/templates/tmpl/default.php +++ b/components/com_config/view/templates/tmpl/default.php @@ -25,19 +25,19 @@ ?>
      -
      - -
      +
      -
      @@ -54,7 +54,5 @@ -
      - diff --git a/components/com_config/view/templates/tmpl/default_options.php b/components/com_config/view/templates/tmpl/default_options.php index 468c53d2c2389..b127c48e64c8f 100644 --- a/components/com_config/view/templates/tmpl/default_options.php +++ b/components/com_config/view/templates/tmpl/default_options.php @@ -9,39 +9,31 @@ defined('_JEXEC') or die; -// Load chosen.css - - -?> -form->getFieldsets('params'); +$fieldSets = $this->form->getFieldsets('params'); ?> +// Search for com_config field set +if (!empty($fieldSets['com_config'])) +{ + echo $this->form->renderFieldset('com_config'); +} +else +{ + // Fall-back to display all in params + foreach ($fieldSets as $name => $fieldSet) + { + $label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CONFIG_' . $name . '_FIELDSET_LABEL'; -
      - form->renderFieldset('com_config'); ?> -
      + if (isset($fieldSet->description) && trim($fieldSet->description)) + { + echo '

      ' . $this->escape(JText::_($fieldSet->description)) . '

      '; + } -form->renderFieldset($name); - // Fall-back to display all in params - foreach ($fieldSets as $name => $fieldSet) : - $label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CONFIG_' . $name . '_FIELDSET_LABEL'; - - if (isset($fieldSet->description) && trim($fieldSet->description)) : - echo '

      ' . $this->escape(JText::_($fieldSet->description)) . '

      '; - endif; - ?> - -
      - form->renderFieldset($name); ?> -
      -