inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-03 22:55:43 +00:00
Code Activity

Cleanup / formatting

Browse Source
This commit is contained in:
Oliver
2018-05-04 01:33:13 +10:00
parent 347a324589
commit 395bf23d6c
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/company/templates/company/index.html
View File

@@ -4,14 +4,15 @@
{% block content %} {% block content %}
<div class='container-fluid'>
<h3><button style='float: right;' class="btn btn-success" id='new-company'>New Company</button></h3>
<h3>Companies</h3> <h3>Companies</h3>
</div>
<table class='table table-striped' id='company-table'> <table class='table table-striped' id='company-table'>
</table> </table>
<div class='container-fluid'>
<button class="btn btn-success" id='new-company'>New Company</button>
</div>
{% include 'modals.html' %} {% include 'modals.html' %}

5
InvenTree/static/css/inventree.css
View File

@@ -115,4 +115,9 @@
border-radius: 5px; border-radius: 5px;
opacity: 0.9; opacity: 0.9;
pointer-events: all; pointer-events: all;
}
.btn {
margin-left: 2px;
margin-right: 2px;
} }

25
InvenTree/stock/templates/stock/index.html
View File

@@ -4,18 +4,27 @@
{% include "stock/loc_link.html" with location=None %} {% include "stock/loc_link.html" with location=None %}
{% if locations.all|length > 0 %} <div class='row'>
<h4>Storage Locations</h4> <div class='col-sm-6'>
{% include "stock/location_list.html" with locations=locations %} <h3>Storage Locations</h3>
{% endif %} </div>
<div class='col-sm-6'>
<h3>
<button style='float: right;' class='btn btn-success' id='location-create'>New Stock Location</button>
</h3>
</div>
</div>
<hr>
{% if locations|length > 0 %}
{% include "stock/location_list.html" with locations=locations %}
<hr>
{% endif %}
<h3>Stock Items</h3>
<table class="table table-striped" id='stock-table'> <table class="table table-striped" id='stock-table'>
</table> </table>
<div class='container-fluid'>
<button class="btn btn-success" id='location-create'>New Stock Location</button>
</div>
{% include 'modals.html' %} {% include 'modals.html' %}
{% endblock %} {% endblock %}

12
InvenTree/stock/templates/stock/location.html
View File

@@ -10,20 +10,24 @@
<p>{{ location.description }}</p> <p>{{ location.description }}</p>
</div> </div>
<div class='col-sm-6'> <div class='col-sm-6'>
<h3>
<div style='float: right;'>
<button class='btn btn-success' id='location-create'>New Stock Location</button>
<div class="dropdown" style="float: right;"> <div class="dropdown" style="float: right;">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Stock Location <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Stock Location
<span class="caret"></span></button> <span class="caret"></span></button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href='#' id='location-create' title='Create new stock location'>New</a></li>
<li><a href="#" id='location-edit' title='Edit stock location'>Edit</a></li> <li><a href="#" id='location-edit' title='Edit stock location'>Edit</a></li>
<li><a href="#" id='location-delete' title='Delete stock location'>Delete</a></li> <li><a href="#" id='location-delete' title='Delete stock location'>Delete</a></li>
</ul> </ul>
</div> </div>
</div>
</h3>
</div> </div>
</div> </div>
{% if location.has_children %} {% if location.has_children %}
<h4>Sub Locations</h4> <h3>Sub Locations</h3>
{% include "stock/location_list.html" with locations=location.children %} {% include "stock/location_list.html" with locations=location.children %}
{% endif %} {% endif %}
@@ -32,7 +36,8 @@
</table> </table>
{% endif %} {% endif %}
<div class='container-fluid'> <div class='container-fluid' style='float: right;'>
<button class="btn btn-success" id='item-create'>New Stock Item</span></button>
<div class="dropdown" style='float: right;'> <div class="dropdown" style='float: right;'>
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Selected <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Selected
<span class="caret"></span></button> <span class="caret"></span></button>
@@ -42,7 +47,6 @@
<li><a href="#" id='multi-item-delete' title='Delete selected stock items'>Delete</a></li> <li><a href="#" id='multi-item-delete' title='Delete selected stock items'>Delete</a></li>
</ul> </ul>
</div> </div>
<button class="btn btn-success" id='item-create'>New Stock Item</span></button>
</div> </div>
{% include 'modals.html' %} {% include 'modals.html' %}