Merge pull request #165 from shadlaws/followon_autocomplete_loading

Follow-on from autocomplete updates.

5 files changed, 6 insertions, 8 deletions

diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index 73b8ab4e..323c2e83 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -164,6 +164,10 @@
   text-align: left;
 }
 
+.ui-autocomplete-loading {
+  background: #e8e8e8 url('../images/loading-small.gif') no-repeat center center;
+}
+
 /** *******************************************************************
  * 2) Admin
  **********************************************************************/
diff --git a/modules/gallery/images/loading-small.gif b/modules/gallery/images/loading-small.gif
new file mode 100644
index 00000000..d0bce154
--- /dev/null
+++ b/modules/gallery/images/loading-small.gif
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 4c611f7e..2e485c08 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -17,7 +17,7 @@
           <a id="dialog_close_link" style="display: none" onclick="$('#dialog').fadeOut(); return false;" href="#" class="close">[x]</a>
           <div id="busy" style="display: none">
             <h1>
-              <img width="16" height="16" src="<?= url::file("themes/wind/images/loading-small.gif") ?>"/>
+              <img width="16" height="16" src="<?= url::file("modules/gallery/images/loading-small.gif") ?>"/>
               <?= t("Upgrade in progress!") ?>
             </h1>
             <p>
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index b2421c7c..5ad142f3 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -6,7 +6,7 @@
 $("document").ready(function() {
   $("#g-path").gallery_autocomplete(
     "<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/server_add/autocomplete"),
-    {multiple: true});
+    {});
 });
 </script>
 
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 0ece722e..41d0bd6e 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -1057,9 +1057,3 @@ div#g-action-status {
 .g-inline li.g-first {
   margin-left: 0;
 }
-
-/* Autocomplete  ~~~~~~~~~~ */
-
-.ac_loading {
-  background: white url('../images/loading-small.gif') right center no-repeat !important;
-}