From d8b0246a787d8dc5a1bc3263cb4c8b4a95cacdf2 Mon Sep 17 00:00:00 2001
From: Real-Gecko <alexandrbezenkov@gmail.com>
Date: Mon, 25 May 2020 17:32:36 +0600
Subject: [PATCH] Fix instance bottom bar overlapping main content

---
 .../bottombar.html => instances/templates/bottom_bar.html   | 0
 instances/templates/instance.html                           | 4 ++--
 instances/templates/instances.html                          | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename templates/bottombar.html => instances/templates/bottom_bar.html (100%)

diff --git a/templates/bottombar.html b/instances/templates/bottom_bar.html
similarity index 100%
rename from templates/bottombar.html
rename to instances/templates/bottom_bar.html
diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 2e8b382..94b3ff4 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -1701,8 +1701,8 @@
             </div>
         </div>
     </div>
-    {% if bottom_bar == 'True' %}
-        {% include 'bottombar.html' %}
+    {% if bottom_bar %}
+        {% include 'bottom_bar.html' %}
     {% endif %}
 
 {% endblock %}
diff --git a/instances/templates/instances.html b/instances/templates/instances.html
index e910798..20ebeae 100644
--- a/instances/templates/instances.html
+++ b/instances/templates/instances.html
@@ -82,9 +82,9 @@
                                     <td><a class="text-secondary" href="{% url 'instance' host.0 inst %}">{{ inst }}</a><br><small><em>{{ vm.title }}</em></small></td>
                                     <td class="d-none d-md-table-cell"><small><em>{% if vm.userinstances.count > 0 %}{{ vm.userinstances.first_user.user.username }}{% if vm.userinstances.count > 1 %} (+{{ vm.userinstances.count|add:"-1" }}){% endif %}{% endif %}</em></small></td>
                                     <td>
-                                        {% ifequal vm.status 1 %}<span class="text-success">{% trans "Active" %}</span>{% endifequal %}
-                                        {% ifequal vm.status 5 %}<span class="text-danger">{% trans "Off" %}</span>{% endifequal %}
-                                        {% ifequal vm.status 3 %}<span class="text-warning">{% trans "Suspend" %}</span>{% endifequal %}
+                                        {% if vm.status == 1 %}<span class="text-success">{% trans "Active" %}</span>{% endif %}
+                                        {% if vm.status == 5 %}<span class="text-danger">{% trans "Off" %}</span>{% endif %}
+                                        {% if vm.status == 3 %}<span class="text-warning">{% trans "Suspend" %}</span>{% endif %}
                                     </td>
                                     <td>{{ vm.vcpu }}</td>
                                     <td>{{ vm.memory|filesizeformat }}</td>