Parcourir la source

Improved activity log display

Jeremy Stretch il y a 8 ans
Parent
commit
f901d9b23f
1 fichiers modifiés avec 92 ajouts et 97 suppressions
  1. 92 97
      netbox/templates/home.html

+ 92 - 97
netbox/templates/home.html

@@ -47,117 +47,112 @@
 	</div>
 </div>
 <div class="row">
-    <div class="col-md-7">
-        <div class="row">
-            <div class="col-md-6">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>DCIM</strong>
-                    </div>
-                    <div class="list-group">
-                        <div class="list-group-item">
-                            <span class="badge pull-right">{{ stats.site_count }}</span>
-                            <h4 class="list-group-item-heading"><a href="{% url 'dcim:site_list' %}">Sites</a></h4>
-                            <p class="list-group-item-text text-muted">Geographic locations</p>
-                        </div>
-                        <div class="list-group-item">
-                            <span class="badge pull-right">{{ stats.rack_count }}</span>
-                            <h4 class="list-group-item-heading"><a href="{% url 'dcim:rack_list' %}">Racks</a></h4>
-                            <p class="list-group-item-text text-muted">Equipment racks, optionally organized by group</p>
-                        </div>
-                        <div class="list-group-item">
-                            <span class="badge pull-right">{{ stats.device_count }}</span>
-                            <h4 class="list-group-item-heading"><a href="{% url 'dcim:device_list' %}">Devices</a></h4>
-                            <p class="list-group-item-text text-muted">Rack-mounted network equipment, servers, and other devices</p>
-                        </div>
-                        <div class="list-group-item">
-                            <h4 class="list-group-item-heading">Connections</h4>
-                            <span class="badge pull-right">{{ stats.interface_connections_count }}</span>
-                            <p style="padding-left: 20px;"><a href="{% url 'dcim:interface_connections_list' %}">Interfaces</a></p>
-                            <span class="badge pull-right">{{ stats.console_connections_count }}</span>
-                            <p style="padding-left: 20px;"><a href="{% url 'dcim:console_connections_list' %}">Console</a></p>
-                            <span class="badge pull-right">{{ stats.power_connections_count }}</span>
-                            <p class="list-group-item-text" style="padding-left: 20px;"><a href="{% url 'dcim:power_connections_list' %}">Power</a></p>
-                        </div>
-                    </div>
+    <div class="col-md-4">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>DCIM</strong>
+            </div>
+            <div class="list-group">
+                <div class="list-group-item">
+                    <span class="badge pull-right">{{ stats.site_count }}</span>
+                    <h4 class="list-group-item-heading"><a href="{% url 'dcim:site_list' %}">Sites</a></h4>
+                    <p class="list-group-item-text text-muted">Geographic locations</p>
+                </div>
+                <div class="list-group-item">
+                    <span class="badge pull-right">{{ stats.rack_count }}</span>
+                    <h4 class="list-group-item-heading"><a href="{% url 'dcim:rack_list' %}">Racks</a></h4>
+                    <p class="list-group-item-text text-muted">Equipment racks, optionally organized by group</p>
+                </div>
+                <div class="list-group-item">
+                    <span class="badge pull-right">{{ stats.device_count }}</span>
+                    <h4 class="list-group-item-heading"><a href="{% url 'dcim:device_list' %}">Devices</a></h4>
+                    <p class="list-group-item-text text-muted">Rack-mounted network equipment, servers, and other devices</p>
+                </div>
+                <div class="list-group-item">
+                    <h4 class="list-group-item-heading">Connections</h4>
+                    <span class="badge pull-right">{{ stats.interface_connections_count }}</span>
+                    <p style="padding-left: 20px;"><a href="{% url 'dcim:interface_connections_list' %}">Interfaces</a></p>
+                    <span class="badge pull-right">{{ stats.console_connections_count }}</span>
+                    <p style="padding-left: 20px;"><a href="{% url 'dcim:console_connections_list' %}">Console</a></p>
+                    <span class="badge pull-right">{{ stats.power_connections_count }}</span>
+                    <p class="list-group-item-text" style="padding-left: 20px;"><a href="{% url 'dcim:power_connections_list' %}">Power</a></p>
                 </div>
-                {% if perms.secrets %}
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <strong>Secrets</strong>
-                        </div>
-                        <div class="list-group">
-                            <div class="list-group-item">
-                                <span class="badge pull-right">{{ stats.secret_count }}</span>
-                                <h4 class="list-group-item-heading"><a href="{% url 'secrets:secret_list' %}">Secrets</a></h4>
-                                <p class="list-group-item-text text-muted">Sensitive data (such as passwords) which has been stored securely</p>
-                            </div>
-                        </div>
-                    </div>
-                {% endif %}
             </div>
