diff --git a/install/Makefile.am b/install/Makefile.am index 80f04bd74..1b0cda90a 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 0bc53548f..72e3e4c01 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" - +Alias /ipa/ui "/usr/share/ipa/ui" + SetHandler None AllowOverride None Satisfy Any diff --git a/install/configure.ac b/install/configure.ac index 2424ef29f..88bf9f805 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 similarity index 100% rename from install/static/FreeWay-Bold.otf rename to install/ui/FreeWay-Bold.otf diff --git a/install/static/FreeWay.otf b/install/ui/FreeWay.otf similarity index 100% rename from install/static/FreeWay.otf rename to install/ui/FreeWay.otf diff --git a/install/static/Mainnav-background.png b/install/ui/Mainnav-background.png similarity index 100% rename from install/static/Mainnav-background.png rename to install/ui/Mainnav-background.png diff --git a/install/static/Mainnav-offtab.png b/install/ui/Mainnav-offtab.png similarity index 100% rename from install/static/Mainnav-offtab.png rename to install/ui/Mainnav-offtab.png diff --git a/install/static/Mainnav-ontab.png b/install/ui/Mainnav-ontab.png similarity index 100% rename from install/static/Mainnav-ontab.png rename to install/ui/Mainnav-ontab.png diff --git a/install/static/Mainnav-seperatorbars.png b/install/ui/Mainnav-seperatorbars.png similarity index 100% rename from install/static/Mainnav-seperatorbars.png rename to install/ui/Mainnav-seperatorbars.png diff --git a/install/static/Makefile.am b/install/ui/Makefile.am similarity index 98% rename from install/static/Makefile.am rename to install/ui/Makefile.am index d6a9274e1..b8b192db3 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 similarity index 100% rename from install/static/Subnav-background.png rename to install/ui/Subnav-background.png diff --git a/install/static/Subnav-offbutton.png b/install/ui/Subnav-offbutton.png similarity index 100% rename from install/static/Subnav-offbutton.png rename to install/ui/Subnav-offbutton.png diff --git a/install/static/Subnav-onbutton.png b/install/ui/Subnav-onbutton.png similarity index 100% rename from install/static/Subnav-onbutton.png rename to install/ui/Subnav-onbutton.png diff --git a/install/static/aci.js b/install/ui/aci.js similarity index 100% rename from install/static/aci.js rename to install/ui/aci.js diff --git a/install/static/add.js b/install/ui/add.js similarity index 100% rename from install/static/add.js rename to install/ui/add.js diff --git a/install/static/associate.js b/install/ui/associate.js similarity index 100% rename from install/static/associate.js rename to install/ui/associate.js diff --git a/install/static/caution.png b/install/ui/caution.png similarity index 100% rename from install/static/caution.png rename to install/ui/caution.png diff --git a/install/static/certificate.js b/install/ui/certificate.js similarity index 100% rename from install/static/certificate.js rename to install/ui/certificate.js diff --git a/install/static/check.png b/install/ui/check.png similarity index 100% rename from install/static/check.png rename to install/ui/check.png diff --git a/install/static/details.js b/install/ui/details.js similarity index 100% rename from install/static/details.js rename to install/ui/details.js diff --git a/install/static/develop.js b/install/ui/develop.js similarity index 100% rename from install/static/develop.js rename to install/ui/develop.js diff --git a/install/static/entity.js b/install/ui/entity.js similarity index 100% rename from install/static/entity.js rename to install/ui/entity.js diff --git a/install/static/gray-fade-line.png b/install/ui/gray-fade-line.png similarity index 100% rename from install/static/gray-fade-line.png rename to install/ui/gray-fade-line.png diff --git a/install/static/group.js b/install/ui/group.js similarity index 100% rename from install/static/group.js rename to install/ui/group.js diff --git a/install/static/hbacrule.js b/install/ui/hbacrule.js similarity index 100% rename from install/static/hbacrule.js rename to install/ui/hbacrule.js diff --git a/install/static/hbacsvc.js b/install/ui/hbacsvc.js similarity index 100% rename from install/static/hbacsvc.js rename to install/ui/hbacsvc.js diff --git a/install/static/hbacsvcgroup.js b/install/ui/hbacsvcgroup.js similarity index 100% rename from install/static/hbacsvcgroup.js rename to install/ui/hbacsvcgroup.js diff --git a/install/static/header.png b/install/ui/header.png similarity index 100% rename from install/static/header.png rename to install/ui/header.png diff --git a/install/static/header_background.png b/install/ui/header_background.png similarity index 100% rename from install/static/header_background.png rename to install/ui/header_background.png diff --git a/install/static/header_logo.png b/install/ui/header_logo.png similarity index 100% rename from install/static/header_logo.png rename to install/ui/header_logo.png diff --git a/install/static/host.js b/install/ui/host.js similarity index 100% rename from install/static/host.js rename to install/ui/host.js diff --git a/install/static/hostgroup.js b/install/ui/hostgroup.js similarity index 100% rename from install/static/hostgroup.js rename to install/ui/hostgroup.js diff --git a/install/static/index.html b/install/ui/index.html similarity index 100% rename from install/static/index.html rename to install/ui/index.html diff --git a/install/static/ipa.css b/install/ui/ipa.css similarity index 100% rename from install/static/ipa.css rename to install/ui/ipa.css diff --git a/install/static/ipa.js b/install/ui/ipa.js similarity index 100% rename from install/static/ipa.js rename to install/ui/ipa.js diff --git a/install/static/ipa_logo_180x50.png b/install/ui/ipa_logo_180x50.png similarity index 100% rename from install/static/ipa_logo_180x50.png rename to install/ui/ipa_logo_180x50.png diff --git a/install/static/ipalogo.png b/install/ui/ipalogo.png similarity index 100% rename from install/static/ipalogo.png rename to install/ui/ipalogo.png diff --git a/install/static/jquery-ui.css b/install/ui/jquery-ui.css similarity index 100% rename from install/static/jquery-ui.css rename to install/ui/jquery-ui.css diff --git a/install/static/jquery-ui.js b/install/ui/jquery-ui.js similarity index 100% rename from install/static/jquery-ui.js rename to install/ui/jquery-ui.js diff --git a/install/static/jquery.ba-bbq.js b/install/ui/jquery.ba-bbq.js similarity index 100% rename from install/static/jquery.ba-bbq.js rename to install/ui/jquery.ba-bbq.js diff --git a/install/static/jquery.cookie.js b/install/ui/jquery.cookie.js similarity index 100% rename from install/static/jquery.cookie.js rename to install/ui/jquery.cookie.js diff --git a/install/static/jquery.js b/install/ui/jquery.js similarity index 100% rename from install/static/jquery.js rename to install/ui/jquery.js diff --git a/install/static/jsl.conf b/install/ui/jsl.conf similarity index 100% rename from install/static/jsl.conf rename to install/ui/jsl.conf diff --git a/install/static/json2.js b/install/ui/json2.js similarity index 100% rename from install/static/json2.js rename to install/ui/json2.js diff --git a/install/static/layouts/Makefile.am b/install/ui/layouts/Makefile.am similarity index 88% rename from install/static/layouts/Makefile.am rename to install/ui/layouts/Makefile.am index 9e1ee7b74..711c236f0 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 similarity index 93% rename from install/static/layouts/default/Makefile.am rename to install/ui/layouts/default/Makefile.am index b02c1c504..82a58c7f6 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 similarity index 100% rename from install/static/layouts/default/hbacrule-details-accesstime.html rename to 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 similarity index 100% rename from install/static/layouts/default/hbacrule-details-general.html rename to 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 similarity index 100% rename from install/static/layouts/default/hbacrule-details-host.html rename to 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 similarity index 100% rename from install/static/layouts/default/hbacrule-details-service.html rename to 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 similarity index 100% rename from install/static/layouts/default/hbacrule-details-sourcehost.html rename to 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 similarity index 100% rename from install/static/layouts/default/hbacrule-details-user.html rename to 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 similarity index 100% rename from install/static/layouts/default/sudorule-details-general.html rename to 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 similarity index 100% rename from install/static/layouts/default/sudorule-group-dialog.html rename to 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 similarity index 100% rename from install/static/layouts/default/sudorule-host-dialog.html rename to 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 similarity index 100% rename from install/static/layouts/default/sudorule-hostgroup-dialog.html rename to 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 similarity index 100% rename from install/static/layouts/default/sudorule-user-dialog.html rename to install/ui/layouts/default/sudorule-user-dialog.html diff --git a/install/static/modal-background.png b/install/ui/modal-background.png similarity index 100% rename from install/static/modal-background.png rename to install/ui/modal-background.png diff --git a/install/static/navigation.js b/install/ui/navigation.js similarity index 100% rename from install/static/navigation.js rename to install/ui/navigation.js diff --git a/install/static/netgroup.js b/install/ui/netgroup.js similarity index 100% rename from install/static/netgroup.js rename to install/ui/netgroup.js diff --git a/install/static/outer-bg.png b/install/ui/outer-bg.png similarity index 100% rename from install/static/outer-bg.png rename to install/ui/outer-bg.png diff --git a/install/static/panel-background.png b/install/ui/panel-background.png similarity index 100% rename from install/static/panel-background.png rename to install/ui/panel-background.png diff --git a/install/static/policy.js b/install/ui/policy.js similarity index 100% rename from install/static/policy.js rename to install/ui/policy.js diff --git a/install/static/rule.js b/install/ui/rule.js similarity index 100% rename from install/static/rule.js rename to install/ui/rule.js diff --git a/install/static/search.js b/install/ui/search.js similarity index 100% rename from install/static/search.js rename to install/ui/search.js diff --git a/install/static/serverconfig.js b/install/ui/serverconfig.js similarity index 100% rename from install/static/serverconfig.js rename to install/ui/serverconfig.js diff --git a/install/static/service.js b/install/ui/service.js similarity index 100% rename from install/static/service.js rename to install/ui/service.js diff --git a/install/static/spinner_header.gif b/install/ui/spinner_header.gif similarity index 100% rename from install/static/spinner_header.gif rename to install/ui/spinner_header.gif diff --git a/install/static/spinner_large.gif b/install/ui/spinner_large.gif similarity index 100% rename from install/static/spinner_large.gif rename to install/ui/spinner_large.gif diff --git a/install/static/spinner_small.gif b/install/ui/spinner_small.gif similarity index 100% rename from install/static/spinner_small.gif rename to install/ui/spinner_small.gif diff --git a/install/static/sudocmd.js b/install/ui/sudocmd.js similarity index 100% rename from install/static/sudocmd.js rename to install/ui/sudocmd.js diff --git a/install/static/sudocmdgroup.js b/install/ui/sudocmdgroup.js similarity index 100% rename from install/static/sudocmdgroup.js rename to install/ui/sudocmdgroup.js diff --git a/install/static/sudorule.js b/install/ui/sudorule.js similarity index 100% rename from install/static/sudorule.js rename to install/ui/sudorule.js diff --git a/install/static/test/README b/install/ui/test/README similarity index 100% rename from install/static/test/README rename to install/ui/test/README diff --git a/install/static/test/aci_tests.html b/install/ui/test/aci_tests.html similarity index 100% rename from install/static/test/aci_tests.html rename to install/ui/test/aci_tests.html diff --git a/install/static/test/aci_tests.js b/install/ui/test/aci_tests.js similarity index 100% rename from install/static/test/aci_tests.js rename to install/ui/test/aci_tests.js diff --git a/install/static/test/all_tests.html b/install/ui/test/all_tests.html similarity index 100% rename from install/static/test/all_tests.html rename to install/ui/test/all_tests.html diff --git a/install/static/test/association_tests.html b/install/ui/test/association_tests.html similarity index 100% rename from install/static/test/association_tests.html rename to install/ui/test/association_tests.html diff --git a/install/static/test/association_tests.js b/install/ui/test/association_tests.js similarity index 100% rename from install/static/test/association_tests.js rename to install/ui/test/association_tests.js diff --git a/install/static/test/certificate_tests.html b/install/ui/test/certificate_tests.html similarity index 100% rename from install/static/test/certificate_tests.html rename to install/ui/test/certificate_tests.html diff --git a/install/static/test/certificate_tests.js b/install/ui/test/certificate_tests.js similarity index 100% rename from install/static/test/certificate_tests.js rename to install/ui/test/certificate_tests.js diff --git a/install/static/test/data/aci_find.json b/install/ui/test/data/aci_find.json similarity index 100% rename from install/static/test/data/aci_find.json rename to 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 similarity index 100% rename from install/static/test/data/automountlocation_find.json rename to 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 similarity index 100% rename from install/static/test/data/automountlocation_show.json rename to 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 similarity index 100% rename from install/static/test/data/cert_remove_hold.json rename to 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 similarity index 100% rename from install/static/test/data/cert_request.json rename to 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 similarity index 100% rename from install/static/test/data/cert_revoke.json rename to 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 similarity index 100% rename from install/static/test/data/cert_show.json rename to 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 similarity index 100% rename from install/static/test/data/config_show.json rename to 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 similarity index 100% rename from install/static/test/data/delegation_find.json rename to 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 similarity index 100% rename from install/static/test/data/delegation_list.json rename to 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 similarity index 100% rename from install/static/test/data/delegation_mod.json rename to 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 similarity index 100% rename from install/static/test/data/delegation_show.json rename to 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 similarity index 100% rename from install/static/test/data/dns_find.json rename to 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 similarity index 100% rename from install/static/test/data/dns_find_rr.json rename to 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 similarity index 100% rename from install/static/test/data/dns_show.json rename to 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 similarity index 100% rename from install/static/test/data/dnsrecord_add.json rename to 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 similarity index 100% rename from install/static/test/data/dnsrecord_del.json rename to 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 similarity index 100% rename from install/static/test/data/dnsrecord_find.json rename to 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 similarity index 100% rename from install/static/test/data/dnszone_add.json rename to 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 similarity index 100% rename from install/static/test/data/dnszone_find.json rename to 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 similarity index 100% rename from install/static/test/data/dnszone_show.json rename to 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 similarity index 100% rename from install/static/test/data/group_add.json rename to 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 similarity index 100% rename from install/static/test/data/group_add_member.json rename to 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 similarity index 100% rename from install/static/test/data/group_find.json rename to 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 similarity index 100% rename from install/static/test/data/group_member_user.json rename to 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 similarity index 100% rename from install/static/test/data/group_remove_member.json rename to 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 similarity index 100% rename from install/static/test/data/group_show.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_add.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_add_accesstime.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_add_host.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_add_service.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_add_sourcehost.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_add_user.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_del.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_find.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_mod.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_remove_accesstime.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_remove_host.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_remove_service.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_remove_sourcehost.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_remove_user.json rename to 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 similarity index 100% rename from install/static/test/data/hbacrule_show.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvc_add.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvc_del.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvc_find.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvc_mod.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvc_show.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvcgroup_add.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvcgroup_add_member.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvcgroup_del.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvcgroup_find.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvcgroup_member_hbacsvc.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvcgroup_mod.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvcgroup_remove_member.json rename to 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 similarity index 100% rename from install/static/test/data/hbacsvcgroup_show.json rename to 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 similarity index 100% rename from install/static/test/data/host_add.json rename to 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 similarity index 100% rename from install/static/test/data/host_disable_dev.example.com.json rename to 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 similarity index 100% rename from install/static/test/data/host_find.json rename to 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 similarity index 100% rename from install/static/test/data/host_mod.json rename to 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 similarity index 100% rename from install/static/test/data/host_show.json rename to 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 similarity index 100% rename from install/static/test/data/host_show_dev.example.com.json rename to 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 similarity index 100% rename from install/static/test/data/host_show_test.example.com.json rename to 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 similarity index 100% rename from install/static/test/data/hostgroup_add.json rename to 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 similarity index 100% rename from install/static/test/data/hostgroup_add_member.json rename to 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 similarity index 100% rename from install/static/test/data/hostgroup_find.json rename to 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 similarity index 100% rename from install/static/test/data/hostgroup_member_host.json rename to 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 similarity index 100% rename from install/static/test/data/hostgroup_show.json rename to 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 similarity index 100% rename from install/static/test/data/i18n_messages.json rename to 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 similarity index 100% rename from install/static/test/data/ipa_init.json rename to 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 similarity index 100% rename from install/static/test/data/json_metadata.json rename to 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 similarity index 100% rename from install/static/test/data/krbtpolicy_show.json rename to 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 similarity index 100% rename from install/static/test/data/netgroup_add.json rename to 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 similarity index 100% rename from install/static/test/data/netgroup_add_member.json rename to 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 similarity index 100% rename from install/static/test/data/netgroup_find.json rename to 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 similarity index 100% rename from install/static/test/data/netgroup_show.json rename to 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 similarity index 100% rename from install/static/test/data/permission_add.json rename to install/ui/test/data/permission_add.json diff --git a/install/static/test/data/permission_del b/install/ui/test/data/permission_del similarity index 100% rename from install/static/test/data/permission_del rename to install/ui/test/data/permission_del diff --git a/install/static/test/data/permission_find.json b/install/ui/test/data/permission_find.json similarity index 100% rename from install/static/test/data/permission_find.json rename to 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 similarity index 100% rename from install/static/test/data/permission_show.json rename to 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 similarity index 100% rename from install/static/test/data/privilege_find.json rename to 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 similarity index 100% rename from install/static/test/data/privilege_show.json rename to 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 similarity index 100% rename from install/static/test/data/pwpolicy_find.json rename to 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 similarity index 100% rename from install/static/test/data/pwpolicy_mod.json rename to 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 similarity index 100% rename from install/static/test/data/pwpolicy_show.json rename to 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 similarity index 100% rename from install/static/test/data/role_find.json rename to 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 similarity index 100% rename from install/static/test/data/role_show.json rename to 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 similarity index 100% rename from install/static/test/data/rolegroup_add.json rename to 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 similarity index 100% rename from install/static/test/data/rolegroup_add_member.json rename to 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 similarity index 100% rename from install/static/test/data/rolegroup_del.json rename to 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 similarity index 100% rename from install/static/test/data/rolegroup_find.json rename to 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 similarity index 100% rename from install/static/test/data/rolegroup_remove_member.json rename to 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 similarity index 100% rename from install/static/test/data/rolegroup_show.json rename to 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 similarity index 100% rename from install/static/test/data/selfservice_find.json rename to 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 similarity index 100% rename from install/static/test/data/selfservice_show.json rename to 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 similarity index 100% rename from install/static/test/data/service_add.json rename to 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 similarity index 100% rename from install/static/test/data/service_add_host.json rename to 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 similarity index 100% rename from install/static/test/data/service_del.json rename to 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 similarity index 100% rename from install/static/test/data/service_disable.json rename to 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 similarity index 100% rename from install/static/test/data/service_find.json rename to 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 similarity index 100% rename from install/static/test/data/service_managedby_host.json rename to 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 similarity index 100% rename from install/static/test/data/service_mod.json rename to 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 similarity index 100% rename from install/static/test/data/service_remove_host.sh rename to 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 similarity index 100% rename from install/static/test/data/service_show.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmd_add.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmd_del.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmd_find.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmd_memberof_add.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmd_memberof_remove.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmd_memberof_show.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmd_mod.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmd_show.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmdgroup_add.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmdgroup_add_member.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmdgroup_del.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmdgroup_find.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmdgroup_member_sudocmd.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmdgroup_mod.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmdgroup_remove_member.json rename to 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 similarity index 100% rename from install/static/test/data/sudocmdgroup_show.json rename to 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 similarity index 100% rename from install/static/test/data/sudorule_add.json rename to 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 similarity index 100% rename from install/static/test/data/sudorule_del.json rename to 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 similarity index 100% rename from install/static/test/data/sudorule_find.json rename to 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 similarity index 100% rename from install/static/test/data/sudorule_mod.json rename to 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 similarity index 100% rename from install/static/test/data/sudorule_show.json rename to 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 similarity index 100% rename from install/static/test/data/taskgroup_find.json rename to 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 similarity index 100% rename from install/static/test/data/user_add.json rename to 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 similarity index 100% rename from install/static/test/data/user_disable.json rename to 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 similarity index 100% rename from install/static/test/data/user_enable.json rename to 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 similarity index 100% rename from install/static/test/data/user_find.json rename to 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 similarity index 100% rename from install/static/test/data/user_memberof_group.json rename to 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 similarity index 100% rename from install/static/test/data/user_mod.json rename to 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 similarity index 100% rename from install/static/test/data/user_show.json rename to install/ui/test/data/user_show.json diff --git a/install/static/test/data/whoami.json b/install/ui/test/data/whoami.json similarity index 100% rename from install/static/test/data/whoami.json rename to install/ui/test/data/whoami.json diff --git a/install/static/test/details_tests.html b/install/ui/test/details_tests.html similarity index 100% rename from install/static/test/details_tests.html rename to install/ui/test/details_tests.html diff --git a/install/static/test/details_tests.js b/install/ui/test/details_tests.js similarity index 100% rename from install/static/test/details_tests.js rename to install/ui/test/details_tests.js diff --git a/install/static/test/entity_tests.html b/install/ui/test/entity_tests.html similarity index 100% rename from install/static/test/entity_tests.html rename to install/ui/test/entity_tests.html diff --git a/install/static/test/entity_tests.js b/install/ui/test/entity_tests.js similarity index 100% rename from install/static/test/entity_tests.js rename to install/ui/test/entity_tests.js diff --git a/install/static/test/index.html b/install/ui/test/index.html similarity index 100% rename from install/static/test/index.html rename to install/ui/test/index.html diff --git a/install/static/test/ipa_tests.html b/install/ui/test/ipa_tests.html similarity index 100% rename from install/static/test/ipa_tests.html rename to install/ui/test/ipa_tests.html diff --git a/install/static/test/ipa_tests.js b/install/ui/test/ipa_tests.js similarity index 100% rename from install/static/test/ipa_tests.js rename to install/ui/test/ipa_tests.js diff --git a/install/static/test/navigation_tests.html b/install/ui/test/navigation_tests.html similarity index 100% rename from install/static/test/navigation_tests.html rename to install/ui/test/navigation_tests.html diff --git a/install/static/test/navigation_tests.js b/install/ui/test/navigation_tests.js similarity index 100% rename from install/static/test/navigation_tests.js rename to install/ui/test/navigation_tests.js diff --git a/install/static/test/qunit.css b/install/ui/test/qunit.css similarity index 100% rename from install/static/test/qunit.css rename to install/ui/test/qunit.css diff --git a/install/static/test/qunit.js b/install/ui/test/qunit.js similarity index 100% rename from install/static/test/qunit.js rename to 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 similarity index 100% rename from install/static/ui-bg_flat_65_ffffff_40x100.png rename to 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 similarity index 100% rename from install/static/ui-bg_glass_40_111111_1x400.png rename to 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 similarity index 100% rename from install/static/ui-bg_glass_55_1c1c1c_1x400.png rename to 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 similarity index 100% rename from install/static/ui-bg_highlight-hard_100_f9f9f9_1x100.png rename to 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 similarity index 100% rename from install/static/ui-bg_highlight-hard_40_aaaaaa_1x100.png rename to 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 similarity index 100% rename from install/static/ui-bg_highlight-soft_50_aaaaaa_1x100.png rename to 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 similarity index 100% rename from install/static/ui-bg_inset-hard_45_cd0a0a_1x100.png rename to 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 similarity index 100% rename from install/static/ui-bg_inset-hard_55_ffeb80_1x100.png rename to 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 similarity index 100% rename from install/static/ui-bg_loop_8_333333_21x21.png rename to 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 similarity index 100% rename from install/static/ui-icons_222222_256x240.png rename to 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 similarity index 100% rename from install/static/ui-icons_4ca300_256x240.png rename to 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 similarity index 100% rename from install/static/ui-icons_bbbbbb_256x240.png rename to 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 similarity index 100% rename from install/static/ui-icons_ededed_256x240.png rename to 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 similarity index 100% rename from install/static/ui-icons_ffcf29_256x240.png rename to 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 similarity index 100% rename from install/static/ui-icons_ffffff_256x240.png rename to install/ui/ui-icons_ffffff_256x240.png diff --git a/install/static/user.js b/install/ui/user.js similarity index 100% rename from install/static/user.js rename to install/ui/user.js diff --git a/install/static/webui.js b/install/ui/webui.js similarity index 100% rename from install/static/webui.js rename to install/ui/webui.js diff --git a/install/static/widget.js b/install/ui/widget.js similarity index 100% rename from install/static/widget.js rename to install/ui/widget.js diff --git a/ipa.spec.in b/ipa.spec.in index 6f9a62872..d43a029c4 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 - 1.99-40 +- Moved directory install/static to install/ui + + * Thu Jan 13 2011 Simo Sorce - 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 8303440ca..0ffa62e4d 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: