Rework on Bootstrap 5: standard navbar+offcanvas (fixed empty menu), Bootstrap Icons, complete B3 theme via BS vars, row/col grids
This commit is contained in:
@@ -16,84 +16,59 @@
|
||||
<link rel="icon" type="image/svg+xml" th:href="@{/favicon.svg(v='2')}">
|
||||
<!-- v=4: сброс кэша стилей после редизайна; при изменении css поднимать версию -->
|
||||
<link rel="stylesheet" th:href="@{/css/bootstrap.min.css}">
|
||||
<link rel="stylesheet" th:href="@{/css/app.css(v='17')}">
|
||||
<link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='17')}">
|
||||
<link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='17')}" disabled>
|
||||
<script th:src="@{/js/highlight.min.js(v='17')}" defer></script>
|
||||
<script th:src="@{/js/table-scroll.js(v='17')}" defer></script>
|
||||
<script th:src="@{/js/tablekit.js(v='17')}" defer></script>
|
||||
<script th:src="@{/js/theme-init.js(v='17')}"></script>
|
||||
<script th:src="@{/js/app.js(v='17')}" defer></script>
|
||||
<script th:src="@{/js/ui-state.js(v='17')}" defer></script>
|
||||
<script th:src="@{/js/md-content.js(v='17')}" defer></script>
|
||||
<script th:src="@{/js/submit-guard.js(v='17')}" defer></script>
|
||||
<link rel="stylesheet" th:href="@{/css/bootstrap-icons.min.css}">
|
||||
<link rel="stylesheet" th:href="@{/css/app.css(v='18')}">
|
||||
<link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='18')}">
|
||||
<link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='18')}" disabled>
|
||||
<script th:src="@{/js/highlight.min.js(v='18')}" defer></script>
|
||||
<script th:src="@{/js/table-scroll.js(v='18')}" defer></script>
|
||||
<script th:src="@{/js/tablekit.js(v='18')}" defer></script>
|
||||
<script th:src="@{/js/bootstrap.bundle.min.js}" defer></script>
|
||||
<script th:src="@{/js/theme-init.js(v='18')}"></script>
|
||||
<script th:src="@{/js/app.js(v='18')}" defer></script>
|
||||
<script th:src="@{/js/ui-state.js(v='18')}" defer></script>
|
||||
<script th:src="@{/js/md-content.js(v='18')}" defer></script>
|
||||
<script th:src="@{/js/submit-guard.js(v='18')}" defer></script>
|
||||
</head>
|
||||
<body>
|
||||
<div class="page">
|
||||
<header class="page-header">
|
||||
<div class="page-header-inner">
|
||||
<a th:href="@{/}" class="logo">LMS<b>.</b></a>
|
||||
<nav class="nav" id="top-nav">
|
||||
<th:block th:if="${currentUser != null}">
|
||||
<a th:if="${currentUser.admin}" th:href="@{/admin/groups}" class="nav-link">Группы</a>
|
||||
<a th:if="${currentUser.admin}" th:href="@{/admin/users}" class="nav-link">Пользователи</a>
|
||||
<a th:if="${currentUser.admin}" th:href="@{/admin/labs}" class="nav-link">Лабораторные</a>
|
||||
<a th:unless="${currentUser.admin}" th:href="@{/student/labs}" class="nav-link">Лабораторные</a>
|
||||
<a th:href="@{/change-password}" class="nav-link">Смена пароля</a>
|
||||
</th:block>
|
||||
</nav>
|
||||
<button type="button" class="btn btn-secondary theme-btn"
|
||||
aria-label="Сменить тему" title="Сменить тему">
|
||||
<span class="theme-icon ico ico-theme" aria-hidden="true"></span>
|
||||
<nav class="navbar b3-navbar navbar-expand-md sticky-top">
|
||||
<div class="container">
|
||||
<a th:href="@{/}" class="navbar-brand">LMS<b>.</b></a>
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#mobileNav"
|
||||
aria-controls="mobileNav" aria-label="Меню">
|
||||
<i class="bi bi-list"></i>
|
||||
</button>
|
||||
<button type="button" id="nav-burger" class="btn btn-sm nav-burger"
|
||||
aria-label="Меню" aria-expanded="false">
|
||||
<span class="ico ico-menu"></span>
|
||||
</button>
|
||||
<div class="user">
|
||||
<th:block th:if="${currentUser != null}">
|
||||
<a th:href="@{/admin}" th:if="${currentUser.admin}" class="nav-user" th:text="${currentUser.name}" title="Личный кабинет">—</a>
|
||||
<a th:href="@{/student}" th:unless="${currentUser.admin}" class="nav-user" th:text="${currentUser.name}" title="Личный кабинет">—</a>
|
||||
</th:block>
|
||||
<a th:if="${currentUser == null}" th:href="@{/login}" class="btn btn-sm">Войти</a>
|
||||
<form th:if="${currentUser != null}" th:action="@{/logout}" method="post">
|
||||
<button class="btn btn-sm" type="submit">Выйти</button>
|
||||
<input type="hidden" name="_csrf" th:value="${csrfToken}">
|
||||
</form>
|
||||
<div class="offcanvas offcanvas-end" tabindex="-1" id="mobileNav" aria-labelledby="mobileNavLabel">
|
||||
<div class="offcanvas-header">
|
||||
<span class="navbar-brand" id="mobileNavLabel">LMS<b>.</b></span>
|
||||
<button type="button" class="navbar-close" data-bs-dismiss="offcanvas" aria-label="Закрыть">✕</button>
|
||||
</div>
|
||||
<div class="offcanvas-body">
|
||||
<ul class="navbar-nav me-auto mb-2 mb-md-0">
|
||||
<li class="nav-item" th:if="${currentUser != null and currentUser.admin}"><a class="nav-link" th:href="@{/admin/groups}">Группы</a></li>
|
||||
<li class="nav-item" th:if="${currentUser != null and currentUser.admin}"><a class="nav-link" th:href="@{/admin/users}">Пользователи</a></li>
|
||||
<li class="nav-item" th:if="${currentUser != null and currentUser.admin}"><a class="nav-link" th:href="@{/admin/labs}">Лабораторные</a></li>
|
||||
<li class="nav-item" th:if="${currentUser != null and !currentUser.admin}"><a class="nav-link" th:href="@{/student/labs}">Лабораторные</a></li>
|
||||
<li class="nav-item" th:if="${currentUser != null}"><a class="nav-link" th:href="@{/change-password}">Смена пароля</a></li>
|
||||
</ul>
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<a th:href="@{/admin}" th:if="${currentUser != null and currentUser.admin}" class="nav-user" th:text="${currentUser.name}" title="Личный кабинет">—</a>
|
||||
<a th:href="@{/student}" th:if="${currentUser != null and !currentUser.admin}" class="nav-user" th:text="${currentUser.name}" title="Личный кабинет">—</a>
|
||||
<button type="button" class="btn btn-secondary btn-sm theme-btn" aria-label="Сменить тему" title="Сменить тему">
|
||||
<i class="bi bi-circle-half"></i>
|
||||
</button>
|
||||
<a th:if="${currentUser == null}" th:href="@{/login}" class="btn btn-sm">Войти</a>
|
||||
<form th:if="${currentUser != null}" th:action="@{/logout}" method="post" class="m-0">
|
||||
<button class="btn btn-sm" type="submit">Выйти</button>
|
||||
<input type="hidden" name="_csrf" th:value="${csrfToken}">
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<div id="mobile-nav-overlay" class="mobile-nav-overlay" hidden></div>
|
||||
<nav id="mobile-nav" class="mobile-nav offcanvas offcanvas-end" aria-label="Меню" tabindex="-1">
|
||||
<div class="mobile-nav-head">
|
||||
<span class="logo">LMS<b>.</b></span>
|
||||
<button class="dlg-close mobile-nav-close" type="button" aria-label="Закрыть меню">✕</button>
|
||||
</div>
|
||||
<div class="mobile-nav-links nav">
|
||||
<th:block th:if="${currentUser != null}">
|
||||
<a th:if="${currentUser.admin}" th:href="@{/admin/groups}" class="nav-link">Группы</a>
|
||||
<a th:if="${currentUser.admin}" th:href="@{/admin/users}" class="nav-link">Пользователи</a>
|
||||
<a th:if="${currentUser.admin}" th:href="@{/admin/labs}" class="nav-link">Лабораторные</a>
|
||||
<a th:unless="${currentUser.admin}" th:href="@{/student/labs}" class="nav-link">Лабораторные</a>
|
||||
<a th:href="@{/change-password}" class="nav-link">Смена пароля</a>
|
||||
</th:block>
|
||||
</div>
|
||||
<div class="mobile-nav-user">
|
||||
<th:block th:if="${currentUser != null}">
|
||||
<a th:href="@{/admin}" th:if="${currentUser.admin}" class="nav-user" th:text="${currentUser.name}" title="Личный кабинет">—</a>
|
||||
<a th:href="@{/student}" th:unless="${currentUser.admin}" class="nav-user" th:text="${currentUser.name}" title="Личный кабинет">—</a>
|
||||
</th:block>
|
||||
<button type="button" class="btn btn-secondary btn-sm theme-btn" aria-label="Сменить тему" title="Сменить тему">
|
||||
<span class="ico ico-theme"></span>
|
||||
</button>
|
||||
<form th:if="${currentUser != null}" th:action="@{/logout}" method="post">
|
||||
<button class="btn btn-secondary btn-sm" type="submit">Выйти</button>
|
||||
<input type="hidden" name="_csrf" th:value="${csrfToken}">
|
||||
</form>
|
||||
</div>
|
||||
</nav>
|
||||
<main class="page-main">
|
||||
<main class="container page-main">
|
||||
<th:block th:replace="${content}" />
|
||||
</main>
|
||||
<footer class="page-footer">
|
||||
|
||||
Reference in New Issue
Block a user