diff options
| -rw-r--r-- | misc/form.js | 19 | ||||
| -rw-r--r-- | modules/filter/filter.module | 82 | ||||
| -rw-r--r-- | modules/filter/filter.test | 2 | ||||
| -rw-r--r-- | modules/node/node.css | 35 |
4 files changed, 95 insertions, 43 deletions
diff --git a/misc/form.js b/misc/form.js index 8631ed68c..fd34cd103 100644 --- a/misc/form.js +++ b/misc/form.js @@ -12,4 +12,23 @@ Drupal.behaviors.multiselectSelector = { } }; + +/** + * Automatically displays the guidelines of the selected text format. + */ +Drupal.behaviors.filterGuidelines = { + attach: function(context) { + $('.filter-guidelines:not(.filterGuidelines-processed)', context) + .addClass('filterGuidelines-processed') + .find('label').hide() + .parents('.filter-wrapper').find('select.filter-list') + .bind('change', function() { + $(this).parents('.filter-wrapper') + .find('.filter-guidelines-item').hide() + .siblings('#filter-guidelines-' + this.value).show(); + }) + .change(); + } +}; + })(jQuery); diff --git a/modules/filter/filter.module b/modules/filter/filter.module index a98423418..5c34b2971 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -60,6 +60,9 @@ function filter_theme() { 'filter_tips_more_info' => array( 'arguments' => array(), ), + 'filter_guidelines' => array( + 'arguments' => array('format' => NULL), + ), ); } @@ -481,58 +484,43 @@ function check_markup($text, $format = FILTER_FORMAT_DEFAULT, $langcode = '', $c function filter_form($value = FILTER_FORMAT_DEFAULT, $weight = NULL, $parents = array('format')) { $value = filter_resolve_format($value); $formats = filter_formats(); - - $extra = theme('filter_tips_more_info'); - + + $form = array( + '#type' => 'fieldset', + '#weight' => $weight, + '#attributes' => array('class' => 'filter-wrapper'), + ); + + $element_id = form_clean_id('edit-' . implode('-', $parents)); + if (count($formats) > 1) { - $form = array( - '#type' => 'fieldset', - '#title' => t('Text format'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#weight' => $weight, - '#element_validate' => array('filter_form_validate'), - ); - // Multiple formats available: display radio buttons with tips. foreach ($formats as $format) { - // Generate the parents as the autogenerator does, so we will have a - // unique id for each radio button. - $parents_for_id = array_merge($parents, array($format->format)); - $form[$format->format] = array( - '#type' => 'radio', - '#title' => $format->name, - '#default_value' => $value, - '#return_value' => $format->format, - '#parents' => $parents, - '#description' => theme('filter_tips', _filter_tips($format->format, FALSE)), - '#id' => form_clean_id('edit-' . implode('-', $parents_for_id)), - ); + $options[$format->format] = $format->name; + $guidelines[$format->format] = array('#markup' => theme('filter_guidelines', $format)); } + drupal_add_js('misc/form.js'); + $form['format'] = array( + '#type' => 'select', + '#title' => t('Text format'), + '#options' => $options, + '#default_value' => $value, + '#parents' => $parents, + '#id' => $element_id, + '#attributes' => array('class' => 'filter-list'), + ); } else { - // Only one format available: use a hidden form item and only show tips. + // Only one format available: use a form value and only show label. $format = array_shift($formats); + unset($format->name); + $guidelines = array('#markup' => theme('filter_guidelines', $format)); $form[$format->format] = array('#type' => 'value', '#value' => $format->format, '#parents' => $parents); - $tips = _filter_tips(variable_get('filter_default_format', 1), FALSE); - $form['format']['guidelines'] = array( - '#title' => t('Formatting guidelines'), - '#markup' => theme('filter_tips', $tips, FALSE), - ); } - $form[] = array('#markup' => $extra); + $form['format_help'] = array('#markup' => '<div id="' . $element_id . '-help" class="filter-help">' . theme('filter_tips_more_info') . '</div>'); + $form['format_guidelines'] = array_merge($guidelines, array('#prefix' => '<div id="' . $element_id . '-guidelines" class="filter-guidelines">', '#suffix' => '</div>')); return $form; } -function filter_form_validate($form) { - foreach (element_children($form) as $key) { - if ($form[$key]['#value'] == $form[$key]['#return_value']) { - return; - } - } - form_error($form, t('An illegal choice has been detected. Please contact the site administrator.')); - watchdog('form', 'Illegal choice %choice in %name element.', array('%choice' => $form[$key]['#value'], '%name' => empty($form['#title']) ? $form['#parents'][0] : $form['#title']), WATCHDOG_ERROR); -} - /** * Returns TRUE if the user is allowed to access this format. */ @@ -586,7 +574,17 @@ function _filter_tips($format, $long = FALSE) { * @ingroup themeable */ function theme_filter_tips_more_info() { - return '<p>' . l(t('More information about formatting options'), 'filter/tips') . '</p>'; + return '<p>' . l(t('More information about text formats'), 'filter/tips') . '</p>'; +} + +/** + * Format guidelines for a text format. + * + * @ingroup themeable + */ +function theme_filter_guidelines($format) { + $name = isset($format->name) ? '<label>' . $format->name . ':</label>' : NULL; + return '<div id="filter-guidelines-' . $format->format . '" class="filter-guidelines-item">' . $name . theme('filter_tips', _filter_tips($format->format, FALSE)) . '</div>'; } /** diff --git a/modules/filter/filter.test b/modules/filter/filter.test index 482c097bb..344737732 100644 --- a/modules/filter/filter.test +++ b/modules/filter/filter.test @@ -101,7 +101,7 @@ class FilterAdminTestCase extends DrupalWebTestCase { $this->drupalLogin($web_user); $this->drupalGet('node/add/page'); - $this->assertFieldByName('body_format', $full, t('Full HTML filter accessible.')); + $this->assertRaw('<option value="' . $full .'">Full HTML</option>', t('Full HTML filter accessible.')); // Use filtered HTML and see if it removes tags that arn't allowed. $body = $this->randomName(); diff --git a/modules/node/node.css b/modules/node/node.css index 7b56fd710..58ed30862 100644 --- a/modules/node/node.css +++ b/modules/node/node.css @@ -42,3 +42,38 @@ td.revision-current { .terms-inline { display: inline; } +.filter-label { + font-weight: bold; +} + +.filter-wrapper { + border-top: 0; + width: 95%; + padding: 0; + margin-top: -1em; + float: left; /* Required by IE6 to respect negative margins */ +} +.filter-guidelines { + clear: left; + margin: 1.5em; +} +.filter-wrapper .form-item { + float: left; + line-height: 3em; + margin: 0 0 0 1.5em; +} +.filter-wrapper .form-item label { + display: inline; +} +.filter-help { + float: right; + margin-right: 1em; +} +.filter-help a { + background: url(../../misc/help.png) right center no-repeat; + padding-right: 20px; +} + +html.js fieldset.collapsible { + clear: left; /* Test fix for Safari issues caused by IE6 fix above, need to test impact elsewhere and move to appropriate CSS file */ +}
\ No newline at end of file |