Index: vertical_tabs.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vertical_tabs/vertical_tabs.js,v
retrieving revision 1.3
diff -u -r1.3 vertical_tabs.js
--- vertical_tabs.js	16 Aug 2008 05:48:06 -0000	1.3
+++ vertical_tabs.js	16 Aug 2008 18:00:29 -0000
@@ -2,11 +2,11 @@
 
 Drupal.verticalTabs.book = function() {
   var text = $('#edit-book-bid option[selected]').text();
-  if (text == Drupal.t('<none>')) {
-    return Drupal.t('Not in book');
+  if (text == '<none>') {
+    return 'Not in book';
   }
-  else if (text == Drupal.t('<create a new book>')) {
-    return Drupal.t('New book');
+  else if (text == '<create a new book>') {
+    return 'New book';
   }
   return text;
 }
@@ -14,36 +14,36 @@
 Drupal.verticalTabs.revision = function() {
   var val = $('#edit-revision').attr('checked');
   if (val) {
-    return Drupal.t('Create new revision');
+    return 'Create new revision';
   }
   else {
-    return Drupal.t('Don\'t create new revision');
+    return 'Don\'t create new revision';
   }
 }
 
 Drupal.verticalTabs.authoring = function() {
   var name = $('#edit-name').val(), date = $('#edit-date').val();
   if (date) {
-    return Drupal.t('By @name on @date', { '@name': name, '@date': date });
+    return 'By '+ name +' on '+ date;
   }
   else {
-    return Drupal.t('By @name', { '@name': name });
+    return 'By '+ name;
   }
 }
 
 Drupal.verticalTabs.publishingOptions = function() {
   var vals = [];
   if ($('#edit-status').attr('checked')) {
-    vals.push(Drupal.t('Published'));
+    vals.push('Published');
   }
   if ($('#edit-promote').attr('checked')) {
-    vals.push(Drupal.t('Promoted to front page'));
+    vals.push('Promoted to front page');
   }
   if ($('#edit-sticky').attr('checked')) {
-    vals.push(Drupal.t('Sticky on top of lists'));
+    vals.push('Sticky on top of lists');
   }
   if (vals.join(', ') == '') {
-    return Drupal.t('None');
+    return 'None';
   }
   return vals.join(', ');
 }
@@ -53,7 +53,7 @@
     return $('#edit-menu-link-title').val();
   }
   else {
-    return Drupal.t('Not in menu');
+    return 'Not in menu';
   }
 }
 
