From 02701a8e9dcbf9975c606696d06715025f713447 Mon Sep 17 00:00:00 2001
From: Vladislav Kopnin <vlad.kopnen@mail.ru>
Date: Thu, 8 Oct 2026 09:34:56 +0300
Subject: [PATCH] =?UTF-8?q?Group=20page:=20explicit=20'=D0=92=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=BD=D1=82=D1=8B'=20button=20for=20variant=20dist?=
 =?UTF-8?q?ribution,=20download=20icon;=20asset=20v30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/main/resources/static/css/app.css     |  2 +-
 .../main/resources/templates/admin/group.html | 13 +++++-----
 .../main/resources/templates/admin/lab.html   |  2 +-
 .../resources/templates/fragments/base.html   | 24 +++++++++----------
 .../resources/templates/learn/article.html    |  2 +-
 .../resources/templates/learn/chapter.html    |  2 +-
 .../main/resources/templates/learn/index.html |  4 ++--
 .../resources/templates/learn/section.html    |  2 +-
 .../main/resources/templates/student/lab.html |  2 +-
 9 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/web/src/main/resources/static/css/app.css b/web/src/main/resources/static/css/app.css
index 5ea7b4e..e43f0d3 100644
--- a/web/src/main/resources/static/css/app.css
+++ b/web/src/main/resources/static/css/app.css
@@ -468,7 +468,7 @@ code.code { padding: 0.125rem 0.5rem; border-radius: var(--radius-xs); font-fami
 .cell-btn.st.dim::before { background: var(--c-border-strong); }
 .mini-count { font-size: 0.72rem; margin-left: 0.15rem; color: var(--c-text-muted); }
 .defense-cell-timer { font-variant-numeric: tabular-nums; }
-.lab-head-actions { display: flex; gap: 0.2rem; }
+.lab-head-actions { display: flex; flex-wrap: wrap; align-items: center; gap: 0.25rem; }
 .btn btn-secondary btn-sm p-2 {
     display: inline-flex; align-items: center; justify-content: center;
     min-width: 1.5rem; height: 1.5rem; padding: 0 0.3rem; cursor: pointer;
diff --git a/web/src/main/resources/templates/admin/group.html b/web/src/main/resources/templates/admin/group.html
index 8df39d8..edaf529 100644
--- a/web/src/main/resources/templates/admin/group.html
+++ b/web/src/main/resources/templates/admin/group.html
@@ -44,10 +44,10 @@
                             <a th:href="@{/admin/labs/{id}(id=${lab.id})}" th:text="|ЛР ${lab.number}|">ЛР</a>
                             <span class="lab-col-title" th:text="${lab.title}">—</span>
                             <div class="lab-head-actions">
-                                <button class="btn btn-secondary btn-sm p-2" type="button"
+                                <button class="btn btn-primary btn-sm" type="button"
                                         th:attr="data-url=@{/admin/groups/{id}/assign-modal(id=${group.id}, labId=${lab.id})},data-lab-name=|ЛР ${lab.number}|" data-action="assign"
-                                        title="Выдача вариантов: уровни, варианты, автокраспределение по группе">
-                                    <i class="cell-ico ico bi bi-list" aria-hidden="true"></i>
+                                        title="Раздать варианты студентам: уровни, варианты, автокраспределение по группе">
+                                    <i class="bi bi-people" aria-hidden="true"></i> Варианты
                                 </button>
                                 <form class="inline-form" th:with="pub=${labPublication[lab.id]}, pc=${pub != null ? pub.publishedCount : 0}, all=${pub != null and pub.allPublished}"
                                       th:action="@{/admin/groups/{id}/publish(id=${group.id})}" method="post">
@@ -64,9 +64,10 @@
                                         <span class="mini-count js-pub-count" th:classappend="(${all} or ${pc == 0}) ? 'is-hidden' : ''" th:text="${pc}"></span>
                                     </button>
                                 </form>
-                                <a class="btn btn-secondary btn-sm p-2"
+                                <a class="btn btn-secondary btn-sm"
                                    th:href="'/admin/groups/' + ${group.id} + '/submissions.zip?labId=' + ${lab.id}"
-                                   th:title="|Скачать решения по ЛР ${lab.number}|">⤓<span class="mini-count" th:text="${labSubmissionCounts[lab.id] ?: 0}">0</span></a>
+                                   th:title="|Скачать решения по ЛР ${lab.number}|">
+                                    <i class="bi bi-download" aria-hidden="true"></i><span class="mini-count" th:text="${labSubmissionCounts[lab.id] ?: 0}">0</span></a>
                             </div>
                         </div>
                     </th>
@@ -342,7 +343,7 @@
     <div class="dlg-body" id="assign-modal-body"></div>
 </dialog>
 
-<script th:src="@{/js/admin-group.js(v='29')}" defer></script>
+<script th:src="@{/js/admin-group.js(v='30')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/admin/lab.html b/web/src/main/resources/templates/admin/lab.html
index 8692a13..c04349f 100644
--- a/web/src/main/resources/templates/admin/lab.html
+++ b/web/src/main/resources/templates/admin/lab.html
@@ -196,7 +196,7 @@
             </dialog>
         </th:block>
     </div>
-    <script th:src="@{/js/admin-lab.js(v='29')}" defer></script>
+    <script th:src="@{/js/admin-lab.js(v='30')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/fragments/base.html b/web/src/main/resources/templates/fragments/base.html
index 60cfb1d..e21af28 100644
--- a/web/src/main/resources/templates/fragments/base.html
+++ b/web/src/main/resources/templates/fragments/base.html
@@ -13,22 +13,22 @@
     <noscript>
         <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
     </noscript>
-    <link rel="icon" type="image/svg+xml" th:href="@{/favicon.svg(v='29')}">
+    <link rel="icon" type="image/svg+xml" th:href="@{/favicon.svg(v='30')}">
     <!-- v=4: сброс кэша стилей после редизайна; при изменении css поднимать версию -->
     <link rel="stylesheet" th:href="@{/css/bootstrap.min.css}">
     <link rel="stylesheet" th:href="@{/css/bootstrap-icons.min.css}">
-        <link rel="stylesheet" th:href="@{/css/app.css(v='29')}">
-    <link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='29')}">
-    <link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='29')}" disabled>
-    <script th:src="@{/js/highlight.min.js(v='29')}" defer></script>
-    <script th:src="@{/js/table-scroll.js(v='29')}" defer></script>
-    <script th:src="@{/js/tablekit.js(v='29')}" defer></script>
+        <link rel="stylesheet" th:href="@{/css/app.css(v='30')}">
+    <link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='30')}">
+    <link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='30')}" disabled>
+    <script th:src="@{/js/highlight.min.js(v='30')}" defer></script>
+    <script th:src="@{/js/table-scroll.js(v='30')}" defer></script>
+    <script th:src="@{/js/tablekit.js(v='30')}" defer></script>
     <script th:src="@{/js/bootstrap.bundle.min.js}" defer></script>
