Index: vertical_tabs.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vertical_tabs/vertical_tabs.info,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 vertical_tabs.info
--- vertical_tabs.info	16 Dec 2008 06:53:16 -0000	1.1.2.1
+++ vertical_tabs.info	5 May 2009 01:32:20 -0000
@@ -1,3 +1,3 @@
 name = Vertical Tabs
 description = Provides vertical tabs for the node form.
-core = 6.x
\ No newline at end of file
+dependencies = jstools
\ No newline at end of file
Index: vertical_tabs.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vertical_tabs/vertical_tabs.js,v
retrieving revision 1.3.2.10
diff -u -p -r1.3.2.10 vertical_tabs.js
--- vertical_tabs.js	3 Apr 2009 07:01:20 -0000	1.3.2.10
+++ vertical_tabs.js	5 May 2009 01:32:20 -0000
@@ -41,13 +41,13 @@ Drupal.behaviors.verticalTabs = function
       $('.vertical-tabs-' + k).remove();
     });
 
-    $('div.vertical-tabs').html(ul).append(fieldsets);
+    $('div.vertical-tabs').html('').append(ul).append(fieldsets);
 
     // Adjust the min-height property of each field area to match the height of the vertical tabs list, then hide them.
     if ($.browser.msie && $.browser.version.substr(0,1) == "6") {
       $('.vertical-tabs-div').add('.vertical-tabs').css('height', $('.vertical-tabs-list').height() - 25); // IE6 min-height doesn't work, so use 'height' instead
     } else {
-      $('.vertical-tabs-div').css('minHeight', $('.vertical-tabs-list').height() - 25);
+      $('.vertical-tabs-div').css('minHeight', $('.vertical-tabs-list').height() - 25 + 'px');
     }
     // Activate the first tab.
     $('.vertical-tabs-div').hide();
Index: vertical_tabs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vertical_tabs/vertical_tabs.module,v
retrieving revision 1.1.2.16
diff -u -p -r1.1.2.16 vertical_tabs.module
--- vertical_tabs.module	3 Apr 2009 07:07:31 -0000	1.1.2.16
+++ vertical_tabs.module	5 May 2009 01:32:21 -0000
@@ -6,23 +6,9 @@
  */
 
 /**
- * Implementation of hook_theme().
- */
-function vertical_tabs_theme() {
-  return array(
-    'vertical_tabs' => array(
-      'arguments' => array('form_element' => NULL),
-    ),
-    'vertical_tabs_js_css' => array(
-      'arguments' => array('js' => NULL, 'css' => NULL, 'settings' => NULL, 'form_id' => NULL),
-    ),
-  );
-}
-
-/**
  * Implementation of hook_form_alter.
  */
-function vertical_tabs_form_alter(&$form, $form_state, $form_id) {
+function vertical_tabs_form_alter($form_id, &$form) {
   // Check to see which form we are in. Since the node form's form id is not
   // just node_form, we can't implement a function for all node forms, so we are
   // stuck implementing the global form_alter and checking if there is the
@@ -122,7 +108,7 @@ function vertical_tabs_form_alter(&$form
 }
 
 function vertical_tabs_node_type_form($node_type) {
-  module_load_include('inc', 'node', 'node.pages');
+  include_once(drupal_get_path('module', 'node') .'/node.pages.inc');
 
   // Build a psuedo-node for a sample node form.
   $node = (object) array(
@@ -131,16 +117,13 @@ function vertical_tabs_node_type_form($n
   );
 
   // Build a sample node form to find fieldsets.
-  $node_form_state = array('values' => array());
   $node_form_id = $node_type .'_node_form';
   $args = array(
     $node_form_id,
-    $node_form_state,
     $node
   );
   $node_form = call_user_func_array('drupal_retrieve_form', $args);
-  $node_form['#post'] = $node_form_state['values'];
-  drupal_prepare_form($node_form_id, $node_form, $node_form_state);
+  drupal_prepare_form($node_form_id, $node_form);
   uasort($node_form, 'element_sort');
 
   // Find all fieldsets.
@@ -261,10 +244,10 @@ function theme_vertical_tabs_js_css($js,
   static $js_added = array();
   if (!isset($js_added[$form_id])) {
     drupal_add_js(array('verticalTabs' => $settings), 'setting');
-    drupal_add_js(drupal_get_path('module', 'vertical_tabs') .'/vertical_tabs.js', 'theme');
+    jstools_add_js(drupal_get_path('module', 'vertical_tabs') .'/vertical_tabs.js', 'theme');
     drupal_add_css(drupal_get_path('module', 'vertical_tabs') .'/vertical_tabs.css', 'theme');
     foreach ($js as $path) {
-      drupal_add_js($path, 'theme');
+      jstools_add_js($path, 'theme');
     }
     foreach ($css as $path) {
       drupal_add_css($path, 'theme');
Index: vertical_tabs.node_form.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vertical_tabs/Attic/vertical_tabs.node_form.js,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 vertical_tabs.node_form.js
--- vertical_tabs.node_form.js	6 Jan 2009 02:47:47 -0000	1.1.2.5
+++ vertical_tabs.node_form.js	5 May 2009 01:32:22 -0000
@@ -57,7 +57,7 @@ Drupal.verticalTabs.menu = function() {
 }
 
 Drupal.verticalTabs.comment_settings = function() {
-  return $('.vertical-tabs-comment_settings input[checked]').parent().text().replace(/^\s*(.*)\s*$/, '$1');
+  return $('.vertical-tabs-comment_settings input:checked').parent().text().replace(/^\s*(.*)\s*$/, '$1');
 }
 
 Drupal.verticalTabs.attachments = function() {
@@ -72,7 +72,7 @@ Drupal.verticalTabs.attachments = functi
 
 Drupal.verticalTabs.path = function() {
   var path = $('#edit-path').val();
-  var automatic = $('#edit-pathauto-perform-alias').attr('checked');
+  var automatic = $('#edit-pathauto-perform-alias').length == 1 ? $('#edit-pathauto-perform-alias').attr('checked') : 0;
 
   if (automatic) {
     return Drupal.t('Automatic alias');
@@ -136,4 +136,65 @@ Drupal.verticalTabs.taxonomy = function(
   else {
     return Drupal.t('No terms');
   }
-}
\ No newline at end of file
+}
+
+/**
+ * Backported from Drupal 6.x
+ */
+Drupal.checkPlain = function(str) {
+  str = String(str);
+  var replace = { '&': '&amp;', '"': '&quot;', '<': '&lt;', '>': '&gt;' };
+  for (var character in replace) {
+    var regex = new RegExp(character, 'g');
+    str = str.replace(regex, replace[character]);
+  }
+  return str;
+};
+
+Drupal.t = function(str, args) {
+  // Fetch the localized version of the string.
+  //if (Drupal.locale.strings && Drupal.locale.strings[str]) {
+  //  str = Drupal.locale.strings[str];
+  //}
+
+  if (args) {
+    // Transform arguments before inserting them
+    for (var key in args) {
+      switch (key.charAt(0)) {
+        // Escaped only
+        case '@':
+          args[key] = Drupal.checkPlain(args[key]);
+        break;
+        // Pass-through
+        case '!':
+          break;
+        // Escaped and placeholder
+        case '%':
+        default:
+          args[key] = Drupal.theme('placeholder', args[key]);
+          break;
+      }
+      str = str.replace(key, args[key]);
+    }
+  }
+  return str;
+};
+
+Drupal.formatPlural = function(count, singular, plural, args) {
+  var args = args || {};
+  args['@count'] = count;
+  // Determine the index of the plural form.
+  var index = /*Drupal.locale.pluralFormula ? Drupal.locale.pluralFormula(args['@count']) : */((args['@count'] == 1) ? 0 : 1);
+
+  if (index == 0) {
+    return Drupal.t(singular, args);
+  }
+  else if (index == 1) {
+    return Drupal.t(plural, args);
+  }
+  else {
+    args['@count['+ index +']'] = args['@count'];
+    delete args['@count'];
+    return Drupal.t(plural.replace('@count', '@count['+ index +']'));
+  }
+};
\ No newline at end of file