ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4447 from IgorA100/patch-588486 

Fix: Changed the design of the data table for view=options&tab=control
copilot/fix-712f30f1-6576-4b01-9635-9d931c991531
Isaac Connor 2025-10-02 09:03:40 -04:00 committed by GitHub
parent aec6f8af32 74356b186c
commit fa34ba57fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/skins/classic/css/base/views/options.css
View File

@ -53,6 +53,7 @@ input.large {
overflow-x: auto;
overflow-y: hidden;
padding-top: 15px;
display: flex;
}
#options {
@ -128,6 +129,7 @@ input[name="newStorage[Url]"] {
form {
/* display: flex;*/
/* flex-direction: column;*/
width: 100%;
height: 100%;
/* padding-top: 2rem; */
}
@ -184,3 +186,18 @@ body.sticky .wrapper-scroll-table {
overflow-x: hidden;
overflow-y: auto;
}
body.sticky .bootstrap-table {
height: 100%;
display: flex;
flex-direction: column;
}
body.sticky .fixed-table-container {
overflow-y: auto;
}
body.sticky #controlTable thead {
position: sticky;
top: 0;
box-shadow: 0 0px 0, 0 -3px 0 #dfe4ea;
}

42
web/skins/classic/views/_options_controlcaps.php
View File

@ -1,20 +1,23 @@
<?php
$controls = dbFetchAll('SELECT * FROM Controls ORDER BY Name');
?>
<div class="row">
<div class="col">
<div id="contentButtons">
<button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
<button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
<button id="addNewBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('AddNewControl') ?>" data-on-click-this="addNewControl" data-url="?view=controlcap"><i class="fa fa-plus"></i></button>
<button id="editBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('EditControl') ?>" data-on-click-this="editControl" data-url="?view=controlcap&cid=" disabled><i class="fa fa-pencil"></i></button>
<button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>" disabled><i class="fa fa-trash"></i></button>
</div>
</div> <!-- .col -->
</div> <!-- .row -->
<div class="wrapper-scroll-table">
<div class="row">
<div class="col">
<div id="page">
<div id="content" class="container-fluid">
<!-- Toolbar button placement and styling handled by bootstrap-tables -->
<div id="toolbar" class="container-fluid">
<div class="row">
<div class="col">
<button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
<button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
<button id="addNewBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('AddNewControl') ?>" data-on-click-this="addNewControl" data-url="?view=controlcap"><i class="fa fa-plus"></i></button>
<button id="editBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('EditControl') ?>" data-on-click-this="editControl" data-url="?view=controlcap&cid=" disabled><i class="fa fa-pencil"></i></button>
<button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>" disabled><i class="fa fa-trash"></i></button>
</div> <!-- .col-->
</div> <!-- .row-->
</div> <!-- #toolbar -->
<div id="controlCaps" class="table-responsive">
<!-- Table styling handled by bootstrap-tables -->
<table id="controlTable" class="table-sm table-borderless"
data-locale="<?php echo i18n() ?>"
data-search="true"
@ -27,8 +30,11 @@ $controls = dbFetchAll('SELECT * FROM Controls ORDER BY Name');
data-buttons-class="btn btn-normal"
data-toolbar="#toolbar"
data-show-columns="true"
data-mobile-responsive="true"
data-min-width="562"
class="table-sm table-borderless table"
>
<thead>
<thead class="thead-highlight">
<tr>
<th data-sortable="false" data-field="toggleCheck" data-checkbox="true"></th>
<th class="colId" data-sortable="true" data-field="Id"><?php echo translate('Id') ?></th>
@ -65,7 +71,7 @@ foreach( $controls as $control ) {
?>
</tbody>
</table>
</div> <!-- .col -->
</div> <!-- .row -->
</div> <!-- .wrapper-scroll-table -->
</div> <!--#controlCaps-->
</div><!--#content-->
</div><!-- #page -->
<script src="skins/<?php echo $skin ?>/views/js/controlcaps.js" nonce="<?php echo $cspNonce ?>"></script>