### Eclipse Workspace Patch 1.0 #P drupal Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.633 diff -u -r1.633 system.module --- modules/system/system.module 26 Oct 2008 18:06:39 -0000 1.633 +++ modules/system/system.module 27 Oct 2008 22:21:20 -0000 @@ -337,7 +337,7 @@ '#collapsible' => FALSE, '#collapsed' => FALSE, '#value' => NULL, - '#process' => array('form_process_ahah'), + '#process' => array('form_process_ahah', 'form_process_vertical_tabs'), ); $type['token'] = array( Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.172 diff -u -r1.172 menu.module --- modules/menu/menu.module 12 Oct 2008 04:30:06 -0000 1.172 +++ modules/menu/menu.module 27 Oct 2008 22:21:18 -0000 @@ -379,6 +379,7 @@ */ 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; @@ -389,7 +390,8 @@ '#collapsible' => TRUE, '#collapsed' => FALSE, '#tree' => TRUE, - '#weight' => -2, + '#weight' => 5, + '#vertical_tab' => 'nodeFormMenu', '#attributes' => array('class' => 'menu-item-form'), ); $item = $form['#node']->menu; Index: modules/book/book.css =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.css,v retrieving revision 1.7 diff -u -r1.7 book.css --- modules/book/book.css 15 May 2008 21:19:24 -0000 1.7 +++ modules/book/book.css 27 Oct 2008 22:21:16 -0000 @@ -36,7 +36,7 @@ margin-bottom: 0; } #edit-book-bid-wrapper .description { - clear: both; + clear: none; } #book-admin-edit select { margin-right: 24px; Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.472 diff -u -r1.472 book.module --- modules/book/book.module 13 Oct 2008 19:59:41 -0000 1.472 +++ modules/book/book.module 27 Oct 2008 22:21:16 -0000 @@ -387,7 +387,7 @@ function _book_add_form_elements(&$form, $node) { // Need this for AJAX. $form['#cache'] = TRUE; - drupal_add_js("if (Drupal.jsEnabled) { $(document).ready(function() { $('#edit-book-pick-book').css('display', 'none'); }); }", 'inline'); + drupal_add_js(drupal_get_path('module', 'book') .'/book.js'); $form['book'] = array( '#type' => 'fieldset', @@ -397,6 +397,7 @@ '#collapsed' => TRUE, '#tree' => TRUE, '#attributes' => array('class' => 'book-outline-form'), + '#vertical_tab' => 'nodeFormBook', ); foreach (array('menu_name', 'mlid', 'nid', 'router_path', 'has_children', 'options', 'module', 'original_bid', 'parent_depth_limit') as $key) { $form['book'][$key] = array( Index: modules/path/path.module =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.module,v retrieving revision 1.149 diff -u -r1.149 path.module --- modules/path/path.module 12 Oct 2008 04:30:06 -0000 1.149 +++ modules/path/path.module 27 Oct 2008 22:21:18 -0000 @@ -186,6 +186,7 @@ */ 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( '#type' => 'fieldset', @@ -194,6 +195,7 @@ '#collapsed' => empty($path), '#access' => user_access('create url aliases'), '#weight' => 30, + '#vertical_tab' => 'nodeFormPath', ); $form['path']['path'] = array( '#type' => 'textfield', Index: includes/form.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/form.inc,v retrieving revision 1.298 diff -u -r1.298 form.inc --- includes/form.inc 27 Oct 2008 10:34:09 -0000 1.298 +++ includes/form.inc 27 Oct 2008 22:21:16 -0000 @@ -874,6 +874,19 @@ 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. @@ -970,9 +983,6 @@ } array_unshift($form['#parents'], $name); } - if (!isset($form['#id'])) { - $form['#id'] = form_clean_id('edit-' . implode('-', $form['#parents'])); - } unset($edit); if (!empty($form['#disabled'])) { @@ -1042,16 +1052,6 @@ } } } - // 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); } @@ -1515,6 +1515,7 @@ $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"; } @@ -1917,6 +1918,54 @@ } /** + * Add vertical tabs to the page. + */ +function form_process_vertical_tabs(&$element) { + static $js_added = array(); + // If the element has a vertical tab, and it is visible, then add it to the JavaScript. + if (isset($element['#vertical_tab']) && $element['#vertical_tab'] && (isset($element['#access']) ? $element['#access'] : TRUE)) { + // If it's not a full array (with the keys "callback" and "arguments"), find out what it is. + if (!is_array($element['#vertical_tab'])) { + // If it's a string, convert it. + if (is_string($element['#vertical_tab'])) { + $element['#vertical_tab'] = array('callback' => $element['#vertical_tab']); + } + // Otherwise, there's no callback. + else { + $element['#vertical_tab'] = array(); + } + } + // Add the tab to the JavaScript. + $js_added[$element['#id']] = array( + 'name' => (isset($element['#title']) ? $element['#title'] : ''), + 'callback' => (isset($element['#vertical_tab']['callback']) ? $element['#vertical_tab']['callback'] : ''), + 'arguments' => (isset($element['#vertical_tab']['arguments']) ? $element['#vertical_tab']['arguments'] : ''), + ); + // If there's more than one tab, then add the JavaScript and add the previous element. + if (count($js_added) == 2) { + drupal_add_js(array('verticalTabs' => $js_added), 'setting'); + // We do not immediately add the JavaScript because otherwise it would be added before + // the collapse.js was added, but we need collapse.js to do it's magic on fieldsets first. + $element['#post_render'][] = '_form_post_render_vertical_tabs'; + } + // Otherwise, just add the current element. + elseif (count($js_added) > 2) { + drupal_add_js(array('verticalTabs' => array($element['#id'] => $js_added[$element['#id']])), 'setting'); + } + } + return $element; +} + +/** + * Actually add the JavaScript and CSS for vertical tabs. + */ +function _form_post_render_vertical_tabs($element) { + drupal_add_js('misc/vertical-tabs.js'); + drupal_add_css('misc/vertical-tabs.css'); + return $element; +} + +/** * Format a form item. * * @param $element Index: modules/node/node.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v retrieving revision 1.45 diff -u -r1.45 node.pages.inc --- modules/node/node.pages.inc 13 Oct 2008 00:33:03 -0000 1.45 +++ modules/node/node.pages.inc 27 Oct 2008 22:21:18 -0000 @@ -96,6 +96,7 @@ * 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'])) { @@ -155,6 +156,7 @@ // Collapsed by default when "Create new revision" is unchecked '#collapsed' => !$node->revision, '#weight' => 20, + '#vertical_tab' => 'nodeFormRevision', ); $form['revision_information']['revision'] = array( '#access' => user_access('administer nodes'), @@ -178,6 +180,7 @@ '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 90, + '#vertical_tab' => 'nodeFormAuthoring', ); $form['author']['name'] = array( '#type' => 'textfield', @@ -207,6 +210,7 @@ '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 95, + '#vertical_tab' => 'nodeFormPublishingOptions', ); $form['options']['status'] = array( '#type' => 'checkbox', @@ -233,8 +237,11 @@ } // Add the buttons. - $form['buttons'] = array(); - $form['buttons']['#weight'] = 100; + $form['buttons'] = array( + '#weight' => 100, + '#prefix' => '
', + '#suffix' => '
', + ); $form['buttons']['submit'] = array( '#type' => 'submit', '#access' => !variable_get('node_preview', 0) || (!form_get_errors() && isset($form_state['node_preview'])), @@ -304,7 +311,7 @@ } /** - * Button sumit function: handle the 'Delete' button on the node form. + * Button submit function: handle the 'Delete' button on the node form. */ function node_form_delete_submit($form, &$form_state) { $destination = ''; Index: misc/drupal.js =================================================================== RCS file: /cvs/drupal/drupal/misc/drupal.js,v retrieving revision 1.46 diff -u -r1.46 drupal.js --- misc/drupal.js 12 Oct 2008 00:29:09 -0000 1.46 +++ misc/drupal.js 27 Oct 2008 22:21:16 -0000 @@ -1,6 +1,6 @@ // $Id: drupal.js,v 1.46 2008/10/12 00:29:09 webchick Exp $ -var Drupal = Drupal || { 'settings': {}, 'behaviors': {}, 'themes': {}, 'locale': {} }; +var Drupal = Drupal || { 'settings': {}, 'behaviors': {}, 'themes': {}, 'locale': {}, 'verticalTabs': {} }; /** * Set the variable that indicates if JavaScript behaviors should be applied. Index: modules/upload/upload.module =================================================================== RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v retrieving revision 1.213 diff -u -r1.213 upload.module --- modules/upload/upload.module 12 Oct 2008 02:42:56 -0000 1.213 +++ modules/upload/upload.module 27 Oct 2008 22:21:20 -0000 @@ -227,6 +227,8 @@ 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( '#type' => 'fieldset', @@ -238,6 +240,7 @@ '#prefix' => '
', '#suffix' => '
', '#weight' => 30, + '#vertical_tab' => 'nodeFormAttachments', ); // Wrapper for fieldset contents (used by ahah.js). Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.659 diff -u -r1.659 comment.module --- modules/comment/comment.module 14 Oct 2008 20:39:42 -0000 1.659 +++ modules/comment/comment.module 27 Oct 2008 22:21:18 -0000 @@ -546,6 +546,8 @@ } elseif (!empty($form['#node_edit_form'])) { $node = $form['#node']; + drupal_add_js(drupal_get_path('module', 'comment') . '/comment-node-form.js'); + drupal_add_js(array('nodeForm' => array('comment' => $node->comment)), 'setting'); $form['comment_settings'] = array( '#type' => 'fieldset', '#access' => user_access('administer comments'), @@ -553,6 +555,7 @@ '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 30, + '#vertical_tab' => 'nodeFormComment', ); $form['comment_settings']['comment'] = array( '#type' => 'radios', Index: misc/vertical-tabs.css =================================================================== RCS file: misc/vertical-tabs.css diff -N misc/vertical-tabs.css --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ misc/vertical-tabs.css 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,100 @@ +/* $Id */ + +.vertical-tabs-list .description { + display: block; +} + +/* Border style of tabs and content */ +div.vertical-tabs-div, +ul.vertical-tabs-list { + border: 1px solid #ccc; +} + +/* Make space for the tabs on the side */ +.vertical-tabs { + margin-left: 180px; +} + +/* Set the background image on the tabs and content */ +.vertical-tabs, +.vertical-tabs ul.vertical-tabs-list { + background: #fff; +} + +/* Position and layout of tabs container */ +.vertical-tabs ul.vertical-tabs-list { + width: 179px; + float: left; + margin: 0 0 0 -180px; + border-right: 0px; + z-index: 1; + border-bottom: 0; + list-style-type: none; + list-style-image: none; + padding: 0; +} + + +/* Reset LIs which probably have awkward layout inherited from tabs */ +.vertical-tabs ul.vertical-tabs-list li { + float: none; + margin: 0; + padding: 0; + background-image: none; +} + +/* Layout of each tab */ +.vertical-tabs ul.vertical-tabs-list a { + display: block; + margin: 0; + padding: .4em .3em .1em .6em; + background: #fafafa; + text-align: left; + font-weight: normal; + border-bottom: 1px solid #ccc; +} + +.vertical-tabs ul.vertical-tabs-list a.vertical-tabs-nodescription { + padding-bottom: .4em; +} + +.vertical-tabs ul.vertical-tabs-list .description { + padding: 0; + line-height: normal; + min-height: 0; + white-space: normal; +} + +.vertical-tabs ul.vertical-tabs-list a { + border-right: 1px solid #ccc; +} + +/* Hover state of tabs */ +.vertical-tabs ul.vertical-tabs-list a:hover { + text-decoration: none; + cursor: pointer; +} + +.vertical-tabs ul.vertical-tabs-list a:focus { + outline: none; +} + +/* Selected tab */ +.vertical-tabs ul.vertical-tabs-list li.selected a { + background: transparent none; + color: black; + border-right: 0; +} + +/* Reset some important elements of each panel */ +.vertical-tabs .vertical-tabs-div { + margin: 0; + padding: .5em; + margin-top: -1px; + margin-left: -1px; + background: transparent none; +} + +.buttons { + clear: both; +} Index: modules/comment/comment-node-form.js =================================================================== RCS file: modules/comment/comment-node-form.js diff -N modules/comment/comment-node-form.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/comment/comment-node-form.js 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,13 @@ +// $Id$ + +Drupal.verticalTabs.nodeFormComment = function() { + var input = $('.vertical-tabs-edit-comment-settings input[checked]'); + console.log('hi'); + if (!input.size()) { + console.log($('.vertical-tabs-edit-comment-settings input')); + input = $('.vertical-tabs-edit-comment-settings input')[Drupal.settings.nodeForm.comment]; + } + else { + return $(input).parent().text().replace(/^\s*(.*)\s*$/, '$1'); + } +} Index: modules/node/node.js =================================================================== RCS file: modules/node/node.js diff -N modules/node/node.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/node/node.js 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,38 @@ +// $Id$ + +Drupal.verticalTabs.nodeFormRevision = function() { + var val = $('#edit-revision').attr('checked'); + if (val) { + return Drupal.t('Create new revision'); + } + else { + return Drupal.t('Don\'t create new revision'); + } +} + +Drupal.verticalTabs.nodeFormAuthoring = function() { + var name = $('#edit-name').val(), date = $('#edit-date').val(); + if (date) { + return Drupal.t('By @name on @date', { '@name': name, '@date': date }); + } + else { + return Drupal.t('By @name', { '@name': name }); + } +} + +Drupal.verticalTabs.nodeFormPublishingOptions = 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(', '); +} Index: modules/menu/menu.js =================================================================== RCS file: modules/menu/menu.js diff -N modules/menu/menu.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/menu/menu.js 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,10 @@ +// $Id$ + +Drupal.verticalTabs.nodeFormMenu = function() { + if ($('#edit-menu-link-title').val()) { + return $('#edit-menu-link-title').val(); + } + else { + return Drupal.t('Not in menu'); + } +} Index: modules/path/path.js =================================================================== RCS file: modules/path/path.js diff -N modules/path/path.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/path/path.js 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,12 @@ +// $Id$ + +Drupal.verticalTabs.nodeFormPath = function() { + var path = $('#edit-path-1').val(); + + if (path) { + return Drupal.t('Alias: @alias', { '@alias': path }); + } + else { + return Drupal.t('No alias'); + } +} Index: misc/vertical-tabs.js =================================================================== RCS file: misc/vertical-tabs.js diff -N misc/vertical-tabs.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ misc/vertical-tabs.js 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,73 @@ +// $Id$ + +/** + * Main vertical tabs behavior - create the vertical tabs. + */ +Drupal.behaviors.verticalTabs = function() { + // Make sure that the vertical tabs list hasn't already been constructed. + if (!$('.vertical-tabs-list').size()) { + // Create the first
and the