jandrade/BinStack
1
0
Fork 0
forked from Business/BinStack
Code Issues Pull Requests Releases Wiki Activity

Mostly fix item table width issues

Browse Source
This commit is contained in:
Skylar Ittner 2018-04-16 17:16:03 -06:00
parent 766c959a75
commit 14c6f5c9cc
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/getitemtable.php
View File

@ -117,8 +117,8 @@ $out['recordsFiltered'] = $recordsFiltered;
$usercache = []; $usercache = [];
for ($i = 0; $i < count($items); $i++) { for ($i = 0; $i < count($items); $i++) {
$items[$i]["editbtn"] = '<a class="btn btn-primary btn-sm" href="app.php?page=edititem&id=' . $items[$i]['itemid'] . '"><i class="fas fa-edit"></i> ' . lang("edit", false) . '</a>'; $items[$i]["editbtn"] = '<a class="btn btn-primary" href="app.php?page=edititem&id=' . $items[$i]['itemid'] . '"><i class="fas fa-edit"></i> ' . lang("edit", false) . '</a>';
$items[$i]["clonebtn"] = '<a class="btn btn-success btn-sm" href="app.php?page=edititem&id=' . $items[$i]['itemid'] . '&clone=1"><i class="fas fa-clone"></i> ' . lang("clone", false) . '</a>'; $items[$i]["clonebtn"] = '<a class="btn btn-success" href="app.php?page=edititem&id=' . $items[$i]['itemid'] . '&clone=1"><i class="fas fa-clone"></i> ' . lang("clone", false) . '</a>';
if (is_null($items[$i]['userid'])) { if (is_null($items[$i]['userid'])) {
$items[$i]["username"] = ""; $items[$i]["username"] = "";
} else { } else {

24
pages/items.php
View File

@ -27,13 +27,13 @@ redirectifnotloggedin();
<th data-priority="0"></th> <th data-priority="0"></th>
<th data-priority="1"><?php lang('actions'); ?></th> <th data-priority="1"><?php lang('actions'); ?></th>
<th data-priority="1"><i class="fas fa-fw fa-box d-none d-md-inline"></i> <?php lang('name'); ?></th> <th data-priority="1"><i class="fas fa-fw fa-box d-none d-md-inline"></i> <?php lang('name'); ?></th>
<th data-priority="4"><i class="fas fa-fw fa-pallet d-none d-md-inline"></i> <?php lang('category'); ?></th> <th data-priority="7"><i class="fas fa-fw fa-pallet d-none d-md-inline"></i> <?php lang('category'); ?></th>
<th data-priority="2"><i class="fas fa-fw fa-map-marker d-none d-md-inline"></i> <?php lang('location'); ?></th> <th data-priority="4"><i class="fas fa-fw fa-map-marker d-none d-md-inline"></i> <?php lang('location'); ?></th>
<th data-priority="3"><i class="fas fa-fw fa-barcode d-none d-md-inline"></i> <?php lang('code 1'); ?></th> <th data-priority="2"><i class="fas fa-fw fa-barcode d-none d-md-inline"></i> <?php lang('code 1'); ?></th>
<th data-priority="4"><i class="fas fa-fw fa-qrcode d-none d-md-inline"></i> <?php lang('code 2'); ?></th> <th data-priority="5"><i class="fas fa-fw fa-qrcode d-none d-md-inline"></i> <?php lang('code 2'); ?></th>
<th data-priority="3"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('qty'); ?></th> <th data-priority="3"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('qty'); ?></th>
<th data-priority="4"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('want'); ?></th> <th data-priority="6"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('want'); ?></th>
<th data-priority="3"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php lang('assigned to'); ?></th> <th data-priority="8"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php lang('assigned to'); ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -43,13 +43,13 @@ redirectifnotloggedin();
<th data-priority="0"></th> <th data-priority="0"></th>
<th data-priority="1"><?php lang('actions'); ?></th> <th data-priority="1"><?php lang('actions'); ?></th>
<th data-priority="1"><i class="fas fa-fw fa-box d-none d-md-inline"></i> <?php lang('name'); ?></th> <th data-priority="1"><i class="fas fa-fw fa-box d-none d-md-inline"></i> <?php lang('name'); ?></th>
<th data-priority="4"><i class="fas fa-fw fa-pallet d-none d-md-inline"></i> <?php lang('category'); ?></th> <th data-priority="7"><i class="fas fa-fw fa-pallet d-none d-md-inline"></i> <?php lang('category'); ?></th>
<th data-priority="2"><i class="fas fa-fw fa-map-marker d-none d-md-inline"></i> <?php lang('location'); ?></th> <th data-priority="4"><i class="fas fa-fw fa-map-marker d-none d-md-inline"></i> <?php lang('location'); ?></th>
<th data-priority="3"><i class="fas fa-fw fa-barcode d-none d-md-inline"></i> <?php lang('code 1'); ?></th> <th data-priority="2"><i class="fas fa-fw fa-barcode d-none d-md-inline"></i> <?php lang('code 1'); ?></th>
<th data-priority="4"><i class="fas fa-fw fa-qrcode d-none d-md-inline"></i> <?php lang('code 2'); ?></th> <th data-priority="5"><i class="fas fa-fw fa-qrcode d-none d-md-inline"></i> <?php lang('code 2'); ?></th>
<th data-priority="3"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('qty'); ?></th> <th data-priority="3"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('qty'); ?></th>
<th data-priority="4"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('want'); ?></th> <th data-priority="6"><i class="fas fa-fw fa-hashtag d-none d-md-inline"></i> <?php lang('want'); ?></th>
<th data-priority="3"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php lang('assigned to'); ?></th> <th data-priority="8"><i class="fas fa-fw fa-user d-none d-md-inline"></i> <?php lang('assigned to'); ?></th>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>

2
static/js/items.js
View File

@ -49,7 +49,7 @@ var itemtable = $('#itemtable').DataTable({
json.items.forEach(function (row) { json.items.forEach(function (row) {
json.data.push([ json.data.push([
"", "",
"<span class='btn-group'>" + row.editbtn + " " + row.clonebtn + "</span>", "<span class='btn-group-vertical btn-group-sm'>" + row.editbtn + " " + row.clonebtn + "</span>",
row.name, row.name,
row.catname, row.catname,
row.locname + " (" + row.loccode + ")", row.locname + " (" + row.loccode + ")",