From 9e4eb3351e05348704a58c46e145c50c6046a3ed Mon Sep 17 00:00:00 2001
From: themohooks <81331307+themohooks@users.noreply.github.com>
Date: Sun, 25 May 2025 15:04:20 +0300
Subject: [PATCH] update components

---
 views/components/Footer.php   |  5 +++-
 views/components/LoadHead.php | 46 ++++++++++++++++++++++-------------
 views/components/Navbar.php   | 27 +++++++++++---------
 3 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/views/components/Footer.php b/views/components/Footer.php
index e4878a6..7a28ebb 100644
--- a/views/components/Footer.php
+++ b/views/components/Footer.php
@@ -21,4 +21,7 @@ function get_current_git_commit($branch = 'main')
           
           
 
-        </td>
\ No newline at end of file
+
+
+        </td>
+
diff --git a/views/components/LoadHead.php b/views/components/LoadHead.php
index 46f6722..fc3ad1f 100644
--- a/views/components/LoadHead.php
+++ b/views/components/LoadHead.php
@@ -1,5 +1,13 @@
+<?php
+use \App\Services\ThemeManager;
+$themeManager = new ThemeManager();
+$themeManager->loadThemes();
+
+$stylesheet = $themeManager->getThemeStylesheet();
+?>
+
 <meta http-equiv="content-type" content="text/html;charset=UTF-8">
-    <meta name="viewport" content="width=1000,user-scalable=yes">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <title><?=NGALLERY['root']['title']?></title>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
@@ -11,24 +19,28 @@
     <link rel="stylesheet" href="/static/css/photo.css<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>">
     <link rel="stylesheet" href="/static/css/notie.css<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>">
     <link rel="stylesheet" href="/static/css/comments.css<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>">
+    <?php
+    if ($stylesheet) { ?>
+    <link rel="stylesheet" href="<?php echo $stylesheet; if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>">
+    <?php } ?>
     <link rel="stylesheet" href="/static/css/map.css<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>">
     <link rel="stylesheet" href="/static/css/jquery-ui-1.8.20.custom.css<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>">
-    <script src="/static/js/jquery.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/jquery.form.min.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/core.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/index.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/jquery-ui.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/selector.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/selector2.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/imageupload.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/progress.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/notie.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/photo.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/comments.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/newcore.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/act.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/core_lk.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
-    <script src="/static/js/tablesort.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>"></script>
+    <script src="/static/js/jquery.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/jquery.form.min.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/core.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/index.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/jquery-ui.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/selector.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/selector2.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/imageupload.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/progress.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/notie.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <!--script src="/static/js/routing.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" defer></!--script-->
+    <script src="/static/js/photo.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/newcore.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/act.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/core_lk.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
+    <script src="/static/js/tablesort.js<?php if (NGALLERY['root']['cloudflare-caching'] === true) { echo '?'.time(); } ?>" data-restart></script>
     <link href='https://unpkg.com/boxicons@2.1.4/css/boxicons.min.css' rel='stylesheet'>
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
 <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
diff --git a/views/components/Navbar.php b/views/components/Navbar.php
index e369b49..1b43968 100644
--- a/views/components/Navbar.php
+++ b/views/components/Navbar.php
@@ -25,20 +25,24 @@ $noncheckedimgs = DB::query('SELECT COUNT(*) FROM followers_notifications WHERE
 if ($noncheckedimgs > 0) {
     $nonrw = '<span class="mm-notify notify-count">'.$noncheckedimgs.'</span>';
 }
-    
 ?>
-<tr>
+<style>
+    /* Анимация индикатора загрузки */
+[data-ajax-loader] {
+    transition: opacity 0.3s, transform 0.3s;
+}
+
+/* Общие стили для контентных контейнеров */
+</style>
+<tr >
 <?php
 if (NGALLERY['root']['registration']['emailverify'] === true && $user->i('status') === 3) { ?>
 <div class="label-orange" style="padding:10px; margin:0 -20px; color:#fff">
 <center><h4 style="color:#fff; margin-bottom:3px">Пожалуйста, подтвердите свою почту</h4>
 <div>Так мы сможем убедиться, что Вы настоящий человек. После подтверждения, Вам будет доступен полностью функционал сайта.<br><br><b>Письмо с ссылкой для подтверждения почты была отправлена на Ваш ящик, указанный при регистрации.</b></div></center></div>
 <?php } ?>
-    <td class="mm-bar">
-        <?php
-        if (explode('/', $_SERVER['REQUEST_URI'])[1] === 'photo') { ?>
-    <a id="title-small" href="/"><img src="<?=$logo?>"><?=$title?></a>
-    <?php } ?>
+    <td id="navbar" class="mm-bar">
+    <a <?php if (explode('/', $_SERVER['REQUEST_URI'])[1] != 'photo') { echo 'style="display: none;"'; } ?> id="title-small" href="/"><img src="<?=$logo?>"><?=$title?></a>
         <ul class="mm mm-level-1">
             <li><a href="#" onclick="return false" class="mm-item"><span class="mm-label">Дополнительно</span></a>
                 <div>
@@ -82,7 +86,11 @@ if (NGALLERY['root']['registration']['emailverify'] === true && $user->i('status
                     </ul>
                 </div>
             </li>
+            <li><a href="/mapmedia" class="mm-item"><span class="mm-label">Map Media<span class="mm-notify notify-count">NEW</span></span></a></li>
             <?php
+            foreach (NGALLERY['root']['navbar'] as $ngn) {
+                echo '<li><a href="'.$ngn['link'].'" class="mm-item"><span class="mm-label">'.$ngn['name'].'</li>';
+            }
             if (Auth::userid() <= 0) { ?>
             
                 <li class="mm-pad-right"><a href="/login" class="mm-item"><span class="mm-icon"><i class="fas fa-xs fa-address-card"></i></span><span class="mm-label">Войти</span></a></li>
@@ -126,9 +134,6 @@ if (NGALLERY['root']['registration']['emailverify'] === true && $user->i('status
         </ul>
     </td>
 </tr>
-<?php
-        if (explode('/', $_SERVER['REQUEST_URI'])[1] != 'photo') { ?>
-<tr>
+<tr <?php if (explode('/', $_SERVER['REQUEST_URI'])[1] === 'photo') { echo 'style="display: none;"'; } ?> id="navbard">
     <td><a href="/" id="title"><img style="width: <?=$width?>;" src="<?=$logo?>" alt="<?=$title?>"><span><?=$title?></span></a></td>
 </tr>
-<?php } ?>
\ No newline at end of file