openstack/horizon
Code Issues Proposed changes

Merge "Show Image ID on Instance Overview"

Browse Source
This commit is contained in:
Jenkins 2015-10-15 10:00:12 +00:00 committed by Gerrit Code Review
commit d8aaa41b91
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
View File

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