diff --git a/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py b/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py index 5cc707dca..5c33fed78 100644 --- a/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py +++ b/horizon/dashboards/nova/instances_and_volumes/instances/tabs.py @@ -66,7 +66,7 @@ class VNCTab(tabs.Tab): exceptions.handle(request, _('Unable to get VNC console for ' 'instance "%s".') % instance.id) - return {'vnc_url': vnc_url} + return {'vnc_url': vnc_url, 'instance_id': instance.id} class InstanceDetailTabs(tabs.TabGroup): diff --git a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html b/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html index c91609a7b..75431a8d5 100644 --- a/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html +++ b/horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html @@ -1,5 +1,10 @@ {% load i18n %}

{% trans "Instance VNC Console" %}

+{% if vnc_url %}

{% blocktrans %}If VNC console is not responding to keyboard input: click the grey status bar below.{% endblocktrans %}

+{% else %} +

{% blocktrans %}VNC console is currently unavailabe. Please try again later.{% endblocktrans %} +{% trans "Reload" %}

+{% endif %} \ No newline at end of file