From 528b155714950ab8a0111e21b62ca0f1aa13aedf Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 12 Sep 2024 09:21:19 -0400
Subject: [PATCH] Merge blocks of output_link_if_exists
---
web/skins/classic/includes/functions.php | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 719d23521..0fd3917f6 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -70,13 +70,6 @@ echo output_cache_busted_stylesheet_links(array(
'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 @@ if ( $basename == 'montage' ) {
<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 @@ if ( $css != 'base' )
'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' )