Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add basic device sorting #704

Merged
merged 1 commit into from
Nov 5, 2022
Merged

Add basic device sorting #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tasmoadmin/includes/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<script src="<?php echo $urlHelper->js("languages/uk", "node_modules/@wikimedia/jquery.i18n/src/"); ?>"></script>

<script src="<?php echo $urlHelper->js("js.cookie", "node_modules/js-cookie/dist/"); ?>"></script>
<script src="<?php echo $urlHelper->js("tablesaw.stackonly.jquery", "node_modules/tablesaw/dist/stackonly/"); ?>"></script>
<script src="<?php echo $urlHelper->js("tablesaw.jquery", "node_modules/tablesaw/dist/"); ?>"></script>
<script src="<?php echo $urlHelper->js("tablesaw-init", "node_modules/tablesaw/dist/"); ?>"></script>
<script src="<?php echo $urlHelper->js("bootstrap-waitingfor", "node_modules/bootstrap-waitingfor/build/"); ?>"></script>
<script src="<?php echo $urlHelper->js("jquery.doubleScroll", "node_modules/jqdoublescroll/"); ?>"></script>
Expand Down
13 changes: 6 additions & 7 deletions tasmoadmin/pages/devices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ class='form-control device-search has-clearer'
<table id='device-list'
class='table table-striped table-sm table-hover tablesaw tablesaw-stack '
data-tablesaw-mode="stack"
border='0'
cellspacing='0'
data-tablesaw-sortable
>
<thead>
<tr>
Expand All @@ -65,17 +64,17 @@ class='table table-striped table-sm table-hover tablesaw tablesaw-stack '
</label>
</div>
</th>
<th><?php echo __("TABLE_HEAD_POSITION", "DEVICES"); ?></th>
<th data-tablesaw-sortable-col data-tablesaw-sortable-numeric><?php echo __("TABLE_HEAD_POSITION", "DEVICES"); ?></th>
<th class='more'><?php echo __("TABLE_HEAD_ID", "DEVICES"); ?></th>
<th><?php echo __("TABLE_HEAD_NAME", "DEVICES"); ?></th>
<th><?php echo __("TABLE_HEAD_IP", "DEVICES"); ?></th>
<th data-tablesaw-sortable-col><?php echo __("TABLE_HEAD_NAME", "DEVICES"); ?></th>
<th data-tablesaw-sortable-col><?php echo __("TABLE_HEAD_IP", "DEVICES"); ?></th>
<th><?php echo __("TABLE_HEAD_STATE", "DEVICES"); ?></th>
<th>
<th data-tablesaw-sortable-col>
<i class="fas fa-signal no-hover"
title='<?php echo __("TABLE_HEAD_RSSI", "DEVICES"); ?>'
></i>
</th>
<th><?php echo __("TABLE_HEAD_VERSION", "DEVICES"); ?></th>
<th data-tablesaw-sortable-col><?php echo __("TABLE_HEAD_VERSION", "DEVICES"); ?></th>
<th><?php echo __("TABLE_HEAD_RUNTIME", "DEVICES"); ?></th>
<th class='energyPower hidden'><?php echo __(
"TABLE_HEAD_ENERGY",
Expand Down