Index: webform/webform.module
===================================================================
--- webform/webform.module	(revision 34261)
+++ webform/webform.module	(working copy)
@@ -548,6 +548,10 @@
     'webform_inline_radio' => array(
       'render element' => 'element',
     ),
+    'webform_progressbar' => array(
+      'variables' => array('webform' => NULL, 'page_number' => NULL, 'page_count' => NULL, 'page_label' => NULL),
+      'template' => 'templates/webform-progressbar',
+    ),
     'webform_mail_message' => array(
       'variables' => array('node' => NULL, 'submission' => NULL, 'email' => NULL),
       'template' => 'templates/webform-mail',
@@ -1928,6 +1932,14 @@
       $prev_page_labels = array();
     }
 
+    if ($page_count > 1) {
+      $form['progressbar'] = array(
+        '#type' => 'markup',
+        '#markup' => theme('webform_progressbar', array('webform' => $node->webform, 'page_num' => $page_num, 'page_count' => $page_count, 'page_label' => webform_page_label($node->webform, $page_num))),
+        '#weight' => -100
+      );
+    }
+
     // Recursively add components to the form. The unfiltered version of the
     // form (typically used in Form Builder), includes all components.
     foreach ($component_tree['children'] as $cid => $component) {
@@ -2649,6 +2661,17 @@
 }
 
 /**
+ * Prepare for theming of the webform progressbar.
+ */
+function template_preprocess_webform_progressbar(&$vars) {
+  $vars['progressbar_page_number'] = $vars['webform']['progressbar_page_number'];
+  $vars['progressbar_percent'] = $vars['webform']['progressbar_percent'];
+  $vars['progressbar_bar'] = $vars['webform']['progressbar_bar'];
+  $vars['progressbar_pagebreak_label'] = $vars['webform']['progressbar_pagebreak_label'];
+  $vars['percent'] = $vars['page_num'] / $vars['page_count'] * 100;
+}
+
+/**
  * Prepare to theme the contents of e-mails sent by webform.
  */
 function template_preprocess_webform_mail_message(&$vars) {
@@ -3888,3 +3911,26 @@
 
   return $form_info;
 }
+
+/**
+ * Find the label of a page
+ *
+ * @param $webform
+ *     The webform object
+ * @param $page_number
+ *     The page number of the page in question
+ * @return string
+ *     The label of the page
+ */
+function webform_page_label($webform, $page_number) {
+  $page_count = 1;
+  foreach($webform['components'] as $component) {
+    if ($component['type'] == 'pagebreak') {
+      $page_count++;
+      if ($page_count == $page_number) {
+        return $component['name'];
+      }
+    }
+  }
+  return ''; //The default for the first page
+}
Index: webform/css/webform.css
===================================================================
--- webform/css/webform.css	(revision 34261)
+++ webform/css/webform.css	(working copy)
@@ -28,3 +28,13 @@
 .webform-container-inline div.ajax-progress-bar div {
   display: inherit;
 }
+.webform-progressbar-inner {
+  height: 1em;
+  background-color: #000088;
+}
+.webform-progressbar-outer {
+  border: 1px solid #000000;
+  width: 100%;
+  height: 1em;
+  margin:0.35em 5px 0;
+}
Index: webform/templates/webform-form.tpl.php
===================================================================
--- webform/templates/webform-form.tpl.php	(revision 34261)
+++ webform/templates/webform-form.tpl.php	(working copy)
@@ -18,6 +18,9 @@
  */
 ?>
 <?php
+  //Print out the progress bar at the top of the page
+  print drupal_render($form['progressbar']);
+
   // Print out the main part of the form.
   // Feel free to break this up and move the pieces within the array.
   print drupal_render($form['submitted']);
Index: webform/includes/webform.admin.inc
===================================================================
--- webform/includes/webform.admin.inc	(revision 34261)
+++ webform/includes/webform.admin.inc	(working copy)
@@ -162,6 +162,25 @@
     '#description' => t('By default, the configuration form for each webform allows the administrator to choose which roles may submit the form. You may want to allow users to always submit the form if you are using a separate node access module to control access to webform nodes themselves.'),
   );
 