-    <script th:src="@{/js/theme-init.js(v='29')}"></script>
-    <script th:src="@{/js/app.js(v='29')}" defer></script>
-    <script th:src="@{/js/ui-state.js(v='29')}" defer></script>
-    <script th:src="@{/js/md-content.js(v='29')}" defer></script>
-    <script th:src="@{/js/submit-guard.js(v='29')}" defer></script>
+    <script th:src="@{/js/theme-init.js(v='30')}"></script>
+    <script th:src="@{/js/app.js(v='30')}" defer></script>
+    <script th:src="@{/js/ui-state.js(v='30')}" defer></script>
+    <script th:src="@{/js/md-content.js(v='30')}" defer></script>
+    <script th:src="@{/js/submit-guard.js(v='30')}" defer></script>
 </head>
 <body>
 <div class="page d-flex flex-column min-vh-100">
diff --git a/web/src/main/resources/templates/learn/article.html b/web/src/main/resources/templates/learn/article.html
index 65c2c8d..fed6351 100644
--- a/web/src/main/resources/templates/learn/article.html
+++ b/web/src/main/resources/templates/learn/article.html
@@ -138,7 +138,7 @@
         </div>
 
 
-    <script th:src="@{/js/mdeditor.js(v='29')}" defer></script>
+    <script th:src="@{/js/mdeditor.js(v='30')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/learn/chapter.html b/web/src/main/resources/templates/learn/chapter.html
index 5ffafa9..b50fab1 100644
--- a/web/src/main/resources/templates/learn/chapter.html
+++ b/web/src/main/resources/templates/learn/chapter.html
@@ -183,7 +183,7 @@
         </div>
     </dialog>
 
-    <script th:src="@{/js/content-sort.js(v='29')}" defer></script>
+    <script th:src="@{/js/content-sort.js(v='30')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/learn/index.html b/web/src/main/resources/templates/learn/index.html
index b0699e7..20fa75f 100644
--- a/web/src/main/resources/templates/learn/index.html
+++ b/web/src/main/resources/templates/learn/index.html
@@ -236,8 +236,8 @@
         </div>
     </dialog>
 
-<script th:src="@{/js/mdeditor.js(v='29')}" defer></script>
-<script th:src="@{/js/content-sort.js(v='29')}" defer></script>
+<script th:src="@{/js/mdeditor.js(v='30')}" defer></script>
+<script th:src="@{/js/content-sort.js(v='30')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/learn/section.html b/web/src/main/resources/templates/learn/section.html
index 3a5e5e1..e24b5d7 100644
--- a/web/src/main/resources/templates/learn/section.html
+++ b/web/src/main/resources/templates/learn/section.html
@@ -143,7 +143,7 @@
         </div>
     </dialog>
 
-    <script th:src="@{/js/content-sort.js(v='29')}" defer></script>
+    <script th:src="@{/js/content-sort.js(v='30')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/student/lab.html b/web/src/main/resources/templates/student/lab.html
index 13fb599..1d92fcc 100644
--- a/web/src/main/resources/templates/student/lab.html
+++ b/web/src/main/resources/templates/student/lab.html
@@ -107,7 +107,7 @@
             <p class="text-sm text-muted">Ожидайте преподавателя с проверкой.</p>
         </div>
     </div>
-<script th:src="@{/js/defense-timer.js(v='29')}" defer></script>
+<script th:src="@{/js/defense-timer.js(v='30')}" defer></script>
 </div>
 </body>
 </html>