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

fix: strip <br/> from bootstrap-table column picker labels 

Column headers like "Alarm<br/>Frames" and "Avg.<br/>Score" show the literal
<br/> text in the column selection dropdown. Add data-switchable-label attributes
with the <br/> replaced by a space so the column picker shows clean labels while
the table headers still render the line break. Fix applied to events.php and
watch.php.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
pull/4707/merge
Isaac Connor 2026-03-12 16:16:46 -04:00
parent 939c2c4a9e
commit 8f29a06ca7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/skins/classic/views/events.php
View File

@ -176,10 +176,10 @@ echo getNavBarHTML();
<th data-sortable="true" data-field="Location" class="Location"><?php echo translate('Location') ?></th>
<?php } ?>
<th data-sortable="true" data-field="Frames" class="Frames"><?php echo translate('Frames') ?></th>
<th data-sortable="true" data-field="AlarmFrames" class="AlarmFrames"><?php echo translate('AlarmBrFrames') ?></th>
<th data-sortable="true" data-field="TotScore" class="TotScore"><?php echo translate('TotalBrScore') ?></th>
<th data-sortable="true" data-field="AvgScore" class="AvgScore"><?php echo translate('AvgBrScore') ?></th>
<th data-sortable="true" data-field="MaxScore" class="MaxScore"><?php echo translate('MaxBrScore') ?></th>
<th data-sortable="true" data-field="AlarmFrames" class="AlarmFrames" data-switchable-label="<?php echo str_replace('<br/>', ' ', translate('AlarmBrFrames')) ?>"><?php echo translate('AlarmBrFrames') ?></th>
<th data-sortable="true" data-field="TotScore" class="TotScore" data-switchable-label="<?php echo str_replace('<br/>', ' ', translate('TotalBrScore')) ?>"><?php echo translate('TotalBrScore') ?></th>
<th data-sortable="true" data-field="AvgScore" class="AvgScore" data-switchable-label="<?php echo str_replace('<br/>', ' ', translate('AvgBrScore')) ?>"><?php echo translate('AvgBrScore') ?></th>
<th data-sortable="true" data-field="MaxScore" class="MaxScore" data-switchable-label="<?php echo str_replace('<br/>', ' ', translate('MaxBrScore')) ?>"><?php echo translate('MaxBrScore') ?></th>
<th data-sortable="false" data-field="Storage" class="Storage"><?php echo translate('Storage') ?></th>
<th data-sortable="true" data-field="DiskSpace" data-footer-formatter="totalDiskSpaceFormatter" class="DiskSpace"><?php echo translate('DiskSpace') ?></th>
</tr>

6
web/skins/classic/views/watch.php
View File

@ -513,9 +513,9 @@ if ( canView('Events') && ($monitor->Type() != 'WebSite') ) {
<th data-sortable="false" data-field="EndDateTime"><?php echo translate('AttrEndTime') ?></th>
<th data-sortable="false" data-field="Length"><?php echo translate('Duration') ?></th>
<th data-sortable="false" data-field="Frames"><?php echo translate('Frames') ?></th>
<th data-sortable="false" data-field="AlarmFrames"><?php echo translate('AlarmBrFrames') ?></th>
<th data-sortable="false" data-field="AvgScore"><?php echo translate('AvgBrScore') ?></th>
<th data-sortable="false" data-field="MaxScore"><?php echo translate('MaxBrScore') ?></th>
<th data-sortable="false" data-field="AlarmFrames" data-switchable-label="<?php echo str_replace('<br/>', ' ', translate('AlarmBrFrames')) ?>"><?php echo translate('AlarmBrFrames') ?></th>
<th data-sortable="false" data-field="AvgScore" data-switchable-label="<?php echo str_replace('<br/>', ' ', translate('AvgBrScore')) ?>"><?php echo translate('AvgBrScore') ?></th>
<th data-sortable="false" data-field="MaxScore" data-switchable-label="<?php echo str_replace('<br/>', ' ', translate('MaxBrScore')) ?>"><?php echo translate('MaxBrScore') ?></th>
<?php if (ZM_WEB_LIST_THUMBS) { ?>
<th data-sortable="false" data-field="Thumbnail"><?php echo translate('Thumbnail') ?></th>
<?php } ?>