openstack/horizon
Code Issues Proposed changes

Merge "Fixes truncated string in details overview table."

Browse Source
This commit is contained in:
Jenkins 2016-03-24 21:20:18 +00:00 committed by Gerrit Code Review
commit 7baeb7c93d
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html
View File

@ -4,24 +4,24 @@
<div class="info detail">
<dl class="dl-horizontal">
<dt>{% trans "Name" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Name' %}">{% trans "Name" %}</dt>
<dd>{{ network.name|default:_("None") }}</dd>
<dt>{% trans "ID" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'ID' %}">{% trans "ID" %}</dt>
<dd>{{ network.id|default:_("None") }}</dd>
<dt>{% trans "Project ID" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Project ID' %}">{% trans "Project ID" %}</dt>
<dd>{{ network.tenant_id|default:_("-") }}</dd>
<dt>{% trans "Status" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Status' %}">{% trans "Status" %}</dt>
<dd>{{ network.status_label|default:_("Unknown") }}</dd>
<dt>{% trans "Admin State" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Admin State' %}">{% trans "Admin State" %}</dt>
<dd>{{ network.admin_state_label|default:_("Unknown") }}</dd>
<dt>{% trans "Shared" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Shared' %}">{% trans "Shared" %}</dt>
<dd>{{ network.shared|yesno|capfirst }}</dd>
<dt>{% trans "External Network" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'External Network' %}">{% trans "External Network" %}</dt>
<dd>{{ network.router__external|yesno|capfirst }}</dd>
<dt>{% trans "MTU" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'MTU' %}">{% trans "MTU" %}</dt>
<dd>{{ network.mtu|default:_("Unknown") }}</dd>
{% if network.provider__network_type %}
<dt>{% trans "Provider Network" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Provider Network' %}">{% trans "Provider Network" %}</dt>
<dd>{% trans "Network Type:" %} {{ network.provider__network_type|default:_("Unknown") }}</dd>
<dd>{% trans "Physical Network:" %} {{ network.provider__physical_network|default:_("-") }}</dd>
<dd>{% trans "Segmentation ID:" %} {{ network.provider__segmentation_id|default:_("-") }}</dd>

26
openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
View File

@ -2,38 +2,38 @@
<div class="detail">
<dl class="dl-horizontal">
<dt>{% trans "Name" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Name' %}">{% trans "Name" %}</dt>
<dd>{{ subnet.name|default:_("None") }}</dd>
<dt>{% trans "ID" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'ID' %}">{% trans "ID" %}</dt>
<dd>{{ subnet.id|default:_("None") }}</dd>
<dt>{% trans "Network Name" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Network Name' %}">{% trans "Network Name" %}</dt>
<dd>{{ subnet.network_name|default:_("None") }}</dd>
{% url 'horizon:project:networks:detail' subnet.network_id as network_url %}
<dt>{% trans "Network ID" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Network ID' %}">{% trans "Network ID" %}</dt>
<dd><a href="{{ network_url }}">{{ subnet.network_id|default:_("None") }}</a></dd>
<dt>{% trans "Subnetpool" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Subnetpool' %}">{% trans "Subnetpool" %}</dt>
{% if subnet.subnetpool_id %}
<dd>{{ subnet.subnetpool_name }} ({{ subnet.subnetpool_id }})</dd>
{% else %}
<dd>{% trans "None" %}</dd>
{% endif %}
<dt>{% trans "IP version" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'IP version' %}">{% trans "IP version" %}</dt>
<dd>{{ subnet.ipver_str|default:_("-") }}</dd>
<dt>{% trans "CIDR" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'CIDR' %}">{% trans "CIDR" %}</dt>
<dd>{{ subnet.cidr|default:_("None") }}</dd>
<dt>{% trans "IP allocation pool" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'IP allocation pool' %}">{% trans "IP allocation pool" %}</dt>
<dd>
{% for pool in subnet.allocation_pools %}
{% trans "Start" %} {{ pool.start }}
{% trans " - End" %} {{ pool.end }}<br>
{% endfor %}
</dd>
<dt>{% trans "Gateway IP" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Gateway IP' %}">{% trans "Gateway IP" %}</dt>
<dd>{{ subnet.gateway_ip|default:_("-") }}</dd>
<dt>{% trans "DHCP Enable" %}<dt>
<dt data-toggle="tooltip" title="{% trans 'DHCP Enable' %}">{% trans "DHCP Enable" %}<dt>
<dd>{{ subnet.enable_dhcp|yesno|capfirst }}</dd>
{% if subnet.ip_version == 6 %}
<dt>{% trans "IPv6 Address Configuration Mode" %}<dt>
<dt data-toggle="tooltip" title="{% trans 'IPv6 Address Configuration Mode' %}">{% trans "IPv6 Address Configuration Mode" %}<dt>
{% if subnet.ipv6_modes_desc %}
<dd>{{ subnet.ipv6_modes_desc }}</dd>
{% else %}
@ -42,7 +42,7 @@
{% endblocktrans %}</dd>
{% endif %}
{% endif %}
<dt>{% trans "Additional routes" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'Additional routes' %}">{% trans "Additional routes" %}</dt>
<dd>
{% for route in subnet.host_routes %}
{% trans "Destination" %} {{ route.destination }}
@ -51,7 +51,7 @@
{% trans "None" %}
{% endfor %}
</dd>
<dt>{% trans "DNS name server" %}</dt>
<dt data-toggle="tooltip" title="{% trans 'DNS name server' %}">{% trans "DNS name server" %}</dt>
<dd>
{% for dns in subnet.dns_nameservers %}
{{ dns }}