Index: better_exposed_filters_exposed_form_plugin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/better_exposed_filters/better_exposed_filters_exposed_form_plugin.inc,v retrieving revision 1.11 diff -u -r1.11 better_exposed_filters_exposed_form_plugin.inc --- better_exposed_filters_exposed_form_plugin.inc 25 May 2010 17:36:47 -0000 1.11 +++ better_exposed_filters_exposed_form_plugin.inc 4 Aug 2010 17:55:29 -0000 @@ -23,12 +23,47 @@ function options_form(&$form, &$form_state) { parent::options_form($form, $form_state); + $bef_options = array(); + /* - * Changes to the options form need to be mirrored in hook_form_alter in - * better_exposed_filters.module to maintain Views 2.x support + * Add options for exposed sorts + */ + $exposed = FALSE; + foreach ($this->display->handler->get_handlers('sort') as $label => $sort) { + if ($sort->options['exposed']) { + $exposed = TRUE; + break; + } + } + if ($exposed) { + $bef_options['sort']['bef_format'] = array( + '#type' => 'select', + '#title' => t('Display exposed sort options as'), + '#default_value' => $this->options['bef']['sort']['bef_format'], + '#options' => array( + 'default' => t('Default select list'), + 'bef' => t('Radio Buttons'), + ), + '#description' => t('Select a format for the exposed sort options.'), + ); + $bef_options['sort']['allow_no_sort'] = array( + '#type' => 'checkbox', + '#title' => t('Display a "Do not sort" option'), + '#default_value' => $this->options['bef']['sort']['allow_no_sort'], + '#description' => t('Adds a "do not sort" option to the existing Asc/Desc options'), + ); + $bef_options['sort']['no_sort_label'] = array( + '#type' => 'textfield', + '#title' => t('"Do not sort" label'), + '#default_value' => $this->options['bef']['sort']['no_sort_label'], + '#description' => t('Text to use if the above option is checked'), + ); + } + + /* + * Changes to the options form need to be mirrored in hook_form_alter in + * better_exposed_filters.module to maintain Views 2.x support */ - - $bef_options = array(); // Go through each filter and add the same options we used to add in hook_form_alter() foreach ($this->display->handler->get_handlers('filter') as $label => $filter) { @@ -53,10 +88,10 @@ 'bef_hidden' => t('Hidden'), ), '#description' => t( - 'Select a format for the exposed filter. The "Hidden" option is - generally used for multi-step filters. Note: if "Force single" - is checked, radio buttons will be used. If "Force single" is - unchecked, checkboxes will be used.' + 'Select a format for the exposed filter. The "Hidden" option is + generally used for multi-step filters. Note: if "Force single" + is checked, radio buttons will be used. If "Force single" is + unchecked, checkboxes will be used.' ), ); @@ -75,7 +110,7 @@ '#default_value' => $this->options['bef'][$label]['more_options']['bef_select_all_none'], '#disabled' => $filter->options['expose']['single'], '#description' => t( - 'Add a "Select All/None" link when rendering the exposed filter using + 'Add a "Select All/None" link when rendering the exposed filter using checkboxes. If this option is disabled, edit the filter and uncheck "Force single". NOTE: The link is built at page load, so it will not appear in the "Live Preview" which is loaded dynamically.' @@ -87,7 +122,7 @@ '#type' => 'textarea', '#title' => t('Description'), '#default_value' => $this->options['bef'][$label]['more_options']['bef_filter_description'], - '#description' => t('Adds descriptive text to the exposed filter. This is usually + '#description' => t('Adds descriptive text to the exposed filter. This is usually rendered in smaller print under the label or the options.'), ); } // foreach ($filters as $filter) { @@ -101,15 +136,56 @@ */ function exposed_form_alter(&$form, &$form_state) { parent::exposed_form_alter($form, $form_state); - + /* - * Changes to the display of BEF filters need to be mirrored in hook_form_alter in - * better_exposed_filters.module to maintain Views 2.x support + * Handle exposed sort elements */ - + if (isset($this->options['bef']['sort']) && ('bef' == $this->options['bef']['sort']['bef_format'])) { + if (1 == count($form['sort_by']['#options'])) { + // Don't show radio buttons when there's just one option. + // NOTE: Views' exposed forms code does some manipulations after form_alter is called, so we can't + // add the markup and hidden form items as proper FAPI elements as they won't get positioned + // correctly. Thus we 'display: none' the select element and add the display text using #suffix. + // TODO: should this be theme-able? Should we move all select-as-radios to theme functions? +// if (empty($form['sort_by']['#suffix'])) { +// $form['sort_by']['#suffix'] = ''; +// } +// if (empty($form['sort_by']['#prefix'])) { +// $form['sort_by']['#prefix'] = ''; +// } + $form['sort_by']['#prefix'] .= '
'; + $form['sort_by']['#suffix'] .= array_pop(array_values($form['sort_by']['#options'])) .'
'; + $form['sort_by']['#attributes'] = array('style' => 'display: none;'); + } + else { + $form['sort_by']['#type'] = 'radios'; + $form['sort_by']['#process'] = array('expand_radios', 'views_process_dependency'); + $form['sort_by']['#prefix'] = '
'; + $form['sort_by']['#suffix'] = '
'; + } + + // Add "Do not sort" option if selected + if ($this->options['bef']['sort']['allow_no_sort']) { + array_unshift($form['sort_order']['#options'], $this->options['bef']['sort']['no_sort_label']); + + // JavaScript support is needed to remove the sort_by and sort_order form elements on form submission + drupal_add_js(drupal_get_path('module', 'better_exposed_filters') .'/better_exposed_filters.js'); + } + + $form['sort_order']['#type'] = 'radios'; + $form['sort_order']['#process'] = array('expand_radios', 'views_process_dependency'); + $form['sort_order']['#prefix'] = '
'; + $form['sort_order']['#suffix'] = '
'; + } + + /* + * Changes to the display of BEF filters need to be mirrored in hook_form_alter in + * better_exposed_filters.module to maintain Views 2.x support + */ + // Shorthand for all filters in this view $filters = $form_state['view']->display_handler->handlers['filter']; - + // Go through each saved option looking for Better Exposed Filter settings foreach ($this->options['bef'] as $label => $options) { @@ -117,30 +193,30 @@ if (!$filters[$label]->options['exposed']) { continue; } - + // Form element is designated by the element ID which is user-configurable $field_id = $form['#info']["filter-$label"]['value']; // Add a description to the exposed filter if (!empty($options['more_options']['bef_filter_description'])) { $form[$field_id]['#description'] = $options['more_options']['bef_filter_description']; - } - + } + switch ($options['bef_format']) { case 'bef': if (empty($form[$field_id]['#multiple'])) { - // For "force-single" select boxes or other single-select options, just switch to + // For "force-single" select boxes or other single-select options, just switch to // radio buttons. $form[$field_id]['#type'] = 'radios'; $form[$field_id]['#process'] = array('expand_radios', 'views_process_dependency'); - $form[$field_id]['#prefix'] = '
'; + $form[$field_id]['#prefix'] = '
'; $form[$field_id]['#suffix'] = '
'; if (isset($form[$field_id]['#options']['All'])) { // @TODO: The terms 'All' and 'Any' are customizable in Views if (!$filters[$label]->options['expose']['optional']) { // Some third-party filter handlers still add the "Any" option even if this is not - // an optional filter. Zap it here if they do. + // an optional filter. Zap it here if they do. unset($form[$field_id]['#options']['All']); } else { @@ -161,14 +237,14 @@ if (!isset($form[$field_id]['#attributes'])) { $form[$field_id]['#attributes'] = array(); } - + // If the 'class' index doesn't exist, PHP will throw a notice if the error_reporting - // level includes E_NOTICE. Suppress the notice with the '@' operator. + // level includes E_NOTICE. Suppress the notice with the '@' operator. @$form[$field_id]['#attributes']['class'] .= 'bef-select-all-none'; } } break; - + case 'bef_hidden': $form['#info']["filter-$field_id"]['label'] = ''; // Hide the label if (empty($form[$field_id]['#multiple'])) { @@ -178,7 +254,7 @@ $form[$field_id]['#theme'] = 'select_as_hidden'; } break; - + } // switch ($options['bef_format']) } // foreach ($this->options['bef']...) } // function exposed_form_alter(...) Index: better_exposed_filters.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/better_exposed_filters/better_exposed_filters.js,v retrieving revision 1.9 diff -u -r1.9 better_exposed_filters.js --- better_exposed_filters.js 7 Jun 2010 22:56:05 -0000 1.9 +++ better_exposed_filters.js 4 Aug 2010 17:55:29 -0000 @@ -60,5 +60,19 @@ } }); } + + /* + * Add support for Do Not Sort option for exposed sorts (Views 3.x only) + */ + $('.views-exposed-form').parents('form:first').submit(function() { + if ($('.bef-sortorder input[value=0]:checked', this).length) { + // Uncheck/select the sort_by and sort_order elements + $('.bef-sortorder input', this).attr('checked', ''); + $('.bef-sortby input', this).attr('checked', ''); + $('.bef-sortby select', this).remove(); + } + // Allow normal form processing to continue from here + }); + }; }