From e34ca1a3f597212ad70bceeb7d1de542b034b233 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 24 Jun 2016 11:23:45 -0400 Subject: [PATCH] Standardized graphs_modal markup; added graphs to Provider view --- netbox/templates/circuits/provider.html | 10 ++++++++++ netbox/templates/dcim/device.html | 14 +------------- netbox/templates/dcim/site.html | 13 +------------ netbox/templates/inc/graphs_modal.html | 11 +++++++++++ 4 files changed, 23 insertions(+), 25 deletions(-) create mode 100644 netbox/templates/inc/graphs_modal.html diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index ad96f6947..333a07faf 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -1,4 +1,5 @@ {% extends '_base.html' %} +{% load static from staticfiles %} {% load helpers %} {% block title %}{{ provider }}{% endblock %} @@ -13,6 +14,10 @@
+ {% if perms.circuits.change_provider %} @@ -109,4 +114,9 @@
+{% include 'inc/graphs_modal.html' %} +{% endblock %} + +{% block javascript %} + {% endblock %} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 18658f593..9d9da6a18 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -327,19 +327,7 @@ {% endif %} - - - +{% include 'inc/graphs_modal.html' %} {% include 'secrets/inc/private_key_modal.html' %} {% endblock %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index 749482cd6..8c5e8130d 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -145,18 +145,7 @@ - - +{% include 'inc/graphs_modal.html' %} {% endblock %} {% block javascript %} diff --git a/netbox/templates/inc/graphs_modal.html b/netbox/templates/inc/graphs_modal.html new file mode 100644 index 000000000..29eaf18bf --- /dev/null +++ b/netbox/templates/inc/graphs_modal.html @@ -0,0 +1,11 @@ +