@@ -67,21 +67,24 @@
     return Drupal.formatPlural(size, '1 attachment', '@count attachments');
   }
   else {
-    return Drupal.t('No attachments');
+    return 'No attachments';
   }
 }
 
 Drupal.verticalTabs.path = function() {
   var path = $('#edit-path').val();
   if (path) {
-    return Drupal.t('Alias: @alias', { '@alias': path });
+    return 'Alias: '+ path;
   }
   else {
-    return Drupal.t('No alias');
+    return 'No alias';
   }
 }
 
 Drupal.behaviors.verticalTabs = function() {
+  $('.vertical-tabs-fieldset').each(function(i){
+    $(this).removeClass('collapsible collapsed');
+  });
   if (!$('.vertical-tabs-list').size()) {
     var ul = $('<div class="vertical-tabs"><ul class="vertical-tabs-list"></ul></div>').find('ul');
     $.each(Drupal.settings.verticalTabs, function(k, v) {
@@ -91,11 +94,11 @@
             .bind('click', function() { $(this).parent().addClass('selected').siblings().removeClass('selected'); $('.vertical-tabs-' + k).height($('.vertical-tabs ul').height() - 13).show().siblings('.vertical-tabs-div').hide(); return false; })
             .end())
           .end()
-          .append($('.vertical-tabs-' + k + ' > .fieldset-wrapper')
-          .addClass('vertical-tabs-' + k)
-          .addClass('vertical-tabs-div'))
-          .find('input, select, textarea')
-          .bind('change', function() { $('.vertical-tabs-list-' + k + ' > .description').html(Drupal.verticalTabs[v.callback].apply(this, v.args)); $('.vertical-tabs-' + k).height($('.vertical-tabs ul').height() - 13) })
+          .append($('.vertical-tabs-' + k)
+            .addClass('vertical-tabs-' + k)
+            .addClass('vertical-tabs-div'))
+            .find('input, select, textarea')
+            .bind('change', function() { $('.vertical-tabs-list-' + k + ' > .description').html(Drupal.verticalTabs[v.callback].apply(this, v.args)); $('.vertical-tabs-' + k).height($('.vertical-tabs ul').height() - 13) })
           .end()
           .find('ul');
           $('.vertical-tabs-' + k).remove();
Index: vertical_tabs.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vertical_tabs/vertical_tabs.info,v
retrieving revision 1.1
diff -u -r1.1 vertical_tabs.info
--- vertical_tabs.info	16 Aug 2008 05:36:43 -0000	1.1
+++ vertical_tabs.info	16 Aug 2008 18:00:28 -0000
@@ -1,3 +1,4 @@
+; $Id$
 name = Vertical Tabs
-description = Provdes vertical tabs for the node form
-core = 6.x
\ No newline at end of file
+description = Provides vertical tabs for the node form
+
Index: vertical_tabs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vertical_tabs/vertical_tabs.module,v
retrieving revision 1.1
diff -u -r1.1 vertical_tabs.module
--- vertical_tabs.module	16 Aug 2008 05:36:43 -0000	1.1
+++ vertical_tabs.module	16 Aug 2008 18:00:29 -0000
@@ -8,7 +8,7 @@
 /**
  * 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
@@ -60,14 +60,18 @@
       }
     }
     // Move the buttons, and add a <div> for easier placement of the tab element.
-    $form['buttons']['#weight'] = $greatest_weight + 1;
-    $form['buttons']['#prefix'] = '<div class="buttons">';
-    $form['buttons']['#suffix'] = '</div>';
+    $form['preview']['#weight'] = $greatest_weight + 1;
+    $form['preview']['#prefix'] = '<div class="buttons">';
+    $form['submit']['#weight'] = $greatest_weight + 2;
+    $form['submit']['#suffix'] = '</div>';
     // Add the JavaScript.
     drupal_add_js(array('verticalTabs' => $javascript), 'setting');
-    // Indicate that the JavaScript should be added later. We do this so that
+    // Drupal 6.x: Indicate that the JavaScript should be added later. We do this so that
     // our JavaScript gets added after collapse.js.
-    $form['#post_render'][] = 'vertical_tabs_add_js_css';
+    //    $form['#post_render'][] = 'vertical_tabs_add_js_css';
+    // Drupal 5.x: remove collapsible classes using js 
+    drupal_add_js(drupal_get_path('module', 'vertical_tabs') .'/vertical_tabs.js');
+    drupal_add_css(drupal_get_path('module', 'vertical_tabs') .'/vertical_tabs.css');
   }
 }
 
Index: vertical_tabs.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vertical_tabs/vertical_tabs.css,v
retrieving revision 1.1
diff -u -r1.1 vertical_tabs.css
--- vertical_tabs.css	16 Aug 2008 05:36:43 -0000	1.1
+++ vertical_tabs.css	16 Aug 2008 18:00:28 -0000
@@ -17,7 +17,7 @@
 /* Set the background image on the tabs and content */
 .vertical-tabs,
 .vertical-tabs ul.vertical-tabs-list {
-  background: #fff url(/d6/themes/garland/images/gradient-inner.png) repeat-x top;
+  background: #fff url(gradient-inner.png) repeat-x top;
 }
 
 /* Position and layout of tabs container */
@@ -50,6 +50,9 @@
   text-align: left;
   font-weight: normal;
 }
+.vertical-tabs ul.vertical-tabs-list a:focus {
+  outline: none;
+}
 
 .vertical-tabs ul.vertical-tabs-list .description {
   padding: 0;