Move button groups into the table toolbar next to search box

- part stock list
- part bom list
This commit is contained in:
Oliver Walters 2019-04-16 08:13:05 +10:00
parent a4467fee21
commit 94b280eed3
2 changed files with 35 additions and 44 deletions

View File

@ -11,29 +11,29 @@
<h3>Bill of Materials</h3>
<table class='table table-striped table-condensed' id='bom-table'>
<div id='button-toolbar'>
{% if editing_enabled %}
<div class='btn-group' style='float: right;'>
<button class='btn btn-info' type='button' id='bom-item-new'>New BOM Item</button>
<button class='btn btn-success' type='button' id='editing-finished'>Save Changes</button>
</div>
{% else %}
<div class='dropdown' style="float: right;">
<button class='btn btn-primary dropdown-toggle' type='button' data-toggle='dropdown'>
Options
<span class='caret'></span>
</button>
<ul class='dropdown-menu'>
<li><a href='#' id='edit-bom' title='Edit BOM'>Edit BOM</a></li>
<li><a href='#' id='export-bom' title='Export BOM'>Export BOM</a></li>
</ul>
</div>
{% endif %}
</div>
<table class='table table-striped table-condensed' data-toolbar="#button-toolbar" id='bom-table'>
</table>
<div><br></div>
{% if editing_enabled %}
<div class='btn-group' style='float: right;'>
<button class='btn btn-info' type='button' id='bom-item-new'>New BOM Item</button>
<button class='btn btn-success' type='button' id='editing-finished'>Save Changes</button>
</div>
{% else %}
<div class='dropdown' style="float: right;">
<button class='btn btn-primary dropdown-toggle' type='button' data-toggle='dropdown'>
Options
<span class='caret'></span>
</button>
<ul class='dropdown-menu'>
<li><a href='#' id='edit-bom' title='Edit BOM'>Edit BOM</a></li>
<li><a href='#' id='export-bom' title='Export BOM'>Export BOM</a></li>
</ul>
</div>
{% endif %}
{% endblock %}
{% block js_load %}

View File

@ -4,32 +4,23 @@
{% include 'part/tabs.html' with tab='stock' %}
<div class='row'>
<div class='col-sm-6'>
<h3>Part Stock</h3>
</div>
<div class='col-sm-6 float-right'>
<h3>
<div class='float-right'>
<button class='btn btn-success' id='add-stock-item'>New Stock Item</button>
<div id='opt-dropdown' class="dropdown" style='float: right;'>
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href='#' id='multi-item-take' title='Take items from stock'>Take items</a></li>
<li><a href='#' id='multi-item-give' title='Give items to stock'>Add items</a></li>
<li><a href="#" id='multi-item-stocktake' title='Stocktake selected stock items'>Stocktake</a></li>
<li><a href='#' id='multi-item-move' title='Move selected stock items'>Move items</a></li>
</ul>
</div>
</div>
</h3>
<h3>Part Stock</h3>
<div id='button-toolbar'>
<button class='btn btn-success' id='add-stock-item'>New Stock Item</button>
<div id='opt-dropdown' class="dropdown" style='float: right;'>
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Options
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href='#' id='multi-item-take' title='Take items from stock'>Take items</a></li>
<li><a href='#' id='multi-item-give' title='Give items to stock'>Add items</a></li>
<li><a href="#" id='multi-item-stocktake' title='Stocktake selected stock items'>Stocktake</a></li>
<li><a href='#' id='multi-item-move' title='Move selected stock items'>Move items</a></li>
</ul>
</div>
</div>
<hr>
<table class='table table-striped table-condensed' id='stock-table'>
<table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='stock-table'>
</table>