diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/floating_ips/_allocate.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/floating_ips/_allocate.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/floating_ips/_allocate.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/floating_ips/allocate.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/floating_ips/allocate.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/floating_ips/allocate.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/floating_ips/allocate.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/floating_ips/associate.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/floating_ips/associate.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/floating_ips/associate.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/floating_ips/associate.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/index.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/index.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/index.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/index.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/keypairs/_create.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/_create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/keypairs/_create.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/_create.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/keypairs/_import.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/_import.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/keypairs/_import.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/_import.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/keypairs/create.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/keypairs/create.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/create.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/keypairs/download.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/download.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/keypairs/download.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/download.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/keypairs/import.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/import.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/keypairs/import.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/keypairs/import.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/security_groups/_create.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/_create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/security_groups/_create.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/_create.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/security_groups/_edit_rules.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/_edit_rules.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/security_groups/_edit_rules.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/_edit_rules.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/security_groups/create.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/security_groups/create.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/create.html diff --git a/horizon/dashboards/nova/templates/nova/access_and_security/security_groups/edit_rules.html b/horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/edit_rules.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/access_and_security/security_groups/edit_rules.html rename to horizon/dashboards/nova/access_and_security/templates/access_and_security/security_groups/edit_rules.html diff --git a/horizon/dashboards/nova/templates/nova/objects/_copy.html b/horizon/dashboards/nova/containers/templates/containers/_copy.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/objects/_copy.html rename to horizon/dashboards/nova/containers/templates/containers/_copy.html diff --git a/horizon/dashboards/nova/templates/nova/containers/_create.html b/horizon/dashboards/nova/containers/templates/containers/_create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/containers/_create.html rename to horizon/dashboards/nova/containers/templates/containers/_create.html diff --git a/horizon/dashboards/nova/templates/nova/objects/_upload.html b/horizon/dashboards/nova/containers/templates/containers/_upload.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/objects/_upload.html rename to horizon/dashboards/nova/containers/templates/containers/_upload.html diff --git a/horizon/dashboards/nova/templates/nova/objects/copy.html b/horizon/dashboards/nova/containers/templates/containers/copy.html similarity index 85% rename from horizon/dashboards/nova/templates/nova/objects/copy.html rename to horizon/dashboards/nova/containers/templates/containers/copy.html index d16760ef6..0d6e6d7ba 100644 --- a/horizon/dashboards/nova/templates/nova/objects/copy.html +++ b/horizon/dashboards/nova/containers/templates/containers/copy.html @@ -7,7 +7,7 @@ {% endblock page_header %} {% block dash_main %} - {% include 'nova/objects/_copy.html' %} + {% include 'nova/containers/_copy.html' %} {% endblock %} diff --git a/horizon/dashboards/nova/templates/nova/containers/create.html b/horizon/dashboards/nova/containers/templates/containers/create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/containers/create.html rename to horizon/dashboards/nova/containers/templates/containers/create.html diff --git a/horizon/dashboards/nova/templates/nova/objects/index.html b/horizon/dashboards/nova/containers/templates/containers/detail.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/objects/index.html rename to horizon/dashboards/nova/containers/templates/containers/detail.html diff --git a/horizon/dashboards/nova/templates/nova/containers/index.html b/horizon/dashboards/nova/containers/templates/containers/index.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/containers/index.html rename to horizon/dashboards/nova/containers/templates/containers/index.html diff --git a/horizon/dashboards/nova/templates/nova/objects/upload.html b/horizon/dashboards/nova/containers/templates/containers/upload.html similarity index 85% rename from horizon/dashboards/nova/templates/nova/objects/upload.html rename to horizon/dashboards/nova/containers/templates/containers/upload.html index 69354b2ed..a6075c40f 100644 --- a/horizon/dashboards/nova/templates/nova/objects/upload.html +++ b/horizon/dashboards/nova/containers/templates/containers/upload.html @@ -7,7 +7,7 @@ {% endblock page_header %} {% block dash_main %} - {% include 'nova/objects/_upload.html' %} + {% include 'nova/containers/_upload.html' %} {% endblock %} diff --git a/horizon/dashboards/nova/containers/tests.py b/horizon/dashboards/nova/containers/tests.py index e58ba48b0..c2591f9cb 100644 --- a/horizon/dashboards/nova/containers/tests.py +++ b/horizon/dashboards/nova/containers/tests.py @@ -108,7 +108,7 @@ class ObjectViewTests(test.TestCase): res = self.client.get(reverse('horizon:nova:containers:object_index', args=[self.containers.first().name])) - self.assertTemplateUsed(res, 'nova/objects/index.html') + self.assertTemplateUsed(res, 'nova/containers/detail.html') # UTF8 encoding here to ensure there aren't problems with Nose output. expected = [obj.name.encode('utf8') for obj in self.objects.list()] self.assertQuerysetEqual(res.context['objects_table'].data, @@ -118,7 +118,7 @@ class ObjectViewTests(test.TestCase): def test_upload_index(self): res = self.client.get(reverse('horizon:nova:containers:object_upload', args=[self.containers.first().name])) - self.assertTemplateUsed(res, 'nova/objects/upload.html') + self.assertTemplateUsed(res, 'nova/containers/upload.html') def test_upload(self): container = self.containers.first() @@ -215,7 +215,7 @@ class ObjectViewTests(test.TestCase): res = self.client.get(reverse('horizon:nova:containers:object_copy', args=[self.containers.first().name, self.objects.first().name])) - self.assertTemplateUsed(res, 'nova/objects/copy.html') + self.assertTemplateUsed(res, 'nova/containers/copy.html') def test_copy(self): container_1 = self.containers.get(name=u"container_one\u6346") diff --git a/horizon/dashboards/nova/containers/views.py b/horizon/dashboards/nova/containers/views.py index eaac1a50b..8752e24ba 100644 --- a/horizon/dashboards/nova/containers/views.py +++ b/horizon/dashboards/nova/containers/views.py @@ -72,7 +72,7 @@ class CreateView(forms.ModalFormView): class ObjectIndexView(tables.MultiTableView): table_classes = (ObjectsTable, ContainerSubfoldersTable) - template_name = 'nova/objects/index.html' + template_name = 'nova/containers/detail.html' def has_more_data(self, table): return self._more @@ -131,7 +131,7 @@ class ObjectIndexView(tables.MultiTableView): class UploadView(forms.ModalFormView): form_class = UploadObject - template_name = 'nova/objects/upload.html' + template_name = 'nova/containers/upload.html' def get_initial(self): return {"container_name": self.kwargs["container_name"], @@ -171,7 +171,7 @@ def object_download(request, container_name, object_path): class CopyView(forms.ModalFormView): form_class = CopyObject - template_name = 'nova/objects/copy.html' + template_name = 'nova/containers/copy.html' def get_form_kwargs(self): kwargs = super(CopyView, self).get_form_kwargs() diff --git a/horizon/dashboards/nova/templates/nova/images_and_snapshots/images/_create.html b/horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/_create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/images_and_snapshots/images/_create.html rename to horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/_create.html diff --git a/horizon/dashboards/nova/templates/nova/images_and_snapshots/images/_detail_overview.html b/horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/_detail_overview.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/images_and_snapshots/images/_detail_overview.html rename to horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/_detail_overview.html diff --git a/horizon/dashboards/nova/templates/nova/images_and_snapshots/images/_update.html b/horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/_update.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/images_and_snapshots/images/_update.html rename to horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/_update.html diff --git a/horizon/dashboards/nova/templates/nova/images_and_snapshots/images/create.html b/horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/images_and_snapshots/images/create.html rename to horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/create.html diff --git a/horizon/dashboards/nova/templates/nova/images_and_snapshots/images/detail.html b/horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/detail.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/images_and_snapshots/images/detail.html rename to horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/detail.html diff --git a/horizon/dashboards/nova/templates/nova/images_and_snapshots/images/update.html b/horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/update.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/images_and_snapshots/images/update.html rename to horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/images/update.html diff --git a/horizon/dashboards/nova/templates/nova/images_and_snapshots/index.html b/horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/index.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/images_and_snapshots/index.html rename to horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/index.html diff --git a/horizon/dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html b/horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/snapshots/_create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/images_and_snapshots/snapshots/_create.html rename to horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/snapshots/_create.html diff --git a/horizon/dashboards/nova/templates/nova/images_and_snapshots/snapshots/create.html b/horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/snapshots/create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/images_and_snapshots/snapshots/create.html rename to horizon/dashboards/nova/images_and_snapshots/templates/images_and_snapshots/snapshots/create.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/index.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/index.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/index.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/index.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_log.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_detail_log.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_log.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_detail_log.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_detail_overview.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_overview.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_detail_overview.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_detail_vnc.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_detail_vnc.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_instance_ips.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_instance_ips.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_instance_ips.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_instance_ips.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_launch_customize_help.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_launch_customize_help.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_launch_customize_help.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_launch_customize_help.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_launch_details_help.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_launch_details_help.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_launch_details_help.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_launch_details_help.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_launch_volumes_help.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_launch_volumes_help.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_launch_volumes_help.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_launch_volumes_help.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_update.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_update.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/_update.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/detail.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/detail.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/detail.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/launch.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/launch.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/launch.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/update.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/update.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/update.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/instances/update.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_attach.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/_attach.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_attach.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/_attach.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/_create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_create.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/_create.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_create_snapshot.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/_create_snapshot.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_create_snapshot.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/_create_snapshot.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/_detail_overview.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/_detail_overview.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/_detail_overview.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/attach.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/attach.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/attach.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/attach.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/create.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/create.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/create.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/create.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/create_snapshot.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/create_snapshot.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/create_snapshot.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/create_snapshot.html diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html b/horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/detail.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/instances_and_volumes/volumes/detail.html rename to horizon/dashboards/nova/instances_and_volumes/templates/instances_and_volumes/volumes/detail.html diff --git a/horizon/dashboards/nova/templates/nova/overview/usage.csv b/horizon/dashboards/nova/overview/templates/overview/usage.csv similarity index 100% rename from horizon/dashboards/nova/templates/nova/overview/usage.csv rename to horizon/dashboards/nova/overview/templates/overview/usage.csv diff --git a/horizon/dashboards/nova/templates/nova/overview/usage.html b/horizon/dashboards/nova/overview/templates/overview/usage.html similarity index 100% rename from horizon/dashboards/nova/templates/nova/overview/usage.html rename to horizon/dashboards/nova/overview/templates/overview/usage.html diff --git a/horizon/dashboards/settings/templates/settings/ec2/download_form.html b/horizon/dashboards/settings/ec2/templates/ec2/download_form.html similarity index 100% rename from horizon/dashboards/settings/templates/settings/ec2/download_form.html rename to horizon/dashboards/settings/ec2/templates/ec2/download_form.html diff --git a/horizon/dashboards/settings/templates/settings/ec2/ec2rc.sh.template b/horizon/dashboards/settings/ec2/templates/ec2/ec2rc.sh.template similarity index 100% rename from horizon/dashboards/settings/templates/settings/ec2/ec2rc.sh.template rename to horizon/dashboards/settings/ec2/templates/ec2/ec2rc.sh.template diff --git a/horizon/dashboards/settings/templates/settings/ec2/index.html b/horizon/dashboards/settings/ec2/templates/ec2/index.html similarity index 100% rename from horizon/dashboards/settings/templates/settings/ec2/index.html rename to horizon/dashboards/settings/ec2/templates/ec2/index.html diff --git a/horizon/dashboards/settings/templates/settings/project/_openrc.html b/horizon/dashboards/settings/project/templates/project/_openrc.html similarity index 100% rename from horizon/dashboards/settings/templates/settings/project/_openrc.html rename to horizon/dashboards/settings/project/templates/project/_openrc.html diff --git a/horizon/dashboards/settings/templates/settings/project/openrc.sh.template b/horizon/dashboards/settings/project/templates/project/openrc.sh.template similarity index 100% rename from horizon/dashboards/settings/templates/settings/project/openrc.sh.template rename to horizon/dashboards/settings/project/templates/project/openrc.sh.template diff --git a/horizon/dashboards/settings/templates/settings/project/settings.html b/horizon/dashboards/settings/project/templates/project/settings.html similarity index 100% rename from horizon/dashboards/settings/templates/settings/project/settings.html rename to horizon/dashboards/settings/project/templates/project/settings.html diff --git a/horizon/dashboards/settings/templates/settings/user/_language.html b/horizon/dashboards/settings/user/templates/user/_language.html similarity index 100% rename from horizon/dashboards/settings/templates/settings/user/_language.html rename to horizon/dashboards/settings/user/templates/user/_language.html diff --git a/horizon/dashboards/settings/templates/settings/user/settings.html b/horizon/dashboards/settings/user/templates/user/settings.html similarity index 100% rename from horizon/dashboards/settings/templates/settings/user/settings.html rename to horizon/dashboards/settings/user/templates/user/settings.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/flavors/_create.html b/horizon/dashboards/syspanel/flavors/templates/flavors/_create.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/flavors/_create.html rename to horizon/dashboards/syspanel/flavors/templates/flavors/_create.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/flavors/create.html b/horizon/dashboards/syspanel/flavors/templates/flavors/create.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/flavors/create.html rename to horizon/dashboards/syspanel/flavors/templates/flavors/create.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/flavors/index.html b/horizon/dashboards/syspanel/flavors/templates/flavors/index.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/flavors/index.html rename to horizon/dashboards/syspanel/flavors/templates/flavors/index.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/images/_update.html b/horizon/dashboards/syspanel/images/templates/images/_update.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/images/_update.html rename to horizon/dashboards/syspanel/images/templates/images/_update.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/images/index.html b/horizon/dashboards/syspanel/images/templates/images/index.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/images/index.html rename to horizon/dashboards/syspanel/images/templates/images/index.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/images/update.html b/horizon/dashboards/syspanel/images/templates/images/update.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/images/update.html rename to horizon/dashboards/syspanel/images/templates/images/update.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/instances/index.html b/horizon/dashboards/syspanel/instances/templates/instances/index.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/instances/index.html rename to horizon/dashboards/syspanel/instances/templates/instances/index.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/overview/usage.csv b/horizon/dashboards/syspanel/overview/templates/overview/usage.csv similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/overview/usage.csv rename to horizon/dashboards/syspanel/overview/templates/overview/usage.csv diff --git a/horizon/dashboards/syspanel/templates/syspanel/overview/usage.html b/horizon/dashboards/syspanel/overview/templates/overview/usage.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/overview/usage.html rename to horizon/dashboards/syspanel/overview/templates/overview/usage.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/_add_user.html b/horizon/dashboards/syspanel/projects/templates/projects/_add_user.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/_add_user.html rename to horizon/dashboards/syspanel/projects/templates/projects/_add_user.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/_create.html b/horizon/dashboards/syspanel/projects/templates/projects/_create.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/_create.html rename to horizon/dashboards/syspanel/projects/templates/projects/_create.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/_quotas.html b/horizon/dashboards/syspanel/projects/templates/projects/_quotas.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/_quotas.html rename to horizon/dashboards/syspanel/projects/templates/projects/_quotas.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/_update.html b/horizon/dashboards/syspanel/projects/templates/projects/_update.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/_update.html rename to horizon/dashboards/syspanel/projects/templates/projects/_update.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/add_user.html b/horizon/dashboards/syspanel/projects/templates/projects/add_user.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/add_user.html rename to horizon/dashboards/syspanel/projects/templates/projects/add_user.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/create.html b/horizon/dashboards/syspanel/projects/templates/projects/create.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/create.html rename to horizon/dashboards/syspanel/projects/templates/projects/create.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/index.html b/horizon/dashboards/syspanel/projects/templates/projects/index.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/index.html rename to horizon/dashboards/syspanel/projects/templates/projects/index.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/quotas.html b/horizon/dashboards/syspanel/projects/templates/projects/quotas.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/quotas.html rename to horizon/dashboards/syspanel/projects/templates/projects/quotas.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/update.html b/horizon/dashboards/syspanel/projects/templates/projects/update.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/update.html rename to horizon/dashboards/syspanel/projects/templates/projects/update.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/usage.csv b/horizon/dashboards/syspanel/projects/templates/projects/usage.csv similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/usage.csv rename to horizon/dashboards/syspanel/projects/templates/projects/usage.csv diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/usage.html b/horizon/dashboards/syspanel/projects/templates/projects/usage.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/usage.html rename to horizon/dashboards/syspanel/projects/templates/projects/usage.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/projects/users.html b/horizon/dashboards/syspanel/projects/templates/projects/users.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/projects/users.html rename to horizon/dashboards/syspanel/projects/templates/projects/users.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/quotas/index.html b/horizon/dashboards/syspanel/quotas/templates/quotas/index.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/quotas/index.html rename to horizon/dashboards/syspanel/quotas/templates/quotas/index.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/services/index.html b/horizon/dashboards/syspanel/services/templates/services/index.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/services/index.html rename to horizon/dashboards/syspanel/services/templates/services/index.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/users/_create.html b/horizon/dashboards/syspanel/users/templates/users/_create.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/users/_create.html rename to horizon/dashboards/syspanel/users/templates/users/_create.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/users/_update.html b/horizon/dashboards/syspanel/users/templates/users/_update.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/users/_update.html rename to horizon/dashboards/syspanel/users/templates/users/_update.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/users/create.html b/horizon/dashboards/syspanel/users/templates/users/create.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/users/create.html rename to horizon/dashboards/syspanel/users/templates/users/create.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/users/index.html b/horizon/dashboards/syspanel/users/templates/users/index.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/users/index.html rename to horizon/dashboards/syspanel/users/templates/users/index.html diff --git a/horizon/dashboards/syspanel/templates/syspanel/users/update.html b/horizon/dashboards/syspanel/users/templates/users/update.html similarity index 100% rename from horizon/dashboards/syspanel/templates/syspanel/users/update.html rename to horizon/dashboards/syspanel/users/templates/users/update.html