diff --git a/accounts/templates/account.html b/accounts/templates/account.html index 658c35f..13d8f69 100644 --- a/accounts/templates/account.html +++ b/accounts/templates/account.html @@ -42,7 +42,7 @@ {% for inst in user_insts %} {{ forloop.counter }} - {{ inst.instance.name }} + {{ inst.instance.name }} {{ inst.is_vnc }} {{ inst.is_change }} {{ inst.is_delete }} diff --git a/instances/templates/allinstances.html b/instances/templates/allinstances.html index 8e6b342..bf03976 100644 --- a/instances/templates/allinstances.html +++ b/instances/templates/allinstances.html @@ -63,7 +63,7 @@ {% for inst, vm in all_user_vms.items %} - {{ vm.name }}
{{ vm.title }} + {{ vm.name }}
{{ vm.title }} {% if vm.status == 1 %} {% trans "Active" %} {% endif %} diff --git a/instances/templates/allinstances_index_grouped.html b/instances/templates/allinstances_index_grouped.html index 40ed8b0..be5bbcf 100644 --- a/instances/templates/allinstances_index_grouped.html +++ b/instances/templates/allinstances_index_grouped.html @@ -42,7 +42,7 @@ {{ forloop.counter }}   - {{ inst }}
+ {{ inst }}
{{ vm.title }} diff --git a/instances/templates/allinstances_index_nongrouped.html b/instances/templates/allinstances_index_nongrouped.html index a8f9da4..6d45116 100644 --- a/instances/templates/allinstances_index_nongrouped.html +++ b/instances/templates/allinstances_index_nongrouped.html @@ -14,7 +14,7 @@ {% for host, inst in all_host_vms.items %} {% for inst, vm in inst.items %} - {{ inst }}
{{ info.title }} + {{ inst }}
{{ info.title }} {{ host.1 }}
{% if info.userinstances.count > 0 %}{{ info.userinstances.first_user.user.username }}{% if info.userinstances.count > 1 %} (+{{ info.userinstances.count|add:"-1" }}){% endif %}{% endif %} {% if vm.status == 1 %}{% trans "Active" %}{% endif %} diff --git a/instances/templates/bottom_bar.html b/instances/templates/bottom_bar.html index 040af6c..81a9e39 100644 --- a/instances/templates/bottom_bar.html +++ b/instances/templates/bottom_bar.html @@ -17,7 +17,7 @@ {% trans "Instances" %} diff --git a/instances/templates/instance.html b/instances/templates/instance.html index a7b8b8f..d25ce0b 100644 --- a/instances/templates/instance.html +++ b/instances/templates/instance.html @@ -52,7 +52,7 @@ {{ ipv4 }} | {% endfor %} {% endfor %} - + {% if user_quota_msg %}
@@ -1749,7 +1749,7 @@