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

ZoneMinder · May 12, 2024 · 7471994 · 7471994
2 parents 3a8f022 + db5a66b
commit 7471994
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
@@ -246,6 +246,7 @@
     'ConfiguredFor'        => 'настроен на',
     'ConfirmDeleteEvents'  => 'Вы действительно хотите удалить выбранные события?',
     'ConfirmPassword'      => 'Подтвердите пароль',
+    'ConfirmUnarchiveEvents'=> 'Вы уверены, что хотите удалить из архива выбранные события?',
     'ConjAnd'              => 'и',
     'ConjOr'               => 'или',
     'Console'              => 'Сервер',

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