From f9df264a227af8e40452485150757fb20d2a7fac Mon Sep 17 00:00:00 2001 From: Ilya Alekseyev Date: Thu, 10 Mar 2016 12:54:15 +0000 Subject: [PATCH] Fixes truncated string in details overview table. In current solution tooltip with full string is showing when hover over. It use template approach. This patch affects all themes. Change-Id: I60162a2c313d08b9ba44484636c72955f8816c1e Closes-Bug: 1443526 Closes-Bug: 1443539 --- .../templates/networks/_detail_overview.html | 18 ++++++------- .../networks/subnets/_detail_overview.html | 26 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html b/openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html index e9249c44e0..22ceaac64c 100644 --- a/openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html +++ b/openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html @@ -4,24 +4,24 @@
-
{% trans "Name" %}
+
{% trans "Name" %}
{{ network.name|default:_("None") }}
-
{% trans "ID" %}
+
{% trans "ID" %}
{{ network.id|default:_("None") }}
-
{% trans "Project ID" %}
+
{% trans "Project ID" %}
{{ network.tenant_id|default:_("-") }}
-
{% trans "Status" %}
+
{% trans "Status" %}
{{ network.status_label|default:_("Unknown") }}
-
{% trans "Admin State" %}
+
{% trans "Admin State" %}
{{ network.admin_state_label|default:_("Unknown") }}
-
{% trans "Shared" %}
+
{% trans "Shared" %}
{{ network.shared|yesno|capfirst }}
-
{% trans "External Network" %}
+
{% trans "External Network" %}
{{ network.router__external|yesno|capfirst }}
-
{% trans "MTU" %}
+
{% trans "MTU" %}
{{ network.mtu|default:_("Unknown") }}
{% if network.provider__network_type %} -
{% trans "Provider Network" %}
+
{% trans "Provider Network" %}
{% trans "Network Type:" %} {{ network.provider__network_type|default:_("Unknown") }}
{% trans "Physical Network:" %} {{ network.provider__physical_network|default:_("-") }}
{% trans "Segmentation ID:" %} {{ network.provider__segmentation_id|default:_("-") }}
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html b/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html index 36effbc5bc..bcd8c06e28 100644 --- a/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html +++ b/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html @@ -2,38 +2,38 @@
-
{% trans "Name" %}
+
{% trans "Name" %}
{{ subnet.name|default:_("None") }}
-
{% trans "ID" %}
+
{% trans "ID" %}
{{ subnet.id|default:_("None") }}
-
{% trans "Network Name" %}
+
{% trans "Network Name" %}
{{ subnet.network_name|default:_("None") }}
{% url 'horizon:project:networks:detail' subnet.network_id as network_url %} -
{% trans "Network ID" %}
+
{% trans "Network ID" %}
{{ subnet.network_id|default:_("None") }}
-
{% trans "Subnetpool" %}
+
{% trans "Subnetpool" %}
{% if subnet.subnetpool_id %}
{{ subnet.subnetpool_name }} ({{ subnet.subnetpool_id }})
{% else %}
{% trans "None" %}
{% endif %} -
{% trans "IP version" %}
+
{% trans "IP version" %}
{{ subnet.ipver_str|default:_("-") }}
-
{% trans "CIDR" %}
+
{% trans "CIDR" %}
{{ subnet.cidr|default:_("None") }}
-
{% trans "IP allocation pool" %}
+
{% trans "IP allocation pool" %}
{% for pool in subnet.allocation_pools %} {% trans "Start" %} {{ pool.start }} {% trans " - End" %} {{ pool.end }}
{% endfor %}
-
{% trans "Gateway IP" %}
+
{% trans "Gateway IP" %}
{{ subnet.gateway_ip|default:_("-") }}
-
{% trans "DHCP Enable" %}
+
{% trans "DHCP Enable" %}
{{ subnet.enable_dhcp|yesno|capfirst }}
{% if subnet.ip_version == 6 %} -
{% trans "IPv6 Address Configuration Mode" %}
+
{% trans "IPv6 Address Configuration Mode" %}
{% if subnet.ipv6_modes_desc %}
{{ subnet.ipv6_modes_desc }}
{% else %} @@ -42,7 +42,7 @@ {% endblocktrans %} {% endif %} {% endif %} -
{% trans "Additional routes" %}
+
{% trans "Additional routes" %}
{% for route in subnet.host_routes %} {% trans "Destination" %} {{ route.destination }} @@ -51,7 +51,7 @@ {% trans "None" %} {% endfor %}
-
{% trans "DNS name server" %}
+
{% trans "DNS name server" %}
{% for dns in subnet.dns_nameservers %} {{ dns }}