diff --git a/computes/templates/computes/instances.html b/computes/templates/computes/instances.html index c61739cc..dfceb80b 100644 --- a/computes/templates/computes/instances.html +++ b/computes/templates/computes/instances.html @@ -72,7 +72,7 @@ {% include 'instance_state.html' %} {{ instance.info.3 }} -

{% if instance.info %}{% widthratio instance.info.1 1024 1 %} MiB{% endif %}

+

{% if instance.info %}{% widthratio instance.info.2 1024 1 %} MiB{% endif %}

{% include 'instance_actions.html' %} diff --git a/instances/templates/allinstances.html b/instances/templates/allinstances.html index 0b8ebe41..e3d5e000 100644 --- a/instances/templates/allinstances.html +++ b/instances/templates/allinstances.html @@ -26,14 +26,18 @@ {% block content %} {% if show_hosts %} - {% for compute in computes %} - {% if compute.status is not True %} - - {% endif %} - {% endfor %} + {% if unreachable_computes %} + {# one alert for every host the panel cannot reach, each with why #} + + {% endif %} {% elif own_hosts_down %} {% endif %}
- {% if app_settings.VIEW_INSTANCES_LIST_STYLE == 'grouped' and request.user.is_superuser %} + {% if not instances.exists %} +

{% trans "There are no VMs here yet." %}

+ {% elif app_settings.VIEW_INSTANCES_LIST_STYLE == 'grouped' and request.user.is_superuser %} {% include 'allinstances_index_grouped.html' %} {% else %} {% include 'allinstances_index_nongrouped.html' %} {% endif %} + {# table_filter.js shows it while no row matches #} +