Merge pull request #3988 from IgorA100/patch-81

Fix: CSS file loading order (functions.php)
ZoneMinder · May 12, 2024 · db5a66b · db5a66b
2 parents cd3e89d + 2a2d200
commit db5a66b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
@@ -114,6 +114,10 @@ function output_cache_busted_stylesheet_links($files) {
   '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'));
+}
 ?>
   <link rel="stylesheet" href="skins/classic/js/jquery-ui-1.13.2/jquery-ui.theme.min.css" type="text/css"/>
   <?php #Chosen can't be cache-busted because it loads sprites by relative path ?>
@@ -137,9 +141,6 @@ function output_cache_busted_stylesheet_links($files) {
     if ( $css != 'base' )
       echo output_link_if_exists(array('/css/'.$css.'/views/control.css'));
   }
-  if ( $basename == 'montage' ) {
-    echo output_link_if_exists(array('/assets/gridstack/dist/gridstack.css', '/assets/gridstack/dist/gridstack-extra.css'));
-  }
 ?>
   <style>
 <?php