Merge remote-tracking branch 'upstream/master'

puppetboard/templates/index.html

@@ -1,7 +1,7 @@
 {% extends 'layout.html' %}
 {% block content %}
 <div class="ui vertical grid">
-  <div class="three column row">
+  <div class="four column row">
     <div class="column">
       <a href="nodes?status=failed">
         <h1 class="ui red header no-margin-bottom">
@@ -11,6 +11,15 @@
       </a>
       <span>with status failed</span>
     </div>
+    <div class="column">
+      <a href="nodes?status=noop">
+        <h1 class="ui header purple no-margin-bottom">
+          {{stats['noop']}}
+          <small>{% if stats['noop']== 1 %} node {% else %} nodes {% endif %}</small>
+        </h1>
+      </a>
+      <span>with status pending</span>
+    </div>
     <div class="column">
       <a href="nodes?status=changed">
         <h1 class="ui header green no-margin-bottom">
@@ -30,7 +39,9 @@
       <span>unreported in the last {{ config.UNRESPONSIVE_HOURS }} hours</span>
     </div>
   </div>
-  <div class="three column row">
+  <div class="four column row">
+    <div class="column">
+    </div>
     <div class="column">
       <h1 class="ui header darkblue no-margin-bottom">{{metrics['num_nodes']}}</h1>
       <span>Population</span>
@@ -70,6 +81,8 @@
                   green
                 {% elif node.status == 'unreported' %}
                   black
+                {% elif node.status == 'noop' %}
+                  blue
                 {% endif %}
                 " href="{{url_for('report_latest', node_name=node.name)}}">
                   {{node.status}}

puppetboard/templates/layout.html

@@ -42,9 +42,11 @@
 
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.12.0/javascript/semantic.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.5.1/moment.min.js"></script>
+    {% if config.LOCALISE_TIMESTAMP %}
+      <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.5.1/moment.min.js"></script>
+      <script src="{{ url_for('static', filename='js/timestamps.js')}}"></script>
+    {% endif %}
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.13.3/jquery.tablesorter.min.js"></script>
-    <script src="{{ url_for('static', filename='js/timestamps.js')}}"></script>
     <script src="{{url_for('static', filename='js/lists.js')}}"></script>
     <script src="{{url_for('static', filename='js/tables.js')}}"></script>
 

puppetboard/templates/nodes.html

@@ -24,6 +24,8 @@
             green
           {% elif node.status == 'unreported' %}
             black
+          {% elif node.status == 'noop' %}
+            blue
           {% endif %}
           " href="{{url_for('report_latest', node_name=node.name)}}">
             {{node.status}}