Merge remote branch 'gallery3/master'

Conflicts:
	themes/admin_wind/css/screen.css
	themes/wind/css/screen.css

14 files changed, 7 insertions, 2 deletions

diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index c7e289c4..273ac116 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -759,7 +759,7 @@ form .g-error {
 }
 
 .g-loading-small {
-  background: #e8e8e8 url('../images/loading-small.gif') no-repeat center center !important;
+  background: #e8e8e8 url('..lib/images/loading-small.gif') no-repeat center center !important;
 }
 
 /** *******************************************************************
@@ -1112,7 +1112,7 @@ ul.sf-menu li li li.sfHover ul {
 }
 
 .rtl .g-breadcrumbs li {
-  background: transparent url('../images/ico-separator-rtl.gif') no-repeat scroll right center;
+  background: transparent url('..images/ico-separator-rtl.gif') no-repeat scroll right center;
   padding: 1em 18px 1em 8px;
 }
 
diff --git a/themes/admin_wind/images/ico-denied-inactive.png b/themes/admin_wind/images/ico-denied-inactive.png
new file mode 100644
index 00000000..56db3ff5
--- /dev/null
+++ b/themes/admin_wind/images/ico-denied-inactive.png
diff --git a/themes/admin_wind/images/ico-denied-passive.png b/themes/admin_wind/images/ico-denied-passive.png
new file mode 100644
index 00000000..1e992230
--- /dev/null
+++ b/themes/admin_wind/images/ico-denied-passive.png
diff --git a/themes/admin_wind/images/ico-denied.png b/themes/admin_wind/images/ico-denied.png
new file mode 100644
index 00000000..08f24936
--- /dev/null
+++ b/themes/admin_wind/images/ico-denied.png
diff --git a/themes/admin_wind/images/ico-lock.png b/themes/admin_wind/images/ico-lock.png
new file mode 100644
index 00000000..2ebc4f6f
--- /dev/null
+++ b/themes/admin_wind/images/ico-lock.png
diff --git a/themes/admin_wind/images/ico-success-inactive.png b/themes/admin_wind/images/ico-success-inactive.png
new file mode 100644
index 00000000..74b2032f
--- /dev/null
+++ b/themes/admin_wind/images/ico-success-inactive.png
diff --git a/themes/admin_wind/images/ico-success-passive.png b/themes/admin_wind/images/ico-success-passive.png
new file mode 100644
index 00000000..dc8d1ded
--- /dev/null
+++ b/themes/admin_wind/images/ico-success-passive.png
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index d4b03eac..a49b8c28 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -1036,6 +1036,11 @@ div#g-action-status {
   margin-left: 0;
 }
 
+/* Autocomplete  ~~~~~~~~~~ */
+.ac_loading {
+  background: white url('../images/loading-small.gif') right center no-repeat !important;
+}
+
 /** *******************************************************************
  *  9) Right to left language styles
  *********************************************************************/
diff --git a/themes/wind/images/ico-denied-inactive.png b/themes/wind/images/ico-denied-inactive.png
new file mode 100644
index 00000000..56db3ff5
--- /dev/null
+++ b/themes/wind/images/ico-denied-inactive.png
diff --git a/themes/wind/images/ico-denied-passive.png b/themes/wind/images/ico-denied-passive.png
new file mode 100644
index 00000000..1e992230
--- /dev/null
+++ b/themes/wind/images/ico-denied-passive.png
diff --git a/themes/wind/images/ico-denied.png b/themes/wind/images/ico-denied.png
new file mode 100644
index 00000000..08f24936
--- /dev/null
+++ b/themes/wind/images/ico-denied.png
diff --git a/themes/wind/images/ico-lock.png b/themes/wind/images/ico-lock.png
new file mode 100644
index 00000000..2ebc4f6f
--- /dev/null
+++ b/themes/wind/images/ico-lock.png
diff --git a/themes/wind/images/ico-success-inactive.png b/themes/wind/images/ico-success-inactive.png
new file mode 100644
index 00000000..74b2032f
--- /dev/null
+++ b/themes/wind/images/ico-success-inactive.png
diff --git a/themes/wind/images/ico-success-passive.png b/themes/wind/images/ico-success-passive.png
new file mode 100644
index 00000000..dc8d1ded
--- /dev/null
+++ b/themes/wind/images/ico-success-passive.png