Merge branch 'master' of github.com:ZoneMinder/zoneminder

Isaac Connor · Isaac Connor · commit 2d0b1d730483 · 2025-03-27T15:02:07.000-04:00
diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css
@@ -983,6 +983,10 @@ a.flip {
     flex-wrap: wrap;
   }
 }
+#ui-datepicker-div {
+  z-index:1001!important;
+}
+
 #fieldsTable ul.chosen-choices {
   max-height: 100px;
   overflow-y:auto;
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
@@ -960,9 +960,11 @@ function getStatsTableHTML($eid, $fid, $row='') {
           
           $result .= '<td class="colAlarmLimits">' .validHtmlStr($stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY']). '</td>'.PHP_EOL;
           $result .= '<td class="colScore">' .$stat['Score']. '</td>'.PHP_EOL;
+        $result .= '</tr>'.PHP_EOL;
       }
     } else {
       $result .= '<tr>'.PHP_EOL;
+        //IMPORTANT! There is a problem with Bootstrap here. The class is being moved from <th> and "colspan" is not being applied
         $result .= '<td class="rowNoStats" colspan="9">' .translate('NoStatisticsRecorded'). '</td>'.PHP_EOL;
       $result .= '</tr>'.PHP_EOL;
     }

Original file line number	Diff line number	Diff line change
`@@ -983,6 +983,10 @@ a.flip {`
`983`	`983`	`flex-wrap: wrap;`
`984`	`984`	`}`
`985`	`985`	`}`
	`986`	`+#ui-datepicker-div {`
	`987`	`+ z-index:1001!important;`
	`988`	`+}`
	`989`	`+`
`986`	`990`	`#fieldsTable ul.chosen-choices {`
`987`	`991`	`max-height: 100px;`
`988`	`992`	`overflow-y:auto;`
Original file line number	Diff line number	Diff line change
`@@ -960,9 +960,11 @@ function getStatsTableHTML($eid, $fid, $row='') {`
`960`	`960`
`961`	`961`	`$result .= '<td class="colAlarmLimits">' .validHtmlStr($stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY']). '</td>'.PHP_EOL;`
`962`	`962`	`$result .= '<td class="colScore">' .$stat['Score']. '</td>'.PHP_EOL;`
	`963`	`+ $result .= '</tr>'.PHP_EOL;`
`963`	`964`	`}`
`964`	`965`	`} else {`
`965`	`966`	`$result .= '<tr>'.PHP_EOL;`
	`967`	`+ //IMPORTANT! There is a problem with Bootstrap here. The class is being moved from <th> and "colspan" is not being applied`
`966`	`968`	`$result .= '<td class="rowNoStats" colspan="9">' .translate('NoStatisticsRecorded'). '</td>'.PHP_EOL;`
`967`	`969`	`$result .= '</tr>'.PHP_EOL;`
`968`	`970`	`}`