Browse Source

Prettied up the reports list

Jeremy Stretch 7 years ago
parent
commit
696d91daa3
2 changed files with 29 additions and 13 deletions
  1. 12 0
      netbox/project-static/css/base.css
  2. 17 13
      netbox/templates/extras/report_list.html

+ 12 - 0
netbox/project-static/css/base.css

@@ -338,6 +338,18 @@ table.component-list tr.ipaddress:hover td {
     background-color: #e6f7f7;
 }
 
+/* Reports */
+table.reports td.method {
+    font-family: monospace;
+    padding-left: 30px;
+}
+table.reports td.stats label {
+    display: inline-block;
+    line-height: 14px;
+    margin-bottom: 0;
+    min-width: 40px;
+}
+
 /* AJAX loader */
 .loading {
     position: fixed;

+ 17 - 13
netbox/templates/extras/report_list.html

@@ -7,39 +7,43 @@
         <div class="col-md-9">
             {% for module, module_reports in reports %}
                 <h3><a name="module.{{ module }}"></a>{{ module|bettertitle }}</h3>
-                <table class="table table-hover table-headings">
+                <table class="table table-hover table-headings reports">
                     <thead>
                         <tr>
                             <th>Name</th>
+                            <th>Status</th>
                             <th>Description</th>
                             <th>Last Run</th>
-                            <th class="text-right">Status</th>
                         </tr>
                     </thead>
                     <tbody>
                         {% for report in module_reports %}
                             <tr>
-                                <td><a name="report.{{ report.name }}"></a><strong>{{ report.name }}</strong></td>
+                                <td>
+                                    <a name="report.{{ report.name }}"></a>
+                                    <strong>{{ report.name }}</strong>
+                                </td>
+                                <td>
+                                    {% include 'extras/inc/report_label.html' %}
+                                </td>
                                 <td>{{ report.description|default:"" }}</td>
                                 {% if report.results %}
                                     <td>{{ report.results.created }}</td>
                                 {% else %}
                                     <td class="text-muted">Never</td>
                                 {% endif %}
-                                <td class="text-right">{% include 'extras/inc/report_label.html' %}</td>
                             </tr>
                             {% for method, stats in report.results.data.items %}
                                 <tr>
-                                    <td colspan="3" style="padding-left: 40px">
-                                        <div class="pull-right">
-                                            <label class="label label-success">{{ stats.success }}</label>
-                                            <label class="label label-info">{{ stats.info }}</label>
-                                            <label class="label label-warning">{{ stats.warning }}</label>
-                                            <label class="label label-danger">{{ stats.failed }}</label>
-                                        </div>
-                                        <span style="font-family: monospace">{{ method }}</span>
+                                    <td colspan="3" class="method">
+                                        {{ method }}
+                                    </td>
+                                    <td class="text-right 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>
+                                        <label class="label label-danger">{{ stats.failed }}</label>
                                     </td>
-                                    <td></td>
                                 </tr>
                             {% endfor %}
                         {% endfor %}