Index: includes/webform.components.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.components.inc,v
retrieving revision 1.25.2.12
diff -u -r1.25.2.12 webform.components.inc
--- includes/webform.components.inc	10 Apr 2010 00:19:15 -0000	1.25.2.12
+++ includes/webform.components.inc	10 Apr 2010 21:38:29 -0000
@@ -28,8 +28,8 @@
  */
 function theme_webform_components_page($node, $form) {
   // Add CSS and JS. Don't preprocess because these files are used rarely.
-  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
-  drupal_add_js(drupal_get_path('module', 'webform') . '/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/css/webform-admin.css', 'theme', 'all', FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/js/webform-admin.js', 'module', 'header', FALSE, TRUE, FALSE);
 
   return $form;
 }
@@ -127,8 +127,8 @@
  */
 function theme_webform_components_form($form) {
   // Add CSS to display submission info. Don't preprocess because this CSS file is used rarely.
-  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
-  drupal_add_js(drupal_get_path('module', 'webform') . '/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/css/webform-admin.css', 'theme', 'all', FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/js/webform-admin.js', 'module', 'header', FALSE, TRUE, FALSE);
 
   drupal_add_tabledrag('webform-components', 'order', 'sibling', 'webform-weight');
   drupal_add_tabledrag('webform-components', 'match', 'parent', 'webform-pid', 'webform-pid', 'webform-cid');
@@ -309,7 +309,7 @@
 
 function webform_component_edit_form(&$form_state, $node, $component, $clone = FALSE) {
   drupal_set_title(t('Edit component: @name', array('@name' => $component['name'])));
-  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/css/webform-admin.css', 'theme', 'all', FALSE);
 
   // Print the correct field type specification.
   // We always need: name and description.
@@ -823,7 +823,7 @@
  */
 function theme_webform_component_select($element) {
   drupal_add_js('misc/tableselect.js');
-  drupal_add_js(drupal_get_path('module', 'webform') . '/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/js/webform-admin.js', 'module', 'header', FALSE, TRUE, FALSE);
 
   $rows = array();
   $header = array();
Index: includes/webform.emails.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.emails.inc,v
retrieving revision 1.9.2.4
diff -u -r1.9.2.4 webform.emails.inc
--- includes/webform.emails.inc	27 Mar 2010 22:19:42 -0000	1.9.2.4
+++ includes/webform.emails.inc	10 Apr 2010 21:38:29 -0000
@@ -90,8 +90,8 @@
  */
 function theme_webform_emails_form($form) {
   // Add CSS to display submission info. Don't preprocess because this CSS file is used rarely.
-  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
-  drupal_add_js(drupal_get_path('module', 'webform') . '/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/css/webform-admin.css', 'theme', 'all', FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/js/webform-admin.js', 'module', 'header', FALSE, TRUE, FALSE);
 
   $node = $form['#node'];
 
@@ -304,8 +304,8 @@
  * Theme the Webform mail settings section of the node form.
  */
 function theme_webform_email_edit_form($form) {
-  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
-  drupal_add_js(drupal_get_path('module', 'webform') . '/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/css/webform-admin.css', 'theme', 'all', FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/js/webform-admin.js', 'module', 'header', FALSE, TRUE, FALSE);
 
   // Loop through fields, rendering them into radio button options.
   foreach (array('email', 'subject', 'from_address', 'from_name') as $field) {
Index: includes/webform.report.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.report.inc,v
retrieving revision 1.16.2.2
diff -u -r1.16.2.2 webform.report.inc
--- includes/webform.report.inc	8 Mar 2010 01:04:08 -0000	1.16.2.2
+++ includes/webform.report.inc	10 Apr 2010 21:38:29 -0000
@@ -125,7 +125,7 @@
 function theme_webform_results_submissions($node, $submissions, $total_count = 0, $pager_count = 0) {
   global $user;
 
-  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/css/webform-admin.css', 'theme', 'all', FALSE);
 
   // This header has to be generated separately so we can add the SQL necessary
   // to sort the results.
@@ -227,7 +227,7 @@
  *   The number of results to be shown per page.
  */
 function theme_webform_results_table($node, $components, $submissions, $total_count, $pager_count) {
-  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/css/webform-admin.css', 'theme', 'all', FALSE);
 
   $header = array();
   $rows = array();
@@ -412,7 +412,7 @@
  * Theme the output of the export form.
  */
 function theme_webform_results_download_form($form) {
-  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/css/webform-admin.css', 'theme', 'all', FALSE);
 
   return drupal_render($form);
 }
@@ -421,7 +421,7 @@
  * Theme the output of the select list format radio buttons.
  */
 function theme_webform_results_download_select_format($element) {
-  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/css/webform-admin.css', 'theme', 'all', FALSE);
 
   $output = '';
 
Index: templates/webform-submission-page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/templates/webform-submission-page.tpl.php,v
retrieving revision 1.2
diff -u -r1.2 webform-submission-page.tpl.php
--- templates/webform-submission-page.tpl.php	26 Feb 2010 12:53:32 -0000	1.2
+++ templates/webform-submission-page.tpl.php	10 Apr 2010 21:38:29 -0000
@@ -13,7 +13,7 @@
  * - $submission_information: The next submission ID.
  */
 
-drupal_add_css(drupal_get_path('module', 'webform') .'/webform.css', 'theme', 'all', FALSE);
+drupal_add_css(drupal_get_path('module', 'webform') .'/css/webform-admin.css', 'theme', 'all', FALSE);
 ?>
 
 <?php print $submission_navigation; ?>
Index: components/select.js
===================================================================
RCS file: components/select.js
diff -N components/select.js
--- components/select.js	29 Mar 2010 03:19:49 -0000	1.1.2.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,56 +0,0 @@
-// $Id: select.js,v 1.1.2.2 2010/03/29 03:19:49 quicksketch Exp $
-
-/**
- * @file
- * Enhancements for select list configuration options.
- */
-
-(function ($) {
-
-Drupal.behaviors.webformSelectLoadOptions = function(context) {
-  settings = Drupal.settings;
-
-  $('#edit-extra-options-source', context).change(function() {
-    var url = settings.webform.selectOptionsUrl + '/' + this.value;
-    $.ajax({
-      url: url,
-      success: Drupal.webform.selectOptionsLoad,
-      dataType: 'json'
-    });
-  });
-}
-
-Drupal.webform = Drupal.webform || {};
-
-Drupal.webform.selectOptionsOriginal = false;
-Drupal.webform.selectOptionsLoad = function(result) {
-  if (Drupal.optionsElement) {
-    if (result.options) {
-      // Save the current select options the first time a new list is chosen.
-      if (Drupal.webform.selectOptionsOriginal === false) {
-        Drupal.webform.selectOptionsOriginal = $(Drupal.optionElements[result.elementId].manualOptionsElement).val();
-      }
-      $(Drupal.optionElements[result.elementId].manualOptionsElement).val(result.options);
-      Drupal.optionElements[result.elementId].disable();
-      Drupal.optionElements[result.elementId].updateWidgetElements();
-    }
-    else {
-      Drupal.optionElements[result.elementId].enable();
-      if (Drupal.webform.selectOptionsOriginal) {
-        $(Drupal.optionElements[result.elementId].manualOptionsElement).val(Drupal.webform.selectOptionsOriginal);
-        Drupal.optionElements[result.elementId].updateWidgetElements();
-        Drupal.webform.selectOptionsOriginal = false;
-      }
-    }
-  }
-  else {
-    if (result.options) {
-      $('#' + result.elementId).val(result.options).attr('readonly', 'readonly');
-    }
-    else {
-      $('#' + result.elementId).attr('readonly', '');
-    }
-  }
-}
-
-})(jQuery);
Index: components/select.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/select.inc,v
retrieving revision 1.39.2.12
diff -u -r1.39.2.12 select.inc
--- components/select.inc	8 Apr 2010 07:32:39 -0000	1.39.2.12
+++ components/select.inc	10 Apr 2010 21:38:29 -0000
@@ -49,7 +49,7 @@
 function _webform_edit_select($component) {
   $form = array();
 
-  drupal_add_js(drupal_get_path('module', 'webform') . '/components/select.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/js/select-admin.js', 'module', 'header', FALSE, TRUE, FALSE);
   drupal_add_js(array('webform' => array('selectOptionsUrl' => url('webform/ajax/options/' . $component['nid']))), 'setting');
 
   $other = array();
Index: webform.js
===================================================================
RCS file: webform.js
diff -N webform.js
--- webform.js	21 Mar 2010 03:04:01 -0000	1.6.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,95 +0,0 @@
-// $Id: webform.js,v 1.6.2.1 2010/03/21 03:04:01 quicksketch Exp $
-
-/**
- * Webform node form interface enhancments.
- */
-
-Drupal.behaviors.webform = function(context) {
-  // Apply special behaviors to fields with default values.
-  Drupal.webform.defaultValues(context);
-  // On click or change, make a parent radio button selected.
-  Drupal.webform.setActive(context);
-  // Update the template select list upon changing a template.
-  Drupal.webform.updateTemplate(context);
-  // Enhance the normal tableselect.js file to support indentations.
-  Drupal.webform.tableSelectIndentation(context);
-}
-
-Drupal.webform = new Object();
-
-Drupal.webform.defaultValues = function(context) {
-  var $fields = $('.webform-default-value:not(.error)', context);
-  var $forms = $fields.parents('form:first');
-  $fields.each(function() {
-    this.defaultValue = $(this).attr('rel');
-    if (this.value != this.defaultValue) {
-      $(this).removeClass('webform-default-value');
-    }
-    $(this).focus(function() {
-      if (this.value == this.defaultValue) {
-        this.value = '';
-        $(this).removeClass('webform-default-value');
-      }
-    });
-    $(this).blur(function() {
-      if (this.value == '') {
-        $(this).addClass('webform-default-value');
-        this.value = this.defaultValue;
-      }
-    });
-  });
-
-  // Clear all the form elements before submission.
-  $forms.submit(function() {
-    $fields.focus();
-  });
-};
-
-Drupal.webform.setActive = function(context) {
-  var setActive = function() {
-    $('.form-radio', $(this).parent().parent()).attr('checked', true);
-  };
-  $('.webform-set-active', context).click(setActive).change(setActive);
-};
-
-Drupal.webform.updateTemplate = function(context) {
-  var defaultTemplate = $('#edit-templates-default').val();
-  var $templateSelect = $('#webform-template-fieldset select', context);
-  var $templateTextarea = $('#webform-template-fieldset textarea', context);
-
-  var updateTemplateSelect = function() {
-    if ($(this).val() == defaultTemplate) {
-      $templateSelect.val('default');
-    }
-    else {
-      $templateSelect.val('custom');
-    }
-  }
-
-  var updateTemplateText = function() {
-    if ($(this).val() == 'default') {
-      $templateTextarea.val(defaultTemplate);
-    }
-  }
-
-  $templateTextarea.keyup(updateTemplateSelect);
-  $templateSelect.change(updateTemplateText);
-}
-
-Drupal.webform.tableSelectIndentation = function(context) {
-  var $tables = $('th.select-all', context).parents('table');
-  $tables.find('input.form-checkbox').change(function() {
-    var $rows = $(this).parents('table:first').find('tr');
-    var row = $(this).parents('tr:first').get(0);
-    var rowNumber = $rows.index(row);
-    var rowTotal = $rows.size();
-    var indentLevel = $(row).find('div.indentation').size();
-    for (var n = rowNumber + 1; n < rowTotal; n++) {
-      if ($rows.eq(n).find('div.indentation').size() <= indentLevel) {
-        break;
-      }
-      $rows.eq(n).find('input.form-checkbox').attr('checked', this.checked);
-    }
-  });
-}
-
Index: webform.css
===================================================================
RCS file: webform.css
diff -N webform.css
--- webform.css	25 Mar 2010 01:00:03 -0000	1.12.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,78 +0,0 @@
-/* $Id: webform.css,v 1.12.2.1 2010/03/25 01:00:03 quicksketch Exp $ */
-
-.webform-display-item {
-  margin-top: 0.5em;
-  margin-bottom: 0.5em;
-}
-.webform-display-item label {
-  display: inline;
-}
-.webform-submission-navigation {
-  text-align: right;
-}
-.webform-submission-next {
-  margin-left: 20px;
-}
-.webform-component-select-table table {
-  margin: 0;
-}
-.webform-component-select-table tr.selected td,
-.webform-component-select-table tr.selected td.active {
-  background: inherit;
-  color: inherit;
-}
-.form-item .webform-component-select-table .description {
-  font-size: inherit;
-}
-.form-item .webform-component-select-table input {
-  width: 12px;
-  height: 12px;
-  margin: 0 2px 2px;
-}
-.webform-select-list-format table {
-  border: 1px solid;
-  width: auto;
-  font-size: 90%;
-}
-.webform-select-list-format td,
-.webform-select-list-format th {
-  border: 1px solid;
-}
-tr.webform-pagebreak td {
-  border-top: 2px dotted #999;
-}
-td.webform-pagebreak {
-  font-weight: bold;
-}
-.webform-options-element thead {
-  display: none;
-}
-.webform-options-element fieldset {
-  border: none;
-  background: none;
-  margin: 0;
-  padding: 0;
-}
-.webform-options-element fieldset legend {
-  display: none;
-}
-.webform-checkbox {
-  text-align: center;
-  width: 40px;
-}
-.webform-default-value {
-  color: #999;
-}
-.webform-results-per-page a.selected {
-  font-weight: bold;
-}
-html.js fieldset.webform-position,
-html.js div.webform-position {
-  display: none;
-}
-tr.webform-add-form .tabledrag-changed {
-  display: none;
-}
-#webform-components tr.webform-add-form {
-  background-color: inherit;
-}
Index: js/webform-admin.js
===================================================================
RCS file: js/webform-admin.js
diff -N js/webform-admin.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ js/webform-admin.js	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,95 @@
+// $Id: webform.js,v 1.6.2.1 2010/03/21 03:04:01 quicksketch Exp $
+
+/**
+ * Webform node form interface enhancments.
+ */
+
+Drupal.behaviors.webform = function(context) {
+  // Apply special behaviors to fields with default values.
+  Drupal.webform.defaultValues(context);
+  // On click or change, make a parent radio button selected.
+  Drupal.webform.setActive(context);
+  // Update the template select list upon changing a template.
+  Drupal.webform.updateTemplate(context);
+  // Enhance the normal tableselect.js file to support indentations.
+  Drupal.webform.tableSelectIndentation(context);
+}
+
+Drupal.webform = new Object();
+
+Drupal.webform.defaultValues = function(context) {
+  var $fields = $('.webform-default-value:not(.error)', context);
+  var $forms = $fields.parents('form:first');
+  $fields.each(function() {
+    this.defaultValue = $(this).attr('rel');
+    if (this.value != this.defaultValue) {
+      $(this).removeClass('webform-default-value');
+    }
+    $(this).focus(function() {
+      if (this.value == this.defaultValue) {
+        this.value = '';
+        $(this).removeClass('webform-default-value');
+      }
+    });
+    $(this).blur(function() {
+      if (this.value == '') {
+        $(this).addClass('webform-default-value');
+        this.value = this.defaultValue;
+      }
+    });
+  });
+
+  // Clear all the form elements before submission.
+  $forms.submit(function() {
+    $fields.focus();
+  });
+};
+
+Drupal.webform.setActive = function(context) {
+  var setActive = function() {
+    $('.form-radio', $(this).parent().parent()).attr('checked', true);
+  };
+  $('.webform-set-active', context).click(setActive).change(setActive);
+};
+
+Drupal.webform.updateTemplate = function(context) {
+  var defaultTemplate = $('#edit-templates-default').val();
+  var $templateSelect = $('#webform-template-fieldset select', context);
+  var $templateTextarea = $('#webform-template-fieldset textarea', context);
+
+  var updateTemplateSelect = function() {
+    if ($(this).val() == defaultTemplate) {
+      $templateSelect.val('default');
+    }
+    else {
+      $templateSelect.val('custom');
+    }
+  }
+
+  var updateTemplateText = function() {
+    if ($(this).val() == 'default') {
+      $templateTextarea.val(defaultTemplate);
+    }
+  }
+
+  $templateTextarea.keyup(updateTemplateSelect);
+  $templateSelect.change(updateTemplateText);
+}
+
+Drupal.webform.tableSelectIndentation = function(context) {
+  var $tables = $('th.select-all', context).parents('table');
+  $tables.find('input.form-checkbox').change(function() {
+    var $rows = $(this).parents('table:first').find('tr');
+    var row = $(this).parents('tr:first').get(0);
+    var rowNumber = $rows.index(row);
+    var rowTotal = $rows.size();
+    var indentLevel = $(row).find('div.indentation').size();
+    for (var n = rowNumber + 1; n < rowTotal; n++) {
+      if ($rows.eq(n).find('div.indentation').size() <= indentLevel) {
+        break;
+      }
+      $rows.eq(n).find('input.form-checkbox').attr('checked', this.checked);
+    }
+  });
+}
+
Index: js/select-admin.js
===================================================================
RCS file: js/select-admin.js
diff -N js/select-admin.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ js/select-admin.js	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,56 @@
+// $Id: select.js,v 1.1.2.2 2010/03/29 03:19:49 quicksketch Exp $
+
+/**
+ * @file
+ * Enhancements for select list configuration options.
+ */
+
+(function ($) {
+
+Drupal.behaviors.webformSelectLoadOptions = function(context) {
+  settings = Drupal.settings;
+
+  $('#edit-extra-options-source', context).change(function() {
+    var url = settings.webform.selectOptionsUrl + '/' + this.value;
+    $.ajax({
+      url: url,
+      success: Drupal.webform.selectOptionsLoad,
+      dataType: 'json'
+    });
+  });
+}
+
+Drupal.webform = Drupal.webform || {};
+
+Drupal.webform.selectOptionsOriginal = false;
+Drupal.webform.selectOptionsLoad = function(result) {
+  if (Drupal.optionsElement) {
+    if (result.options) {
+      // Save the current select options the first time a new list is chosen.
+      if (Drupal.webform.selectOptionsOriginal === false) {
+        Drupal.webform.selectOptionsOriginal = $(Drupal.optionElements[result.elementId].manualOptionsElement).val();
+      }
+      $(Drupal.optionElements[result.elementId].manualOptionsElement).val(result.options);
+      Drupal.optionElements[result.elementId].disable();
+      Drupal.optionElements[result.elementId].updateWidgetElements();
+    }
+    else {
+      Drupal.optionElements[result.elementId].enable();
+      if (Drupal.webform.selectOptionsOriginal) {
+        $(Drupal.optionElements[result.elementId].manualOptionsElement).val(Drupal.webform.selectOptionsOriginal);
+        Drupal.optionElements[result.elementId].updateWidgetElements();
+        Drupal.webform.selectOptionsOriginal = false;
+      }
+    }
+  }
+  else {
+    if (result.options) {
+      $('#' + result.elementId).val(result.options).attr('readonly', 'readonly');
+    }
+    else {
+      $('#' + result.elementId).attr('readonly', '');
+    }
+  }
+}
+
+})(jQuery);
Index: css/webform-admin.css
===================================================================
RCS file: css/webform-admin.css
diff -N css/webform-admin.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ css/webform-admin.css	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,78 @@
+/* $Id: webform.css,v 1.12.2.1 2010/03/25 01:00:03 quicksketch Exp $ */
+
+.webform-display-item {
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}
+.webform-display-item label {
+  display: inline;
+}
+.webform-submission-navigation {
+  text-align: right;
+}
+.webform-submission-next {
+  margin-left: 20px;
+}
+.webform-component-select-table table {
+  margin: 0;
+}
+.webform-component-select-table tr.selected td,
+.webform-component-select-table tr.selected td.active {
+  background: inherit;
+  color: inherit;
+}
+.form-item .webform-component-select-table .description {
+  font-size: inherit;
+}
+.form-item .webform-component-select-table input {
+  width: 12px;
+  height: 12px;
+  margin: 0 2px 2px;
+}
+.webform-select-list-format table {
+  border: 1px solid;
+  width: auto;
+  font-size: 90%;
+}
+.webform-select-list-format td,
+.webform-select-list-format th {
+  border: 1px solid;
+}
+tr.webform-pagebreak td {
+  border-top: 2px dotted #999;
+}
+td.webform-pagebreak {
+  font-weight: bold;
+}
+.webform-options-element thead {
+  display: none;
+}
+.webform-options-element fieldset {
+  border: none;
+  background: none;
+  margin: 0;
+  padding: 0;
+}
+.webform-options-element fieldset legend {
+  display: none;
+}
+.webform-checkbox {
+  text-align: center;
+  width: 40px;
+}
+.webform-default-value {
+  color: #999;
+}
+.webform-results-per-page a.selected {
+  font-weight: bold;
+}
+html.js fieldset.webform-position,
+html.js div.webform-position {
+  display: none;
+}
+tr.webform-add-form .tabledrag-changed {
+  display: none;
+}
+#webform-components tr.webform-add-form {
+  background-color: inherit;
+}