+  $form['progressbar'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Progress bar'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+  );
+  $form['progressbar']['webform_progressbar_style']  = array(
+    '#type' => 'checkboxes',
+    '#title' => t('Progress bar style'),
+    '#options' => array(
+      'progressbar_page_number' => t('Show page number as number of completed (i.e. Page 1 of 10)'),
+      'progressbar_percent' => t('Show percentage completed (i.e. 10%)'),
+      'progressbar_bar' => t('Show percentage completed bar.'),
+      'progressbar_pagebreak_label' => t('Show the page break label in each page.'),
+    ),
+    '#default_value' => variable_get('webform_progressbar_style', array()),
+    '#description' => t('Choose how the progress bar should be displayed for multi-page forms.'),
+  );
+
   $form = system_settings_form($form);
   $form['#theme'] = 'webform_admin_settings';
   array_unshift($form['#submit'], 'webform_admin_settings_submit');
Index: webform/includes/webform.pages.inc
===================================================================
--- webform/includes/webform.pages.inc	(revision 34261)
+++ webform/includes/webform.pages.inc	(working copy)
@@ -13,6 +13,8 @@
   $form['#attached']['library'][] = array('webform', 'admin');
 
   $form['#node'] = $node;
+  //var_dump ($node->webform);
+  //def();
 
   $form['#submit'] = array(
     'webform_configure_form_submit',
@@ -230,6 +232,37 @@
   );
   /* End Advanced Settings Form */
 
+  /* Start Progress Bar Settings Form*/
+  $progressbar_defaults = variable_get('webform_progressbar_style', array());
+  $form['progressbar'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Progress bar'),
+    '#description' => t('Choose how the progress bar should be displayed for multi-page forms.'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+  );
+  $form['progressbar']['progressbar_page_number']  = array(
+    '#type' => 'checkbox',
+    '#title' => t('Show page number as number of completed (i.e. Page 1 of 10)'),
+    '#default_value' => isset($node->webform['progressbar_page_number']) ? $node->webform['progressbar_page_number'] : $progressbar_defaults['progressbar_page_number'],
+  );
+  $form['progressbar']['progressbar_percent']  = array(
+    '#type' => 'checkbox',
+    '#title' => t('Show percentage completed (i.e. 10%)'),
+    '#default_value' => isset($node->webform['progressbar_percent']) ? $node->webform['progressbar_percent'] : $progressbar_defaults['progressbar_percent'],
+  );
+  $form['progressbar']['progressbar_bar']  = array(
+    '#type' => 'checkbox',
+    '#title' => t('Show percentage completed bar.'),
+    '#default_value' => isset($node->webform['progressbar_bar']) ? $node->webform['progressbar_bar'] : $progressbar_defaults['progressbar_bar'],
+  );
+  $form['progressbar']['progressbar_pagebreak_label']  = array(
+    '#type' => 'checkbox',
+    '#title' => t('Show the page break label in each page.'),
+    '#default_value' => isset($node->webform['progressbar_pagebreak_label']) ? $node->webform['progressbar_pagebreak_label'] : $progressbar_defaults['progressbar_pagebreak_label'],
+  );
+  /* End Progress Bar Settings Form*/
+
   $form['actions'] = array(
     '#type' => 'actions',
     '#weight' => 300,
@@ -336,6 +369,12 @@
 
   // Set submit button text.
   $node->webform['submit_text'] = $form_state['values']['submit_text'];
+
+  //Set the progress bar preference
+  $node->webform['progressbar_page_number'] = $form_state['values']['progressbar_page_number'];
+  $node->webform['progressbar_percent'] = $form_state['values']['progressbar_percent'];
+  $node->webform['progressbar_bar'] = $form_state['values']['progressbar_bar'];
+  $node->webform['progressbar_pagebreak_label'] = $form_state['values']['progressbar_pagebreak_label'];
 }
 
 /**
Index: webform/webform.install
===================================================================
--- webform/webform.install	(revision 34261)
+++ webform/webform.install	(working copy)
@@ -109,6 +109,30 @@
         'not null' => TRUE,
         'default' => -1,
       ),
+      'progressbar_page_number' => array(
+        'description' => 'Should the the page number be shown as part of the progress bar?',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'progressbar_percent' => array(
+        'description' => 'Should the percentage complete be shown as part of the progress bar?',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'progressbar_bar' => array(
+        'description' => 'Should the bar be shown as part of the progress bar?',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'progressbar_pagebreak_label' => array(
+        'description' => 'Should the pagebreak label be shown as part of the progress bar?',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
     ),
     'primary key' => array('nid'),
   );
@@ -831,3 +855,22 @@
 function webform_update_7320() {
   db_query("UPDATE {file_managed} SET status = 1 WHERE fid IN (SELECT fid FROM {file_usage} WHERE module = :module_name)", array(':module_name' => 'webform'));
 }
+
+
+/**
+ * Add progressbar display on/off fields
+ */
+function webform_update_7321() {
+  if (!db_field_exists('webform', 'progressbar_page_number')) {
+    db_add_field('webform', 'progressbar_page_number', array('type' => 'int', 'not null' => TRUE, 'default' => 0));
+  }
+  if (!db_field_exists('webform', 'progressbar_percent')) {
+    db_add_field('webform', 'progressbar_percent', array('type' => 'int', 'not null' => TRUE, 'default' => 0));
+  }
+  if (!db_field_exists('webform', 'progressbar_bar')) {
+    db_add_field('webform', 'progressbar_bar', array('type' => 'int', 'not null' => TRUE, 'default' => 0));
+  }
+  if (!db_field_exists('webform', 'progressbar_pagebreak_label')) {
+    db_add_field('webform', 'progressbar_pagebreak_label', array('type' => 'int', 'not null' => TRUE, 'default' => 0));
+  }
+}