mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-30 20:46:47 +00:00
Clean up buttons for stock location
This commit is contained in:
parent
21479e39d9
commit
fefbcf2ed9
@ -34,7 +34,7 @@ InvenTree | Company - {{ company.name }}
|
|||||||
<span class='glyphicon glyphicon-cog'/>
|
<span class='glyphicon glyphicon-cog'/>
|
||||||
</button>
|
</button>
|
||||||
<button type='button' class='btn btn-default btn-glyph' id='company-delete' title='Delete company'>
|
<button type='button' class='btn btn-default btn-glyph' id='company-delete' title='Delete company'>
|
||||||
<span class='glyphicon glyphicon-trash' style='color: #a11;'/>
|
<span class='glyphicon glyphicon-trash'/>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -65,7 +65,7 @@
|
|||||||
</button>
|
</button>
|
||||||
{% if not part.active %}
|
{% if not part.active %}
|
||||||
<button type='button' class='btn btn-default btn-glyph' id='part-delete' title='Delete part'>
|
<button type='button' class='btn btn-default btn-glyph' id='part-delete' title='Delete part'>
|
||||||
<span id='part-delete-icon' class='glyphicon glyphicon-trash' style='color: #a11;'/>
|
<span id='part-delete-icon' class='glyphicon glyphicon-trash'/>
|
||||||
</button>
|
</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
@ -23,11 +23,19 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.glyphicon-ok {
|
.glyphicon-ok {
|
||||||
color: #5f5;
|
color: #5C5;
|
||||||
}
|
}
|
||||||
|
|
||||||
.glyphicon-remove {
|
.glyphicon-remove {
|
||||||
color: #f55;
|
color: #C55;
|
||||||
|
}
|
||||||
|
|
||||||
|
.glyphicon-trash {
|
||||||
|
color: #C55;
|
||||||
|
}
|
||||||
|
|
||||||
|
.glyphicon-plus {
|
||||||
|
color: #5C5;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* CSS overrides for treeview */
|
/* CSS overrides for treeview */
|
||||||
|
@ -16,6 +16,9 @@
|
|||||||
<button type='button' class='btn btn-default btn-glyph' id='stock-remove' title='Take from stock'>
|
<button type='button' class='btn btn-default btn-glyph' id='stock-remove' title='Take from stock'>
|
||||||
<span class='glyphicon glyphicon-minus-sign' style='color: #a11;'/>
|
<span class='glyphicon glyphicon-minus-sign' style='color: #a11;'/>
|
||||||
</button>
|
</button>
|
||||||
|
<button type='button' class='btn btn-default btn-glyph' id='stock-count' title='Count stock'>
|
||||||
|
<span class='glyphicon glyphicon-ok-circle'/>
|
||||||
|
</button>
|
||||||
<button type='button' class='btn btn-default btn-glyph' id='stock-move' title='Transfer stock'>
|
<button type='button' class='btn btn-default btn-glyph' id='stock-move' title='Transfer stock'>
|
||||||
<span class='glyphicon glyphicon-transfer' style='color: #11a;'/>
|
<span class='glyphicon glyphicon-transfer' style='color: #11a;'/>
|
||||||
</button>
|
</button>
|
||||||
@ -27,7 +30,7 @@
|
|||||||
<span class='glyphicon glyphicon-cog'/>
|
<span class='glyphicon glyphicon-cog'/>
|
||||||
</button>
|
</button>
|
||||||
<button type='button' class='btn btn-default btn-glyph' id='stock-delete' title='Edit stock item'>
|
<button type='button' class='btn btn-default btn-glyph' id='stock-delete' title='Edit stock item'>
|
||||||
<span class='glyphicon glyphicon-trash' style='color: #a11;'/>
|
<span class='glyphicon glyphicon-trash'/>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
@ -124,7 +127,7 @@
|
|||||||
|
|
||||||
|
|
||||||
{% if item.has_tracking_info %}
|
{% if item.has_tracking_info %}
|
||||||
|
<hr>
|
||||||
<div id='table-toolbar'>
|
<div id='table-toolbar'>
|
||||||
<h4>Stock Tracking Information</h4>
|
<h4>Stock Tracking Information</h4>
|
||||||
</div>
|
</div>
|
||||||
@ -181,7 +184,7 @@
|
|||||||
itemAdjust("move");
|
itemAdjust("move");
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#stock-stocktake").click(function() {
|
$("#stock-count").click(function() {
|
||||||
itemAdjust('count');
|
itemAdjust('count');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -9,7 +9,19 @@
|
|||||||
<p>{{ location.description }}</p>
|
<p>{{ location.description }}</p>
|
||||||
<p>
|
<p>
|
||||||
<div class='btn-group'>
|
<div class='btn-group'>
|
||||||
|
<button class='btn btn-default btn-glyph' id='location-create' title='Create new stock location'>
|
||||||
|
<span class='glyphicon glyphicon-plus'/>
|
||||||
|
</button>
|
||||||
{% include "qr_button.html" %}
|
{% include "qr_button.html" %}
|
||||||
|
<button class='btn btn-default btn-glyph' id='location-count' title='Count stock items'>
|
||||||
|
<span class='glyphicon glyphicon-ok-circle'/>
|
||||||
|
</button>
|
||||||
|
<button class='btn btn-default btn-glyph' id='location-edit' title='Edit stock location'>
|
||||||
|
<span class='glyphicon glyphicon-cog'/>
|
||||||
|
</button>
|
||||||
|
<button class='btn btn-default btn-glyph' id='location-delete' title='Delete stock location'>
|
||||||
|
<span class='glyphicon glyphicon-trash'/>
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
{% else %}
|
{% else %}
|
||||||
@ -18,19 +30,6 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</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>
|
|
||||||
{% if location %}
|
|
||||||
<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='location-edit' title='Edit stock location'>Edit</a></li>
|
|
||||||
<li><a href="#" id='location-delete' title='Delete stock location'>Delete</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
@ -91,6 +90,18 @@
|
|||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
{% if location %}
|
||||||
|
$("#location-count").click(function() {
|
||||||
|
launchModalForm("/stock/adjust/", {
|
||||||
|
data: {
|
||||||
|
action: "count",
|
||||||
|
location: {{ location.id }},
|
||||||
|
reload: true,
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
$('#show-qr-code').click(function() {
|
$('#show-qr-code').click(function() {
|
||||||
launchModalForm("{% url 'stock-location-qr' location.id %}",
|
launchModalForm("{% url 'stock-location-qr' location.id %}",
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user