diff --git includes/common.inc includes/common.inc index e380270..45af841 100644 --- includes/common.inc +++ includes/common.inc @@ -3717,6 +3717,9 @@ function drupal_common_theme() { 'form_element' => array( 'arguments' => array('element' => NULL), ), + 'vertical_tabs_panes' => array( + 'arguments' => array('element' => NULL), + ), ); } diff --git includes/form.inc includes/form.inc index e0a7d08..226f867 100644 --- includes/form.inc +++ includes/form.inc @@ -883,6 +883,19 @@ function form_builder($form_id, $form, &$form_state) { if (isset($form['#input']) && $form['#input']) { _form_builder_handle_input_element($form_id, $form, $form_state, $complete_form); } + if (!isset($form['#id'])) { + $form['#id'] = form_clean_id('edit-' . implode('-', $form['#parents'])); + } + // Allow for elements to expand to multiple elements, e.g., radios, + // checkboxes and files. + if (isset($form['#process']) && !$form['#processed']) { + foreach ($form['#process'] as $process) { + if (drupal_function_exists($process)) { + $form = $process($form, isset($edit) ? $edit : NULL, $form_state, $complete_form); + } + } + $form['#processed'] = TRUE; + } $form['#defaults_loaded'] = TRUE; // We start off assuming all form elements are in the correct order. @@ -990,9 +1003,6 @@ function _form_builder_handle_input_element($form_id, &$form, &$form_state, $com } array_unshift($form['#parents'], $name); } - if (!isset($form['#id'])) { - $form['#id'] = form_clean_id('edit-' . implode('-', $form['#parents'])); - } if (!empty($form['#disabled'])) { $form['#attributes']['disabled'] = 'disabled'; @@ -1061,16 +1071,6 @@ function _form_builder_handle_input_element($form_id, &$form, &$form_state, $com } } } - // Allow for elements to expand to multiple elements, e.g., radios, - // checkboxes and files. - if (isset($form['#process']) && !$form['#processed']) { - foreach ($form['#process'] as $process) { - if (drupal_function_exists($process)) { - $form = $process($form, isset($edit) ? $edit : NULL, $form_state, $complete_form); - } - } - $form['#processed'] = TRUE; - } form_set_value($form, $form['#value'], $form_state); } @@ -1505,6 +1505,7 @@ function theme_fieldset($element) { $element['#attributes']['class'] .= ' collapsed'; } } + $element['#attributes']['id'] = $element['#id']; return '' . ($element['#title'] ? '' . $element['#title'] . '' : '') . (isset($element['#description']) && $element['#description'] ? '
' . $element['#description'] . '
' : '') . (!empty($element['#children']) ? $element['#children'] : '') . (isset($element['#value']) ? $element['#value'] : '') . "\n"; } @@ -2400,6 +2401,13 @@ function theme_form_element($element) { } /** + * Makes the element's children fieldsets be vertical tabs. + */ +function theme_vertical_tabs_panes($element) { + return '
' . drupal_render_children($element) . '
'; +} + +/** * Sets a form element's class attribute. * * Adds 'required' and 'error' classes as needed. diff --git misc/vertical-tabs.css misc/vertical-tabs.css new file mode 100644 index 0000000..a0bf370 --- /dev/null +++ misc/vertical-tabs.css @@ -0,0 +1,81 @@ +/* $Id */ + +.vertical-tabs { + margin: 1em 0 1em 15em; + border: 1px solid #ccc; +} + +.vertical-tabs-list { + width: 15em; + list-style: none; + list-style-image: none; /* IE6 */ + border-top: 1px solid #ccc; + padding: 0; + position: relative; /* IE6 */ + margin: -1px 0 -1px -15em; + float: left; +} + +.vertical-tabs .vertical-tabs-panes fieldset.vertical-tabs-pane { + margin: 0 !important; + padding: 0 1em; + border: 0; +} + +.vertical-tabs .vertical-tabs-panes fieldset.vertical-tabs-pane legend { + display: none; +} + + + +/* Layout of each tab */ +.vertical-tabs-list li { + background: #eee; + border: 1px solid #ccc; + border-top: 0; + padding: 0; + margin: 0; + height: 1%; +} + +.vertical-tabs-list li a { + display: block; + text-decoration: none; + padding: 0.5em 0.6em; + line-height: 1.3em; + height: 1%; + outline: none; +} + +.vertical-tabs-list li a:focus { + position:relative; + z-index: 5; +} + +.vertical-tabs-list li a:hover { + text-decoration: none; +} + +.vertical-tabs-list li strong { + font-weight:normal; +} + +.vertical-tabs-list li.selected { + background: #fff; + border-right: 0; + position: relative; +} + +.vertical-tabs-list li.selected strong { + font-weight: bold; + color: #000; +} + +.vertical-tabs-list .description { + display: block; +} + +.vertical-tabs ul.vertical-tabs-list .description { + line-height: normal; + margin-bottom: 0; +} diff --git misc/vertical-tabs.js misc/vertical-tabs.js new file mode 100644 index 0000000..1fbccb7 --- /dev/null +++ misc/vertical-tabs.js @@ -0,0 +1,81 @@ +// $Id$ + +(function($) { + +Drupal.behaviors.verticalTabs = { + attach: function(context) { + $('.vertical-tabs-panes:not(.vertical-tabs-processed)', context).each(function() { + // create the tabs + var list = $(''); + $(this).wrap('
').before(list); + + $('> fieldset', this).each(function(i) { + var tab = new Drupal.verticalTab({ title: $('> legend', this).text(), fieldset: $(this) }); + list.append(tab.item); + $(this) + .addClass('vertical-tabs-pane') + .data('verticalTab', tab) + .find('input, textarea, select') + .change(function() { + tab.updateDescription(); + }); + }); + + $('> li:first', list).addClass('first'); + $('> li:last', list).addClass('last'); + + $('> fieldset:first', this).data('verticalTab').focus(); + // attach the tab description update functions + }).addClass('vertical-tabs-processed'); + } +}; + +Drupal.verticalTab = function(settings) { + var that = this; + $.extend(this, settings, Drupal.theme('verticalTab', settings)); + this.link.click(function() { + that.focus(); + return false; + }); + this.updateDescription(); +}; + +Drupal.verticalTab.update = function(tab) { + var data = $(tab).data('verticalTab'); + if (data) { + data.updateDescription(); + } +}; + +Drupal.verticalTab.prototype = { + focus: function() { + this.fieldset.siblings().each(function() { + var tab = $(this).data('verticalTab'); + tab.fieldset.hide(); + tab.item.removeClass('selected'); + }); + + this.fieldset.show(); + this.item.addClass('selected'); + }, + + updateDescription: function() { + var callback = this.fieldset.data('verticalTabCallback'); + if (callback) { + this.description.html(callback.call(this)); + } + } +}; + +Drupal.theme.prototype.verticalTab = function(settings) { + var tab = {}; + tab.item = $('
  • ') + .append(tab.link = $('') + .append(tab.title = $('').text(settings.title)) + .append(tab.description = $('') + ) + ); + return tab; +}; + +})(jQuery); diff --git modules/book/book.js modules/book/book.js new file mode 100644 index 0000000..473864f --- /dev/null +++ modules/book/book.js @@ -0,0 +1,28 @@ +// $Id$ + +(function($) { + +Drupal.behaviors.nodeBookVTab = { + attach: function(context) { + $('#edit-book').data('verticalTabCallback', function() { + var val = $('#edit-book-bid').val(); + + if (val === '0') + return Drupal.t('Not in book'); + else if (val === 'new') + return Drupal.t('New book'); + else + return $('#edit-book-bid option[selected]').text(); + }).each(function() { + Drupal.verticalTab && Drupal.verticalTab.update(this); + }); + } +}; + +if (Drupal.jsEnabled) { + $(document).ready(function() { + $('#edit-book-pick-book').css('display', 'none'); + }); +} + +})(jQuery); diff --git modules/book/book.module modules/book/book.module index 15130d8..dc83439 100644 --- modules/book/book.module +++ modules/book/book.module @@ -349,7 +349,7 @@ function book_form_alter(&$form, $form_state, $form_id) { if ($access) { _book_add_form_elements($form, $node); - $form['book']['pick-book'] = array( + $form['miscellaneous']['book']['pick-book'] = array( '#type' => 'submit', '#value' => t('Change book (update list of parents)'), // Submit the node form so the parent select options get updated. @@ -415,27 +415,25 @@ function _book_parent_select($book_link) { function _book_add_form_elements(&$form, $node) { // Need this for AJAX. $form['#cache'] = TRUE; - drupal_add_js("if (Drupal.jsEnabled) { jQuery(function() { jQuery('#edit-book-pick-book').css('display', 'none'); }); }", 'inline'); + drupal_add_js(drupal_get_path('module', 'book') .'/book.js'); - $form['book'] = array( + $form['miscellaneous']['book'] = array( '#type' => 'fieldset', '#title' => t('Book outline'), '#weight' => 10, - '#collapsible' => TRUE, - '#collapsed' => TRUE, '#tree' => TRUE, '#attributes' => array('class' => 'book-outline-form'), ); foreach (array('menu_name', 'mlid', 'nid', 'router_path', 'has_children', 'options', 'module', 'original_bid', 'parent_depth_limit') as $key) { - $form['book'][$key] = array( + $form['miscellaneous']['book'][$key] = array( '#type' => 'value', '#value' => $node->book[$key], ); } - $form['book']['plid'] = _book_parent_select($node->book); + $form['miscellaneous']['book']['plid'] = _book_parent_select($node->book); - $form['book']['weight'] = array( + $form['miscellaneous']['book']['weight'] = array( '#type' => 'weight', '#title' => t('Weight'), '#default_value' => $node->book['weight'], @@ -466,7 +464,7 @@ function _book_add_form_elements(&$form, $node) { } // Add a drop-down to select the destination book. - $form['book']['bid'] = array( + $form['miscellaneous']['book']['bid'] = array( '#type' => 'select', '#title' => t('Book'), '#default_value' => $node->book['bid'], diff --git modules/comment/comment-node-form.js modules/comment/comment-node-form.js new file mode 100644 index 0000000..e65474c --- /dev/null +++ modules/comment/comment-node-form.js @@ -0,0 +1,15 @@ +// $Id$ + +(function($) { + +Drupal.behaviors.nodeCommentVTab = { + attach: function(context) { + $('#edit-comment-settings').data('verticalTabCallback', function() { + return $('input:checked', this.fieldset).parent().text(); + }).each(function() { + Drupal.verticalTab && Drupal.verticalTab.update(this); + }); + } +}; + +})(jQuery); diff --git modules/comment/comment.module modules/comment/comment.module index 15ab14f..76348e5 100644 --- modules/comment/comment.module +++ modules/comment/comment.module @@ -574,15 +574,14 @@ function comment_form_node_type_form_alter(&$form, $form_state) { function comment_form_alter(&$form, $form_state, $form_id) { if (!empty($form['#node_edit_form'])) { $node = $form['#node']; - $form['comment_settings'] = array( + drupal_add_js(drupal_get_path('module', 'comment') . '/comment-node-form.js'); + $form['miscellaneous']['comment_settings'] = array( '#type' => 'fieldset', '#access' => user_access('administer comments'), '#title' => t('Comment settings'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, '#weight' => 30, ); - $form['comment_settings']['comment'] = array( + $form['miscellaneous']['comment_settings']['comment'] = array( '#type' => 'radios', '#parents' => array('comment'), '#default_value' => $node->comment, diff --git modules/menu/menu.js modules/menu/menu.js new file mode 100644 index 0000000..720f8a5 --- /dev/null +++ modules/menu/menu.js @@ -0,0 +1,15 @@ +// $Id$ + +(function($) { + +Drupal.behaviors.nodeMenuVTab = { + attach: function(context) { + $('#edit-menu').data('verticalTabCallback', function() { + return $('#edit-menu-link-title', this.fieldset).val() || Drupal.t('Not in menu'); + }).each(function() { + Drupal.verticalTab && Drupal.verticalTab.update(this); + }); + } +}; + +})(jQuery); diff --git modules/menu/menu.module modules/menu/menu.module index 1964bdb..8c61cc5 100644 --- modules/menu/menu.module +++ modules/menu/menu.module @@ -388,38 +388,37 @@ function _menu_parent_depth_limit($item) { */ function menu_form_alter(&$form, $form_state, $form_id) { if (!empty($form['#node_edit_form'])) { + drupal_add_js(drupal_get_path('module', 'menu') . '/menu.js'); // Note - doing this to make sure the delete checkbox stays in the form. $form['#cache'] = TRUE; - $form['menu'] = array( + $form['miscellaneous']['menu'] = array( '#type' => 'fieldset', '#title' => t('Menu settings'), '#access' => user_access('administer menu'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, '#tree' => TRUE, - '#weight' => -2, + '#weight' => 5, '#attributes' => array('class' => 'menu-item-form'), ); $item = $form['#node']->menu; if ($item['mlid']) { // There is an existing link. - $form['menu']['delete'] = array( + $form['miscellaneous']['menu']['delete'] = array( '#type' => 'checkbox', '#title' => t('Delete this menu item.'), ); } if (!$item['link_title']) { - $form['menu']['#collapsed'] = TRUE; + $form['miscellaneous']['menu']['#collapsed'] = TRUE; } foreach (array('mlid', 'module', 'hidden', 'has_children', 'customized', 'options', 'expanded', 'hidden', 'parent_depth_limit') as $key) { - $form['menu'][$key] = array('#type' => 'value', '#value' => $item[$key]); + $form['miscellaneous']['menu'][$key] = array('#type' => 'value', '#value' => $item[$key]); } - $form['menu']['#item'] = $item; + $form['miscellaneous']['menu']['#item'] = $item; - $form['menu']['link_title'] = array('#type' => 'textfield', + $form['miscellaneous']['menu']['link_title'] = array('#type' => 'textfield', '#title' => t('Menu link title'), '#default_value' => $item['link_title'], '#description' => t('The link text corresponding to this item that should appear in the menu. Leave blank if you do not wish to add this post to the menu.'), @@ -431,7 +430,7 @@ function menu_form_alter(&$form, $form_state, $form_id) { if (!isset($options[$default])) { $default = 'main-menu:0'; } - $form['menu']['parent'] = array( + $form['miscellaneous']['menu']['parent'] = array( '#type' => 'select', '#title' => t('Parent item'), '#default_value' => $default, @@ -441,7 +440,7 @@ function menu_form_alter(&$form, $form_state, $form_id) { ); $form['#submit'][] = 'menu_node_form_submit'; - $form['menu']['weight'] = array( + $form['miscellaneous']['menu']['weight'] = array( '#type' => 'weight', '#title' => t('Weight'), '#delta' => 50, diff --git modules/node/node.js modules/node/node.js new file mode 100644 index 0000000..9cd90a1 --- /dev/null +++ modules/node/node.js @@ -0,0 +1,53 @@ +// $Id$ + +(function($) { + +Drupal.behaviors.nodeRevisionVTab = { + attach: function(context) { + $('#edit-revision-information').data('verticalTabCallback', function() { + return $('#edit-revision', this.fieldset).is(':checked') ? + Drupal.t('Create new revision') : + Drupal.t('Don\'t create new revision'); + }).each(function() { + Drupal.verticalTab && Drupal.verticalTab.update(this); + }); + } +}; + +Drupal.behaviors.nodeAuthoringVTab = { + attach: function(context) { + $('#edit-author').data('verticalTabCallback', function() { + var name = $('#edit-name').val(), date = $('#edit-date').val(); + return date ? + Drupal.t('By @name on @date', { '@name': name, '@date': date }) : + Drupal.t('By @name', { '@name': name }); + }).each(function() { + Drupal.verticalTab && Drupal.verticalTab.update(this); + }); + } +}; + +Drupal.behaviors.nodePublishingVTab = { + attach: function(context) { + $('#edit-options').data('verticalTabCallback', function() { + var vals = []; + if ($('#edit-status').attr('checked')) { + vals.push(Drupal.t('Published')); + } + if ($('#edit-promote').attr('checked')) { + vals.push(Drupal.t('Promoted to front page')); + } + if ($('#edit-sticky').attr('checked')) { + vals.push(Drupal.t('Sticky on top of lists')); + } + if (vals.join(', ') == '') { + return Drupal.t('None'); + } + return vals.join(', '); + }).each(function() { + Drupal.verticalTab && Drupal.verticalTab.update(this); + }); + } +}; + +})(jQuery); diff --git modules/node/node.pages.inc modules/node/node.pages.inc index 089ee81..64d75b3 100644 --- modules/node/node.pages.inc +++ modules/node/node.pages.inc @@ -97,6 +97,7 @@ function node_object_prepare(&$node) { * Generate the node add/edit form array. */ function node_form(&$form_state, $node) { + drupal_add_js(drupal_get_path('module', 'node') . '/node.js'); global $user; if (isset($form_state['node'])) { @@ -146,24 +147,28 @@ function node_form(&$form_state, $node) { $form['#node'] = $node; + $form['miscellaneous'] = array( + '#theme' => 'vertical_tabs_panes', + ); + + drupal_add_js('misc/vertical-tabs.js', array('weight' => 0)); + drupal_add_css('misc/vertical-tabs.css'); + // Add a log field if the "Create new revision" option is checked, or if the // current user has the ability to check that option. if (!empty($node->revision) || user_access('administer nodes')) { - $form['revision_information'] = array( + $form['miscellaneous']['revision_information'] = array( '#type' => 'fieldset', '#title' => t('Revision information'), - '#collapsible' => TRUE, - // Collapsed by default when "Create new revision" is unchecked - '#collapsed' => !$node->revision, '#weight' => 20, ); - $form['revision_information']['revision'] = array( + $form['miscellaneous']['revision_information']['revision'] = array( '#access' => user_access('administer nodes'), '#type' => 'checkbox', '#title' => t('Create new revision'), '#default_value' => $node->revision, ); - $form['revision_information']['log'] = array( + $form['miscellaneous']['revision_information']['log'] = array( '#type' => 'textarea', '#title' => t('Revision log message'), '#rows' => 2, @@ -172,15 +177,13 @@ function node_form(&$form_state, $node) { } // Node author information for administrators - $form['author'] = array( + $form['miscellaneous']['author'] = array( '#type' => 'fieldset', '#access' => user_access('administer nodes'), '#title' => t('Authoring information'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, '#weight' => 90, ); - $form['author']['name'] = array( + $form['miscellaneous']['author']['name'] = array( '#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, @@ -189,7 +192,7 @@ function node_form(&$form_state, $node) { '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', t('Anonymous')))), ); - $form['author']['date'] = array( + $form['miscellaneous']['author']['date'] = array( '#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, @@ -197,29 +200,27 @@ function node_form(&$form_state, $node) { ); if (isset($node->date)) { - $form['author']['date']['#default_value'] = $node->date; + $form['miscellaneous']['author']['date']['#default_value'] = $node->date; } // Node options for administrators - $form['options'] = array( + $form['miscellaneous']['options'] = array( '#type' => 'fieldset', '#access' => user_access('administer nodes'), '#title' => t('Publishing options'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, '#weight' => 95, ); - $form['options']['status'] = array( + $form['miscellaneous']['options']['status'] = array( '#type' => 'checkbox', '#title' => t('Published'), '#default_value' => $node->status, ); - $form['options']['promote'] = array( + $form['miscellaneous']['options']['promote'] = array( '#type' => 'checkbox', '#title' => t('Promoted to front page'), '#default_value' => $node->promote, ); - $form['options']['sticky'] = array( + $form['miscellaneous']['options']['sticky'] = array( '#type' => 'checkbox', '#title' => t('Sticky at top of lists'), '#default_value' => $node->sticky, @@ -277,7 +278,7 @@ function node_body_field(&$node, $label, $word_count) { $form = array( '#after_build' => array('node_teaser_js', 'node_teaser_include_verify')); - $form['#prefix'] = '
    '; + $form['#prefix'] = '
    '; $form['#suffix'] = '
    '; $form['teaser_js'] = array( diff --git modules/path/path.js modules/path/path.js new file mode 100644 index 0000000..c36e5b1 --- /dev/null +++ modules/path/path.js @@ -0,0 +1,19 @@ +// $Id$ + +(function($) { + +Drupal.behaviors.nodePathVTab = { + attach: function(context) { + $('#edit-path').data('verticalTabCallback', function() { + var path = $('#edit-path-1').val(); + + return path ? + Drupal.t('Alias: @alias', { '@alias': path }) : + Drupal.t('No alias'); + }).each(function() { + Drupal.verticalTab && Drupal.verticalTab.update(this); + }); + } +}; + +})(jQuery); diff --git modules/path/path.module modules/path/path.module index 02b8f22..b629b11 100644 --- modules/path/path.module +++ modules/path/path.module @@ -188,16 +188,15 @@ function path_node_delete($node) { */ function path_form_alter(&$form, $form_state, $form_id) { if (!empty($form['#node_edit_form'])) { + drupal_add_js(drupal_get_path('module', 'path') .'/path.js'); $path = isset($form['#node']->path) ? $form['#node']->path : NULL; - $form['path'] = array( + $form['miscellaneous']['path'] = array( '#type' => 'fieldset', '#title' => t('URL path settings'), - '#collapsible' => TRUE, - '#collapsed' => empty($path), '#access' => user_access('create url aliases'), '#weight' => 30, ); - $form['path']['path'] = array( + $form['miscellaneous']['path']['path'] = array( '#type' => 'textfield', '#default_value' => $path, '#maxlength' => 128, @@ -206,7 +205,7 @@ function path_form_alter(&$form, $form_state, $form_id) { '#description' => t('Optionally specify an alternative URL by which this node can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'), ); if ($path) { - $form['path']['pid'] = array( + $form['miscellaneous']['path']['pid'] = array( '#type' => 'value', '#value' => db_result(db_query("SELECT pid FROM {url_alias} WHERE dst = '%s' AND language = '%s'", $path, $form['#node']->language)) ); diff --git modules/upload/upload.js modules/upload/upload.js new file mode 100644 index 0000000..3652958 --- /dev/null +++ modules/upload/upload.js @@ -0,0 +1,16 @@ +// $Id$ + +(function($) { + +Drupal.behaviors.nodeUploadVTab = { + attach: function(context) { + $('#edit-attachments').data('verticalTabCallback', function() { + var size = $('#upload-attachments tbody tr').size(); + return Drupal.formatPlural(size, '1 attachment', '@count attachments'); + }).each(function() { + Drupal.verticalTab && Drupal.verticalTab.update(this); + }); + } +}; + +})(jQuery); diff --git modules/upload/upload.module modules/upload/upload.module index 31e91d6..d290ed1 100644 --- modules/upload/upload.module +++ modules/upload/upload.module @@ -224,21 +224,19 @@ function upload_form_alter(&$form, $form_state, $form_id) { if (!empty($form['#node_edit_form'])) { $node = $form['#node']; if (variable_get("upload_$node->type", TRUE)) { + drupal_add_js(drupal_get_path('module', 'upload') .'/upload.js'); + // Attachments fieldset - $form['attachments'] = array( + $form['miscellaneous']['attachments'] = array( '#type' => 'fieldset', '#access' => user_access('upload files'), '#title' => t('File attachments'), - '#collapsible' => TRUE, - '#collapsed' => empty($node->files), '#description' => t('Changes made to the attachments are not permanent until you save this post. The first "listed" file will be included in RSS feeds.'), - '#prefix' => '
    ', - '#suffix' => '
    ', '#weight' => 30, ); // Wrapper for fieldset contents (used by ahah.js). - $form['attachments']['wrapper'] = array( + $form['miscellaneous']['attachments']['wrapper'] = array( '#prefix' => '
    ', '#suffix' => '
    ', ); @@ -249,16 +247,16 @@ function upload_form_alter(&$form, $form_state, $form_id) { $temp = file_directory_temp(); // Note: pass by reference if (!file_check_directory($path, FILE_CREATE_DIRECTORY) || !file_check_directory($temp, FILE_CREATE_DIRECTORY)) { - $form['attachments']['#description'] = t('File attachments are disabled. The file directories have not been properly configured.'); + $form['miscellaneous']['attachments']['#description'] = t('File attachments are disabled. The file directories have not been properly configured.'); if (user_access('administer site configuration')) { - $form['attachments']['#description'] .= ' ' . t('Please visit the file system configuration page.', array('@admin-file-system' => url('admin/settings/file-system'))); + $form['miscellaneous']['attachments']['#description'] .= ' ' . t('Please visit the file system configuration page.', array('@admin-file-system' => url('admin/settings/file-system'))); } else { - $form['attachments']['#description'] .= ' ' . t('Please contact the site administrator.'); + $form['miscellaneous']['attachments']['#description'] .= ' ' . t('Please contact the site administrator.'); } } else { - $form['attachments']['wrapper'] += _upload_form($node); + $form['miscellaneous']['attachments']['wrapper'] += _upload_form($node); $form['#attributes']['enctype'] = 'multipart/form-data'; } $form['#submit'][] = 'upload_node_form_submit'; @@ -645,7 +643,7 @@ function upload_js() { $files = array(); // Load the form from the Form API cache. - if (!($cached_form = form_get_cache($_POST['form_build_id'], $cached_form_state)) || !isset($cached_form['#node']) || !isset($cached_form['attachments'])) { + if (!($cached_form = form_get_cache($_POST['form_build_id'], $cached_form_state)) || !isset($cached_form['#node']) || !isset($cached_form['miscellaneous']['attachments'])) { form_set_error('form_token', t('Validation error, please try again. If this error persists, please contact the site administrator.')); $output = theme('status_messages'); print drupal_to_js(array('status' => TRUE, 'data' => $output)); @@ -671,10 +669,10 @@ function upload_js() { $form = _upload_form($node); - unset($cached_form['attachments']['wrapper']['new']); - $cached_form['attachments']['wrapper'] = array_merge($cached_form['attachments']['wrapper'], $form); + unset($cached_form['miscellaneous']['attachments']['wrapper']['new']); + $cached_form['miscellaneous']['attachments']['wrapper'] = array_merge($cached_form['miscellaneous']['attachments']['wrapper'], $form); - $cached_form['attachments']['#collapsed'] = FALSE; + $cached_form['miscellaneous']['attachments']['#collapsed'] = FALSE; form_set_cache($_POST['form_build_id'], $cached_form, $cached_form_state); diff --git themes/garland/fix-ie.css themes/garland/fix-ie.css index adc8da1..3752a5b 100644 --- themes/garland/fix-ie.css +++ themes/garland/fix-ie.css @@ -25,6 +25,10 @@ fieldset { background: none; } +div.vertical-tabs ul.vertical-tabs-list li.first { + background-image: none; +} + ul.primary { /* Fix missing top margin */ position: relative; /* LTR */ diff --git themes/garland/style.css themes/garland/style.css index 412346f..d410d7a 100644 --- themes/garland/style.css +++ themes/garland/style.css @@ -823,6 +823,13 @@ fieldset { background-color: transparent; } +/* Keep the background position at 0 for filters and vertical tabs. */ +*:first-child+html fieldset.filter-wrapper, +*:first-child+html fieldset.vertical-tabs-pane { + background-position: 0 0; +} + + *:first-child+html fieldset > .description, *:first-child+html fieldset .fieldset-wrapper .description { padding-top: 1em; } @@ -851,6 +858,39 @@ html.js fieldset.collapsed legend a { background: url(images/menu-collapsed.gif) no-repeat 0% 50%; /* LTR */ } + /** + * Vertical tabs. + */ +div.vertical-tabs { + margin-right: 5%; + border-color: #d9eaf5; +} + +div.vertical-tabs .vertical-tabs-panes fieldset.vertical-tabs-pane { + padding: 1px 1em; +} + +div.vertical-tabs ul.vertical-tabs-list { + border-color: #d9eaf5; +} + +div.vertical-tabs ul.vertical-tabs-list li { + background-color: #edf5fa; + border-color: #d9eaf5; +} + +div.vertical-tabs ul.vertical-tabs-list li.selected { + background: #fff repeat-x 0 0; +} + +div.vertical-tabs ul.vertical-tabs-list li.selected.first { + background-image: url(images/gradient-inner.png); +} + +div.vertical-tabs ul.vertical-tabs-list li.selected a strong { + color: #494949; +} + /** * Syndication icons and block */