From b518258e6dbcd8e9155ae64037e1b93d949243b6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 23 Jul 2018 16:10:46 -0400
Subject: [PATCH] Closes #2250: Include stat counters on report result
 navigation

---
 netbox/project-static/css/base.css       |   2 +-
 netbox/templates/extras/report.html      | 104 ++++++++++++-----------
 netbox/templates/extras/report_list.html |   2 +-
 3 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css
index e658589ac..32bb8aea5 100644
--- a/netbox/project-static/css/base.css
+++ b/netbox/project-static/css/base.css
@@ -372,7 +372,7 @@ table.reports td.method {
     font-family: monospace;
     padding-left: 30px;
 }
-table.reports td.stats label {
+td.report-stats label {
     display: inline-block;
     line-height: 14px;
     margin-bottom: 0;
diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html
index 0e637abbc..92753e23b 100644
--- a/netbox/templates/extras/report.html
+++ b/netbox/templates/extras/report.html
@@ -29,67 +29,73 @@
                 <p class="lead">{{ report.description }}</p>
             {% endif %}
             {% if report.result %}
-                <p>Last run: {{ report.result.created }}</p>
-            {% else %}
-                <p class="text-muted">Last run: Never</p>
+                <p>Last run: <strong>{{ report.result.created }}</strong></p>
             {% endif %}
-        </div>
-        <div class="col-md-9">
             {% if report.result %}
-                <table class="table table-hover report">
-                    <thead>
-                        <tr>
-                            <th>Time</th>
-                            <th>Level</th>
-                            <th>Object</th>
-                            <th>Message</th>
-                        </tr>
-                    </thead>
-                    <tbody>
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <strong>Report Methods</strong>
+                    </div>
+                    <table class="table table-hover panel-body">
                         {% for method, data in report.result.data.items %}
                             <tr>
-                                <th colspan="4">
-                                    <a name="{{ method }}"></a>{{ method }}
-                                </th>
+                                <td><code><a href="#{{ method }}">{{ method }}</a></code></td>
+                                <td class="text-right report-stats">
+                                    <label class="label label-success">{{ data.success }}</label>
+                                    <label class="label label-info">{{ data.info }}</label>
+                                    <label class="label label-warning">{{ data.warning }}</label>
+                                    <label class="label label-danger">{{ data.failure }}</label>
+                                </td>
                             </tr>
-                            {% for time, level, obj, url, message in data.log %}
-                                <tr class="{% if level == 'failure' %}danger{% elif level %}{{ level }}{% endif %}">
-                                    <td>{{ time }}</td>
-                                    <td>
-                                        <label class="label label-{% if level == 'failure' %}danger{% else %}{{ level }}{% endif %}">{{ level|title }}</label>
-                                    </td>
-                                    <td>
-                                        {% if obj and url %}
-                                            <a href="{{ url }}">{{ obj }}</a>
-                                        {% elif obj %}
-                                            {{ obj }}
-                                        {% endif %}
-                                    </td>
-                                    <td>{{ message }}</td>
-                                </tr>
-                            {% endfor %}
                         {% endfor %}
-                    </tbody>
-                </table>
+                    </table>
+                </div>
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <strong>Report Results</strong>
+                    </div>
+                    <table class="table table-hover panel-body report">
+                        <thead>
+                            <tr class="table-headings">
+                                <th>Time</th>
+                                <th>Level</th>
+                                <th>Object</th>
+                                <th>Message</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for method, data in report.result.data.items %}
+                                <tr>
+                                    <th colspan="4" style="font-family: monospace">
+                                        <a name="{{ method }}"></a>{{ method }}
+                                    </th>
+                                </tr>
+                                {% for time, level, obj, url, message in data.log %}
+                                    <tr class="{% if level == 'failure' %}danger{% elif level %}{{ level }}{% endif %}">
+                                        <td>{{ time }}</td>
+                                        <td>
+                                            <label class="label label-{% if level == 'failure' %}danger{% else %}{{ level }}{% endif %}">{{ level|title }}</label>
+                                        </td>
+                                        <td>
+                                            {% if obj and url %}
+                                                <a href="{{ url }}">{{ obj }}</a>
+                                            {% elif obj %}
+                                                {{ obj }}
+                                            {% endif %}
+                                        </td>
+                                        <td>{{ message }}</td>
+                                    </tr>
+                                {% endfor %}
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
             {% else %}
                 <div class="well">No results are available for this report. Please run the report first.</div>
             {% endif %}
         </div>
         <div class="col-md-3">
             {% if report.result %}
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Methods</strong>
-                    </div>
-                    <ul class="list-group">
-                        {% for method, data in report.result.data.items %}
-                            <li class="list-group-item">
-                                <a href="#{{ method }}">{{ method }}</a>
-                                <span class="badge">{{ data.log|length }}</span>
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </div>
             {% endif %}
         </div>
     </div>
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index 5c64eaf0d..7d2f8a2e2 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -38,7 +38,7 @@
                                         <td colspan="3" class="method">
                                             {{ method }}
                                         </td>
-                                        <td class="text-right stats">
+                                        <td class="text-right report-stats">
                                             <label class="label label-success">{{ stats.success }}</label>
                                             <label class="label label-info">{{ stats.info }}</label>
                                             <label class="label label-warning">{{ stats.warning }}</label>