-            <div class="col-md-6">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>IPAM</strong>
-                    </div>
-                    <div class="list-group">
-                        <div class="list-group-item">
-                            <span class="badge pull-right">{{ stats.aggregate_count }}</span>
-                            <h4 class="list-group-item-heading"><a href="{% url 'ipam:aggregate_list' %}">Aggregates</a></h4>
-                            <p class="list-group-item-text text-muted">Top-level IP allocations</p>
-                        </div>
-                        <div class="list-group-item">
-                            <span class="badge pull-right">{{ stats.prefix_count }}</span>
-                            <h4 class="list-group-item-heading"><a href="{% url 'ipam:prefix_list' %}">Prefixes</a></h4>
-                            <p class="list-group-item-text text-muted">IPv4 and IPv6 network assignments</p>
-                        </div>
-                        <div class="list-group-item">
-                            <span class="badge pull-right">{{ stats.ipaddress_count }}</span>
-                            <h4 class="list-group-item-heading"><a href="{% url 'ipam:ipaddress_list' %}">IP Addresses</a></h4>
-                            <p class="list-group-item-text text-muted">Individual IPv4 and IPv6 addresses</p>
-                        </div>
-                        <div class="list-group-item">
-                            <span class="badge pull-right">{{ stats.vlan_count }}</span>
-                            <h4 class="list-group-item-heading"><a href="{% url 'ipam:vlan_list' %}">VLANs</a></h4>
-                            <p class="list-group-item-text text-muted">Layer two domains, identified by VLAN ID</p>
-                        </div>
-                    </div>
+        </div>
+        {% if perms.secrets %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Secrets</strong>
                 </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Circuits</strong>
-                    </div>
-                    <div class="list-group">
-                        <div class="list-group-item">
-                            <span class="badge pull-right">{{ stats.provider_count }}</span>
-                            <h4 class="list-group-item-heading"><a href="{% url 'circuits:provider_list' %}">Providers</a></h4>
-                            <p class="list-group-item-text text-muted">Organizations which provide circuit connectivity</p>
-                        </div>
-                        <div class="list-group-item">
-                            <span class="badge pull-right">{{ stats.circuit_count }}</span>
-                            <h4 class="list-group-item-heading"><a href="{% url 'circuits:circuit_list' %}">Circuits</a></h4>
-                            <p class="list-group-item-text text-muted">Communication links for Internet transit, peering, and other services</p>
-                        </div>
+                <div class="list-group">
+                    <div class="list-group-item">
+                        <span class="badge pull-right">{{ stats.secret_count }}</span>
+                        <h4 class="list-group-item-heading"><a href="{% url 'secrets:secret_list' %}">Secrets</a></h4>
+                        <p class="list-group-item-text text-muted">Sensitive data (such as passwords) which has been stored securely</p>
                     </div>
                 </div>
             </div>
+        {% endif %}
+    </div>
+    <div class="col-md-4">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>IPAM</strong>
+            </div>
+            <div class="list-group">
+                <div class="list-group-item">
+                    <span class="badge pull-right">{{ stats.aggregate_count }}</span>
+                    <h4 class="list-group-item-heading"><a href="{% url 'ipam:aggregate_list' %}">Aggregates</a></h4>
+                    <p class="list-group-item-text text-muted">Top-level IP allocations</p>
+                </div>
+                <div class="list-group-item">
+                    <span class="badge pull-right">{{ stats.prefix_count }}</span>
+                    <h4 class="list-group-item-heading"><a href="{% url 'ipam:prefix_list' %}">Prefixes</a></h4>
+                    <p class="list-group-item-text text-muted">IPv4 and IPv6 network assignments</p>
+                </div>
+                <div class="list-group-item">
+                    <span class="badge pull-right">{{ stats.ipaddress_count }}</span>
+                    <h4 class="list-group-item-heading"><a href="{% url 'ipam:ipaddress_list' %}">IP Addresses</a></h4>
+                    <p class="list-group-item-text text-muted">Individual IPv4 and IPv6 addresses</p>
+                </div>
+                <div class="list-group-item">
+                    <span class="badge pull-right">{{ stats.vlan_count }}</span>
+                    <h4 class="list-group-item-heading"><a href="{% url 'ipam:vlan_list' %}">VLANs</a></h4>
+                    <p class="list-group-item-text text-muted">Layer two domains, identified by VLAN ID</p>
+                </div>
+            </div>
+        </div>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Circuits</strong>
+            </div>
+            <div class="list-group">
+                <div class="list-group-item">
+                    <span class="badge pull-right">{{ stats.provider_count }}</span>
+                    <h4 class="list-group-item-heading"><a href="{% url 'circuits:provider_list' %}">Providers</a></h4>
+                    <p class="list-group-item-text text-muted">Organizations which provide circuit connectivity</p>
+                </div>
+                <div class="list-group-item">
+                    <span class="badge pull-right">{{ stats.circuit_count }}</span>
+                    <h4 class="list-group-item-heading"><a href="{% url 'circuits:circuit_list' %}">Circuits</a></h4>
+                    <p class="list-group-item-text text-muted">Communication links for Internet transit, peering, and other services</p>
+                </div>
+            </div>
         </div>
     </div>
-    <div class="col-md-5">
+    <div class="col-md-4">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>Recent Activity</strong>
             </div>
-            <table class="table table-hover panel-body">
+            <div class="list-group">
                 {% for a in recent_activity %}
-                    <tr>
-                        <td>{{ a.time|date:"Y-m-d H:i" }}</td>
-                        <td>{{ a.user }}</td>
-                        <td>{{ a.icon }} {{ a.message|safe }}</td>
-                    </tr>
+                    <div class="list-group-item">
+                        {{ a.icon }} {{ a.message|safe }}<br />
+                        <small class="text-muted">{{ a.user }} - {{ a.time|date:"Y-m-d H:i" }}</small>
+                    </div>
                 {% endfor %}
-            </table>
+            </div>
         </div>
     </div>
 </div>