Merge branch 'develop'

This commit is contained in:
snipe 2017-10-03 18:12:47 -07:00
commit fb180d74a1

View file

@ -40,12 +40,15 @@
'id' => 'bulkForm']) }} 'id' => 'bulkForm']) }}
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@if (Input::get('status')!='deleted')
<div id="toolbar"> <div id="toolbar">
<select name="bulk_actions" class="form-control select2" style="width: 300px;"> <select name="bulk_actions" class="form-control select2" style="width: 300px;">
<option value="edit">Bulk Edit</option> <option value="edit">Bulk Edit</option>
</select> </select>
<button class="btn btn-primary" id="bulkEdit" disabled>Go</button> <button class="btn btn-primary" id="bulkEdit" disabled>Go</button>
</div> </div>
@endif