Renamed templates within their new directory structures to remove unnecessary duplication of information. Updated views and tests. Removed duplicate copy of _messages.html. All tests pass, click-through successful.
This commit is contained in:
parent
94c4b1ed83
commit
3391957ff6
|
@ -74,7 +74,7 @@ def index(request, tenant_id):
|
|||
containers = api.swift_get_containers(request)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/containers/dash_containers.html', {
|
||||
'django_openstack/dash/containers/index.html', {
|
||||
'containers': containers,
|
||||
'delete_form': delete_form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
@ -87,6 +87,6 @@ def create(request, tenant_id):
|
|||
return handled
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/containers/dash_containers_create.html', {
|
||||
'django_openstack/dash/containers/create.html', {
|
||||
'create_form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -137,7 +137,7 @@ def index(request, tenant_id):
|
|||
messages.error(request, 'Error fetching floating ips: %s' % e.message)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/floating_ips/dash_floating_ips.html', {
|
||||
'django_openstack/dash/floating_ips/index.html', {
|
||||
'allocate_form': FloatingIpAllocate(initial={
|
||||
'tenant_id': request.user.tenant}),
|
||||
'disassociate_form': FloatingIpDisassociate(),
|
||||
|
@ -160,7 +160,7 @@ def associate(request, tenant_id, ip_id):
|
|||
return handled
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/floating_ips/dash_floating_ips_associate.html', {
|
||||
'django_openstack/dash/floating_ips/associate.html', {
|
||||
'associate_form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
||||
|
@ -172,5 +172,5 @@ def disassociate(request, tenant_id, ip_id):
|
|||
return handled
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/floating_ips/dash_floating_ips_associate.html', {
|
||||
'django_openstack/dash/floating_ips/associate.html', {
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -143,7 +143,7 @@ def index(request, tenant_id):
|
|||
if im['container_format'] not in ['aki', 'ari']]
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/dash/images/dash_images.html', {
|
||||
'django_openstack/dash/images/index.html', {
|
||||
'tenant': tenant,
|
||||
'images': images,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
@ -204,7 +204,7 @@ def launch(request, tenant_id, image_id):
|
|||
return handled
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/dash/images/dash_launch.html', {
|
||||
'django_openstack/dash/images/launch.html', {
|
||||
'tenant': tenant,
|
||||
'image': image,
|
||||
'form': form,
|
||||
|
|
|
@ -129,7 +129,7 @@ def index(request, tenant_id):
|
|||
reboot_form = RebootInstance()
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/instances/dash_instances.html', {
|
||||
'django_openstack/dash/instances/index.html', {
|
||||
'instances': instances,
|
||||
'terminate_form': terminate_form,
|
||||
'reboot_form': reboot_form,
|
||||
|
@ -203,10 +203,10 @@ def usage(request, tenant_id=None):
|
|||
instances += terminated_instances
|
||||
|
||||
if request.GET.get('format', 'html') == 'csv':
|
||||
template_name = 'django_openstack/dash/instances/dash_usage.csv'
|
||||
template_name = 'django_openstack/dash/instances/usage.csv'
|
||||
mimetype = "text/csv"
|
||||
else:
|
||||
template_name = 'django_openstack/dash/instances/dash_usage.html'
|
||||
template_name = 'django_openstack/dash/instances/usage.html'
|
||||
mimetype = "text/html"
|
||||
|
||||
return shortcuts.render_to_response(template_name, {
|
||||
|
@ -280,7 +280,7 @@ def update(request, tenant_id, instance_id):
|
|||
return handled
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/instances/dash_instance_update.html', {
|
||||
'django_openstack/dash/instances/update.html', {
|
||||
'instance': instance,
|
||||
'form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -88,7 +88,7 @@ def index(request, tenant_id):
|
|||
messages.error(request, 'Error fetching keypairs: %s' % e.message)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/keypairs/dash_keypairs.html', {
|
||||
'django_openstack/dash/keypairs/index.html', {
|
||||
'keypairs': keypairs,
|
||||
'delete_form': delete_form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
@ -101,6 +101,6 @@ def create(request, tenant_id):
|
|||
return handled
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/keypairs/dash_keypairs_create.html', {
|
||||
'django_openstack/dash/keypairs/create.html', {
|
||||
'create_form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -137,7 +137,7 @@ def index(request, tenant_id):
|
|||
messages.error(request, 'Unable to get network list: %s' % e.message)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/networks/dash_networks.html', {
|
||||
'django_openstack/dash/networks/index.html', {
|
||||
'networks': networks,
|
||||
'delete_form': delete_form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
@ -150,7 +150,7 @@ def create(request, tenant_id):
|
|||
return shortcuts.redirect('dash_networks', request.user.tenant)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/networks/dash_network_create.html', {
|
||||
'django_openstack/dash/networks/create.html', {
|
||||
'network_form': network_form
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
||||
|
@ -172,7 +172,7 @@ def detail(request, tenant_id, network_id):
|
|||
messages.error(request, 'Unable to get network details:%s' % e.message)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/networks/dash_networks_detail.html', {
|
||||
'django_openstack/dash/networks/detail.html', {
|
||||
'network': network,
|
||||
'tenant': tenant_id,
|
||||
'delete_port_form': delete_port_form,
|
||||
|
@ -190,7 +190,7 @@ def rename(request, tenant_id, network_id):
|
|||
return shortcuts.redirect('dash_networks', request.user.tenant)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/networks/dash_network_rename.html', {
|
||||
'django_openstack/dash/networks/rename.html', {
|
||||
'network': network_details,
|
||||
'rename_form': rename_form
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -134,7 +134,7 @@ def index(request, tenant_id, container_name):
|
|||
|
||||
delete_form.fields['container_name'].initial = container_name
|
||||
return render_to_response(
|
||||
'django_openstack/dash/objects/dash_objects.html', {
|
||||
'django_openstack/dash/objects/index.html', {
|
||||
'container_name': container_name,
|
||||
'objects': objects,
|
||||
'delete_form': delete_form,
|
||||
|
@ -150,7 +150,7 @@ def upload(request, tenant_id, container_name):
|
|||
|
||||
form.fields['container_name'].initial = container_name
|
||||
return render_to_response(
|
||||
'django_openstack/dash/objects/dash_objects_upload.html', {
|
||||
'django_openstack/dash/objects/upload.html', {
|
||||
'container_name': container_name,
|
||||
'upload_form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
@ -185,7 +185,7 @@ def copy(request, tenant_id, container_name, object_name):
|
|||
form.fields['orig_object_name'].initial = object_name
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/dash/objects/dash_object_copy.html',
|
||||
'django_openstack/dash/objects/copy.html',
|
||||
{'container_name': container_name,
|
||||
'object_name': object_name,
|
||||
'copy_form': form},
|
||||
|
|
|
@ -160,7 +160,7 @@ def create(request, tenant_id, network_id):
|
|||
)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/ports/dash_ports_create.html', {
|
||||
'django_openstack/dash/ports/create.html', {
|
||||
'network_id': network_id,
|
||||
'create_form': create_form
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
@ -178,7 +178,7 @@ def attach(request, tenant_id, network_id, port_id):
|
|||
vifs = _get_available_vifs(request)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/ports/dash_port_attach.html', {
|
||||
'django_openstack/dash/ports/attach.html', {
|
||||
'network': network_id,
|
||||
'port': port_id,
|
||||
'attach_form': attach_form,
|
||||
|
|
|
@ -154,7 +154,7 @@ def index(request, tenant_id):
|
|||
% e.message)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/security_groups/dash_security_groups.html', {
|
||||
'django_openstack/dash/security_groups/index.html', {
|
||||
'security_groups': security_groups,
|
||||
'delete_form': delete_form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
@ -182,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(
|
||||
'django_openstack/dash/security_groups/dash_security_groups_edit_rules.html', {
|
||||
'django_openstack/dash/security_groups/edit_rules.html', {
|
||||
'security_group': security_group,
|
||||
'delete_form': delete_form,
|
||||
'form': add_form,
|
||||
|
@ -197,6 +197,6 @@ def create(request, tenant_id):
|
|||
return handled
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/security_groups/dash_security_groups_create.html', {
|
||||
'django_openstack/dash/security_groups/create.html', {
|
||||
'form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -84,7 +84,7 @@ def index(request, tenant_id):
|
|||
messages.error(request, msg)
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/dash/snapshots/dash_snapshots.html', {
|
||||
'django_openstack/dash/snapshots/index.html', {
|
||||
'images': images,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
||||
|
@ -113,7 +113,7 @@ def create(request, tenant_id, instance_id):
|
|||
return shortcuts.redirect('dash_instances', tenant_id)
|
||||
|
||||
return shortcuts.render_to_response(
|
||||
'django_openstack/dash/snapshots/dash_snapshots_create.html', {
|
||||
'django_openstack/dash/snapshots/create.html', {
|
||||
'instance': instance,
|
||||
'create_form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -95,7 +95,7 @@ def index(request):
|
|||
|
||||
flavors.sort(key=lambda x: x.id, reverse=True)
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/flavors/syspanel_flavors.html', {
|
||||
'django_openstack/syspanel/flavors/index.html', {
|
||||
'delete_form': delete_form,
|
||||
'flavors': flavors,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
@ -115,7 +115,7 @@ def create(request):
|
|||
global_summary.human_readable('ram_size')
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/flavors/syspanel_create_flavor.html', {
|
||||
'django_openstack/syspanel/flavors/create.html', {
|
||||
'global_summary': global_summary.summary,
|
||||
'form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -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('django_openstack/syspanel/images/syspanel_images.html', {
|
||||
return render_to_response('django_openstack/syspanel/images/index.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('django_openstack/syspanel/images/syspanel_image_update.html', {
|
||||
return render_to_response('django_openstack/syspanel/images/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('django_openstack/syspanel/images/syspanel_image_update.html', {
|
||||
return render_to_response('django_openstack/syspanel/images/update.html', {
|
||||
'image': image,
|
||||
'form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
@ -235,7 +235,7 @@ def upload(request):
|
|||
"Image could not be uploaded, please try agian.")
|
||||
form = UploadImageForm(request.POST)
|
||||
return render_to_response('django_nova_syspanel/images/'
|
||||
'image_upload.html', {
|
||||
'upload.html', {
|
||||
'form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
||||
|
@ -243,6 +243,6 @@ def upload(request):
|
|||
else:
|
||||
form = UploadImageForm()
|
||||
return render_to_response('django_nova_syspanel/images/'
|
||||
'image_upload.html', {
|
||||
'upload.html', {
|
||||
'form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -104,10 +104,10 @@ def usage(request):
|
|||
global_summary.human_readable('ram_size')
|
||||
|
||||
if request.GET.get('format', 'html') == 'csv':
|
||||
template_name = 'django_openstack/syspanel/instances/syspanel_usage.csv'
|
||||
template_name = 'django_openstack/syspanel/instances/usage.csv'
|
||||
mimetype = "text/csv"
|
||||
else:
|
||||
template_name = 'django_openstack/syspanel/instances/syspanel_usage.html'
|
||||
template_name = 'django_openstack/syspanel/instances/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 = 'django_openstack/syspanel/instances/syspanel_tenant_usage.csv'
|
||||
template_name = 'django_openstack/syspanel/instances/tenant_usage.csv'
|
||||
mimetype = "text/csv"
|
||||
else:
|
||||
template_name = 'django_openstack/syspanel/instances/syspanel_tenant_usage.html'
|
||||
template_name = 'django_openstack/syspanel/instances/tenant_usage.html'
|
||||
mimetype = "text/html"
|
||||
|
||||
return render_to_response(template_name, {
|
||||
|
@ -197,7 +197,7 @@ def index(request):
|
|||
reboot_form = RebootInstance()
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/instances/syspanel_instances.html', {
|
||||
'django_openstack/syspanel/instances/index.html', {
|
||||
'instances': instances,
|
||||
'terminate_form': terminate_form,
|
||||
'reboot_form': reboot_form,
|
||||
|
@ -224,7 +224,7 @@ def refresh(request):
|
|||
reboot_form = RebootInstance()
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/instances/_syspanel_instance_list.html', {
|
||||
'django_openstack/syspanel/instances/_list.html', {
|
||||
'instances': instances,
|
||||
'terminate_form': terminate_form,
|
||||
'reboot_form': reboot_form,
|
||||
|
|
|
@ -25,6 +25,6 @@ def index(request):
|
|||
quotas.pop('id')
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/quotas/syspanel_quotas.html', {
|
||||
'django_openstack/syspanel/quotas/index.html', {
|
||||
'quotas': quotas,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -109,7 +109,7 @@ def index(request):
|
|||
svc['host']))
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/services/syspanel_services.html', {
|
||||
'django_openstack/syspanel/services/index.html', {
|
||||
'services': services,
|
||||
'service_toggle_enabled_form': ToggleService,
|
||||
'other_services': other_services,
|
||||
|
|
|
@ -179,7 +179,7 @@ def index(request):
|
|||
messages.error(request, 'Unable to get tenant info: %s' % e.message)
|
||||
tenants.sort(key=lambda x: x.id, reverse=True)
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/tenants/syspanel_tenants.html', {
|
||||
'django_openstack/syspanel/tenants/index.html', {
|
||||
'tenants': tenants,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
||||
|
@ -192,7 +192,7 @@ def create(request):
|
|||
return handled
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/tenants/syspanel_tenant_create.html', {
|
||||
'django_openstack/syspanel/tenants/create.html', {
|
||||
'form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
||||
|
@ -217,7 +217,7 @@ def update(request, tenant_id):
|
|||
return redirect('syspanel_tenants')
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/tenants/syspanel_tenant_update.html', {
|
||||
'django_openstack/syspanel/tenants/update.html', {
|
||||
'form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
||||
|
@ -247,7 +247,7 @@ def users(request, tenant_id):
|
|||
if i in new_user_ids:
|
||||
new_user_ids.remove(i)
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/tenants/syspanel_tenant_users.html', {
|
||||
'django_openstack/syspanel/tenants/users.html', {
|
||||
'add_user_form': add_user_form,
|
||||
'remove_user_form': remove_user_form,
|
||||
'tenant_id': tenant_id,
|
||||
|
@ -280,7 +280,7 @@ def quotas(request, tenant_id):
|
|||
form = UpdateQuotas(initial=quota_set)
|
||||
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/tenants/syspanel_tenant_quotas.html', {
|
||||
'django_openstack/syspanel/tenants/quotas.html', {
|
||||
'form': form,
|
||||
'tenant_id': tenant_id,
|
||||
'quotas': quotas,
|
||||
|
|
|
@ -111,7 +111,7 @@ def index(request):
|
|||
user_delete_form = UserDeleteForm()
|
||||
user_enable_disable_form = UserEnableDisableForm()
|
||||
|
||||
return shortcuts.render_to_response('django_openstack/syspanel/users/syspanel_users.html', {
|
||||
return shortcuts.render_to_response('django_openstack/syspanel/users/index.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(
|
||||
'django_openstack/syspanel/users/syspanel_user_update.html', {
|
||||
'django_openstack/syspanel/users/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(
|
||||
'django_openstack/syspanel/users/syspanel_user_update.html', {
|
||||
'django_openstack/syspanel/users/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(
|
||||
'django_openstack/syspanel/users/syspanel_user_create.html', {
|
||||
'django_openstack/syspanel/users/create.html', {
|
||||
'form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
||||
else:
|
||||
form = UserForm(tenant_list=tenants)
|
||||
return render_to_response(
|
||||
'django_openstack/syspanel/users/syspanel_user_create.html', {
|
||||
'django_openstack/syspanel/users/create.html', {
|
||||
'form': form,
|
||||
}, context_instance=template.RequestContext(request))
|
||||
|
|
|
@ -1,41 +0,0 @@
|
|||
{% for message in messages %}
|
||||
<div class="message ui-widget">
|
||||
{% if message.tags == "info" %}
|
||||
<div class="ui-state-highlight ui-corner-all">
|
||||
<span class="close ui-icon ui-icon-circle-close"></span>
|
||||
<p>
|
||||
<span class="ui-icon ui-icon-info"></span>
|
||||
{{ message }}
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if message.tags == "warning" %}
|
||||
<div class="ui-state-highlight ui-corner-all" >
|
||||
<span class="close ui-icon ui-icon-circle-close"></span>
|
||||
<p>
|
||||
<span class="ui-icon ui-icon-alert"></span>
|
||||
{{ message }}
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if message.tags == "success" %}
|
||||
<div class="ui-state-highlight ui-corner-all success" >
|
||||
<span class="close ui-icon ui-icon-circle-close"></span>
|
||||
<p>
|
||||
<span class="ui-icon ui-icon-check"></span>
|
||||
{{ message }}
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if message.tags == "error" %}
|
||||
<div class="ui-state-error ui-corner-all" >
|
||||
<span class="close ui-icon ui-icon-circle-close"></span>
|
||||
<p>
|
||||
<span class="ui-icon ui-icon-alert"></span>
|
||||
{{ message }}
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
{% endwith %}
|
||||
{% endblock %}
|
||||
{% block sidebar %}
|
||||
{% include 'django_openstack/dash/_dash_sidebar.html' %}
|
||||
{% include 'django_openstack/dash/_sidebar.html' %}
|
||||
{% endblock %}
|
||||
|
||||
{% block main %}
|
|
@ -8,7 +8,7 @@
|
|||
<td>{{ container.name }}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "django_openstack/dash/containers/_delete_container.html" with form=delete_form %}</li>
|
||||
<li class="form">{% include "django_openstack/dash/containers/_delete.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>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="containers" %}
|
||||
|
@ -13,7 +13,7 @@
|
|||
{% block dash_main %}
|
||||
<div class="dash_block">
|
||||
<div class="left">
|
||||
{% include 'django_openstack/dash/containers/_container_form.html' with form=create_form %}
|
||||
{% include 'django_openstack/dash/containers/_form.html' with form=create_form %}
|
||||
</div>
|
||||
|
||||
<div class="right">
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="containers" %}
|
||||
|
@ -13,6 +13,6 @@
|
|||
{% endblock page_header %}
|
||||
|
||||
{% block dash_main %}
|
||||
{% include 'django_openstack/dash/containers/_container_list.html' %}
|
||||
{% include 'django_openstack/dash/containers/_list.html' %}
|
||||
<a class="action_link large-rounded" href="{% url dash_containers_create request.user.tenant %}">Create New Container >></a>
|
||||
{% endblock %}
|
|
@ -22,9 +22,9 @@
|
|||
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "django_openstack/dash/floating_ips/_release_floating_ip.html" with form=release_form %}</li>
|
||||
<li class="form">{% include "django_openstack/dash/floating_ips/_release.html" with form=release_form %}</li>
|
||||
{% if ip.fixed_ip %}
|
||||
<li class="form">{% include "django_openstack/dash/floating_ips/_disassociate_floating_ip.html" with form=disassociate_form %}</li>
|
||||
<li class="form">{% include "django_openstack/dash/floating_ips/_disassociate.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 %}
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="floatingips" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
{% block dash_main %}
|
||||
<div class="dash_block">
|
||||
<div class="left">
|
||||
{% include 'django_openstack/dash/floating_ips/_floating_ip_associate.html' with form=associate_form %}
|
||||
{% include 'django_openstack/dash/floating_ips/_associate.html' with form=associate_form %}
|
||||
</div>
|
||||
|
||||
<div class="right">
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="floatingips" %}
|
||||
|
@ -14,12 +14,12 @@
|
|||
|
||||
{% block dash_main %}
|
||||
{% if floating_ips %}
|
||||
{% include 'django_openstack/dash/floating_ips/_floating_ips_list.html' %}
|
||||
{% include 'django_openstack/dash/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 "django_openstack/dash/floating_ips/_allocate_floating_ip.html" with form=allocate_form %}
|
||||
{% include "django_openstack/dash/floating_ips/_allocate.html" with form=allocate_form %}
|
||||
{% endblock %}
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="images" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
|
||||
{% block dash_main %}
|
||||
{% if images %}
|
||||
{% include 'django_openstack/dash/images/_image_list.html' %}
|
||||
{% include 'django_openstack/dash/images/_list.html' %}
|
||||
|
||||
{% endif %}
|
||||
{% endblock %}
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="images" %}
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="instances" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
|
||||
{% block dash_main %}
|
||||
{% if instances %}
|
||||
{% include 'django_openstack/dash/instances/_instance_list.html' %}
|
||||
{% include 'django_openstack/dash/instances/_list.html' %}
|
||||
{% else %}
|
||||
<div class="message_box info">
|
||||
<h2>Info</h2>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="instances" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
{% block dash_main %}
|
||||
<div class="dash_block">
|
||||
<div class="left">
|
||||
{% include 'django_openstack/dash/instances/_instance_form.html' with form=form %}
|
||||
{% include 'django_openstack/dash/instances/_form.html' with form=form %}
|
||||
<h3><a href="{% url dash_instances request.user.tenant %}"><< Return to Instances List</a></h3>
|
||||
</div>
|
||||
|
Can't render this file because it contains an unexpected character in line 1 and column 48.
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
{% load parse_date %}
|
||||
{% load sizeformat %}
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
<td>{{ keypair.fingerprint }}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "django_openstack/dash/keypairs/_delete_keypair.html" with form=delete_form %}</li>
|
||||
<li class="form">{% include "django_openstack/dash/keypairs/_delete.html" with form=delete_form %}</li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="keypairs" %}
|
||||
|
@ -27,7 +27,7 @@
|
|||
<div class="dash_block">
|
||||
<div class="left">
|
||||
<h3>Your private key is being downloaded.</h3>
|
||||
{% include 'django_openstack/dash/keypairs/_keypair_form.html' with form=create_form %}
|
||||
{% include 'django_openstack/dash/keypairs/_form.html' with form=create_form %}
|
||||
<h3><a href="{% url dash_keypairs request.user.tenant %}"><< Return to keypairs list</a></h3>
|
||||
</div>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="keypairs" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
|
||||
{% block dash_main %}
|
||||
{% if keypairs %}
|
||||
{% include 'django_openstack/dash/keypairs/_keypair_list.html' %}
|
||||
{% include 'django_openstack/dash/keypairs/_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">
|
|
@ -17,7 +17,7 @@
|
|||
<td>{{network.used}}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "django_openstack/dash/networks/_delete_network.html" with form=delete_form %}</li>
|
||||
<li class="form">{% include "django_openstack/dash/networks/_delete.html" with form=delete_form %}</li>
|
||||
<li><a href='{% url dash_network_rename request.user.tenant network.id %}'>Rename</a></li>
|
||||
</ul>
|
||||
</td>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="networks" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
{% block dash_main %}
|
||||
<div class="dash_block">
|
||||
<div class="left">
|
||||
{% include 'django_openstack/dash/networks/_network_form.html' with form=network_form %}
|
||||
{% include 'django_openstack/dash/networks/_form.html' with form=network_form %}
|
||||
<h3><a href="{% url dash_networks request.user.tenant %}"><< Return to networks list</a></h3>
|
||||
</div>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="networks" %}
|
||||
|
@ -19,7 +19,7 @@
|
|||
|
||||
{% block dash_main %}
|
||||
{% if network.ports %}
|
||||
{% include 'django_openstack/dash/networks/_network_detail.html' %}
|
||||
{% include 'django_openstack/dash/networks/_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">
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="networks" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
|
||||
{% block dash_main %}
|
||||
{% if networks %}
|
||||
{% include 'django_openstack/dash/networks/_network_list.html' %}
|
||||
{% include 'django_openstack/dash/networks/_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">
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="networks" %}
|
|
@ -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 "django_openstack/dash/objects/_delete_object.html" with form=delete_form %}</li>
|
||||
<li class="form">{% include "django_openstack/dash/objects/_delete.html" with form=delete_form %}</li>
|
||||
<li><a href="{% url dash_objects_download request.user.tenant container_name object.name %}">Download</a>
|
||||
</ul>
|
||||
</td>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="containers" %}
|
||||
|
@ -16,7 +16,7 @@
|
|||
<div class="dash_block wide form">
|
||||
<div class="left">
|
||||
<h3>Copy Object: '{{object_name}}'</h3>
|
||||
{% include 'django_openstack/dash/objects/_copy_object.html' with form=copy_form greeting="HI" %}
|
||||
{% include 'django_openstack/dash/objects/_copy.html' with form=copy_form greeting="HI" %}
|
||||
<h3><a href="{% url dash_objects request.user.tenant container_name %}"><< Return to objects list</a></h3>
|
||||
</div>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="containers" %}
|
||||
|
@ -11,7 +11,7 @@
|
|||
<h2>Objects</h2>
|
||||
<div class="right">
|
||||
<div class='search'>
|
||||
{% include 'django_openstack/dash/objects/_object_filter.html' with form=filter_form %}
|
||||
{% include 'django_openstack/dash/objects/_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 'django_openstack/dash/objects/_object_list.html' %}
|
||||
{% include 'django_openstack/dash/objects/_list.html' %}
|
||||
{% else %}
|
||||
<div class="message_box info">
|
||||
<h2>Info</h2>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="containers" %}
|
||||
|
@ -15,7 +15,7 @@
|
|||
|
||||
<div class="dash_block wide form">
|
||||
<div class="left">
|
||||
{% include 'django_openstack/dash/objects/_object_form.html' with form=upload_form %}
|
||||
{% include 'django_openstack/dash/objects/_form.html' with form=upload_form %}
|
||||
<h3><a href="{% url dash_objects request.user.tenant container_name %}"><< Return to objects list</a></h3>
|
||||
</div>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="networks" %}
|
||||
|
@ -33,7 +33,7 @@
|
|||
{% block dash_main %}
|
||||
<div class="dash_block">
|
||||
<div class="left">
|
||||
{% include 'django_openstack/dash/ports/_attach_port.html' with form=attach_form %}
|
||||
{% include 'django_openstack/dash/ports/_attach.html' with form=attach_form %}
|
||||
<h3><a href="{% url dash_networks_detail request.user.tenant network %}"><< Return to network detail</a></h3>
|
||||
</div>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="networks" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
{% block dash_main %}
|
||||
<div class="dash_block">
|
||||
<div class="left">
|
||||
{% include 'django_openstack/dash/ports/_create_port.html' with form=create_form %}
|
||||
{% include 'django_openstack/dash/ports/_create.html' with form=create_form %}
|
||||
<h3><a href="{% url dash_networks_detail request.user.tenant network_id %}"><< Return to network detail</a></h3>
|
||||
</div>
|
||||
|
|
@ -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 "django_openstack/dash/security_groups/_delete_security_group.html" with form=delete_form %}</li>
|
||||
<li class="form">{% include "django_openstack/dash/security_groups/_delete.html" with form=delete_form %}</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</td>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="security_groups" %}
|
||||
|
@ -13,7 +13,7 @@
|
|||
{% block dash_main %}
|
||||
<div class="dash_block">
|
||||
<div class="left">
|
||||
{% include 'django_openstack/dash/security_groups/_security_group_form.html' %}
|
||||
{% include 'django_openstack/dash/security_groups/_form.html' %}
|
||||
</div>
|
||||
|
||||
<div class="right">
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="security_groups" %}
|
||||
|
@ -32,7 +32,7 @@
|
|||
<td>{{rule.ip_range.cidr}}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "django_openstack/dash/security_groups/_delete_security_group_rule.html" with form=delete_form %}</li>
|
||||
<li class="form">{% include "django_openstack/dash/security_groups/_delete_rule.html" with form=delete_form %}</li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="security_groups" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
|
||||
{% block dash_main %}
|
||||
{% if security_groups %}
|
||||
{% include 'django_openstack/dash/security_groups/_security_group_list.html' %}
|
||||
{% include 'django_openstack/dash/security_groups/_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">
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="snapshots" %}
|
||||
|
@ -22,7 +22,7 @@
|
|||
<div class="dash_block">
|
||||
<div class="left">
|
||||
<h3>Choose a name for your snapshot.</h3>
|
||||
{% include 'django_openstack/dash/snapshots/_snapshot_form.html' with form=create_form %}
|
||||
{% include 'django_openstack/dash/snapshots/_form.html' with form=create_form %}
|
||||
<h3><a href="{% url dash_snapshots request.user.tenant %}"><< Return to snapshots list</a></h3>
|
||||
</div>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/dash/dash_base.html' %}
|
||||
{% extends 'django_openstack/dash/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="snapshots" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
|
||||
{% block dash_main %}
|
||||
{% if images %}
|
||||
{% include 'django_openstack/dash/images/_image_list.html' %}
|
||||
{% include 'django_openstack/dash/images/_list.html' %}
|
||||
{% else %}
|
||||
<div class="message_box info">
|
||||
<h2>Info</h2>
|
|
@ -6,7 +6,7 @@
|
|||
{% endwith %}
|
||||
{% endblock %}
|
||||
{% block sidebar %}
|
||||
{% include 'django_openstack/syspanel/_syspanel_sidebar.html' %}
|
||||
{% include 'django_openstack/syspanel/_sidebar.html' %}
|
||||
{% endblock %}
|
||||
|
||||
{% block main %}
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/syspanel/flavors/_flavor_form.html' %}
|
||||
{% extends 'django_openstack/syspanel/flavors/_form.html' %}
|
||||
|
||||
{% block submit %}
|
||||
<input type="submit" value="Create Flavor" class="large-rounded" />
|
|
@ -16,7 +16,7 @@
|
|||
<td>{{flavor.disk}}GB</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "django_openstack/syspanel/flavors/_delete_flavor.html" with form=delete_form %}</li>
|
||||
<li class="form">{% include "django_openstack/syspanel/flavors/_delete.html" with form=delete_form %}</li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/syspanel/syspanel_base.html' %}
|
||||
{% extends 'django_openstack/syspanel/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="flavors" %}
|
||||
|
@ -29,7 +29,7 @@
|
|||
</ul>
|
||||
</div>
|
||||
<div class="left">
|
||||
{% include "django_openstack/syspanel/flavors/_create_flavor.html" %}
|
||||
{% include "django_openstack/syspanel/flavors/_create.html" %}
|
||||
</div>
|
||||
<div class="right">
|
||||
<h3>Description:</h3>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/syspanel/syspanel_base.html' %}
|
||||
{% extends 'django_openstack/syspanel/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="flavors" %}
|
||||
|
@ -13,6 +13,6 @@
|
|||
{% endblock page_header %}
|
||||
|
||||
{% block syspanel_main %}
|
||||
{% include "django_openstack/syspanel/flavors/_syspanel_flavor_list.html" %}
|
||||
{% include "django_openstack/syspanel/flavors/_list.html" %}
|
||||
<a id="flavor_create_link" class="action_link large-rounded" href="{% url syspanel_flavors_create %}">Create New Flavor </a>
|
||||
{% endblock %}
|
|
@ -21,8 +21,8 @@
|
|||
<td>{{image.status|capfirst}}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<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 class="form">{% include "django_openstack/syspanel/images/_delete.html" with form=delete_form %}</li>
|
||||
{# <li class="form">{% include "django_openstack/syspanel/images/_toggle.html" with form=toggle_form %}</li> #}
|
||||
|
||||
<li><a href="{% url syspanel_images_update image.id %}">Edit</a></li>
|
||||
</ul>
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/syspanel/syspanel_base.html' %}
|
||||
{% extends 'django_openstack/syspanel/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="images" %}
|
||||
|
@ -13,5 +13,5 @@
|
|||
{% endblock page_header %}
|
||||
|
||||
{% block syspanel_main %}
|
||||
{% include "django_openstack/syspanel/images/_syspanel_image_list.html" %}
|
||||
{% include "django_openstack/syspanel/images/_list.html" %}
|
||||
{% endblock %}
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/syspanel/syspanel_base.html' %}
|
||||
{% extends 'django_openstack/syspanel/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="images" %}
|
||||
|
@ -13,7 +13,7 @@
|
|||
{% block syspanel_main %}
|
||||
<div class="dash_block">
|
||||
<div class="left">
|
||||
{% include 'django_openstack/syspanel/images/_image_form.html' %}
|
||||
{% include 'django_openstack/syspanel/images/_form.html' %}
|
||||
</div>
|
||||
|
||||
<div class="right">
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/syspanel/syspanel_base.html' %}
|
||||
{% extends 'django_openstack/syspanel/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="instances" %}
|
||||
|
@ -14,7 +14,7 @@
|
|||
|
||||
{% block syspanel_main %}
|
||||
{% if instances %}
|
||||
{% include 'django_openstack/syspanel/instances/_syspanel_instance_list.html' %}
|
||||
{% include 'django_openstack/syspanel/instances/_list.html' %}
|
||||
{% else %}
|
||||
<div class="message_box info">
|
||||
<h2>Info</h2>
|
Can't render this file because it contains an unexpected character in line 1 and column 48.
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/syspanel/syspanel_base.html' %}
|
||||
{% extends 'django_openstack/syspanel/base.html' %}
|
||||
{% load parse_date %}
|
||||
{% load sizeformat %}
|
||||
|
Can't render this file because it contains an unexpected character in line 1 and column 48.
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/syspanel/syspanel_base.html' %}
|
||||
{% extends 'django_openstack/syspanel/base.html' %}
|
||||
{% load sizeformat %}
|
||||
|
||||
{# default landing page for a admin user #}
|
|
@ -1,4 +1,4 @@
|
|||
{% extends 'django_openstack/syspanel/syspanel_base.html' %}
|
||||
{% extends 'django_openstack/syspanel/base.html' %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% with current_sidebar="quotas" %}
|
|
@ -44,7 +44,7 @@
|
|||
<td>{{service.up}}</td>
|
||||
<td id="actions">
|
||||
<ul>
|
||||
<li class="form">{% include "django_openstack/syspanel/services/_service_toggle_enabled.html" with form=service_toggle_enabled_form %}</li>
|
||||
<li class="form">{% include "django_openstack/syspanel/services/_toggle.html" with form=service_toggle_enabled_form %}</li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue