Fixes bug #846771 on LaunchPad -- moves django_openstack templates out of openstack_dashboard and into directories in the django_openstack app grouped logically according to modules. Site-specific templates (not referenced by the django_openstack app) remain in the openstack_dashboard project.

django-openstack/django_openstack/dash/views/containers.py

@@ -73,7 +73,8 @@ def index(request, tenant_id):
 
     containers = api.swift_get_containers(request)
 
-    return shortcuts.render_to_response('dash_containers.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/containers/dash_containers.html', {
         'containers': containers,
         'delete_form': delete_form,
     }, context_instance=template.RequestContext(request))
@@ -85,6 +86,7 @@ def create(request, tenant_id):
     if handled:
         return handled
 
-    return shortcuts.render_to_response('dash_containers_create.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/containers/dash_containers_create.html', {
         'create_form': form,
     }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/dash/views/floating_ips.py

@@ -136,7 +136,8 @@ def index(request, tenant_id):
         LOG.error("ClientException in floating ip index", exc_info=True)
         messages.error(request, 'Error fetching floating ips: %s' % e.message)
 
-    return shortcuts.render_to_response('dash_floating_ips.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/floating_ips/dash_floating_ips.html', {
         'allocate_form': FloatingIpAllocate(initial={
                                             'tenant_id': request.user.tenant}),
         'disassociate_form': FloatingIpDisassociate(),
@@ -158,7 +159,8 @@ def associate(request, tenant_id, ip_id):
     if handled:
         return handled
 
-    return shortcuts.render_to_response('dash_floating_ips_associate.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/floating_ips/dash_floating_ips_associate.html', {
         'associate_form': form,
     }, context_instance=template.RequestContext(request))
 
@@ -169,5 +171,6 @@ def disassociate(request, tenant_id, ip_id):
     if handled:
         return handled
 
-    return shortcuts.render_to_response('dash_floating_ips_associate.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/floating_ips/dash_floating_ips_associate.html', {
     }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/dash/views/images.py

@@ -142,7 +142,8 @@ def index(request, tenant_id):
     images = [im for im in all_images
               if im['container_format'] not in ['aki', 'ari']]
 
-    return render_to_response('dash_images.html', {
+    return render_to_response(
+    'django_openstack/dash/images/dash_images.html', {
         'tenant': tenant,
         'images': images,
     }, context_instance=template.RequestContext(request))
@@ -202,7 +203,8 @@ def launch(request, tenant_id, image_id):
     if handled:
         return handled
 
-    return render_to_response('dash_launch.html', {
+    return render_to_response(
+    'django_openstack/dash/images/dash_launch.html', {
         'tenant': tenant,
         'image': image,
         'form': form,

django-openstack/django_openstack/dash/views/instances.py

@@ -128,7 +128,8 @@ def index(request, tenant_id):
     terminate_form = TerminateInstance()
     reboot_form = RebootInstance()
 
-    return shortcuts.render_to_response('dash_instances.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/instances/dash_instances.html', {
         'instances': instances,
         'terminate_form': terminate_form,
         'reboot_form': reboot_form,
@@ -148,7 +149,8 @@ def refresh(request, tenant_id):
     terminate_form = TerminateInstance()
     reboot_form = RebootInstance()
 
-    return shortcuts.render_to_response('_instance_list.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/instances/_instance_list.html', {
         'instances': instances,
         'terminate_form': terminate_form,
         'reboot_form': reboot_form,
@@ -201,10 +203,10 @@ def usage(request, tenant_id=None):
         instances += terminated_instances
 
     if request.GET.get('format', 'html') == 'csv':
-        template_name = 'dash_usage.csv'
+        template_name = 'django_openstack/dash/instances/dash_usage.csv'
         mimetype = "text/csv"
     else:
-        template_name = 'dash_usage.html'
+        template_name = 'django_openstack/dash/instances/dash_usage.html'
         mimetype = "text/html"
 
     return shortcuts.render_to_response(template_name, {
@@ -277,7 +279,8 @@ def update(request, tenant_id, instance_id):
     if handled:
         return handled
 
-    return shortcuts.render_to_response('dash_instance_update.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/instances/dash_instance_update.html', {
         'instance': instance,
         'form': form,
     }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/dash/views/keypairs.py

@@ -87,7 +87,8 @@ def index(request, tenant_id):
         LOG.error("ClientException in keypair index", exc_info=True)
         messages.error(request, 'Error fetching keypairs: %s' % e.message)
 
-    return shortcuts.render_to_response('dash_keypairs.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/keypairs/dash_keypairs.html', {
         'keypairs': keypairs,
         'delete_form': delete_form,
     }, context_instance=template.RequestContext(request))
@@ -99,6 +100,7 @@ def create(request, tenant_id):
     if handled:
         return handled
 
-    return shortcuts.render_to_response('dash_keypairs_create.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/keypairs/dash_keypairs_create.html', {
         'create_form': form,
     }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/dash/views/networks.py

@@ -136,7 +136,8 @@ def index(request, tenant_id):
     except Exception, e:
         messages.error(request, 'Unable to get network list: %s' % e.message)
 
-    return shortcuts.render_to_response('dash_networks.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/networks/dash_networks.html', {
         'networks': networks,
         'delete_form': delete_form,
     }, context_instance=template.RequestContext(request))
@@ -148,7 +149,8 @@ def create(request, tenant_id):
     if handled:
         return shortcuts.redirect('dash_networks', request.user.tenant)
 
-    return shortcuts.render_to_response('dash_network_create.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/networks/dash_network_create.html', {
         'network_form': network_form
     }, context_instance=template.RequestContext(request))
 
@@ -169,7 +171,8 @@ def detail(request, tenant_id, network_id):
     except Exception, e:
         messages.error(request, 'Unable to get network details:%s' % e.message)
 
-    return shortcuts.render_to_response('dash_networks_detail.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/networks/dash_networks_detail.html', {
         'network': network,
         'tenant': tenant_id,
         'delete_port_form': delete_port_form,
@@ -186,7 +189,8 @@ def rename(request, tenant_id, network_id):
     if handled:
         return shortcuts.redirect('dash_networks', request.user.tenant)
 
-    return shortcuts.render_to_response('dash_network_rename.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/networks/dash_network_rename.html', {
         'network': network_details,
         'rename_form': rename_form
     }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/dash/views/objects.py

@@ -133,7 +133,8 @@ def index(request, tenant_id, container_name):
         objects = api.swift_get_objects(request, container_name)
 
     delete_form.fields['container_name'].initial = container_name
-    return render_to_response('dash_objects.html', {
+    return render_to_response(
+    'django_openstack/dash/objects/dash_objects.html', {
         'container_name': container_name,
         'objects': objects,
         'delete_form': delete_form,
@@ -148,7 +149,8 @@ def upload(request, tenant_id, container_name):
         return handled
 
     form.fields['container_name'].initial = container_name
-    return render_to_response('dash_objects_upload.html', {
+    return render_to_response(
+    'django_openstack/dash/objects/dash_objects_upload.html', {
         'container_name': container_name,
         'upload_form': form,
     }, context_instance=template.RequestContext(request))
@@ -183,7 +185,7 @@ def copy(request, tenant_id, container_name, object_name):
     form.fields['orig_object_name'].initial = object_name
 
     return render_to_response(
-        'dash_object_copy.html',
+        'django_openstack/dash/objects/dash_object_copy.html',
         {'container_name': container_name,
          'object_name': object_name,
          'copy_form': form},

django-openstack/django_openstack/dash/views/ports.py

@@ -159,7 +159,8 @@ def create(request, tenant_id, network_id):
             network_id=network_id
         )
 
-    return shortcuts.render_to_response('dash_ports_create.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/ports/dash_ports_create.html', {
         'network_id': network_id,
         'create_form': create_form
     }, context_instance=template.RequestContext(request))
@@ -176,7 +177,8 @@ def attach(request, tenant_id, network_id, port_id):
     # Get all avaliable vifs
     vifs = _get_available_vifs(request)
 
-    return shortcuts.render_to_response('dash_port_attach.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/ports/dash_port_attach.html', {
         'network': network_id,
         'port': port_id,
         'attach_form': attach_form,

django-openstack/django_openstack/dash/views/security_groups.py

@@ -153,7 +153,8 @@ def index(request, tenant_id):
         messages.error(request, 'Error fetching security_groups: %s'
                                  % e.message)
 
-    return shortcuts.render_to_response('dash_security_groups.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/security_groups/dash_security_groups.html', {
         'security_groups': security_groups,
         'delete_form': delete_form,
     }, context_instance=template.RequestContext(request))
@@ -181,7 +182,7 @@ def edit_rules(request, tenant_id, security_group_id):
         return shortcuts.redirect('dash_security_groups', tenant_id)
 
     return shortcuts.render_to_response(
-        'dash_security_groups_edit_rules.html', {
+        'django_openstack/dash/security_groups/dash_security_groups_edit_rules.html', {
         'security_group': security_group,
         'delete_form': delete_form,
         'form': add_form,
@@ -195,6 +196,7 @@ def create(request, tenant_id):
     if handled:
         return handled
 
-    return shortcuts.render_to_response('dash_security_groups_create.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/security_groups/dash_security_groups_create.html', {
         'form': form,
     }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/dash/views/snapshots.py

@@ -83,7 +83,8 @@ def index(request, tenant_id):
         LOG.error(msg, exc_info=True)
         messages.error(request, msg)
 
-    return render_to_response('dash_snapshots.html', {
+    return render_to_response(
+    'django_openstack/dash/snapshots/dash_snapshots.html', {
         'images': images,
     }, context_instance=template.RequestContext(request))
 
@@ -111,7 +112,8 @@ def create(request, tenant_id, instance_id):
                                   ', '.join(valid_states))
         return shortcuts.redirect('dash_instances', tenant_id)
 
-    return shortcuts.render_to_response('dash_snapshots_create.html', {
+    return shortcuts.render_to_response(
+    'django_openstack/dash/snapshots/dash_snapshots_create.html', {
         'instance': instance,
         'create_form': form,
     }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/syspanel/views/flavors.py

@@ -94,7 +94,8 @@ def index(request):
         messages.error(request, 'Unable to get usage info: %s' % e.message)
 
     flavors.sort(key=lambda x: x.id, reverse=True)
-    return render_to_response('syspanel_flavors.html', {
+    return render_to_response(
+    'django_openstack/syspanel/flavors/syspanel_flavors.html', {
         'delete_form': delete_form,
         'flavors': flavors,
     }, context_instance=template.RequestContext(request))
@@ -113,7 +114,8 @@ def create(request):
     global_summary.human_readable('disk_size')
     global_summary.human_readable('ram_size')
 
-    return render_to_response('syspanel_create_flavor.html', {
+    return render_to_response(
+    'django_openstack/syspanel/flavors/syspanel_create_flavor.html', {
         'global_summary': global_summary.summary,
         'form': form,
     }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/syspanel/views/images.py

@@ -111,7 +111,7 @@ def index(request):
         LOG.error("Error retrieving image list", exc_info=True)
         messages.error(request, "Error retrieving image list: %s" % e.message)
 
-    return render_to_response('syspanel_images.html', {
+    return render_to_response('django_openstack/syspanel/images/syspanel_images.html', {
         'delete_form': delete_form,
         'toggle_form': toggle_form,
         'images': images,
@@ -175,7 +175,7 @@ def update(request, image_id):
             messages.error(request,
                            "Image could not be uploaded, please try agian.")
             form = UpdateImageForm(request.POST)
-            return render_to_response('syspanel_image_update.html', {
+            return render_to_response('django_openstack/syspanel/images/syspanel_image_update.html', {
                 'image': image,
                 'form': form,
             }, context_instance=template.RequestContext(request))
@@ -193,7 +193,7 @@ def update(request, image_id):
                 'disk_format': image.get('disk_format', ''),
             })
 
-        return render_to_response('syspanel_image_update.html', {
+        return render_to_response('django_openstack/syspanel/images/syspanel_image_update.html', {
             'image': image,
             'form': form,
         }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/syspanel/views/instances.py

@@ -104,10 +104,10 @@ def usage(request):
     global_summary.human_readable('ram_size')
 
     if request.GET.get('format', 'html') == 'csv':
-        template_name = 'syspanel_usage.csv'
+        template_name = 'django_openstack/syspanel/instances/syspanel_usage.csv'
         mimetype = "text/csv"
     else:
-        template_name = 'syspanel_usage.html'
+        template_name = 'django_openstack/syspanel/instances/syspanel_usage.html'
         mimetype = "text/html"
 
     return render_to_response(
@@ -159,10 +159,10 @@ def tenant_usage(request, tenant_id):
                 running_instances.append(i)
 
     if request.GET.get('format', 'html') == 'csv':
-        template_name = 'syspanel_tenant_usage.csv'
+        template_name = 'django_openstack/syspanel/instances/syspanel_tenant_usage.csv'
         mimetype = "text/csv"
     else:
-        template_name = 'syspanel_tenant_usage.html'
+        template_name = 'django_openstack/syspanel/instances/syspanel_tenant_usage.html'
         mimetype = "text/html"
 
     return render_to_response(template_name, {
@@ -196,7 +196,8 @@ def index(request):
     terminate_form = TerminateInstance()
     reboot_form = RebootInstance()
 
-    return render_to_response('syspanel_instances.html', {
+    return render_to_response(
+    'django_openstack/syspanel/instances/syspanel_instances.html', {
         'instances': instances,
         'terminate_form': terminate_form,
         'reboot_form': reboot_form,
@@ -222,7 +223,8 @@ def refresh(request):
     terminate_form = TerminateInstance()
     reboot_form = RebootInstance()
 
-    return render_to_response('_syspanel_instance_list.html', {
+    return render_to_response(
+    'django_openstack/syspanel/instances/_syspanel_instance_list.html', {
         'instances': instances,
         'terminate_form': terminate_form,
         'reboot_form': reboot_form,

django-openstack/django_openstack/syspanel/views/quotas.py

@@ -24,6 +24,7 @@ def index(request):
     quotas['ram'] = int(quotas['ram']) / 100
     quotas.pop('id')
 
-    return render_to_response('syspanel_quotas.html', {
+    return render_to_response(
+    'django_openstack/syspanel/quotas/syspanel_quotas.html', {
         'quotas': quotas,
     }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/syspanel/views/services.py

@@ -108,7 +108,8 @@ def index(request):
     other_services = sorted(other_services, key=lambda svc: (svc['type'] +
                                                              svc['host']))
 
-    return render_to_response('syspanel_services.html', {
+    return render_to_response(
+    'django_openstack/syspanel/services/syspanel_services.html', {
         'services': services,
         'service_toggle_enabled_form': ToggleService,
         'other_services': other_services,

django-openstack/django_openstack/syspanel/views/tenants.py

@@ -178,7 +178,8 @@ def index(request):
         LOG.error('ApiException while getting tenant list', exc_info=True)
         messages.error(request, 'Unable to get tenant info: %s' % e.message)
     tenants.sort(key=lambda x: x.id, reverse=True)
-    return render_to_response('syspanel_tenants.html', {
+    return render_to_response(
+    'django_openstack/syspanel/tenants/syspanel_tenants.html', {
         'tenants': tenants,
     }, context_instance=template.RequestContext(request))
 
@@ -191,7 +192,7 @@ def create(request):
         return handled
 
     return render_to_response(
-    'syspanel_tenant_create.html', {
+    'django_openstack/syspanel/tenants/syspanel_tenant_create.html', {
         'form': form,
     }, context_instance=template.RequestContext(request))
 
@@ -216,7 +217,7 @@ def update(request, tenant_id):
             return redirect('syspanel_tenants')
 
     return render_to_response(
-    'syspanel_tenant_update.html', {
+    'django_openstack/syspanel/tenants/syspanel_tenant_update.html', {
         'form': form,
     }, context_instance=template.RequestContext(request))
 
@@ -246,7 +247,7 @@ def users(request, tenant_id):
         if i in new_user_ids:
             new_user_ids.remove(i)
     return render_to_response(
-    'syspanel_tenant_users.html', {
+    'django_openstack/syspanel/tenants/syspanel_tenant_users.html', {
         'add_user_form': add_user_form,
         'remove_user_form': remove_user_form,
         'tenant_id': tenant_id,
@@ -279,7 +280,7 @@ def quotas(request, tenant_id):
     form = UpdateQuotas(initial=quota_set)
 
     return render_to_response(
-    'syspanel_tenant_quotas.html', {
+    'django_openstack/syspanel/tenants/syspanel_tenant_quotas.html', {
         'form': form,
         'tenant_id': tenant_id,
         'quotas': quotas,

django-openstack/django_openstack/syspanel/views/users.py

@@ -111,7 +111,7 @@ def index(request):
     user_delete_form = UserDeleteForm()
     user_enable_disable_form = UserEnableDisableForm()
 
-    return shortcuts.render_to_response('syspanel_users.html', {
+    return shortcuts.render_to_response('django_openstack/syspanel/users/syspanel_users.html', {
         'users': users,
         'user_delete_form': user_delete_form,
         'user_enable_disable_form': user_enable_disable_form,
@@ -146,7 +146,7 @@ def update(request, user_id):
                                     please try again.')
 
             return render_to_response(
-            'syspanel_user_update.html', {
+            'django_openstack/syspanel/users/syspanel_user_update.html', {
                 'form': form,
                 'user_id': user_id,
             }, context_instance=template.RequestContext(request))
@@ -169,7 +169,7 @@ def update(request, user_id):
                                  'email': email},
                                  tenant_list=tenants)
         return render_to_response(
-        'syspanel_user_update.html', {
+        'django_openstack/syspanel/users/syspanel_user_update.html', {
             'form': form,
             'user_id': user_id,
         }, context_instance=template.RequestContext(request))
@@ -218,13 +218,13 @@ def create(request):
                 return redirect('syspanel_users')
         else:
             return render_to_response(
-            'syspanel_user_create.html', {
+            'django_openstack/syspanel/users/syspanel_user_create.html', {
                 'form': form,
             }, context_instance=template.RequestContext(request))
 
     else:
         form = UserForm(tenant_list=tenants)
         return render_to_response(
-        'syspanel_user_create.html', {
+        'django_openstack/syspanel/users/syspanel_user_create.html', {
             'form': form,
         }, context_instance=template.RequestContext(request))

django-openstack/django_openstack/templates/django_openstack/dash/containers/_container_list.html

@@ -8,7 +8,7 @@
     <td>{{ container.name }}</td>
     <td id="actions">
       <ul>
-        <li class="form">{% include "_delete_container.html" with form=delete_form %}</li>
+        <li class="form">{% include "django_openstack/dash/containers/_delete_container.html" with form=delete_form %}</li>
         <li><a href="{% url dash_objects request.user.tenant container.name %}">List Objects</a></li>
         <li><a href="{% url dash_objects_upload request.user.tenant container.name %}">Upload Object</a></li>
       </ul>

django-openstack/django_openstack/templates/django_openstack/dash/containers/dash_containers.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="containers" %}
@@ -9,10 +9,10 @@
 {% block page_header %}
   {% url dash_images request.user.tenant as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Containers" refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title="Containers" refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block dash_main %}
-  {% include '_container_list.html' %}
+  {% include 'django_openstack/dash/containers/_container_list.html' %}
   <a class="action_link large-rounded" href="{% url dash_containers_create request.user.tenant %}">Create New Container &gt;&gt;</a>
 {% endblock %}

django-openstack/django_openstack/templates/django_openstack/dash/containers/dash_containers_create.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="containers" %}
@@ -7,13 +7,13 @@
 {% endblock %}
 
 {% block page_header %}
-  {% include "_page_header.html" with title="Create Tenant" %}
+  {% include "django_openstack/common/_page_header.html" with title="Create Tenant" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include '_container_form.html' with form=create_form %}
+      {% include 'django_openstack/dash/containers/_container_form.html' with form=create_form %}
     </div>
 
     <div class="right">

django-openstack/django_openstack/templates/django_openstack/dash/dash_base.html

@@ -6,7 +6,7 @@
   {% endwith %}
 {% endblock %}
 {% block sidebar %}
-  {% include '_dash_sidebar.html' %}
+  {% include 'django_openstack/dash/_dash_sidebar.html' %}
 {% endblock %}
 
 {% block main %}

django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_floating_ips_list.html

@@ -22,9 +22,9 @@
 
     <td id="actions">
       <ul>
-        <li class="form">{% include "_release_floating_ip.html" with form=release_form %}</li>
+        <li class="form">{% include "django_openstack/dash/floating_ips/_release_floating_ip.html" with form=release_form %}</li>
         {% if ip.fixed_ip %}
-        <li class="form">{% include "_disassociate_floating_ip.html" with form=disassociate_form %}</li>
+        <li class="form">{% include "django_openstack/dash/floating_ips/_disassociate_floating_ip.html" with form=disassociate_form %}</li>
         {% else %}
           <li class="form"><a href="{% url dash_floating_ips_associate request.user.tenant ip.id %}">Associate to instance</a></li>
         {% endif %}

django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/dash_floating_ips.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="floatingips" %}
@@ -9,17 +9,17 @@
 {% block page_header %}
   {% url dash_floating_ips request.user.tenant as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Floating IPs" refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title="Floating IPs" refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   {% if floating_ips %}
-    {% include '_floating_ips_list.html' %}
+    {% include 'django_openstack/dash/floating_ips/_floating_ips_list.html' %}
   {% else %}
     <div class="message_box info">
       <h2>Info</h2>
       <p>There are currently no floating ips assigned to your tenant.</p>
     </div>
   {% endif %}
-  {% include "_allocate_floating_ip.html" with form=allocate_form %}
+  {% include "django_openstack/dash/floating_ips/_allocate_floating_ip.html" with form=allocate_form %}
 {% endblock %}

django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/dash_floating_ips_associate.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="floatingips" %}
@@ -8,13 +8,13 @@
 
 {% block page_header %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Associate Floating IP" %}
+  {% include "django_openstack/common/_page_header.html" with title="Associate Floating IP" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include '_floating_ip_associate.html' with form=associate_form %}
+      {% include 'django_openstack/dash/floating_ips/_floating_ip_associate.html' with form=associate_form %}
     </div>
 
     <div class="right">

django-openstack/django_openstack/templates/django_openstack/dash/images/_launch.html

@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/_launch.html' %}
+{% extends 'django_openstack/dash/images/_launch_form.html' %}
 
 {% block submit %}
   <input type="submit" value="Launch Instance" class="large-rounded" />

django-openstack/django_openstack/templates/django_openstack/dash/images/dash_images.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="images" %}
@@ -9,12 +9,12 @@
 {% block page_header %}
   {% url dash_images request.user.tenant as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Images" refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title="Images" refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   {% if images %}
-    {% include '_image_list.html' %}
+    {% include 'django_openstack/dash/images/_image_list.html' %}
 
   {% endif %}
 {% endblock %}

django-openstack/django_openstack/templates/django_openstack/dash/images/dash_launch.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="images" %}
@@ -8,13 +8,13 @@
 
 {% block page_header %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Launch Instance" %}
+  {% include "django_openstack/common/_page_header.html" with title="Launch Instance" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include '_launch.html' %}
+      {% include 'django_openstack/dash/images/_launch.html' %}
     </div>
     <div class="right">
       <h3>Description:</h3>

django-openstack/django_openstack/templates/django_openstack/dash/instances/_instance_list.html

@@ -57,8 +57,8 @@
           <td>{{instance.status|lower|capfirst}}</td>
           <td id="actions">
             <ul>
-              <li class="form">{% include "_terminate.html" with form=terminate_form %}</li>
-              <li class="form">{% include "_reboot.html" with form=reboot_form %}</li>
+              <li class="form">{% include "django_openstack/common/instances/_terminate.html" with form=terminate_form %}</li>
+              <li class="form">{% include "django_openstack/common/instances/_reboot.html" with form=reboot_form %}</li>
               <li><a target="_blank" href="{% url dash_instances_console request.user.tenant instance.id %}">Log</a></li>
               <li><a target="_blank" href="{% url dash_instances_vnc request.user.tenant instance.id %}">VNC Console</a></li>
               <li><a href="{% url dash_instances_update request.user.tenant instance.id %}">Edit</a></li>

django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_instance_update.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="instances" %}
@@ -8,13 +8,13 @@
 
 {% block page_header %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Update Instance" %}
+  {% include "django_openstack/common/_page_header.html" with title="Update Instance" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include '_instance_form.html' with form=form %}
+      {% include 'django_openstack/dash/instances/_instance_form.html' with form=form %}
       <h3><a href="{% url dash_instances request.user.tenant %}"><< Return to Instances List</a></h3>
     </div>
 
@@ -39,7 +39,7 @@
       setInterval(function(){
         loadInstances();
       }, 15000);
-      
+
       $("a.refresh").click(function(e){
         e.preventDefault()
         loadInstances();

django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_instances.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="instances" %}
@@ -9,12 +9,12 @@
 {% block page_header %}
   {% url dash_instances request.user.tenant as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Instances" refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title="Instances" refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   {% if instances %}
-    {% include '_instance_list.html' %}
+    {% include 'django_openstack/dash/instances/_instance_list.html' %}
   {% else %}
     <div class="message_box info">
       <h2>Info</h2>
@@ -37,14 +37,14 @@
     setInterval(function(){
       loadInstances();
     }, 15000);
-    
+
     loadOptionsWidget();
-    
+
     $("a.refresh").click(function(e){
       e.preventDefault()
       loadInstances();
     })
-    
+
     function loadOptionsWidget(){
       checkbox = document.createElement("input");
         cb = $(checkbox);

django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_usage.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 {% load parse_date %}
 {% load sizeformat %}
 
@@ -10,7 +10,7 @@
 
 {% block page_header %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Overview" %}
+  {% include "django_openstack/common/_page_header.html" with title="Overview" %}
 {% endblock page_header %}
 
 {% block dash_main %}
@@ -96,5 +96,5 @@
         <p>There are currently no instances.<br/><br/>You can launch an instance from the  <a href='{% url dash_images request.user.tenant %}'>Images Page.</a></p>
       </div>
   {% endif %}
-  
+
 {% endblock %}

django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_keypair_list.html

@@ -10,7 +10,7 @@
     <td>{{ keypair.fingerprint }}</td>
     <td id="actions">
       <ul>
-        <li class="form">{% include "_delete_keypair.html" with form=delete_form %}</li>
+        <li class="form">{% include "django_openstack/dash/keypairs/_delete_keypair.html" with form=delete_form %}</li>
       </ul>
     </td>
   </tr>

django-openstack/django_openstack/templates/django_openstack/dash/keypairs/dash_keypairs.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="keypairs" %}
@@ -9,12 +9,12 @@
 {% block page_header %}
   {% url dash_keypairs request.user.tenant as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Keypairs" refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title="Keypairs" refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   {% if keypairs %}
-    {% include '_keypair_list.html' %}
+    {% include 'django_openstack/dash/keypairs/_keypair_list.html' %}
     <a id="keypairs_create_link" class="action_link large-rounded" href="{% url dash_keypairs_create request.user.tenant %}">Create New Keypair</a>
   {% else %}
     <div class="message_box info">

django-openstack/django_openstack/templates/django_openstack/dash/keypairs/dash_keypairs_create.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="keypairs" %}
@@ -20,14 +20,14 @@
 
 {% block page_header %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Create Keypair" %}
+  {% include "django_openstack/common/_page_header.html" with title="Create Keypair" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
       <h3>Your private key is being downloaded.</h3>
-      {% include '_keypair_form.html' with form=create_form %}
+      {% include 'django_openstack/dash/keypairs/_keypair_form.html' with form=create_form %}
       <h3><a href="{% url dash_keypairs request.user.tenant %}"><< Return to keypairs list</a></h3>
     </div>
 

django-openstack/django_openstack/templates/django_openstack/dash/networks/_network_detail.html

@@ -30,12 +30,12 @@
           <td id="actions">
             <ul>
               {% if port.attachment %}
-              <li class="form">{% include "_detach_port.html" with form=detach_port_form %}</li>
+              <li class="form">{% include "django_openstack/dash/networks/_detach_port.html" with form=detach_port_form %}</li>
               {% else %}
               <li><a href='{% url dash_ports_attach request.user.tenant network.id port.id %}'>Attach</a></li>
               {% endif %}
-              <li class="form">{% include "_delete_port.html" with form=delete_port_form %}</li>
-              <li class="form">{% include "_toggle_port.html" with form=toggle_port_form %}</li>
+              <li class="form">{% include "django_openstack/dash/networks/_delete_port.html" with form=delete_port_form %}</li>
+              <li class="form">{% include "django_openstack/dash/networks/_toggle_port.html" with form=toggle_port_form %}</li>
             </ul>
           </td>
           <td id="extensions">

django-openstack/django_openstack/templates/django_openstack/dash/networks/_network_list.html

@@ -17,7 +17,7 @@
           <td>{{network.used}}</td>
           <td id="actions">
             <ul>
-              <li class="form">{% include "_delete_network.html" with form=delete_form %}</li>
+              <li class="form">{% include "django_openstack/dash/networks/_delete_network.html" with form=delete_form %}</li>
               <li><a href='{% url dash_network_rename request.user.tenant network.id %}'>Rename</a></li>
             </ul>
         </td>

django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_network_create.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -8,13 +8,13 @@
 
 {% block page_header %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Create Network" %}
+  {% include "django_openstack/common/_page_header.html" with title="Create Network" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include '_network_form.html' with form=network_form %}
+      {% include 'django_openstack/dash/networks/_network_form.html' with form=network_form %}
       <h3><a href="{% url dash_networks request.user.tenant %}"><< Return to networks list</a></h3>
     </div>
 

django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_network_rename.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -8,7 +8,7 @@
 
 {% block page_header %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Rename Network" %}
+  {% include "django_openstack/common/_page_header.html" with title="Rename Network" %}
 {% endblock page_header %}
 
 {% block headerjs %}
@@ -22,7 +22,7 @@
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include '_rename_form.html' with form=rename_form %}
+      {% include 'django_openstack/dash/networks/_rename_form.html' with form=rename_form %}
       <h3><a href="{% url dash_networks request.user.tenant %}"><< Return to networks list</a></h3>
     </div>
 

django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_networks.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -9,12 +9,12 @@
 {% block page_header %}
   {% url dash_networks request.user.tenant as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Networks" refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title="Networks" refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   {% if networks %}
-    {% include '_network_list.html' %}
+    {% include 'django_openstack/dash/networks/_network_list.html' %}
     <a id="network_create_link" class="action_link large-rounded" href="{% url dash_network_create request.user.tenant %}">Create New Network</a>
   {% else %}
     <div class="message_box info">

django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_networks_detail.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -9,7 +9,7 @@
 {% block page_header %}
   {% url dash_networks_detail request.user.tenant network.id as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title=network.name refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title=network.name refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block breadcrumbs %}
@@ -19,12 +19,12 @@
 
 {% block dash_main %}
   {% if network.ports %}
-    {% include '_network_detail.html' %}
+    {% include 'django_openstack/dash/networks/_network_detail.html' %}
     <a id="network_create_link" class="action_link large-rounded" href="{% url dash_ports_create request.user.tenant network.id %}">Create Ports</a>
   {% else %}
     <div class="message_box info">
      <h2>Info</h2>
      <p>There are currently no ports in this network. <a href="{% url dash_ports_create request.user.tenant network.id %}">Create Ports &gt;&gt;</a></p>
-    </div> 
+    </div>
   {% endif %}
 {% endblock %}

django-openstack/django_openstack/templates/django_openstack/dash/objects/_object_list.html

@@ -9,7 +9,7 @@
     <td id="actions">
       <ul>
         <li><a href="{% url dash_object_copy request.user.tenant container_name object.name %}">Copy</a></li>
-        <li class="form">{% include "_delete_object.html" with form=delete_form %}</li>
+        <li class="form">{% include "django_openstack/dash/objects/_delete_object.html" with form=delete_form %}</li>
         <li><a href="{% url dash_objects_download request.user.tenant container_name object.name %}">Download</a>
       </ul>
     </td>

django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_object_copy.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="containers" %}
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block page_header %}
-  {% include "_page_header.html" with title="Copy Object" %}
+  {% include "django_openstack/common/_page_header.html" with title="Copy Object" %}
 {% endblock page_header %}
 
 {% block dash_main %}
@@ -16,7 +16,7 @@
   <div class="dash_block wide form">
     <div class="left">
       <h3>Copy Object: '{{object_name}}'</h3>
-      {% include '_copy_object.html' with form=copy_form greeting="HI" %}
+      {% include 'django_openstack/dash/objects/_copy_object.html' with form=copy_form greeting="HI" %}
       <h3><a href="{% url dash_objects request.user.tenant container_name %}">&lt;&lt; Return to objects list</a></h3>
     </div>
 

django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_objects.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="containers" %}
@@ -11,7 +11,7 @@
     <h2>Objects</h2>
     <div class="right">
       <div class='search'>
-        {% include '_object_filter.html' with form=filter_form %}
+        {% include 'django_openstack/dash/objects/_object_filter.html' with form=filter_form %}
       </div>
       <a class="refresh" title="Refresh" href="{% url dash_objects request.user.tenant container_name %}">Refresh List</a>
     </div>
@@ -22,7 +22,7 @@
   <h3 class="container_name"><span>Container:</span> {{ container_name }}</h3>
 
   {% if objects %}
-    {% include '_object_list.html' %}
+    {% include 'django_openstack/dash/objects/_object_list.html' %}
   {% else %}
     <div class="message_box info">
       <h2>Info</h2>

django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_objects_upload.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="containers" %}
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block page_header %}
-  {% include "_page_header.html" with title="Upload Objects" %}
+  {% include "django_openstack/common/_page_header.html" with title="Upload Objects" %}
 {% endblock page_header %}
 
 {% block dash_main %}
@@ -15,7 +15,7 @@
 
   <div class="dash_block wide form">
     <div class="left">
-      {% include '_object_form.html' with form=upload_form %}
+      {% include 'django_openstack/dash/objects/_object_form.html' with form=upload_form %}
       <h3><a href="{% url dash_objects request.user.tenant container_name %}">&lt;&lt; Return to objects list</a></h3>
     </div>
 

django-openstack/django_openstack/templates/django_openstack/dash/ports/dash_port_attach.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -8,7 +8,7 @@
 
 {% block page_header %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Attach Port" %}
+  {% include "django_openstack/common/_page_header.html" with title="Attach Port" %}
 {% endblock page_header %}
 
 {% block headerjs %}
@@ -18,7 +18,7 @@
       '{{vif.id}}' : '{{vif.name}}',
     {% endfor %}
   };
-  
+
   $(document).ready(function() {
     $.each(VIF_OPTIONS, function(val, text) {
         $('select#id_vif_id')
@@ -33,7 +33,7 @@
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include '_attach_port.html' with form=attach_form %}
+      {% include 'django_openstack/dash/ports/_attach_port.html' with form=attach_form %}
       <h3><a href="{% url dash_networks_detail request.user.tenant network %}"><< Return to network detail</a></h3>
     </div>
 

django-openstack/django_openstack/templates/django_openstack/dash/ports/dash_ports_create.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -8,13 +8,13 @@
 
 {% block page_header %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Create Network" %}
+  {% include "django_openstack/common/_page_header.html" with title="Create Network" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include '_create_port.html' with form=create_form %}
+      {% include 'django_openstack/dash/ports/_create_port.html' with form=create_form %}
       <h3><a href="{% url dash_networks_detail request.user.tenant network_id %}"><< Return to network detail</a></h3>
     </div>
 

django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_security_group_list.html

@@ -14,7 +14,7 @@
       <ul>
         <li><a href="{% url dash_security_groups_edit_rules request.user.tenant security_group.id %}">Edit Rules</a></li>
         {% if security_group.name != 'default' %}
-          <li class="form">{% include "_delete_security_group.html" with form=delete_form %}</li>
+          <li class="form">{% include "django_openstack/dash/security_groups/_delete_security_group.html" with form=delete_form %}</li>
         {% endif %}
       </ul>
     </td>

django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="security_groups" %}
@@ -9,12 +9,12 @@
 {% block page_header %}
   {% url dash_security_groups request.user.tenant as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Security Groups" refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title="Security Groups" refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   {% if security_groups %}
-    {% include '_security_group_list.html' %}
+    {% include 'django_openstack/dash/security_groups/_security_group_list.html' %}
     <a id="security_groups_create_link" class="action_link large-rounded" href="{% url dash_security_groups_create request.user.tenant %}">Create Security Group</a>
   {% else %}
     <div class="message_box info">

django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups_create.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="security_groups" %}
@@ -7,13 +7,13 @@
 {% endblock %}
 
 {% block page_header %}
-  {% include "_page_header.html" with title="Create Security Group" %}
+  {% include "django_openstack/common/_page_header.html" with title="Create Security Group" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include '_security_group_form.html' %}
+      {% include 'django_openstack/dash/security_groups/_security_group_form.html' %}
     </div>
 
     <div class="right">

django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups_edit_rules.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="security_groups" %}
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block page_header %}
-  {% include "_page_header.html" with title="Edit Security Group Rules" %}
+  {% include "django_openstack/common/_page_header.html" with title="Edit Security Group Rules" %}
 {% endblock page_header %}
 
 {% block dash_main %}
@@ -32,7 +32,7 @@
             <td>{{rule.ip_range.cidr}}</td>
             <td id="actions">
               <ul>
-                <li class="form">{% include "_delete_security_group_rule.html" with form=delete_form %}</li>
+                <li class="form">{% include "django_openstack/dash/security_groups/_delete_security_group_rule.html" with form=delete_form %}</li>
               </ul>
             </td>
           </tr>
@@ -60,7 +60,7 @@
             <input name="security_group_id" type="hidden" value="{{security_group.id}}" />
             <input type="submit" value="Add Rule" class="large-rounded action_link" />
           </fieldset>
-        </form> 
+        </form>
       </div>
     </div>
     <div style="clear: both;"></div>

django-openstack/django_openstack/templates/django_openstack/dash/snapshots/dash_snapshots.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="snapshots" %}
@@ -9,12 +9,12 @@
 {% block page_header %}
   {% url dash_snapshots request.user.tenant as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Snapshots" refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title="Snapshots" refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   {% if images %}
-    {% include '_image_list.html' %}
+    {% include 'django_openstack/dash/images/_image_list.html' %}
   {% else %}
     <div class="message_box info">
       <h2>Info</h2>

django-openstack/django_openstack/templates/django_openstack/dash/snapshots/dash_snapshots_create.html

@@ -1,4 +1,4 @@
-{% extends 'dash_base.html' %}
+{% extends 'django_openstack/dash/dash_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="snapshots" %}
@@ -15,14 +15,14 @@
 {% endblock %}
 
 {% block page_header %}
-  {% include "_page_header.html" with title="Create a Snapshot" %}
+  {% include "django_openstack/common/_page_header.html" with title="Create a Snapshot" %}
 {% endblock page_header %}
 
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
       <h3>Choose a name for your snapshot.</h3>
-      {% include '_snapshot_form.html' with form=create_form %}
+      {% include 'django_openstack/dash/snapshots/_snapshot_form.html' with form=create_form %}
       <h3><a href="{% url dash_snapshots request.user.tenant %}"><< Return to snapshots list</a></h3>
     </div>
 

django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_create_flavor.html

@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/_create_flavor.html' %}
+{% extends 'django_openstack/syspanel/flavors/_flavor_form.html' %}
 
 {% block submit %}
   <input type="submit" value="Create Flavor" class="large-rounded" />

django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_syspanel_flavor_list.html

@@ -16,7 +16,7 @@
       <td>{{flavor.disk}}GB</td>
       <td id="actions">
         <ul>
-          <li class="form">{% include "_delete_flavor.html" with form=delete_form %}</li>
+          <li class="form">{% include "django_openstack/syspanel/flavors/_delete_flavor.html" with form=delete_form %}</li>
         </ul>
       </td>
     </tr>

django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/syspanel_create_flavor.html

@@ -1,4 +1,4 @@
-{% extends 'syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/syspanel_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="flavors" %}
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block page_header %}
-  {% include "_page_header.html" with title="Create Flavor" %}
+  {% include "django_openstack/common/_page_header.html" with title="Create Flavor" %}
 {% endblock page_header %}
 
 {% block syspanel_main %}
@@ -29,7 +29,7 @@
         </ul>
       </div>
       <div class="left">
-        {% include "_create_flavor.html" %}
+        {% include "django_openstack/syspanel/flavors/_create_flavor.html" %}
       </div>
       <div class="right">
         <h3>Description:</h3>

django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/syspanel_flavors.html

@@ -1,4 +1,4 @@
-{% extends 'syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/syspanel_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="flavors" %}
@@ -9,10 +9,10 @@
 {% block page_header %}
   {% url syspanel_flavors as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Flavors" refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title="Flavors" refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block syspanel_main %}
-  {% include "_syspanel_flavor_list.html" %}
+  {% include "django_openstack/syspanel/flavors/_syspanel_flavor_list.html" %}
   <a id="flavor_create_link" class="action_link large-rounded" href="{% url syspanel_flavors_create %}">Create New Flavor </a>
 {% endblock %}

django-openstack/django_openstack/templates/django_openstack/syspanel/images/_syspanel_image_list.html

@@ -21,8 +21,8 @@
       <td>{{image.status|capfirst}}</td>
       <td id="actions">
         <ul>
-          <li class="form">{% include "_delete_image.html" with form=delete_form %}</li>
-          {# <li class="form">{% include "_toggle_image.html" with form=toggle_form %}</li> #}
+          <li class="form">{% include "django_openstack/syspanel/images/_delete_image.html" with form=delete_form %}</li>
+          {# <li class="form">{% include "django_openstack/syspanel/images/_toggle_image.html" with form=toggle_form %}</li> #}
 
           <li><a href="{% url syspanel_images_update image.id %}">Edit</a></li>
         </ul>

django-openstack/django_openstack/templates/django_openstack/syspanel/images/syspanel_image_update.html

@@ -1,4 +1,4 @@
-{% extends 'syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/syspanel_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="images" %}
@@ -7,13 +7,13 @@
 {% endblock %}
 
 {% block page_header %}
-  {% include "_page_header.html" with title="Update Image" %}
+  {% include "django_openstack/common/_page_header.html" with title="Update Image" %}
 {% endblock page_header %}
 
 {% block syspanel_main %}
   <div class="dash_block">
     <div class="left">
-      {% include '_image_form.html' %}
+      {% include 'django_openstack/syspanel/images/_image_form.html' %}
     </div>
 
     <div class="right">

django-openstack/django_openstack/templates/django_openstack/syspanel/images/syspanel_images.html

@@ -1,4 +1,4 @@
-{% extends 'syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/syspanel_base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="images" %}
@@ -9,9 +9,9 @@
 {% block page_header %}
   {% url syspanel_images as refresh_link %}
   {# to make searchable false, just remove it from the include statement #}
-  {% include "_page_header.html" with title="Images" refresh_link=refresh_link searchable="true" %}
+  {% include "django_openstack/common/_page_header.html" with title="Images" refresh_link=refresh_link searchable="true" %}
 {% endblock page_header %}
 
 {% block syspanel_main %}
-  {% include "_syspanel_image_list.html" %}
+  {% include "django_openstack/syspanel/images/_syspanel_image_list.html" %}
 {% endblock %}

django-openstack/django_openstack/templates/django_openstack/syspanel/instances/_syspanel_instance_list.html

@@ -42,8 +42,8 @@
       <td>{{instance.status|lower|capfirst}}</td>
       <td id="actions">
         <ul>
-          <li class="form">{% include "_terminate.html" with form=terminate_form %}</li>
-          <li class="form">{% include "_reboot.html" with form=reboot_form %}</li>
+          <li class="form">{% include "django_openstack/common/instances/_terminate.html" with form=terminate_form %}</li>
+          <li class="form">{% include "django_openstack/common/instances/_reboot.html" with form=reboot_form %}</li>
           <li><a target="_blank" href="{% url dash_instances_console request.user.tenant instance.id %}">Console Log</a></li>
           <li><a target="_blank" href="{% url dash_instances_vnc request.user.tenant instance.id %}">VNC Console</a></li>
         </ul>