inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 04:55:44 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into build-fixes

Browse Source 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
This commit is contained in:
Oliver Walters
2020-10-29 00:01:10 +11:00
parent 4a7e9a2278 6dc5ef0cdc
commit 544b63cac5
12 changed files with 216 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/build/templates/build/index.html
View File

@ -21,7 +21,8 @@ InvenTree | {% trans "Build Orders" %}
<div id='button-toolbar'>
<div class='button-toolbar container-fluid' style='float: right;'>
<button type='button' class="btn btn-success" id='new-build'>{% trans "New Build Order" %}</button>
<button type='button' class="btn btn-success" id='new-build'>
<span class='fas fa-tools'></span> {% trans "New Build Order" %}</button>
<div class='filter-list' id='filter-list-build'>
<!-- An empty div in which the filter list will be constructed -->
</div>