diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-21 13:41:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-21 13:41:53 +0000 |
| commit | ca8d61cf55d05823909e408c014bde8f2108be8d (patch) | |
| tree | fa4ac9450a0bbe784e534268b9063a1bcf7b865c /openstack_dashboard/dashboards/project/network_topology/templates/network_topology | |
| parent | 723f03ab8942dd74b45665f9f5adf3c6e26de962 (diff) | |
| parent | b5673ecd47f44d6a929f35603b91cebb432461fd (diff) | |
| download | horizon-ca8d61cf55d05823909e408c014bde8f2108be8d.tar.gz | |
Merge "Net topology: Show console link only when useful"
Diffstat (limited to 'openstack_dashboard/dashboards/project/network_topology/templates/network_topology')
| -rw-r--r-- | openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html index bbf70c4ae..952609bc1 100644 --- a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html +++ b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html @@ -15,12 +15,11 @@ <div class="footerInner"> <div class="cell link"> <a href="[[url]]">» [[view_details_label]]</a> - {% comment %}The Console link is available if settings.CONSOLE_TYPE is not set at all, or if it's set to any value other than None or False.{% endcomment %} - {% if console_type %} - [[#console_id]] + {% comment %}The console link will only appear if the console item is defined + on the javascript side while rendering the template.{% endcomment %} + [[#console]] <a href="[[url]][[console]]" class="vnc_window">» [[open_console_label]]</a> - [[/console_id]] - {% endif %} + [[/console]] </div> [[#type]] <div class="cell delete"> |