moved images up

Adding an images subdir was proliferating changes throught the build system
this seemed easier

18 files changed, 36 insertions, 47 deletions

diff --git a/install/static/Makefile.am b/install/static/Makefile.am
index 748ccf1d4..b5a5c5f10 100644
--- a/install/static/Makefile.am
+++ b/install/static/Makefile.am
@@ -1,7 +1,8 @@
+AUTOMAKE_OPTIONS = 1.7
+
 NULL =
 
-SUBDIRS =                       	\
-	images				\
+SUBDIRS =  				\
 	$(NULL)
 
 appdir = $(IPA_DATA_DIR)/static
@@ -41,6 +42,21 @@ app_DATA =                              \
 	Subnav-background.png		\
 	Subnav-offbutton.png		\
 	Subnav-onbutton.png		\
+	ui-bg_flat_65_ffffff_40x100.png \
+	ui-bg_glass_40_111111_1x400.png \
+	ui-bg_glass_55_1c1c1c_1x400.png \
+	ui-bg_highlight-hard_100_f9f9f9_1x100.png \
+	ui-bg_highlight-hard_40_aaaaaa_1x100.png \
+	ui-bg_highlight-soft_50_aaaaaa_1x100.png \
+	ui-bg_inset-hard_45_cd0a0a_1x100.png \
+	ui-bg_inset-hard_55_ffeb80_1x100.png \
+	ui-bg_loop_8_333333_21x21.png \
+	ui-icons_222222_256x240.png \
+	ui-icons_4ca300_256x240.png \
+	ui-icons_bbbbbb_256x240.png \
+	ui-icons_ededed_256x240.png \
+	ui-icons_ffcf29_256x240.png \
+	ui-icons_ffffff_256x240.png \
 	$(NULL)
 
 EXTRA_DIST =                            \
@@ -50,3 +66,4 @@ EXTRA_DIST =                            \
 MAINTAINERCLEANFILES =                  \
         *~                              \
         Makefile.in
