Standardized graphs_modal markup; added graphs to Provider view

This commit is contained in:
Jeremy Stretch 2016-06-24 11:23:45 -04:00
parent 39330850b3
commit e34ca1a3f5
4 changed files with 23 additions and 25 deletions

View File

@ -1,4 +1,5 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load static from staticfiles %}
{% load helpers %} {% load helpers %}
{% block title %}{{ provider }}{% endblock %} {% block title %}{{ provider }}{% endblock %}
@ -13,6 +14,10 @@
</div> </div>
</div> </div>
<div class="pull-right"> <div class="pull-right">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#graphs_modal" data-obj="{{ provider.name }}" data-url="{% url 'circuits-api:provider_graphs' pk=provider.pk %}" title="Show graphs">
<i class="glyphicon glyphicon-signal" aria-hidden="true"></i>
Graphs
</button>
{% if perms.circuits.change_provider %} {% if perms.circuits.change_provider %}
<a href="{% url 'circuits:provider_edit' slug=provider.slug %}" class="btn btn-warning"> <a href="{% url 'circuits:provider_edit' slug=provider.slug %}" class="btn btn-warning">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
@ -109,4 +114,9 @@
</div> </div>
</div> </div>
</div> </div>
{% include 'inc/graphs_modal.html' %}
{% endblock %}
{% block javascript %}
<script src="{% static 'js/graphs.js' %}"></script>
{% endblock %} {% endblock %}

View File

@ -327,19 +327,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% include 'inc/graphs_modal.html' %}
<div class="modal fade" id="graphs_modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="graphs_modal_title">Modal title</h4>
</div>
<div class="modal-body"></div>
</div>
</div>
</div>
{% include 'secrets/inc/private_key_modal.html' %} {% include 'secrets/inc/private_key_modal.html' %}
{% endblock %} {% endblock %}

View File

@ -145,18 +145,7 @@
</div> </div>
</div> </div>
</div> </div>
{% include 'inc/graphs_modal.html' %}
<div class="modal fade" id="graphs_modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="graphs_modal_title">Modal title</h4>
</div>
<div class="modal-body"></div>
</div>
</div>
</div>
{% endblock %} {% endblock %}
{% block javascript %} {% block javascript %}

View File

@ -0,0 +1,11 @@
<div class="modal fade" id="graphs_modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="graphs_modal_title">Modal title</h4>
</div>
<div class="modal-body"></div>
</div>
</div>
</div>