Loaded both modals into single include

This commit is contained in:
Oliver 2018-04-27 21:35:36 +10:00
parent e1e3cc71e6
commit c4e305bde6
9 changed files with 31 additions and 28 deletions

View File

@ -25,6 +25,12 @@
</a>
</div>
{% include 'modals.html' %}
{% endblock %}
{% block javascript %}
<script type="text/javascript" src="{% static 'script/delay.js' %}"></script>
<script type="text/javascript" src="{% static 'script/filter_company.js' %}">
</script>

View File

@ -34,8 +34,7 @@
<button class="btn btn-danger" id='part-delete'>Delete supplier part</button>
</div>
{% include 'modal.html' %}
{% include 'modal_delete.html' %}
{% include 'modals.html' %}
{% endblock %}

View File

@ -11,8 +11,7 @@
{% include 'part/tabs.html' with tab='bom' %}
{% include 'modal.html' %}
{% include 'modal_delete.html' %}
{% include 'modals.html' %}
<h3>Bill of Materials</h3>

View File

@ -31,8 +31,7 @@
</div>
{% include 'modal.html' %}
{% include 'modal_delete.html' %}
{% include 'modals.html' %}
{% endblock %}

View File

@ -6,8 +6,7 @@
<h3>Part Details</h3>
{% include 'modal.html' %}
{% include 'modal_delete.html' %}
{% include 'modals.html' %}
<table class='table table-striped'>
<tr>

View File

@ -5,7 +5,7 @@
{% include "part/cat_link.html" with category=category %}
{% include 'modal.html' %}
{% include 'modals.html' %}
{% if children.all|length > 0 %}
<h4>Part Categories</h4>

View File

@ -35,7 +35,7 @@
<button class="btn btn-success" id='supplier-create'>New Supplier Part</button>
</div>
{% include 'modal.html' %}
{% include 'modals.html' %}
{% endblock %}

View File

@ -1,18 +0,0 @@
<div class='modal fade modal-fixed-footer' tabindex='-1' role='dialog' id='modal-form'>
<div class='modal-dialog'>
<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>
<h3 id='modal-title'>Form Title Here</h3>
</div>
<div class='modal-form-content'>
</div>
<div class='modal-footer'>
<button type='button' class='btn btn-default' data-dismiss='modal'>Close</button>
<button type='button' class='btn btn-primary' id='modal-form-submit'>Submit</button>
</div>
</div>
</div>
</div>

View File

@ -1,3 +1,22 @@
<div class='modal fade modal-fixed-footer' tabindex='-1' role='dialog' id='modal-form'>
<div class='modal-dialog'>
<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>
<h3 id='modal-title'>Form Title Here</h3>
</div>
<div class='modal-form-content'>
</div>
<div class='modal-footer'>
<button type='button' class='btn btn-default' data-dismiss='modal'>Close</button>
<button type='button' class='btn btn-primary' id='modal-form-submit'>Submit</button>
</div>
</div>
</div>
</div>
<div class='modal fade modal-fixed-footer' tabindex='-1' role='dialog' id='modal-delete'>
<div class='modal-dialog'>
<div class='modal-content'>