+	$(NULL)
diff --git a/install/static/images/Makefile.am b/install/static/images/Makefile.am
deleted file mode 100644
index cc122a487..000000000
--- a/install/static/images/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-NULL =
-
-appdir = $(IPA_DATA_DIR)/static
-app_DATA =                                       \
-        ui-bg_flat_65_ffffff_40x100.png          \
-        ui-bg_glass_40_111111_1x400.png          \
-        ui-bg_glass_55_1c1c1c_1x400.png          \
-        ui-bg_highlight-hard_100_f9f9f9_1x100.png\
-        ui-bg_highlight-hard_40_aaaaaa_1x100.png \
-        ui-bg_highlight-soft_50_aaaaaa_1x100.png \
-        ui-bg_inset-hard_45_cd0a0a_1x100.png     \
-        ui-bg_inset-hard_55_ffeb80_1x100.png     \
-        ui-bg_loop_8_333333_21x21.png            \
-        ui-icons_222222_256x240.png              \
-        ui-icons_4ca300_256x240.png              \
-        ui-icons_bbbbbb_256x240.png              \
-        ui-icons_ededed_256x240.png              \
-        ui-icons_ffcf29_256x240.png              \
-        ui-icons_ffffff_256x240.png              \
-	$(NULL)
-
-EXTRA_DIST =                            \
-        $(app_DATA)                     \
-        $(NULL)
-
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
diff --git a/install/static/jquery-ui.css b/install/static/jquery-ui.css
index 7a30e44c8..01c3ec90e 100644
--- a/install/static/jquery-ui.css
+++ b/install/static/jquery-ui.css
@@ -59,26 +59,26 @@
 .ui-widget { font-family: Verdana, Arial, sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #cccccc; background: #f9f9f9 url(images/ui-bg_highlight-hard_100_f9f9f9_1x100.png) 50% top repeat-x; color: #222222; }
+.ui-widget-content { border: 1px solid #cccccc; background: #f9f9f9 url(ui-bg_highlight-hard_100_f9f9f9_1x100.png) 50% top repeat-x; color: #222222; }
 .ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #a3a3a3; background: #333333 url(images/ui-bg_loop_8_333333_21x21.png) 50% 50% repeat; color: #eeeeee; font-weight: bold; }
+.ui-widget-header { border: 1px solid #a3a3a3; background: #333333 url(ui-bg_loop_8_333333_21x21.png) 50% 50% repeat; color: #eeeeee; font-weight: bold; }
 .ui-widget-header a { color: #eeeeee; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #777777; background: #111111 url(images/ui-bg_glass_40_111111_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #e3e3e3; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #777777; background: #111111 url(ui-bg_glass_40_111111_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #e3e3e3; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #e3e3e3; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #000000; background: #1c1c1c url(images/ui-bg_glass_55_1c1c1c_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #000000; background: #1c1c1c url(ui-bg_glass_55_1c1c1c_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #cccccc; background: #ffffff url(images/ui-bg_flat_65_ffffff_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #222222; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #cccccc; background: #ffffff url(ui-bg_flat_65_ffffff_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #222222; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #222222; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #ffde2e; background: #ffeb80 url(images/ui-bg_inset-hard_55_ffeb80_1x100.png) 50% bottom repeat-x; color: #363636; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #ffde2e; background: #ffeb80 url(ui-bg_inset-hard_55_ffeb80_1x100.png) 50% bottom repeat-x; color: #363636; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #9e0505; background: #cd0a0a url(images/ui-bg_inset-hard_45_cd0a0a_1x100.png) 50% bottom repeat-x; color: #ffffff; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #9e0505; background: #cd0a0a url(ui-bg_inset-hard_45_cd0a0a_1x100.png) 50% bottom repeat-x; color: #ffffff; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -89,14 +89,14 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_bbbbbb_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_ededed_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_4ca300_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffcf29_256x240.png); }
+.ui-icon { width: 16px; height: 16px; background-image: url(ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(ui-icons_bbbbbb_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(ui-icons_ededed_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(ui-icons_ffffff_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(ui-icons_222222_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(ui-icons_4ca300_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(ui-icons_ffcf29_256x240.png); }
 
 /* positioning */
 .ui-icon-carat-1-n { background-position: 0 0; }
@@ -291,8 +291,8 @@
 .ui-corner-all { -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; }
 
 /* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_highlight-hard_40_aaaaaa_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_highlight-soft_50_aaaaaa_1x100.png) 50% top repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+.ui-widget-overlay { background: #aaaaaa url(ui-bg_highlight-hard_40_aaaaaa_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(ui-bg_highlight-soft_50_aaaaaa_1x100.png) 50% top repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
  * jQuery UI Resizable @VERSION
  *
  * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
diff --git a/install/static/images/ui-bg_flat_65_ffffff_40x100.png b/install/static/ui-bg_flat_65_ffffff_40x100.png
index ac8b229af..ac8b229af 100644
--- a/install/static/images/ui-bg_flat_65_ffffff_40x100.png
+++ b/install/static/ui-bg_flat_65_ffffff_40x100.png
diff --git a/install/static/images/ui-bg_glass_40_111111_1x400.png b/install/static/ui-bg_glass_40_111111_1x400.png
index 1ec812773..1ec812773 100644
--- a/install/static/images/ui-bg_glass_40_111111_1x400.png
+++ b/install/static/ui-bg_glass_40_111111_1x400.png
diff --git a/install/static/images/ui-bg_glass_55_1c1c1c_1x400.png b/install/static/ui-bg_glass_55_1c1c1c_1x400.png
index 93db02b0f..93db02b0f 100644
--- a/install/static/images/ui-bg_glass_55_1c1c1c_1x400.png
+++ b/install/static/ui-bg_glass_55_1c1c1c_1x400.png
diff --git a/install/static/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png b/install/static/ui-bg_highlight-hard_100_f9f9f9_1x100.png
index 2cb80364b..2cb80364b 100644
--- a/install/static/images/ui-bg_highlight-hard_100_f9f9f9_1x100.png
+++ b/install/static/ui-bg_highlight-hard_100_f9f9f9_1x100.png
diff --git a/install/static/images/ui-bg_highlight-hard_40_aaaaaa_1x100.png b/install/static/ui-bg_highlight-hard_40_aaaaaa_1x100.png
index a7aeeb0ae..a7aeeb0ae 100644
--- a/install/static/images/ui-bg_highlight-hard_40_aaaaaa_1x100.png
+++ b/install/static/ui-bg_highlight-hard_40_aaaaaa_1x100.png
diff --git a/install/static/images/ui-bg_highlight-soft_50_aaaaaa_1x100.png b/install/static/ui-bg_highlight-soft_50_aaaaaa_1x100.png
index a0ffd222d..a0ffd222d 100644
--- a/install/static/images/ui-bg_highlight-soft_50_aaaaaa_1x100.png
+++ b/install/static/ui-bg_highlight-soft_50_aaaaaa_1x100.png
diff --git a/install/static/images/ui-bg_inset-hard_45_cd0a0a_1x100.png b/install/static/ui-bg_inset-hard_45_cd0a0a_1x100.png
index 718aa1176..718aa1176 100644
--- a/install/static/images/ui-bg_inset-hard_45_cd0a0a_1x100.png
+++ b/install/static/ui-bg_inset-hard_45_cd0a0a_1x100.png
diff --git a/install/static/images/ui-bg_inset-hard_55_ffeb80_1x100.png b/install/static/ui-bg_inset-hard_55_ffeb80_1x100.png
index 0286bb1d7..0286bb1d7 100644
--- a/install/static/images/ui-bg_inset-hard_55_ffeb80_1x100.png
+++ b/install/static/ui-bg_inset-hard_55_ffeb80_1x100.png
diff --git a/install/static/images/ui-bg_loop_8_333333_21x21.png b/install/static/ui-bg_loop_8_333333_21x21.png
index a6e1a3e1c..a6e1a3e1c 100644
--- a/install/static/images/ui-bg_loop_8_333333_21x21.png
+++ b/install/static/ui-bg_loop_8_333333_21x21.png
diff --git a/install/static/images/ui-icons_222222_256x240.png b/install/static/ui-icons_222222_256x240.png
index b273ff111..b273ff111 100644
--- a/install/static/images/ui-icons_222222_256x240.png
+++ b/install/static/ui-icons_222222_256x240.png
diff --git a/install/static/images/ui-icons_4ca300_256x240.png b/install/static/ui-icons_4ca300_256x240.png
index fadab6000..fadab6000 100644
--- a/install/static/images/ui-icons_4ca300_256x240.png
+++ b/install/static/ui-icons_4ca300_256x240.png
diff --git a/install/static/images/ui-icons_bbbbbb_256x240.png b/install/static/ui-icons_bbbbbb_256x240.png
index 146dbd10b..146dbd10b 100644
--- a/install/static/images/ui-icons_bbbbbb_256x240.png
+++ b/install/static/ui-icons_bbbbbb_256x240.png
diff --git a/install/static/images/ui-icons_ededed_256x240.png b/install/static/ui-icons_ededed_256x240.png
index 608e09d69..608e09d69 100644
--- a/install/static/images/ui-icons_ededed_256x240.png
+++ b/install/static/ui-icons_ededed_256x240.png
diff --git a/install/static/images/ui-icons_ffcf29_256x240.png b/install/static/ui-icons_ffcf29_256x240.png
index c066ff2a0..c066ff2a0 100644
--- a/install/static/images/ui-icons_ffcf29_256x240.png
+++ b/install/static/ui-icons_ffcf29_256x240.png
diff --git a/install/static/images/ui-icons_ffffff_256x240.png b/install/static/ui-icons_ffffff_256x240.png
index 42f8f992c..42f8f992c 100644
--- a/install/static/images/ui-icons_ffffff_256x240.png
+++ b/install/static/ui-icons_ffffff_256x240.png