#181741 by quicksketch: fix AHAH throbber/progress bar issues and generalize progress display configuration to allow module developers to choose from the throbber and progress bar

5 files changed, 20 insertions, 19 deletions

diff --git a/modules/block/block-rtl.css b/modules/block/block-rtl.css
index 6a690f5f2..b43e9cd29 100644
--- a/modules/block/block-rtl.css
+++ b/modules/block/block-rtl.css
@@ -5,7 +5,7 @@
   padding-right: 1.5em;
 }
 #blocks select {
-  margin-left: 18px;
+  margin-left: 24px;
 }
 #blocks select.progress-disabled {
   margin-left: 0px;
diff --git a/modules/block/block.css b/modules/block/block.css
index 61a2b4eb1..87eac484f 100644
--- a/modules/block/block.css
+++ b/modules/block/block.css
@@ -13,7 +13,7 @@
   padding: 3px;
 }
 #blocks select {
-  margin-right: 18px; /* LTR */
+  margin-right: 24px; /* LTR */
 }
 #blocks select.progress-disabled {
   margin-right: 0px; /* LTR */
@@ -21,18 +21,3 @@
 #blocks tr.ahah-new-content {
   background-color: #ffd;
 }
-#blocks .progress {
-  width: 15px;
-  height: 15px;
-  margin: -2px 0;
-}
-#blocks .progress .bar {
-  width: 15px;
-  height: 15px;
-  background: transparent url(../../misc/throbber.gif) no-repeat 0px -18px;
-  border: none;
-  float: left; /* LTR */
-}
-#blocks .progress .message {
-  display: none;
-}
diff --git a/modules/system/system-rtl.css b/modules/system/system-rtl.css
index cbd7df44f..d1b6ddbc6 100644
--- a/modules/system/system-rtl.css
+++ b/modules/system/system-rtl.css
@@ -74,6 +74,9 @@ div.teaser-button-wrapper {
 .ahah-progress {
   float: right;
 }
+.ahah-progress .throbber {
+  float: right;
+}
 input.password-field {
   margin-left: 10px;
   margin-right: inherit;
diff --git a/modules/system/system.css b/modules/system/system.css
index ed90a3562..567ae751f 100644
--- a/modules/system/system.css
+++ b/modules/system/system.css
@@ -366,9 +366,8 @@ html.js .no-js {
 .progress .bar {
   background: #fff url(../../misc/progress.gif);
   border: 1px solid #00375a;
-  width: 5em;
   height: 1.5em;
-  margin: 0.2em 0 0 0.2em;
+  margin: 0 0.2em;
 }
 .progress .filled {
   background: #0072b9;
@@ -385,6 +384,19 @@ html.js .no-js {
 .ahah-progress {
   float: left; /* LTR */
 }
+.ahah-progress .throbber {
+  width: 15px;
+  height: 15px;
+  margin: 2px;
+  background: transparent url(../../misc/throbber.gif) no-repeat 0px -18px;
+  float: left; /* LTR */
+}
+tr .ahah-progress .throbber {
+  margin: 0 2px;
+}
+.ahah-progress-bar {
+  width: 16em;
+}
 
 /*
 ** Formatting for welcome page
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index bfe39fcaa..93de16ed2 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -502,6 +502,7 @@ function _upload_form($node) {
       '#ahah' => array(
         'path' => 'upload/js',
         'wrapper' => 'attach-wrapper',
+        'progress' => array('type' => 'bar', 'message' => t('Please wait...')),
       ),
       '#submit' => array('node_form_submit_build_node'),
     );