rename static to ui

Directory rename

245 files changed, 24 insertions, 20 deletions

diff --git a/install/Makefile.am b/install/Makefile.am
index 80f04bd7..1b0cda90 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS =			\
         html			\
         migration		\
         share			\
-        static			\
+        ui			\
         tools			\
         updates			\
         po			\
diff --git a/install/conf/ipa.conf b/install/conf/ipa.conf
index 0bc53548..72e3e4c0 100644
--- a/install/conf/ipa.conf
+++ b/install/conf/ipa.conf
@@ -85,8 +85,8 @@ Alias /ipa/crl "/var/lib/pki-ca/publish"
 
 
 #  webUI  is now completely static, and served out of that directory
-Alias /ipa/ui "/usr/share/ipa/static"
-<Directory "/usr/share/ipa/static">
+Alias /ipa/ui "/usr/share/ipa/ui"
+<Directory "/usr/share/ipa/ui">
   SetHandler None
   AllowOverride None
   Satisfy Any
diff --git a/install/configure.ac b/install/configure.ac
index 2424ef29..88bf9f80 100644
--- a/install/configure.ac
+++ b/install/configure.ac
@@ -72,9 +72,9 @@ AC_CONFIG_FILES([
     html/Makefile
     migration/Makefile
     share/Makefile
-    static/Makefile
-    static/layouts/Makefile
-    static/layouts/default/Makefile
+    ui/Makefile
+    ui/layouts/Makefile
+    ui/layouts/default/Makefile
     tools/Makefile
     tools/man/Makefile
     updates/Makefile
diff --git a/install/static/FreeWay-Bold.otf b/install/ui/FreeWay-Bold.otf
index 79318531..79318531 100644
--- a/install/static/FreeWay-Bold.otf
+++ b/install/ui/FreeWay-Bold.otf
diff --git a/install/static/FreeWay.otf b/install/ui/FreeWay.otf
index ebefcb25..ebefcb25 100644
--- a/install/static/FreeWay.otf
+++ b/install/ui/FreeWay.otf
diff --git a/install/static/Mainnav-background.png b/install/ui/Mainnav-background.png
index 37a9dc6a..37a9dc6a 100644
--- a/install/static/Mainnav-background.png
+++ b/install/ui/Mainnav-background.png
diff --git a/install/static/Mainnav-offtab.png b/install/ui/Mainnav-offtab.png
index 997863a2..997863a2 100644
--- a/install/static/Mainnav-offtab.png
+++ b/install/ui/Mainnav-offtab.png
diff --git a/install/static/Mainnav-ontab.png b/install/ui/Mainnav-ontab.png
index 303402f7..303402f7 100644
--- a/install/static/Mainnav-ontab.png
+++ b/install/ui/Mainnav-ontab.png
diff --git a/install/static/Mainnav-seperatorbars.png b/install/ui/Mainnav-seperatorbars.png
index 9d1a9d41..9d1a9d41 100644
--- a/install/static/Mainnav-seperatorbars.png
+++ b/install/ui/Mainnav-seperatorbars.png
diff --git a/install/static/Makefile.am b/install/ui/Makefile.am
index d6a9274e..b8b192db 100644
--- a/install/static/Makefile.am
+++ b/install/ui/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS =  				\
 	layouts 				\
 	$(NULL)
 
-appdir = $(IPA_DATA_DIR)/static
+appdir = $(IPA_DATA_DIR)/ui
 app_DATA =                              \
 	aci.js				\
 	add.js				\
diff --git a/install/static/Subnav-background.png b/install/ui/Subnav-background.png
index c1baebff..c1baebff 100644
--- a/install/static/Subnav-background.png
+++ b/install/ui/Subnav-background.png
diff --git a/install/static/Subnav-offbutton.png b/install/ui/Subnav-offbutton.png
index 859e5f5e..859e5f5e 100644
--- a/install/static/Subnav-offbutton.png
+++ b/install/ui/Subnav-offbutton.png
diff --git a/install/static/Subnav-onbutton.png b/install/ui/Subnav-onbutton.png
index 2cee0a70..2cee0a70 100644
--- a/install/static/Subnav-onbutton.png
+++ b/install/ui/Subnav-onbutton.png
diff --git a/install/static/aci.js b/install/ui/aci.js
index 85cfcaa8..85cfcaa8 100644
--- a/install/static/aci.js
+++ b/install/ui/aci.js
diff --git a/install/static/add.js b/install/ui/add.js
index 69b1108c..69b1108c 100644
--- a/install/static/add.js
+++ b/install/ui/add.js
diff --git a/install/static/associate.js b/install/ui/associate.js
index 9fc90723..9fc90723 100644
--- a/install/static/associate.js
+++ b/install/ui/associate.js
diff --git a/install/static/caution.png b/install/ui/caution.png
index ce7a68ad..ce7a68ad 100755
--- a/install/static/caution.png
+++ b/install/ui/caution.png
diff --git a/install/static/certificate.js b/install/ui/certificate.js
index b7e5a51d..b7e5a51d 100755
--- a/install/static/certificate.js
+++ b/install/ui/certificate.js
diff --git a/install/static/check.png b/install/ui/check.png
index c3646db1..c3646db1 100755
--- a/install/static/check.png
+++ b/install/ui/check.png
diff --git a/install/static/details.js b/install/ui/details.js
index aad77a9c..aad77a9c 100644
--- a/install/static/details.js
+++ b/install/ui/details.js
diff --git a/install/static/develop.js b/install/ui/develop.js
index 46225350..46225350 100644
--- a/install/static/develop.js
+++ b/install/ui/develop.js
diff --git a/install/static/entity.js b/install/ui/entity.js
index 9c58ee3d..9c58ee3d 100644
--- a/install/static/entity.js
+++ b/install/ui/entity.js
diff --git a/install/static/gray-fade-line.png b/install/ui/gray-fade-line.png
index 896cfca0..896cfca0 100644
--- a/install/static/gray-fade-line.png
+++ b/install/ui/gray-fade-line.png
diff --git a/install/static/group.js b/install/ui/group.js
index 13017ac5..13017ac5 100644
--- a/install/static/group.js
+++ b/install/ui/group.js
diff --git a/install/static/hbacrule.js b/install/ui/hbacrule.js
index 455ad4d3..455ad4d3 100644
--- a/install/static/hbacrule.js
+++ b/install/ui/hbacrule.js
diff --git a/install/static/hbacsvc.js b/install/ui/hbacsvc.js
index dc0bc323..dc0bc323 100644
--- a/install/static/hbacsvc.js
+++ b/install/ui/hbacsvc.js
diff --git a/install/static/hbacsvcgroup.js b/install/ui/hbacsvcgroup.js
index 2dd049cb..2dd049cb 100644
--- a/install/static/hbacsvcgroup.js
+++ b/install/ui/hbacsvcgroup.js
diff --git a/install/static/header.png b/install/ui/header.png
index 265d9b40..265d9b40 100644
--- a/install/static/header.png
+++ b/install/ui/header.png
diff --git a/install/static/header_background.png b/install/ui/header_background.png
index 609a4575..609a4575 100644
--- a/install/static/header_background.png
+++ b/install/ui/header_background.png
diff --git a/install/static/header_logo.png b/install/ui/header_logo.png
index 2b8e6536..2b8e6536 100644
--- a/install/static/header_logo.png
+++ b/install/ui/header_logo.png
diff --git a/install/static/host.js b/install/ui/host.js
index c3851ff7..c3851ff7 100644
--- a/install/static/host.js
+++ b/install/ui/host.js
diff --git a/install/static/hostgroup.js b/install/ui/hostgroup.js
index 0525c05f..0525c05f 100644
--- a/install/static/hostgroup.js
+++ b/install/ui/hostgroup.js
diff --git a/install/static/index.html b/install/ui/index.html
index 7ee4aa61..7ee4aa61 100644
--- a/install/static/index.html
+++ b/install/ui/index.html
diff --git a/install/static/ipa.css b/install/ui/ipa.css
index 5726ad99..5726ad99 100644
--- a/install/static/ipa.css
+++ b/install/ui/ipa.css
diff --git a/install/static/ipa.js b/install/ui/ipa.js
index 48c116a8..48c116a8 100644
--- a/install/static/ipa.js
+++ b/install/ui/ipa.js
diff --git a/install/static/ipa_logo_180x50.png b/install/ui/ipa_logo_180x50.png
index defa78cf..defa78cf 100644
--- a/install/static/ipa_logo_180x50.png
+++ b/install/ui/ipa_logo_180x50.png
diff --git a/install/static/ipalogo.png b/install/ui/ipalogo.png
index 62185c1b..62185c1b 100644
--- a/install/static/ipalogo.png
+++ b/install/ui/ipalogo.png
diff --git a/install/static/jquery-ui.css b/install/ui/jquery-ui.css
index 01c3ec90..01c3ec90 100644
--- a/install/static/jquery-ui.css
+++ b/install/ui/jquery-ui.css
diff --git a/install/static/jquery-ui.js b/install/ui/jquery-ui.js
index b1cac98b..b1cac98b 100644
--- a/install/static/jquery-ui.js
+++ b/install/ui/jquery-ui.js
diff --git a/install/static/jquery.ba-bbq.js b/install/ui/jquery.ba-bbq.js
index bcbf2483..bcbf2483 100644
--- a/install/static/jquery.ba-bbq.js
+++ b/install/ui/jquery.ba-bbq.js
diff --git a/install/static/jquery.cookie.js b/install/ui/jquery.cookie.js
index 6df1faca..6df1faca 100644
--- a/install/static/jquery.cookie.js
+++ b/install/ui/jquery.cookie.js
diff --git a/install/static/jquery.js b/install/ui/jquery.js
index fff67764..fff67764 100644
--- a/install/static/jquery.js
+++ b/install/ui/jquery.js
diff --git a/install/static/jsl.conf b/install/ui/jsl.conf
index 1d7190e4..1d7190e4 100644
--- a/install/static/jsl.conf
+++ b/install/ui/jsl.conf
diff --git a/install/static/json2.js b/install/ui/json2.js
index 0a4cabb3..0a4cabb3 100644
--- a/install/static/json2.js
+++ b/install/ui/json2.js
diff --git a/install/static/layouts/Makefile.am b/install/ui/layouts/Makefile.am
index 9e1ee7b7..711c236f 100644
--- a/install/static/layouts/Makefile.am
+++ b/install/ui/layouts/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS =  				\
 	default				\
 	$(NULL)
 
-appdir = $(IPA_DATA_DIR)/static/layouts
+appdir = $(IPA_DATA_DIR)/ui/layouts
 app_DATA =                              \
 	$(NULL)
 
diff --git a/install/static/layouts/default/Makefile.am b/install/ui/layouts/default/Makefile.am
index b02c1c50..82a58c7f 100644
--- a/install/static/layouts/default/Makefile.am
+++ b/install/ui/layouts/default/Makefile.am
@@ -5,7 +5,7 @@ NULL =
 SUBDIRS =  				\
 	$(NULL)
 
-appdir = $(IPA_DATA_DIR)/static/layouts/default
+appdir = $(IPA_DATA_DIR)/ui/layouts/default
 app_DATA =                              \
 	hbacrule-details-accesstime.html	\
 	hbacrule-details-general.html	\
diff --git a/install/static/layouts/default/hbacrule-details-accesstime.html b/install/ui/layouts/default/hbacrule-details-accesstime.html
index 8d5e258b..8d5e258b 100755
--- a/install/static/layouts/default/hbacrule-details-accesstime.html
+++ b/install/ui/layouts/default/hbacrule-details-accesstime.html
diff --git a/install/static/layouts/default/hbacrule-details-general.html b/install/ui/layouts/default/hbacrule-details-general.html
index 97836909..97836909 100755
--- a/install/static/layouts/default/hbacrule-details-general.html
+++ b/install/ui/layouts/default/hbacrule-details-general.html
diff --git a/install/static/layouts/default/hbacrule-details-host.html b/install/ui/layouts/default/hbacrule-details-host.html
index 1ba386da..1ba386da 100755
--- a/install/static/layouts/default/hbacrule-details-host.html
+++ b/install/ui/layouts/default/hbacrule-details-host.html
diff --git a/install/static/layouts/default/hbacrule-details-service.html b/install/ui/layouts/default/hbacrule-details-service.html
index 77e8420d..77e8420d 100755
--- a/install/static/layouts/default/hbacrule-details-service.html
+++ b/install/ui/layouts/default/hbacrule-details-service.html
diff --git a/install/static/layouts/default/hbacrule-details-sourcehost.html b/install/ui/layouts/default/hbacrule-details-sourcehost.html
index aae1ef38..aae1ef38 100755
--- a/install/static/layouts/default/hbacrule-details-sourcehost.html
+++ b/install/ui/layouts/default/hbacrule-details-sourcehost.html
diff --git a/install/static/layouts/default/hbacrule-details-user.html b/install/ui/layouts/default/hbacrule-details-user.html
index 1b58848f..1b58848f 100755
--- a/install/static/layouts/default/hbacrule-details-user.html
+++ b/install/ui/layouts/default/hbacrule-details-user.html
diff --git a/install/static/layouts/default/sudorule-details-general.html b/install/ui/layouts/default/sudorule-details-general.html
index 728ecf11..728ecf11 100755
--- a/install/static/layouts/default/sudorule-details-general.html
+++ b/install/ui/layouts/default/sudorule-details-general.html
diff --git a/install/static/layouts/default/sudorule-group-dialog.html b/install/ui/layouts/default/sudorule-group-dialog.html
index d576f1a1..d576f1a1 100755
--- a/install/static/layouts/default/sudorule-group-dialog.html
+++ b/install/ui/layouts/default/sudorule-group-dialog.html
diff --git a/install/static/layouts/default/sudorule-host-dialog.html b/install/ui/layouts/default/sudorule-host-dialog.html
index 5eec4186..5eec4186 100755
--- a/install/static/layouts/default/sudorule-host-dialog.html
+++ b/install/ui/layouts/default/sudorule-host-dialog.html
diff --git a/install/static/layouts/default/sudorule-hostgroup-dialog.html b/install/ui/layouts/default/sudorule-hostgroup-dialog.html
index 57d72f38..57d72f38 100755
--- a/install/static/layouts/default/sudorule-hostgroup-dialog.html
+++ b/install/ui/layouts/default/sudorule-hostgroup-dialog.html
diff --git a/install/static/layouts/default/sudorule-user-dialog.html b/install/ui/layouts/default/sudorule-user-dialog.html
index 78687cea..78687cea 100755
--- a/install/static/layouts/default/sudorule-user-dialog.html
+++ b/install/ui/layouts/default/sudorule-user-dialog.html
diff --git a/install/static/modal-background.png b/install/ui/modal-background.png
index 605d8220..605d8220 100644
--- a/install/static/modal-background.png
+++ b/install/ui/modal-background.png
diff --git a/install/static/navigation.js b/install/ui/navigation.js
index 7ae5b656..7ae5b656 100644
--- a/install/static/navigation.js
+++ b/install/ui/navigation.js
diff --git a/install/static/netgroup.js b/install/ui/netgroup.js
index 20567351..20567351 100644
--- a/install/static/netgroup.js
+++ b/install/ui/netgroup.js
diff --git a/install/static/outer-bg.png b/install/ui/outer-bg.png
index a6f81d64..a6f81d64 100644
--- a/install/static/outer-bg.png
+++ b/install/ui/outer-bg.png
diff --git a/install/static/panel-background.png b/install/ui/panel-background.png
index 9f9f4d69..9f9f4d69 100644
--- a/install/static/panel-background.png
+++ b/install/ui/panel-background.png
diff --git a/install/static/policy.js b/install/ui/policy.js
index eeec44e3..eeec44e3 100644
--- a/install/static/policy.js
+++ b/install/ui/policy.js
diff --git a/install/static/rule.js b/install/ui/rule.js
index f625f853..f625f853 100644
--- a/install/static/rule.js
+++ b/install/ui/rule.js
diff --git a/install/static/search.js b/install/ui/search.js
index 934000b9..934000b9 100644
--- a/install/static/search.js
+++ b/install/ui/search.js
diff --git a/install/static/serverconfig.js b/install/ui/serverconfig.js
index 6c0a824b..6c0a824b 100644
--- a/install/static/serverconfig.js
+++ b/install/ui/serverconfig.js
diff --git a/install/static/service.js b/install/ui/service.js
index 81f00ec7..81f00ec7 100644
--- a/install/static/service.js
+++ b/install/ui/service.js
diff --git a/install/static/spinner_header.gif b/install/ui/spinner_header.gif
index ba9fb781..ba9fb781 100644
--- a/install/static/spinner_header.gif
+++ b/install/ui/spinner_header.gif
diff --git a/install/static/spinner_large.gif b/install/ui/spinner_large.gif
index 276dd5a7..276dd5a7 100644
--- a/install/static/spinner_large.gif
+++ b/install/ui/spinner_large.gif
diff --git a/install/static/spinner_small.gif b/install/ui/spinner_small.gif
index 1a2da81c..1a2da81c 100644
--- a/install/static/spinner_small.gif
+++ b/install/ui/spinner_small.gif
diff --git a/install/static/sudocmd.js b/install/ui/sudocmd.js
index e398ae8f..e398ae8f 100644
--- a/install/static/sudocmd.js
+++ b/install/ui/sudocmd.js
diff --git a/install/static/sudocmdgroup.js b/install/ui/sudocmdgroup.js
index 6cb2b83d..6cb2b83d 100644
--- a/install/static/sudocmdgroup.js
+++ b/install/ui/sudocmdgroup.js
diff --git a/install/static/sudorule.js b/install/ui/sudorule.js
index 94f3247b..94f3247b 100644
--- a/install/static/sudorule.js
+++ b/install/ui/sudorule.js
diff --git a/install/static/test/README b/install/ui/test/README
index 96e7f9e8..96e7f9e8 100755
--- a/install/static/test/README
+++ b/install/ui/test/README
diff --git a/install/static/test/aci_tests.html b/install/ui/test/aci_tests.html
index 7cdbeffa..7cdbeffa 100755
--- a/install/static/test/aci_tests.html
+++ b/install/ui/test/aci_tests.html
diff --git a/install/static/test/aci_tests.js b/install/ui/test/aci_tests.js
index c51b556d..c51b556d 100644
--- a/install/static/test/aci_tests.js
+++ b/install/ui/test/aci_tests.js
diff --git a/install/static/test/all_tests.html b/install/ui/test/all_tests.html
index 6a29daff..6a29daff 100644
--- a/install/static/test/all_tests.html
+++ b/install/ui/test/all_tests.html
diff --git a/install/static/test/association_tests.html b/install/ui/test/association_tests.html
index 40b3c208..40b3c208 100644
--- a/install/static/test/association_tests.html
+++ b/install/ui/test/association_tests.html
diff --git a/install/static/test/association_tests.js b/install/ui/test/association_tests.js
index a65678a7..a65678a7 100644
--- a/install/static/test/association_tests.js
+++ b/install/ui/test/association_tests.js
diff --git a/install/static/test/certificate_tests.html b/install/ui/test/certificate_tests.html
index 5b411ff1..5b411ff1 100755
--- a/install/static/test/certificate_tests.html
+++ b/install/ui/test/certificate_tests.html
diff --git a/install/static/test/certificate_tests.js b/install/ui/test/certificate_tests.js
index c50ec186..c50ec186 100755
--- a/install/static/test/certificate_tests.js
+++ b/install/ui/test/certificate_tests.js
diff --git a/install/static/test/data/aci_find.json b/install/ui/test/data/aci_find.json
index 00682ffd..00682ffd 100644
--- a/install/static/test/data/aci_find.json
+++ b/install/ui/test/data/aci_find.json
diff --git a/install/static/test/data/automountlocation_find.json b/install/ui/test/data/automountlocation_find.json
index ea1a54e8..ea1a54e8 100644
--- a/install/static/test/data/automountlocation_find.json
+++ b/install/ui/test/data/automountlocation_find.json
diff --git a/install/static/test/data/automountlocation_show.json b/install/ui/test/data/automountlocation_show.json
index 97ce2624..97ce2624 100644
--- a/install/static/test/data/automountlocation_show.json
+++ b/install/ui/test/data/automountlocation_show.json
diff --git a/install/static/test/data/cert_remove_hold.json b/install/ui/test/data/cert_remove_hold.json
index 12548cb2..12548cb2 100644
--- a/install/static/test/data/cert_remove_hold.json
+++ b/install/ui/test/data/cert_remove_hold.json
diff --git a/install/static/test/data/cert_request.json b/install/ui/test/data/cert_request.json
index c4410729..c4410729 100644
--- a/install/static/test/data/cert_request.json
+++ b/install/ui/test/data/cert_request.json
diff --git a/install/static/test/data/cert_revoke.json b/install/ui/test/data/cert_revoke.json
index 3fca1ee6..3fca1ee6 100644
--- a/install/static/test/data/cert_revoke.json
+++ b/install/ui/test/data/cert_revoke.json
diff --git a/install/static/test/data/cert_show.json b/install/ui/test/data/cert_show.json
index 71d895f0..71d895f0 100644
--- a/install/static/test/data/cert_show.json
+++ b/install/ui/test/data/cert_show.json
diff --git a/install/static/test/data/config_show.json b/install/ui/test/data/config_show.json
index e3b6154b..e3b6154b 100644
--- a/install/static/test/data/config_show.json
+++ b/install/ui/test/data/config_show.json
diff --git a/install/static/test/data/delegation_find.json b/install/ui/test/data/delegation_find.json
index 82b31fc5..82b31fc5 100644
--- a/install/static/test/data/delegation_find.json
+++ b/install/ui/test/data/delegation_find.json
diff --git a/install/static/test/data/delegation_list.json b/install/ui/test/data/delegation_list.json
index d4d9fc06..d4d9fc06 100644
--- a/install/static/test/data/delegation_list.json
+++ b/install/ui/test/data/delegation_list.json
diff --git a/install/static/test/data/delegation_mod.json b/install/ui/test/data/delegation_mod.json
index 9f7da68b..9f7da68b 100644
--- a/install/static/test/data/delegation_mod.json
+++ b/install/ui/test/data/delegation_mod.json
diff --git a/install/static/test/data/delegation_show.json b/install/ui/test/data/delegation_show.json
index 9444c875..9444c875 100644
--- a/install/static/test/data/delegation_show.json
+++ b/install/ui/test/data/delegation_show.json
diff --git a/install/static/test/data/dns_find.json b/install/ui/test/data/dns_find.json
index c3b49f41..c3b49f41 100644
--- a/install/static/test/data/dns_find.json
+++ b/install/ui/test/data/dns_find.json
diff --git a/install/static/test/data/dns_find_rr.json b/install/ui/test/data/dns_find_rr.json
index 4183f703..4183f703 100644
--- a/install/static/test/data/dns_find_rr.json
+++ b/install/ui/test/data/dns_find_rr.json
diff --git a/install/static/test/data/dns_show.json b/install/ui/test/data/dns_show.json
index 3f3046a5..3f3046a5 100644
--- a/install/static/test/data/dns_show.json
+++ b/install/ui/test/data/dns_show.json
diff --git a/install/static/test/data/dnsrecord_add.json b/install/ui/test/data/dnsrecord_add.json
index 968d3f60..968d3f60 100644
--- a/install/static/test/data/dnsrecord_add.json
+++ b/install/ui/test/data/dnsrecord_add.json
diff --git a/install/static/test/data/dnsrecord_del.json b/install/ui/test/data/dnsrecord_del.json
index 93a53627..93a53627 100644
--- a/install/static/test/data/dnsrecord_del.json
+++ b/install/ui/test/data/dnsrecord_del.json
diff --git a/install/static/test/data/dnsrecord_find.json b/install/ui/test/data/dnsrecord_find.json
index 1d64b3ab..1d64b3ab 100644
--- a/install/static/test/data/dnsrecord_find.json
+++ b/install/ui/test/data/dnsrecord_find.json
diff --git a/install/static/test/data/dnszone_add.json b/install/ui/test/data/dnszone_add.json
index 6870acc5..6870acc5 100644
--- a/install/static/test/data/dnszone_add.json
+++ b/install/ui/test/data/dnszone_add.json
diff --git a/install/static/test/data/dnszone_find.json b/install/ui/test/data/dnszone_find.json
index b8f76d41..b8f76d41 100644
--- a/install/static/test/data/dnszone_find.json
+++ b/install/ui/test/data/dnszone_find.json
diff --git a/install/static/test/data/dnszone_show.json b/install/ui/test/data/dnszone_show.json
index 35e50762..35e50762 100644
--- a/install/static/test/data/dnszone_show.json
+++ b/install/ui/test/data/dnszone_show.json
diff --git a/install/static/test/data/group_add.json b/install/ui/test/data/group_add.json
index 180f5f11..180f5f11 100644
--- a/install/static/test/data/group_add.json
+++ b/install/ui/test/data/group_add.json
diff --git a/install/static/test/data/group_add_member.json b/install/ui/test/data/group_add_member.json
index 7f10d105..7f10d105 100644
--- a/install/static/test/data/group_add_member.json
+++ b/install/ui/test/data/group_add_member.json
diff --git a/install/static/test/data/group_find.json b/install/ui/test/data/group_find.json
index 902689a0..902689a0 100644
--- a/install/static/test/data/group_find.json
+++ b/install/ui/test/data/group_find.json
diff --git a/install/static/test/data/group_member_user.json b/install/ui/test/data/group_member_user.json
index 971b13d4..971b13d4 100644
--- a/install/static/test/data/group_member_user.json
+++ b/install/ui/test/data/group_member_user.json
diff --git a/install/static/test/data/group_remove_member.json b/install/ui/test/data/group_remove_member.json
index 0118438a..0118438a 100644
--- a/install/static/test/data/group_remove_member.json
+++ b/install/ui/test/data/group_remove_member.json
diff --git a/install/static/test/data/group_show.json b/install/ui/test/data/group_show.json
index 536b120c..536b120c 100644
--- a/install/static/test/data/group_show.json
+++ b/install/ui/test/data/group_show.json
diff --git a/install/static/test/data/hbacrule_add.json b/install/ui/test/data/hbacrule_add.json
index 2a5d251b..2a5d251b 100644
--- a/install/static/test/data/hbacrule_add.json
+++ b/install/ui/test/data/hbacrule_add.json
diff --git a/install/static/test/data/hbacrule_add_accesstime.json b/install/ui/test/data/hbacrule_add_accesstime.json
index 3c631155..3c631155 100644
--- a/install/static/test/data/hbacrule_add_accesstime.json
+++ b/install/ui/test/data/hbacrule_add_accesstime.json
diff --git a/install/static/test/data/hbacrule_add_host.json b/install/ui/test/data/hbacrule_add_host.json
index 038d6aea..038d6aea 100644
--- a/install/static/test/data/hbacrule_add_host.json
+++ b/install/ui/test/data/hbacrule_add_host.json
diff --git a/install/static/test/data/hbacrule_add_service.json b/install/ui/test/data/hbacrule_add_service.json
index c658fe8b..c658fe8b 100644
--- a/install/static/test/data/hbacrule_add_service.json
+++ b/install/ui/test/data/hbacrule_add_service.json
diff --git a/install/static/test/data/hbacrule_add_sourcehost.json b/install/ui/test/data/hbacrule_add_sourcehost.json
index a657207f..a657207f 100644
--- a/install/static/test/data/hbacrule_add_sourcehost.json
+++ b/install/ui/test/data/hbacrule_add_sourcehost.json
diff --git a/install/static/test/data/hbacrule_add_user.json b/install/ui/test/data/hbacrule_add_user.json
index 0c4c976e..0c4c976e 100644
--- a/install/static/test/data/hbacrule_add_user.json
+++ b/install/ui/test/data/hbacrule_add_user.json
diff --git a/install/static/test/data/hbacrule_del.json b/install/ui/test/data/hbacrule_del.json
index 2197a12c..2197a12c 100644
--- a/install/static/test/data/hbacrule_del.json
+++ b/install/ui/test/data/hbacrule_del.json
diff --git a/install/static/test/data/hbacrule_find.json b/install/ui/test/data/hbacrule_find.json
index fd95d9f5..fd95d9f5 100644
--- a/install/static/test/data/hbacrule_find.json
+++ b/install/ui/test/data/hbacrule_find.json
diff --git a/install/static/test/data/hbacrule_mod.json b/install/ui/test/data/hbacrule_mod.json
index ea2b4d1e..ea2b4d1e 100644
--- a/install/static/test/data/hbacrule_mod.json
+++ b/install/ui/test/data/hbacrule_mod.json
diff --git a/install/static/test/data/hbacrule_remove_accesstime.json b/install/ui/test/data/hbacrule_remove_accesstime.json
index 3c631155..3c631155 100644
--- a/install/static/test/data/hbacrule_remove_accesstime.json
+++ b/install/ui/test/data/hbacrule_remove_accesstime.json
diff --git a/install/static/test/data/hbacrule_remove_host.json b/install/ui/test/data/hbacrule_remove_host.json
index 02f56ecd..02f56ecd 100644
--- a/install/static/test/data/hbacrule_remove_host.json
+++ b/install/ui/test/data/hbacrule_remove_host.json
diff --git a/install/static/test/data/hbacrule_remove_service.json b/install/ui/test/data/hbacrule_remove_service.json
index f8b6b51a..f8b6b51a 100644
--- a/install/static/test/data/hbacrule_remove_service.json
+++ b/install/ui/test/data/hbacrule_remove_service.json
diff --git a/install/static/test/data/hbacrule_remove_sourcehost.json b/install/ui/test/data/hbacrule_remove_sourcehost.json
index da32f76e..da32f76e 100644
--- a/install/static/test/data/hbacrule_remove_sourcehost.json
+++ b/install/ui/test/data/hbacrule_remove_sourcehost.json
diff --git a/install/static/test/data/hbacrule_remove_user.json b/install/ui/test/data/hbacrule_remove_user.json
index f25317e8..f25317e8 100644
--- a/install/static/test/data/hbacrule_remove_user.json
+++ b/install/ui/test/data/hbacrule_remove_user.json
diff --git a/install/static/test/data/hbacrule_show.json b/install/ui/test/data/hbacrule_show.json
index 2c0b64b3..2c0b64b3 100644
--- a/install/static/test/data/hbacrule_show.json
+++ b/install/ui/test/data/hbacrule_show.json
diff --git a/install/static/test/data/hbacsvc_add.json b/install/ui/test/data/hbacsvc_add.json
index 87eb51d7..87eb51d7 100644
--- a/install/static/test/data/hbacsvc_add.json
+++ b/install/ui/test/data/hbacsvc_add.json
diff --git a/install/static/test/data/hbacsvc_del.json b/install/ui/test/data/hbacsvc_del.json
index fcfce625..fcfce625 100644
--- a/install/static/test/data/hbacsvc_del.json
+++ b/install/ui/test/data/hbacsvc_del.json
diff --git a/install/static/test/data/hbacsvc_find.json b/install/ui/test/data/hbacsvc_find.json
index 86a9bcaa..86a9bcaa 100644
--- a/install/static/test/data/hbacsvc_find.json
+++ b/install/ui/test/data/hbacsvc_find.json
diff --git a/install/static/test/data/hbacsvc_mod.json b/install/ui/test/data/hbacsvc_mod.json
index 335009a9..335009a9 100644
--- a/install/static/test/data/hbacsvc_mod.json
+++ b/install/ui/test/data/hbacsvc_mod.json
diff --git a/install/static/test/data/hbacsvc_show.json b/install/ui/test/data/hbacsvc_show.json
index 8ebfbd7c..8ebfbd7c 100644
--- a/install/static/test/data/hbacsvc_show.json
+++ b/install/ui/test/data/hbacsvc_show.json
diff --git a/install/static/test/data/hbacsvcgroup_add.json b/install/ui/test/data/hbacsvcgroup_add.json
index 0dd1e96f..0dd1e96f 100644
--- a/install/static/test/data/hbacsvcgroup_add.json
+++ b/install/ui/test/data/hbacsvcgroup_add.json
diff --git a/install/static/test/data/hbacsvcgroup_add_member.json b/install/ui/test/data/hbacsvcgroup_add_member.json
index 8526e184..8526e184 100644
--- a/install/static/test/data/hbacsvcgroup_add_member.json
+++ b/install/ui/test/data/hbacsvcgroup_add_member.json
diff --git a/install/static/test/data/hbacsvcgroup_del.json b/install/ui/test/data/hbacsvcgroup_del.json
index 134f7417..134f7417 100644
--- a/install/static/test/data/hbacsvcgroup_del.json
+++ b/install/ui/test/data/hbacsvcgroup_del.json
diff --git a/install/static/test/data/hbacsvcgroup_find.json b/install/ui/test/data/hbacsvcgroup_find.json
index 797530e3..797530e3 100644
--- a/install/static/test/data/hbacsvcgroup_find.json
+++ b/install/ui/test/data/hbacsvcgroup_find.json
diff --git a/install/static/test/data/hbacsvcgroup_member_hbacsvc.json b/install/ui/test/data/hbacsvcgroup_member_hbacsvc.json
index a407a622..a407a622 100644
--- a/install/static/test/data/hbacsvcgroup_member_hbacsvc.json
+++ b/install/ui/test/data/hbacsvcgroup_member_hbacsvc.json
diff --git a/install/static/test/data/hbacsvcgroup_mod.json b/install/ui/test/data/hbacsvcgroup_mod.json
index e0ec916d..e0ec916d 100644
--- a/install/static/test/data/hbacsvcgroup_mod.json
+++ b/install/ui/test/data/hbacsvcgroup_mod.json
diff --git a/install/static/test/data/hbacsvcgroup_remove_member.json b/install/ui/test/data/hbacsvcgroup_remove_member.json
index cdf41378..cdf41378 100644
--- a/install/static/test/data/hbacsvcgroup_remove_member.json
+++ b/install/ui/test/data/hbacsvcgroup_remove_member.json
diff --git a/install/static/test/data/hbacsvcgroup_show.json b/install/ui/test/data/hbacsvcgroup_show.json
index ad3c4253..ad3c4253 100644
--- a/install/static/test/data/hbacsvcgroup_show.json
+++ b/install/ui/test/data/hbacsvcgroup_show.json
diff --git a/install/static/test/data/host_add.json b/install/ui/test/data/host_add.json
index 8b4d8b93..8b4d8b93 100644
--- a/install/static/test/data/host_add.json
+++ b/install/ui/test/data/host_add.json
diff --git a/install/static/test/data/host_disable_dev.example.com.json b/install/ui/test/data/host_disable_dev.example.com.json
index 06f5aaa9..06f5aaa9 100644
--- a/install/static/test/data/host_disable_dev.example.com.json
+++ b/install/ui/test/data/host_disable_dev.example.com.json
diff --git a/install/static/test/data/host_find.json b/install/ui/test/data/host_find.json
index 48b1fcb8..48b1fcb8 100644
--- a/install/static/test/data/host_find.json
+++ b/install/ui/test/data/host_find.json
diff --git a/install/static/test/data/host_mod.json b/install/ui/test/data/host_mod.json
index 3cb7d9ec..3cb7d9ec 100644
--- a/install/static/test/data/host_mod.json
+++ b/install/ui/test/data/host_mod.json
diff --git a/install/static/test/data/host_show.json b/install/ui/test/data/host_show.json
index b8780231..b8780231 100644
--- a/install/static/test/data/host_show.json
+++ b/install/ui/test/data/host_show.json
diff --git a/install/static/test/data/host_show_dev.example.com.json b/install/ui/test/data/host_show_dev.example.com.json
index 1ee9f445..1ee9f445 100644
--- a/install/static/test/data/host_show_dev.example.com.json
+++ b/install/ui/test/data/host_show_dev.example.com.json
diff --git a/install/static/test/data/host_show_test.example.com.json b/install/ui/test/data/host_show_test.example.com.json
index b8780231..b8780231 100644
--- a/install/static/test/data/host_show_test.example.com.json
+++ b/install/ui/test/data/host_show_test.example.com.json
diff --git a/install/static/test/data/hostgroup_add.json b/install/ui/test/data/hostgroup_add.json
index bc41ee7d..bc41ee7d 100644
--- a/install/static/test/data/hostgroup_add.json
+++ b/install/ui/test/data/hostgroup_add.json
diff --git a/install/static/test/data/hostgroup_add_member.json b/install/ui/test/data/hostgroup_add_member.json
index a9220175..a9220175 100644
--- a/install/static/test/data/hostgroup_add_member.json
+++ b/install/ui/test/data/hostgroup_add_member.json
diff --git a/install/static/test/data/hostgroup_find.json b/install/ui/test/data/hostgroup_find.json
index 6732910c..6732910c 100644
--- a/install/static/test/data/hostgroup_find.json
+++ b/install/ui/test/data/hostgroup_find.json
diff --git a/install/static/test/data/hostgroup_member_host.json b/install/ui/test/data/hostgroup_member_host.json
index c4c7dfa9..c4c7dfa9 100644
--- a/install/static/test/data/hostgroup_member_host.json
+++ b/install/ui/test/data/hostgroup_member_host.json
diff --git a/install/static/test/data/hostgroup_show.json b/install/ui/test/data/hostgroup_show.json
index 776d446d..776d446d 100644
--- a/install/static/test/data/hostgroup_show.json
+++ b/install/ui/test/data/hostgroup_show.json
diff --git a/install/static/test/data/i18n_messages.json b/install/ui/test/data/i18n_messages.json
index 6dfb1c64..6dfb1c64 100644
--- a/install/static/test/data/i18n_messages.json
+++ b/install/ui/test/data/i18n_messages.json
diff --git a/install/static/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index e0e6053c..e0e6053c 100644
--- a/install/static/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
diff --git a/install/static/test/data/json_metadata.json b/install/ui/test/data/json_metadata.json
index 222a8b65..222a8b65 100644
--- a/install/static/test/data/json_metadata.json
+++ b/install/ui/test/data/json_metadata.json
diff --git a/install/static/test/data/krbtpolicy_show.json b/install/ui/test/data/krbtpolicy_show.json
index 39882e14..39882e14 100644
--- a/install/static/test/data/krbtpolicy_show.json
+++ b/install/ui/test/data/krbtpolicy_show.json
diff --git a/install/static/test/data/netgroup_add.json b/install/ui/test/data/netgroup_add.json
index 989bb5db..989bb5db 100644
--- a/install/static/test/data/netgroup_add.json
+++ b/install/ui/test/data/netgroup_add.json
diff --git a/install/static/test/data/netgroup_add_member.json b/install/ui/test/data/netgroup_add_member.json
index 5fbae9e1..5fbae9e1 100644
--- a/install/static/test/data/netgroup_add_member.json
+++ b/install/ui/test/data/netgroup_add_member.json
diff --git a/install/static/test/data/netgroup_find.json b/install/ui/test/data/netgroup_find.json
index 15626e0b..15626e0b 100644
--- a/install/static/test/data/netgroup_find.json
+++ b/install/ui/test/data/netgroup_find.json
diff --git a/install/static/test/data/netgroup_show.json b/install/ui/test/data/netgroup_show.json
index aa77e888..aa77e888 100644
--- a/install/static/test/data/netgroup_show.json
+++ b/install/ui/test/data/netgroup_show.json
diff --git a/install/static/test/data/permission_add.json b/install/ui/test/data/permission_add.json
index 9ea7b226..9ea7b226 100644
--- a/install/static/test/data/permission_add.json
+++ b/install/ui/test/data/permission_add.json
diff --git a/install/static/test/data/permission_del b/install/ui/test/data/permission_del
index c1136898..c1136898 100644
--- a/install/static/test/data/permission_del
+++ b/install/ui/test/data/permission_del
diff --git a/install/static/test/data/permission_find.json b/install/ui/test/data/permission_find.json
index cad5f086..cad5f086 100644
--- a/install/static/test/data/permission_find.json
+++ b/install/ui/test/data/permission_find.json
diff --git a/install/static/test/data/permission_show.json b/install/ui/test/data/permission_show.json
index d823061d..d823061d 100644
--- a/install/static/test/data/permission_show.json
+++ b/install/ui/test/data/permission_show.json
diff --git a/install/static/test/data/privilege_find.json b/install/ui/test/data/privilege_find.json
index c48c4a0e..c48c4a0e 100644
--- a/install/static/test/data/privilege_find.json
+++ b/install/ui/test/data/privilege_find.json
diff --git a/install/static/test/data/privilege_show.json b/install/ui/test/data/privilege_show.json
index 7d9328aa..7d9328aa 100644
--- a/install/static/test/data/privilege_show.json
+++ b/install/ui/test/data/privilege_show.json
diff --git a/install/static/test/data/pwpolicy_find.json b/install/ui/test/data/pwpolicy_find.json
index 629ebfc9..629ebfc9 100644
--- a/install/static/test/data/pwpolicy_find.json
+++ b/install/ui/test/data/pwpolicy_find.json
diff --git a/install/static/test/data/pwpolicy_mod.json b/install/ui/test/data/pwpolicy_mod.json
index 44d58951..44d58951 100644
--- a/install/static/test/data/pwpolicy_mod.json
+++ b/install/ui/test/data/pwpolicy_mod.json
diff --git a/install/static/test/data/pwpolicy_show.json b/install/ui/test/data/pwpolicy_show.json
index e91f52ef..e91f52ef 100644
--- a/install/static/test/data/pwpolicy_show.json
+++ b/install/ui/test/data/pwpolicy_show.json
diff --git a/install/static/test/data/role_find.json b/install/ui/test/data/role_find.json
index af013803..af013803 100644
--- a/install/static/test/data/role_find.json
+++ b/install/ui/test/data/role_find.json
diff --git a/install/static/test/data/role_show.json b/install/ui/test/data/role_show.json
index 9ad8dd68..9ad8dd68 100644
--- a/install/static/test/data/role_show.json
+++ b/install/ui/test/data/role_show.json
diff --git a/install/static/test/data/rolegroup_add.json b/install/ui/test/data/rolegroup_add.json
index 54e2c283..54e2c283 100644
--- a/install/static/test/data/rolegroup_add.json
+++ b/install/ui/test/data/rolegroup_add.json
diff --git a/install/static/test/data/rolegroup_add_member.json b/install/ui/test/data/rolegroup_add_member.json
index e68ecc28..e68ecc28 100644
--- a/install/static/test/data/rolegroup_add_member.json
+++ b/install/ui/test/data/rolegroup_add_member.json
diff --git a/install/static/test/data/rolegroup_del.json b/install/ui/test/data/rolegroup_del.json
index 8af1e630..8af1e630 100644
--- a/install/static/test/data/rolegroup_del.json
+++ b/install/ui/test/data/rolegroup_del.json
diff --git a/install/static/test/data/rolegroup_find.json b/install/ui/test/data/rolegroup_find.json
index 8ed2a76b..8ed2a76b 100644
--- a/install/static/test/data/rolegroup_find.json
+++ b/install/ui/test/data/rolegroup_find.json
diff --git a/install/static/test/data/rolegroup_remove_member.json b/install/ui/test/data/rolegroup_remove_member.json
index d42bb601..d42bb601 100644
--- a/install/static/test/data/rolegroup_remove_member.json
+++ b/install/ui/test/data/rolegroup_remove_member.json
diff --git a/install/static/test/data/rolegroup_show.json b/install/ui/test/data/rolegroup_show.json
index 4652fb2c..4652fb2c 100644
--- a/install/static/test/data/rolegroup_show.json
+++ b/install/ui/test/data/rolegroup_show.json
diff --git a/install/static/test/data/selfservice_find.json b/install/ui/test/data/selfservice_find.json
index 91db6e40..91db6e40 100644
--- a/install/static/test/data/selfservice_find.json
+++ b/install/ui/test/data/selfservice_find.json
diff --git a/install/static/test/data/selfservice_show.json b/install/ui/test/data/selfservice_show.json
index 358e6592..358e6592 100644
--- a/install/static/test/data/selfservice_show.json
+++ b/install/ui/test/data/selfservice_show.json
diff --git a/install/static/test/data/service_add.json b/install/ui/test/data/service_add.json
index 4275d9bb..4275d9bb 100644
--- a/install/static/test/data/service_add.json
+++ b/install/ui/test/data/service_add.json
diff --git a/install/static/test/data/service_add_host.json b/install/ui/test/data/service_add_host.json
index cb199e31..cb199e31 100644
--- a/install/static/test/data/service_add_host.json
+++ b/install/ui/test/data/service_add_host.json
diff --git a/install/static/test/data/service_del.json b/install/ui/test/data/service_del.json
index 053b0ad9..053b0ad9 100644
--- a/install/static/test/data/service_del.json
+++ b/install/ui/test/data/service_del.json
diff --git a/install/static/test/data/service_disable.json b/install/ui/test/data/service_disable.json
index d62c0547..d62c0547 100644
--- a/install/static/test/data/service_disable.json
+++ b/install/ui/test/data/service_disable.json
diff --git a/install/static/test/data/service_find.json b/install/ui/test/data/service_find.json
index b71ea9e3..b71ea9e3 100644
--- a/install/static/test/data/service_find.json
+++ b/install/ui/test/data/service_find.json
diff --git a/install/static/test/data/service_managedby_host.json b/install/ui/test/data/service_managedby_host.json
index 181fc5b9..181fc5b9 100644
--- a/install/static/test/data/service_managedby_host.json
+++ b/install/ui/test/data/service_managedby_host.json
diff --git a/install/static/test/data/service_mod.json b/install/ui/test/data/service_mod.json
index f5618646..f5618646 100644
--- a/install/static/test/data/service_mod.json
+++ b/install/ui/test/data/service_mod.json
diff --git a/install/static/test/data/service_remove_host.sh b/install/ui/test/data/service_remove_host.sh
index 15234f4d..15234f4d 100644
--- a/install/static/test/data/service_remove_host.sh
+++ b/install/ui/test/data/service_remove_host.sh
diff --git a/install/static/test/data/service_show.json b/install/ui/test/data/service_show.json
index 9cb11d53..9cb11d53 100644
--- a/install/static/test/data/service_show.json
+++ b/install/ui/test/data/service_show.json
diff --git a/install/static/test/data/sudocmd_add.json b/install/ui/test/data/sudocmd_add.json
index 6fb4a5fc..6fb4a5fc 100644
--- a/install/static/test/data/sudocmd_add.json
+++ b/install/ui/test/data/sudocmd_add.json
diff --git a/install/static/test/data/sudocmd_del.json b/install/ui/test/data/sudocmd_del.json
index d6bc5ad0..d6bc5ad0 100644
--- a/install/static/test/data/sudocmd_del.json
+++ b/install/ui/test/data/sudocmd_del.json
diff --git a/install/static/test/data/sudocmd_find.json b/install/ui/test/data/sudocmd_find.json
index f7f5a23e..f7f5a23e 100644
--- a/install/static/test/data/sudocmd_find.json
+++ b/install/ui/test/data/sudocmd_find.json
diff --git a/install/static/test/data/sudocmd_memberof_add.json b/install/ui/test/data/sudocmd_memberof_add.json
index fc45ef4e..fc45ef4e 100644
--- a/install/static/test/data/sudocmd_memberof_add.json
+++ b/install/ui/test/data/sudocmd_memberof_add.json
diff --git a/install/static/test/data/sudocmd_memberof_remove.json b/install/ui/test/data/sudocmd_memberof_remove.json
index c5e031b8..c5e031b8 100644
--- a/install/static/test/data/sudocmd_memberof_remove.json
+++ b/install/ui/test/data/sudocmd_memberof_remove.json
diff --git a/install/static/test/data/sudocmd_memberof_show.json b/install/ui/test/data/sudocmd_memberof_show.json
index 279dc6c9..279dc6c9 100644
--- a/install/static/test/data/sudocmd_memberof_show.json
+++ b/install/ui/test/data/sudocmd_memberof_show.json
diff --git a/install/static/test/data/sudocmd_mod.json b/install/ui/test/data/sudocmd_mod.json
index 82919cd2..82919cd2 100644
--- a/install/static/test/data/sudocmd_mod.json
+++ b/install/ui/test/data/sudocmd_mod.json
diff --git a/install/static/test/data/sudocmd_show.json b/install/ui/test/data/sudocmd_show.json
index b27c832f..b27c832f 100644
--- a/install/static/test/data/sudocmd_show.json
+++ b/install/ui/test/data/sudocmd_show.json
diff --git a/install/static/test/data/sudocmdgroup_add.json b/install/ui/test/data/sudocmdgroup_add.json
index ce389f56..ce389f56 100644
--- a/install/static/test/data/sudocmdgroup_add.json
+++ b/install/ui/test/data/sudocmdgroup_add.json
diff --git a/install/static/test/data/sudocmdgroup_add_member.json b/install/ui/test/data/sudocmdgroup_add_member.json
index 254746e6..254746e6 100644
--- a/install/static/test/data/sudocmdgroup_add_member.json
+++ b/install/ui/test/data/sudocmdgroup_add_member.json
diff --git a/install/static/test/data/sudocmdgroup_del.json b/install/ui/test/data/sudocmdgroup_del.json
index 24c7ab69..24c7ab69 100644
--- a/install/static/test/data/sudocmdgroup_del.json
+++ b/install/ui/test/data/sudocmdgroup_del.json
diff --git a/install/static/test/data/sudocmdgroup_find.json b/install/ui/test/data/sudocmdgroup_find.json
index d640e35b..d640e35b 100644
--- a/install/static/test/data/sudocmdgroup_find.json
+++ b/install/ui/test/data/sudocmdgroup_find.json
diff --git a/install/static/test/data/sudocmdgroup_member_sudocmd.json b/install/ui/test/data/sudocmdgroup_member_sudocmd.json
index 7871a468..7871a468 100644
--- a/install/static/test/data/sudocmdgroup_member_sudocmd.json
+++ b/install/ui/test/data/sudocmdgroup_member_sudocmd.json
diff --git a/install/static/test/data/sudocmdgroup_mod.json b/install/ui/test/data/sudocmdgroup_mod.json
index d0eb3226..d0eb3226 100644
--- a/install/static/test/data/sudocmdgroup_mod.json
+++ b/install/ui/test/data/sudocmdgroup_mod.json
diff --git a/install/static/test/data/sudocmdgroup_remove_member.json b/install/ui/test/data/sudocmdgroup_remove_member.json
index 22353c31..22353c31 100644
--- a/install/static/test/data/sudocmdgroup_remove_member.json
+++ b/install/ui/test/data/sudocmdgroup_remove_member.json
diff --git a/install/static/test/data/sudocmdgroup_show.json b/install/ui/test/data/sudocmdgroup_show.json
index 1478ba26..1478ba26 100644
--- a/install/static/test/data/sudocmdgroup_show.json
+++ b/install/ui/test/data/sudocmdgroup_show.json
diff --git a/install/static/test/data/sudorule_add.json b/install/ui/test/data/sudorule_add.json
index 396b4935..396b4935 100644
--- a/install/static/test/data/sudorule_add.json
+++ b/install/ui/test/data/sudorule_add.json
diff --git a/install/static/test/data/sudorule_del.json b/install/ui/test/data/sudorule_del.json
index c3097989..c3097989 100644
--- a/install/static/test/data/sudorule_del.json
+++ b/install/ui/test/data/sudorule_del.json
diff --git a/install/static/test/data/sudorule_find.json b/install/ui/test/data/sudorule_find.json
index a843b2a5..a843b2a5 100644
--- a/install/static/test/data/sudorule_find.json
+++ b/install/ui/test/data/sudorule_find.json
diff --git a/install/static/test/data/sudorule_mod.json b/install/ui/test/data/sudorule_mod.json
index 7785f5f5..7785f5f5 100644
--- a/install/static/test/data/sudorule_mod.json
+++ b/install/ui/test/data/sudorule_mod.json
diff --git a/install/static/test/data/sudorule_show.json b/install/ui/test/data/sudorule_show.json
index 51f83af7..51f83af7 100644
--- a/install/static/test/data/sudorule_show.json
+++ b/install/ui/test/data/sudorule_show.json
diff --git a/install/static/test/data/taskgroup_find.json b/install/ui/test/data/taskgroup_find.json
index fa5c4625..fa5c4625 100644
--- a/install/static/test/data/taskgroup_find.json
+++ b/install/ui/test/data/taskgroup_find.json
diff --git a/install/static/test/data/user_add.json b/install/ui/test/data/user_add.json
index e6a98b5c..e6a98b5c 100644
--- a/install/static/test/data/user_add.json
+++ b/install/ui/test/data/user_add.json
diff --git a/install/static/test/data/user_disable.json b/install/ui/test/data/user_disable.json
index 75a71fdf..75a71fdf 100644
--- a/install/static/test/data/user_disable.json
+++ b/install/ui/test/data/user_disable.json
diff --git a/install/static/test/data/user_enable.json b/install/ui/test/data/user_enable.json
index c596c81d..c596c81d 100644
--- a/install/static/test/data/user_enable.json
+++ b/install/ui/test/data/user_enable.json
diff --git a/install/static/test/data/user_find.json b/install/ui/test/data/user_find.json
index 8a409471..8a409471 100644
--- a/install/static/test/data/user_find.json
+++ b/install/ui/test/data/user_find.json
diff --git a/install/static/test/data/user_memberof_group.json b/install/ui/test/data/user_memberof_group.json
index e8f7a8fa..e8f7a8fa 100644
--- a/install/static/test/data/user_memberof_group.json
+++ b/install/ui/test/data/user_memberof_group.json
diff --git a/install/static/test/data/user_mod.json b/install/ui/test/data/user_mod.json
index c77012c1..c77012c1 100644
--- a/install/static/test/data/user_mod.json
+++ b/install/ui/test/data/user_mod.json
diff --git a/install/static/test/data/user_show.json b/install/ui/test/data/user_show.json
index 33893d77..33893d77 100644
--- a/install/static/test/data/user_show.json
+++ b/install/ui/test/data/user_show.json
diff --git a/install/static/test/data/whoami.json b/install/ui/test/data/whoami.json
index a922d372..a922d372 100644
--- a/install/static/test/data/whoami.json
+++ b/install/ui/test/data/whoami.json
diff --git a/install/static/test/details_tests.html b/install/ui/test/details_tests.html
index 3cb20c56..3cb20c56 100644
--- a/install/static/test/details_tests.html
+++ b/install/ui/test/details_tests.html
diff --git a/install/static/test/details_tests.js b/install/ui/test/details_tests.js
index d832bd26..d832bd26 100644
--- a/install/static/test/details_tests.js
+++ b/install/ui/test/details_tests.js
diff --git a/install/static/test/entity_tests.html b/install/ui/test/entity_tests.html
index cd6b6409..cd6b6409 100644
--- a/install/static/test/entity_tests.html
+++ b/install/ui/test/entity_tests.html
diff --git a/install/static/test/entity_tests.js b/install/ui/test/entity_tests.js
index 21fff48f..21fff48f 100644
--- a/install/static/test/entity_tests.js
+++ b/install/ui/test/entity_tests.js
diff --git a/install/static/test/index.html b/install/ui/test/index.html
index 78b41e9b..78b41e9b 100644
--- a/install/static/test/index.html
+++ b/install/ui/test/index.html
diff --git a/install/static/test/ipa_tests.html b/install/ui/test/ipa_tests.html
index 903e7154..903e7154 100644
--- a/install/static/test/ipa_tests.html
+++ b/install/ui/test/ipa_tests.html
diff --git a/install/static/test/ipa_tests.js b/install/ui/test/ipa_tests.js
index 4fa0d1ea..4fa0d1ea 100644
--- a/install/static/test/ipa_tests.js
+++ b/install/ui/test/ipa_tests.js
diff --git a/install/static/test/navigation_tests.html b/install/ui/test/navigation_tests.html
index 16d095ac..16d095ac 100644
--- a/install/static/test/navigation_tests.html
+++ b/install/ui/test/navigation_tests.html
diff --git a/install/static/test/navigation_tests.js b/install/ui/test/navigation_tests.js
index bc198ac0..bc198ac0 100644
--- a/install/static/test/navigation_tests.js
+++ b/install/ui/test/navigation_tests.js
diff --git a/install/static/test/qunit.css b/install/ui/test/qunit.css
index e9404f59..e9404f59 100644
--- a/install/static/test/qunit.css
+++ b/install/ui/test/qunit.css
diff --git a/install/static/test/qunit.js b/install/ui/test/qunit.js
index 0b8173a8..0b8173a8 100644
--- a/install/static/test/qunit.js
+++ b/install/ui/test/qunit.js
diff --git a/install/static/ui-bg_flat_65_ffffff_40x100.png b/install/ui/ui-bg_flat_65_ffffff_40x100.png
index ac8b229a..ac8b229a 100644
--- a/install/static/ui-bg_flat_65_ffffff_40x100.png
+++ b/install/ui/ui-bg_flat_65_ffffff_40x100.png
diff --git a/install/static/ui-bg_glass_40_111111_1x400.png b/install/ui/ui-bg_glass_40_111111_1x400.png
index 1ec81277..1ec81277 100644
--- a/install/static/ui-bg_glass_40_111111_1x400.png
+++ b/install/ui/ui-bg_glass_40_111111_1x400.png
diff --git a/install/static/ui-bg_glass_55_1c1c1c_1x400.png b/install/ui/ui-bg_glass_55_1c1c1c_1x400.png
index 93db02b0..93db02b0 100644
--- a/install/static/ui-bg_glass_55_1c1c1c_1x400.png
+++ b/install/ui/ui-bg_glass_55_1c1c1c_1x400.png
diff --git a/install/static/ui-bg_highlight-hard_100_f9f9f9_1x100.png b/install/ui/ui-bg_highlight-hard_100_f9f9f9_1x100.png
index 2cb80364..2cb80364 100644
--- a/install/static/ui-bg_highlight-hard_100_f9f9f9_1x100.png
+++ b/install/ui/ui-bg_highlight-hard_100_f9f9f9_1x100.png
diff --git a/install/static/ui-bg_highlight-hard_40_aaaaaa_1x100.png b/install/ui/ui-bg_highlight-hard_40_aaaaaa_1x100.png
index a7aeeb0a..a7aeeb0a 100644
--- a/install/static/ui-bg_highlight-hard_40_aaaaaa_1x100.png
+++ b/install/ui/ui-bg_highlight-hard_40_aaaaaa_1x100.png
diff --git a/install/static/ui-bg_highlight-soft_50_aaaaaa_1x100.png b/install/ui/ui-bg_highlight-soft_50_aaaaaa_1x100.png
index a0ffd222..a0ffd222 100644
--- a/install/static/ui-bg_highlight-soft_50_aaaaaa_1x100.png
+++ b/install/ui/ui-bg_highlight-soft_50_aaaaaa_1x100.png
diff --git a/install/static/ui-bg_inset-hard_45_cd0a0a_1x100.png b/install/ui/ui-bg_inset-hard_45_cd0a0a_1x100.png
index 718aa117..718aa117 100644
--- a/install/static/ui-bg_inset-hard_45_cd0a0a_1x100.png
+++ b/install/ui/ui-bg_inset-hard_45_cd0a0a_1x100.png
diff --git a/install/static/ui-bg_inset-hard_55_ffeb80_1x100.png b/install/ui/ui-bg_inset-hard_55_ffeb80_1x100.png
index 0286bb1d..0286bb1d 100644
--- a/install/static/ui-bg_inset-hard_55_ffeb80_1x100.png
+++ b/install/ui/ui-bg_inset-hard_55_ffeb80_1x100.png
diff --git a/install/static/ui-bg_loop_8_333333_21x21.png b/install/ui/ui-bg_loop_8_333333_21x21.png
index a6e1a3e1..a6e1a3e1 100644
--- a/install/static/ui-bg_loop_8_333333_21x21.png
+++ b/install/ui/ui-bg_loop_8_333333_21x21.png
diff --git a/install/static/ui-icons_222222_256x240.png b/install/ui/ui-icons_222222_256x240.png
index b273ff11..b273ff11 100644
--- a/install/static/ui-icons_222222_256x240.png
+++ b/install/ui/ui-icons_222222_256x240.png
diff --git a/install/static/ui-icons_4ca300_256x240.png b/install/ui/ui-icons_4ca300_256x240.png
index fadab600..fadab600 100644
--- a/install/static/ui-icons_4ca300_256x240.png
+++ b/install/ui/ui-icons_4ca300_256x240.png
diff --git a/install/static/ui-icons_bbbbbb_256x240.png b/install/ui/ui-icons_bbbbbb_256x240.png
index 146dbd10..146dbd10 100644
--- a/install/static/ui-icons_bbbbbb_256x240.png
+++ b/install/ui/ui-icons_bbbbbb_256x240.png
diff --git a/install/static/ui-icons_ededed_256x240.png b/install/ui/ui-icons_ededed_256x240.png
index 608e09d6..608e09d6 100644
--- a/install/static/ui-icons_ededed_256x240.png
+++ b/install/ui/ui-icons_ededed_256x240.png
diff --git a/install/static/ui-icons_ffcf29_256x240.png b/install/ui/ui-icons_ffcf29_256x240.png
index c066ff2a..c066ff2a 100644
--- a/install/static/ui-icons_ffcf29_256x240.png
+++ b/install/ui/ui-icons_ffcf29_256x240.png
diff --git a/install/static/ui-icons_ffffff_256x240.png b/install/ui/ui-icons_ffffff_256x240.png
index 42f8f992..42f8f992 100644
--- a/install/static/ui-icons_ffffff_256x240.png
+++ b/install/ui/ui-icons_ffffff_256x240.png
diff --git a/install/static/user.js b/install/ui/user.js
index 1b499a82..1b499a82 100644
--- a/install/static/user.js
+++ b/install/ui/user.js
diff --git a/install/static/webui.js b/install/ui/webui.js
index 1f45f0b1..1f45f0b1 100644
--- a/install/static/webui.js
+++ b/install/ui/webui.js
diff --git a/install/static/widget.js b/install/ui/widget.js
index 576eef77..576eef77 100644
--- a/install/static/widget.js
+++ b/install/ui/widget.js
diff --git a/ipa.spec.in b/ipa.spec.in
index 6f9a6287..d43a029c 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -363,16 +363,16 @@ fi
 %{_usr}/share/ipa/migration/invalid.html
 %{_usr}/share/ipa/migration/migration.css
 %{_usr}/share/ipa/migration/migration.py*
-%dir %{_usr}/share/ipa/static
-%{_usr}/share/ipa/static/index.html
-%{_usr}/share/ipa/static/*.png
-%{_usr}/share/ipa/static/*.gif
-%{_usr}/share/ipa/static/*.css
-%{_usr}/share/ipa/static/*.js
-%{_usr}/share/ipa/static/*.otf
-%dir %{_usr}/share/ipa/static/layouts
-%dir %{_usr}/share/ipa/static/layouts/default
-%{_usr}/share/ipa/static/layouts/default/*.html
+%dir %{_usr}/share/ipa/ui
+%{_usr}/share/ipa/ui/index.html
+%{_usr}/share/ipa/ui/*.png
+%{_usr}/share/ipa/ui/*.gif
+%{_usr}/share/ipa/ui/*.css
+%{_usr}/share/ipa/ui/*.js
+%{_usr}/share/ipa/ui/*.otf
+%dir %{_usr}/share/ipa/ui/layouts
+%dir %{_usr}/share/ipa/ui/layouts/default
+%{_usr}/share/ipa/ui/layouts/default/*.html
 %dir %{_sysconfdir}/ipa
 %dir %{_sysconfdir}/ipa/html
 %config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
@@ -464,6 +464,10 @@ fi
 %config(noreplace) %{_sysconfdir}/ipa/default.conf
 
 %changelog
+* Thu Jan 19 2011 Adam Young <ayoung@redhat.com> - 1.99-40
+- Moved directory install/static to install/ui
+
+
 * Thu Jan 13 2011 Simo Sorce <ssorce@redhat.com> - 1.99-39
 - Remove dependency on nss_ldap/nss-pam-ldapd
 - The official client is sssd and that's what we use by default.
diff --git a/lite-server.py b/lite-server.py
index 8303440c..0ffa62e4 100755
--- a/lite-server.py
+++ b/lite-server.py
@@ -69,7 +69,7 @@ class WebUIApp(object):
         path_info = environ['PATH_INFO'].lstrip('/')
         if path_info == '':
             path_info = self.INDEX_FILE
-        requested_file = path.join(getcwd(), 'install/static/', path_info)
+        requested_file = path.join(getcwd(), 'install/ui/', path_info)
         extension = requested_file.rsplit('.', 1)[-1]
 
         if extension not in self.EXTENSION_TO_MIME_MAP: