Merge pull request #164 from clburlison/puppet-status-align-fix

fix: Correct puppet status alignment
salopensource · Dec 8, 2017 · 6b017e8 · 6b017e8
2 parents fc5e3f3 + bfb727a
commit 6b017e8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 35 deletions.
diff --git a/server/plugins/puppetstatus/templates/front.html b/server/plugins/puppetstatus/templates/front.html
@@ -1,5 +1,5 @@
 
-    <div class="panel panel-default">
+    <div class="panel panel-default panel-traffic-light">
         <div class="panel-heading">
             {{ title }}
         </div>
@@ -10,23 +10,22 @@
         {% else %}
         <a href="{% url 'machine_list_front' plugin 'puppeterror' %}" class="btn btn-danger">
         {% endif %}
-			<span class="bigger"> {{ error_count }} </span><br />
-			{{ error_label }}
-          </a>
-
-
-      {% if month_count == 0 %}
-      <a href="{% url 'machine_list_front' plugin '1month' %}" class="btn btn-success">
-      {% else %}
-      <a href="{% url 'machine_list_front' plugin '1month' %}" class="btn btn-danger">
-      {% endif %}
-		<span class="bigger"> {{ month_count }} </span><br />
-		{{ month_label }}
+            <span class="bigger"> {{ error_count }} </span><br />
+            {{ error_label }}
         </a>
 
-      <a href="{% url 'machine_list_front' plugin 'success' %}" class="btn btn-success">
-    <span class="bigger"> {{ success_count }} </span><br />
-    {{ success_label }}
-        </a> 
-</div>
-</div>
+        {% if month_count == 0 %}
+        <a href="{% url 'machine_list_front' plugin '1month' %}" class="btn btn-success">
+        {% else %}
+        <a href="{% url 'machine_list_front' plugin '1month' %}" class="btn btn-danger">
+        {% endif %}
+            <span class="bigger"> {{ month_count }} </span><br />
+            {{ month_label }}
+        </a>
+
+        <a href="{% url 'machine_list_front' plugin 'success' %}" class="btn btn-success">
+            <span class="bigger"> {{ success_count }} </span><br />
+            {{ success_label }}
+        </a>
+        </div>
+    </div>
diff --git a/server/plugins/puppetstatus/templates/id.html b/server/plugins/puppetstatus/templates/id.html
@@ -10,22 +10,22 @@
         {% else %}
         <a href="{% url 'machine_list_id' plugin 'puppeterror' page theid %}" class="btn btn-danger">
         {% endif %}
-  			<span class="bigger"> {{ error_count }} </span><br />
-  			{{ error_label }}
+              <span class="bigger"> {{ error_count }} </span><br />
+              {{ error_label }}
          </a>
 
-          {% if month_count == 0 %}
-          <a href="{% url 'machine_list_id' plugin '1month' page theid %}" class="btn btn-success">
-          {% else %}
-          <a href="{% url 'machine_list_id' plugin '1month' page theid %}" class="btn btn-danger">
-          {% endif %}
-    		<span class="bigger"> {{ month_count }} </span><br />
-    		{{ month_label }}
-          </a>
+        {% if month_count == 0 %}
+        <a href="{% url 'machine_list_id' plugin '1month' page theid %}" class="btn btn-success">
+        {% else %}
+        <a href="{% url 'machine_list_id' plugin '1month' page theid %}" class="btn btn-danger">
+        {% endif %}
+            <span class="bigger"> {{ month_count }} </span><br />
+            {{ month_label }}
+        </a>
 
-      <a href="{% url 'machine_list_id' plugin 'success' page theid %}" class="btn btn-success">
-    <span class="bigger"> {{ success_count }} </span><br />
-    {{ success_label }}
-        </a> 
-</div>
-</div>
+        <a href="{% url 'machine_list_id' plugin 'success' page theid %}" class="btn btn-success">
+            <span class="bigger"> {{ success_count }} </span><br />
+            {{ success_label }}
+        </a>
+        </div>
+    </div>