Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.196.2.5
diff -u -r1.196.2.5 webform.module
--- webform.module	21 Mar 2010 03:18:12 -0000	1.196.2.5
+++ webform.module	21 Mar 2010 03:24:50 -0000
@@ -999,7 +999,7 @@
 
     // If a new node, redirect the user to the components form after save.
     if (empty($node->nid)) {
-      $form['buttons']['submit']['#submit'][] = 'webform_form_submit';
+      $form['actions']['submit']['#submit'][] = 'webform_form_submit';
     }
   }
 }
@@ -1297,9 +1297,11 @@
     );
 
     // Add buttons for pages, drafts, and submissions.
-    $form['buttons'] = array(
+    $form['actions'] = array(
       '#tree' => FALSE,
       '#weight' => 1000,
+      '#type' => 'container',
+      '#attributes' => array('class' => array('form-actions')),
     );
 
     if ($page_count > 1) {
@@ -1308,7 +1310,7 @@
 
       // Add the submit button(s).
      if ($node->webform['allow_draft'] && (empty($submission) || $submission->is_draft) && $user->uid != 0) {
-        $form['buttons']['draft'] = array(
+        $form['actions']['draft'] = array(
           '#type' => 'submit',
           '#value' => t('Save Draft'),
           '#weight' => -2,
@@ -1316,7 +1318,7 @@
         );
       }
       if ($page_num > 1) {
-        $form['buttons']['previous'] = array(
+        $form['actions']['previous'] = array(
           '#type' => 'submit',
           '#value' => $prev_page,
           '#weight' => 5,
@@ -1324,14 +1326,14 @@
         );
       }
       if ($page_num == $page_count) {
-        $form['buttons']['submit'] = array(
+        $form['actions']['submit'] = array(
           '#type' => 'submit',
           '#value' => empty($node->webform['submit_text']) ? t('Submit') : $node->webform['submit_text'],
           '#weight' => 10,
         );
       }
       elseif ($page_num < $page_count) {
-        $form['buttons']['next'] = array(
+        $form['actions']['next'] = array(
           '#type' => 'submit',
           '#value' => $next_page,
           '#weight' => 10,
@@ -1340,7 +1342,7 @@
     }
     else {
       // Add the submit button.
-      $form['buttons']['submit'] = array(
+      $form['actions']['submit'] = array(
         '#type' => 'submit',
         '#value' => empty($node->webform['submit_text']) ? t('Submit') : $node->webform['submit_text'],
         '#weight' => 10,