Merge blocks of output_link_if_exists

ZoneMinder · Sep 12, 2024 · 528b155 · 528b155
1 parent 9e9d47d
commit 528b155
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
@@ -70,13 +70,6 @@ function xhtmlHeadersStart($file, $title) {
  'css/bootstrap.min.css',
 ));
 
-echo output_link_if_exists(array(
- 'js/dateTimePicker/jquery-ui-timepicker-addon.css',
- 'js/jquery-ui-1.13.2/jquery-ui.structure.min.css',
- 'js/bootstrap-table-1.22.3/bootstrap-table.min.css',
- 'js/bootstrap-table-1.22.3/extensions/page-jump-to/bootstrap-table-page-jump-to.min.css',
-), true);
-
 if ( $basename == 'montage' ) {
  echo output_link_if_exists(array('/assets/gridstack/dist/gridstack.css', '/assets/gridstack/dist/gridstack-extra.css'));
 }
@@ -86,6 +79,10 @@ function xhtmlHeadersStart($file, $title) {
  <link rel="stylesheet" href="skins/classic/js/chosen/chosen.min.css" type="text/css"/>
 <?php
 echo output_link_if_exists(array(
+ 'js/dateTimePicker/jquery-ui-timepicker-addon.css',
+ 'js/jquery-ui-1.13.2/jquery-ui.structure.min.css',
+ 'js/bootstrap-table-1.22.3/bootstrap-table.min.css',
+ 'js/bootstrap-table-1.22.3/extensions/page-jump-to/bootstrap-table-page-jump-to.min.css',
  'css/base/skin.css',
  'css/base/views/'.$basename.'.css',
 ), true);
@@ -96,8 +93,7 @@ function xhtmlHeadersStart($file, $title) {
  'css/'.$css.'/views/'.$basename.'.css',
  'css/'.$css.'/jquery-ui-theme.css',
  ));
-?>
-<?php
+
  if ( $basename == 'watch' ) {
  echo output_link_if_exists(array('/css/base/views/control.css'));
  if ( $css != 'base' )