Show Image ID on Instance Overview

Instances can be filtered by Image ID, but that ID isn't displayed.
This patch shows the Image ID, and also makes the Flavour name more
explicit.

Change-Id: I38c59fb0a387f8f05d42b0a0107d0102a4ddc480
Partial-Bug: 1366320
This commit is contained in:
Rob Cresswell 2015-09-30 16:25:54 +01:00
parent 1f29e5cd67
commit 2281c3a4a7
1 changed files with 12 additions and 10 deletions

View File

@ -47,8 +47,8 @@
<h4>{% trans "Specs" %}</h4>
<hr class="header_rule">
<dl class="dl-horizontal">
<dt>{% trans "Flavor" %}</dt>
{% if instance.full_flavor %}
<dt>{% trans "Flavor Name" %}</dt>
<dd>{{ instance.full_flavor.name }}</dd>
<dt>{% trans "Flavor ID" %}</dt>
<dd>{{ instance.full_flavor.id }}</dd>
@ -63,7 +63,8 @@
<dd>{{ instance.full_flavor.ephemeral }}{% trans "GB" %}</dd>
{% endif %}
{% else %}
{% trans "Not available" %}
<dt>{% trans "Flavor" %}</dt>
<dd>{% trans "Not available" %}</dd>
{% endif %}
</dl>
</div>
@ -113,14 +114,15 @@
{% with formatted_default_key_name="<em>"|add:default_key_name|add:"</em>" %}
<dd>{{ instance.key_name|default:formatted_default_key_name }}</dd>
{% endwith %}
<dt>{% trans "Image Name" %}</dt>
<dd>
{% if instance.image %}
<a href="{{ instance.image_url }}">{{ instance.image_name }}</a>
{% else %}
<em>{% trans "None" %}</em>
{% endif %}
</dd>
{% if instance.image %}
<dt>{% trans "Image Name" %}</dt>
<dd><a href="{{ instance.image_url }}">{{ instance.image_name }}</a></dd>
<dt>{% trans "Image ID" %}</dt>
<dd>{{ instance.image.id }}</dd>
{% else %}
<dt>{% trans "Image" %}</dt>
<dd>{% trans "None" %}</dd>
{% endif %}
{% with default_item_value="<em>"|add:_("N/A")|add:"</em>" %}
{% for key, value in instance.metadata.items %}
<dt>{{ key|force_escape }}</dt>