Learn pages: icon actions (eye/pencil/hand/trash), centered accordion arrows; toasts bottom-center in B3 style

2026-10-02 17:31:06 +03:00
parent c2f7235df6
commit 5a1985b142
6 changed files with 62 additions and 71 deletions
--- a/web/src/main/resources/templates/admin/group.html
+++ b/web/src/main/resources/templates/admin/group.html
@@ -307,7 +307,7 @@



-<div th:if="${createdStudent}" class="card import-card toast">
+<div th:if="${createdStudent}" class="card import-card">
    <div class="card-body">
        <h2 class="section-title">Студент добавлен</h2>
        <p class="text-sm" th:text="${createdStudent.fullName}">—</p>
@@ -317,7 +317,7 @@
 </div>

 <!-- Итог импорта группы: одноразовые пароли новых студентов показываются здесь один раз. -->
-<div th:if="${importResult}" class="card import-card toast">
+<div th:if="${importResult}" class="card import-card">
    <div class="card-body">
        <h2 class="section-title">
            Группа <span th:text="${importResult.groupName}">—</span> импортирована
--- a/web/src/main/resources/templates/learn/article.html
+++ b/web/src/main/resources/templates/learn/article.html
@@ -52,9 +52,8 @@
                    <input type="hidden" name="id" th:value="${article.id}">
                    <input type="hidden" name="published" th:value="${!article.published}">
                    <input type="hidden" name="back" th:value="${back}">
-                    <button class="btn" type="submit"
-                            th:classappend="${article.published} ? 'btn-secondary' : 'btn-primary'"
-                            th:text="${article.published} ? 'Скрыть от студентов' : 'Опубликовать'">Скрыть</button>
+                    <button class="mini-btn" type="submit" th:if="${article.published}" title="Скрыть статью" aria-label="Скрыть статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/></svg></button>
+                    <button class="mini-btn" type="submit" th:unless="${article.published}" title="Опубликовать статью" aria-label="Опубликовать статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/><line x1="3" y1="3" x2="21" y2="21"/></svg></button>
                </form>
                <a class="btn btn-secondary"
                   th:href="@{/learn/{c}(c=${article.chapterSlug})}">К главе</a>
@@ -62,7 +61,7 @@
                      onsubmit="return confirm('Удалить статью?')">
                    <input type="hidden" name="_csrf" th:value="${csrfToken}">
                    <input type="hidden" name="back" th:value="${backParent}">
-                    <button class="btn btn-danger" type="submit">Удалить статью</button>
+                    <button class="mini-btn danger" type="submit" title="Удалить статью" aria-label="Удалить статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M9 6V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2"/></svg></button>
                </form>
            </div>

--- a/web/src/main/resources/templates/learn/chapter.html
+++ b/web/src/main/resources/templates/learn/chapter.html
@@ -16,26 +16,25 @@

    <div th:if="${currentUser != null and currentUser.admin}" class="flex flex-wrap gap-2 mb-4">
        <button class="btn btn-primary" type="button" onclick="openModal('modal-new-section')">+ Раздел</button>
-        <button class="btn btn-secondary" type="button" onclick="openModal('modal-rename-chapter')">Переименовать главу</button>
+        <button class="mini-btn" type="button" onclick="openModal('modal-rename-chapter')" title="Переименовать главу" aria-label="Переименовать главу"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 3a2.8 2.8 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z"/></svg></button>
        <form class="inline-form" th:action="@{/admin/content/chapters/toggle-published}" method="post">
            <input type="hidden" name="_csrf" th:value="${csrfToken}">
            <input type="hidden" name="id" th:value="${chapter.id}">
            <input type="hidden" name="published" th:value="${!chapter.published}">
            <input type="hidden" name="back" th:value="${back}">
-            <button class="btn" type="submit"
-                    th:classappend="${chapter.published} ? 'btn-secondary' : 'btn-primary'"
-                    th:text="${chapter.published} ? 'Скрыть главу' : 'Опубликовать главу'">Скрыть</button>
+            <button class="mini-btn" type="submit" th:if="${chapter.published}" title="Скрыть главу" aria-label="Скрыть главу"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/></svg></button>
+            <button class="mini-btn" type="submit" th:unless="${chapter.published}" title="Опубликовать главу" aria-label="Опубликовать главу"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/><line x1="3" y1="3" x2="21" y2="21"/></svg></button>
        </form>
        <form class="inline-form" th:action="@{/admin/content/chapters/{id}/delete(id=${chapter.id})}" method="post"
              onsubmit="return confirm('Удалить главу со всеми разделами и статьями?')">
            <input type="hidden" name="_csrf" th:value="${csrfToken}">
            <input type="hidden" name="back" th:value="${backParent}">
-            <button class="btn btn-danger" type="submit">Удалить главу</button>
+            <button class="mini-btn danger" type="submit" title="Удалить главу со всеми разделами и статьями" aria-label="Удалить главу со всеми разделами и статьями"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M9 6V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2"/></svg></button>
        </form>
    </div>

    <div th:if="${currentUser != null and currentUser.admin}" class="card card-body text-sm text-muted mb-4">
-        Перетаскивайте за значок ⠿ слева, чтобы менять порядок разделов и переносить статьи
+        Перетаскивайте за значок руки слева, чтобы менять порядок разделов и переносить статьи
        между разделами этой главы. Порядок сохраняется сразу.
    </div>
    <div th:if="${currentUser != null and currentUser.admin}" id="sort-status" class="sort-status" hidden>
@@ -52,7 +51,7 @@
            <div class="sub-head sort-row">
                <span th:if="${currentUser != null and currentUser.admin}" class="drag-handle" draggable="true"
                      th:attr="data-drag-kind='section',data-drag-id=${section.id}"
-                      title="Перетащите мышью: изменить порядок разделов">⠿</span>
+                      title="Перетащите мышью: изменить порядок разделов"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 11V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M14 10V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M10 10.5V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2v8"/><path d="M18 8a2 2 0 1 1 4 0v6a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"/></svg></span>
                <button type="button" class="sub-toggle" aria-expanded="false" onclick="toggleSection(this)"
                        title="Свернуть или развернуть раздел">
                    <span class="sub-arrow" aria-hidden="true"></span>
@@ -62,24 +61,21 @@
                   th:text="${section.title}">Раздел</a>
                <span th:if="${!section.published}" class="badge badge-warn">скрыто</span>
                <div th:if="${currentUser != null and currentUser.admin}" class="sort-actions">
-                    <button class="btn btn-secondary" type="button"
-                            th:data-modal="|modal-rename-section-${section.id}|" onclick="openModalData(this)">Переименовать</button>
+                    <button class="mini-btn" type="button" th:data-modal="|modal-rename-section-${section.id}|" onclick="openModalData(this)" title="Переименовать раздел" aria-label="Переименовать раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 3a2.8 2.8 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z"/></svg></button>
                    <form class="inline-form" th:action="@{/admin/content/sections/toggle-published}" method="post">
                        <input type="hidden" name="_csrf" th:value="${csrfToken}">
                        <input type="hidden" name="id" th:value="${section.id}">
                        <input type="hidden" name="published" th:value="${!section.published}">
                        <input type="hidden" name="back" th:value="${back}">
-                        <button class="btn" type="submit"
-                                th:classappend="${section.published} ? 'btn-secondary' : 'btn-primary'"
-                                th:text="${section.published} ? 'Скрыть' : 'Опубликовать'">Скрыть</button>
+                        <button class="mini-btn" type="submit" th:if="${section.published}" title="Скрыть раздел" aria-label="Скрыть раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/></svg></button>
+                        <button class="mini-btn" type="submit" th:unless="${section.published}" title="Опубликовать раздел" aria-label="Опубликовать раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/><line x1="3" y1="3" x2="21" y2="21"/></svg></button>
                    </form>
-                    <button class="btn btn-secondary" type="button"
-                            th:data-modal="|modal-move-${section.id}|" onclick="openModalData(this)">Перенести статьи и удалить</button>
+                    <button class="mini-btn" type="button" th:data-modal="|modal-move-${section.id}|" onclick="openModalData(this)" title="Перенести статьи и удалить" aria-label="Перенести статьи и удалить"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 11V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M14 10V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M10 10.5V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2v8"/><path d="M18 8a2 2 0 1 1 4 0v6a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"/></svg></button>
                    <form class="inline-form" th:action="@{/admin/content/sections/{id}/delete(id=${section.id})}" method="post"
                          onsubmit="return confirm('Удалить раздел вместе со статьями?')">
                        <input type="hidden" name="_csrf" th:value="${csrfToken}">
                        <input type="hidden" name="back" th:value="${back}">
-                        <button class="btn btn-danger" type="submit">Удалить</button>
+                        <button class="mini-btn danger" type="submit" title="Удалить раздел вместе со статьями" aria-label="Удалить раздел вместе со статьями"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M9 6V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2"/></svg></button>
                    </form>
                </div>
            </div>
@@ -89,7 +85,7 @@
                    <li th:each="article : ${section.articles}" th:attr="data-article-id=${article.id}">
                        <span th:if="${currentUser != null and currentUser.admin}" class="drag-handle" draggable="true"
                              th:attr="data-drag-kind='article',data-drag-id=${article.id}"
-                              title="Перетащите мышью: изменить порядок или перенести в другой раздел">⠿</span>
+                              title="Перетащите мышью: изменить порядок или перенести в другой раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 11V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M14 10V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M10 10.5V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2v8"/><path d="M18 8a2 2 0 1 1 4 0v6a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"/></svg></span>
                        <a class="sort-title"
                           th:href="@{/learn/{c}/{s}/{a}(c=${chapter.slug}, s=${section.slug}, a=${article.slug})}"
                           th:text="${article.title}">Статья</a>
@@ -102,9 +98,8 @@
                                <input type="hidden" name="id" th:value="${article.id}">
                                <input type="hidden" name="published" th:value="${!article.published}">
                                <input type="hidden" name="back" th:value="${back}">
-                                <button class="btn" type="submit"
-                                        th:classappend="${article.published} ? 'btn-secondary' : 'btn-primary'"
-                                        th:text="${article.published} ? 'Скрыть' : 'Опубликовать'">Скрыть</button>
+                                <button class="mini-btn" type="submit" th:if="${article.published}" title="Скрыть статью" aria-label="Скрыть статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/></svg></button>
+                                <button class="mini-btn" type="submit" th:unless="${article.published}" title="Опубликовать статью" aria-label="Опубликовать статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/><line x1="3" y1="3" x2="21" y2="21"/></svg></button>
                            </form>
                        </div>
                    </li>
--- a/web/src/main/resources/templates/learn/index.html
+++ b/web/src/main/resources/templates/learn/index.html
@@ -24,7 +24,7 @@
        <div class="sort-row">
            <span th:if="${currentUser != null and currentUser.admin}" class="drag-handle" draggable="true"
                  th:attr="data-drag-kind='chapter',data-drag-id=${chapter.id}"
-                  title="Перетащите мышью: изменить порядок глав">⠿</span>
+                  title="Перетащите мышью: изменить порядок глав"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 11V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M14 10V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M10 10.5V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2v8"/><path d="M18 8a2 2 0 1 1 4 0v6a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"/></svg></span>
            <h2 class="section-title sort-title m-0" th:text="${chapter.title}">Глава</h2>
            <span th:if="${!chapter.published}" class="badge badge-warn">скрыто</span>
            <div th:if="${currentUser != null and currentUser.admin}" class="sort-actions">
@@ -32,16 +32,14 @@
                    <input type="hidden" name="_csrf" th:value="${csrfToken}">
                    <input type="hidden" name="id" th:value="${chapter.id}">
                    <input type="hidden" name="published" th:value="${!chapter.published}">
-                    <button class="btn" type="submit"
-                            th:classappend="${chapter.published} ? 'btn-secondary' : 'btn-primary'"
-                            th:text="${chapter.published} ? 'Скрыть главу' : 'Опубликовать главу'">Скрыть главу</button>
+                    <button class="mini-btn" type="submit" th:if="${chapter.published}" title="Скрыть главу" aria-label="Скрыть главу"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/></svg></button>
+                    <button class="mini-btn" type="submit" th:unless="${chapter.published}" title="Опубликовать главу" aria-label="Опубликовать главу"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/><line x1="3" y1="3" x2="21" y2="21"/></svg></button>
                </form>
-                <button class="btn btn-secondary" type="button"
-                        th:data-modal="|modal-rename-chapter-${chapter.id}|" onclick="openModalData(this)">Переименовать</button>
+                <button class="mini-btn" type="button" th:data-modal="|modal-rename-chapter-${chapter.id}|" onclick="openModalData(this)" title="Переименовать главу" aria-label="Переименовать главу"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 3a2.8 2.8 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z"/></svg></button>
                <form class="inline-form" th:action="@{/admin/content/chapters/{id}/delete(id=${chapter.id})}" method="post"
                      onsubmit="return confirm('Удалить главу со всеми разделами и статьями?')">
                    <input type="hidden" name="_csrf" th:value="${csrfToken}">
-                    <button class="btn btn-danger" type="submit">Удалить главу</button>
+                    <button class="mini-btn danger" type="submit" title="Удалить главу со всеми разделами и статьями" aria-label="Удалить главу со всеми разделами и статьями"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M9 6V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2"/></svg></button>
                </form>
            </div>
        </div>
@@ -54,7 +52,7 @@
                <div class="sub-head sort-row">
                    <span th:if="${currentUser != null and currentUser.admin}" class="drag-handle" draggable="true"
                          th:attr="data-drag-kind='section',data-drag-id=${section.id}"
-                          title="Перетащите мышью: изменить порядок или перенести раздел">⠿</span>
+                          title="Перетащите мышью: изменить порядок или перенести раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 11V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M14 10V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M10 10.5V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2v8"/><path d="M18 8a2 2 0 1 1 4 0v6a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"/></svg></span>
                    <button type="button" class="sub-toggle" aria-expanded="false" onclick="toggleSection(this)"
                            title="Свернуть или развернуть раздел">
                        <span class="sub-arrow" aria-hidden="true"></span>
@@ -68,18 +66,15 @@
                            <input type="hidden" name="_csrf" th:value="${csrfToken}">
                            <input type="hidden" name="id" th:value="${section.id}">
                            <input type="hidden" name="published" th:value="${!section.published}">
-                            <button class="btn" type="submit"
-                                    th:classappend="${section.published} ? 'btn-secondary' : 'btn-primary'"
-                                    th:text="${section.published} ? 'Скрыть раздел' : 'Опубликовать раздел'">Скрыть раздел</button>
+                            <button class="mini-btn" type="submit" th:if="${section.published}" title="Скрыть раздел" aria-label="Скрыть раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/></svg></button>
+                            <button class="mini-btn" type="submit" th:unless="${section.published}" title="Опубликовать раздел" aria-label="Опубликовать раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/><line x1="3" y1="3" x2="21" y2="21"/></svg></button>
                        </form>
-                        <button class="btn btn-secondary" type="button"
-                                th:data-modal="|modal-rename-section-${section.id}|" onclick="openModalData(this)">Переименовать</button>
-                        <button class="btn btn-secondary" type="button"
-                                th:data-modal="|modal-move-${section.id}|" onclick="openModalData(this)">Перенести статьи</button>
+                        <button class="mini-btn" type="button" th:data-modal="|modal-rename-section-${section.id}|" onclick="openModalData(this)" title="Переименовать раздел" aria-label="Переименовать раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 3a2.8 2.8 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z"/></svg></button>
+                        <button class="mini-btn" type="button" th:data-modal="|modal-move-${section.id}|" onclick="openModalData(this)" title="Перенести статьи в другой раздел" aria-label="Перенести статьи в другой раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 11V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M14 10V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M10 10.5V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2v8"/><path d="M18 8a2 2 0 1 1 4 0v6a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"/></svg></button>
                        <form class="inline-form" th:action="@{/admin/content/sections/{id}/delete(id=${section.id})}" method="post"
                              onsubmit="return confirm('Удалить раздел со всеми статьями?')">
                            <input type="hidden" name="_csrf" th:value="${csrfToken}">
-                            <button class="btn btn-danger" type="submit">Удалить раздел</button>
+                            <button class="mini-btn danger" type="submit" title="Удалить раздел со всеми статьями" aria-label="Удалить раздел со всеми статьями"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M9 6V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2"/></svg></button>
                        </form>
                    </div>
                </div>
@@ -89,7 +84,7 @@
                        <li th:each="article : ${section.articles}" th:attr="data-article-id=${article.id}">
                            <span th:if="${currentUser != null and currentUser.admin}" class="drag-handle" draggable="true"
                                  th:attr="data-drag-kind='article',data-drag-id=${article.id}"
-                                  title="Перетащите мышью: изменить порядок или перенести статью">⠿</span>
+                                  title="Перетащите мышью: изменить порядок или перенести статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 11V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M14 10V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M10 10.5V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2v8"/><path d="M18 8a2 2 0 1 1 4 0v6a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"/></svg></span>
                            <a class="sort-title"
                               th:href="@{/learn/{c}/{s}/{a}(c=${chapter.slug}, s=${section.slug}, a=${article.slug})}"
                               th:text="${article.title}">Статья</a>
@@ -99,16 +94,15 @@
                                    <input type="hidden" name="_csrf" th:value="${csrfToken}">
                                    <input type="hidden" name="id" th:value="${article.id}">
                                    <input type="hidden" name="published" th:value="${!article.published}">
-                                    <button class="btn" type="submit"
-                                            th:classappend="${article.published} ? 'btn-secondary' : 'btn-primary'"
-                                            th:text="${article.published} ? 'Скрыть' : 'Опубликовать'">Скрыть</button>
+                                    <button class="mini-btn" type="submit" th:if="${article.published}" title="Скрыть статью" aria-label="Скрыть статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/></svg></button>
+                                    <button class="mini-btn" type="submit" th:unless="${article.published}" title="Опубликовать статью" aria-label="Опубликовать статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/><line x1="3" y1="3" x2="21" y2="21"/></svg></button>
                                </form>
                                <a class="btn btn-secondary"
                                   th:href="@{/learn/{c}/{s}/{a}(c=${chapter.slug}, s=${section.slug}, a=${article.slug}, edit=1)}">Править</a>
                                <form class="inline-form" th:action="@{/admin/content/articles/{id}/delete(id=${article.id})}" method="post"
                                      onsubmit="return confirm('Удалить статью?')">
                                    <input type="hidden" name="_csrf" th:value="${csrfToken}">
-                                    <button class="btn btn-danger" type="submit">✕</button>
+                                    <button class="mini-btn danger" type="submit" title="Удалить статью" aria-label="Удалить статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M9 6V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2"/></svg></button>
                                </form>
                            </div>
                        </li>
--- a/web/src/main/resources/templates/learn/section.html
+++ b/web/src/main/resources/templates/learn/section.html
@@ -18,27 +18,26 @@

    <div th:if="${currentUser != null and currentUser.admin}" class="flex flex-wrap gap-2 mb-4">
        <button class="btn btn-primary" type="button" onclick="openModal('modal-new-article')">+ Статья</button>
-        <button class="btn btn-secondary" type="button" onclick="openModal('modal-rename-section')">Переименовать раздел</button>
+        <button class="mini-btn" type="button" onclick="openModal('modal-rename-section')" title="Переименовать раздел" aria-label="Переименовать раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 3a2.8 2.8 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z"/></svg></button>
        <form class="inline-form" th:action="@{/admin/content/sections/toggle-published}" method="post">
            <input type="hidden" name="_csrf" th:value="${csrfToken}">
            <input type="hidden" name="id" th:value="${section.id}">
            <input type="hidden" name="published" th:value="${!section.published}">
            <input type="hidden" name="back" th:value="${back}">
-            <button class="btn" type="submit"
-                    th:classappend="${section.published} ? 'btn-secondary' : 'btn-primary'"
-                    th:text="${section.published} ? 'Скрыть раздел' : 'Опубликовать раздел'">Скрыть</button>
+            <button class="mini-btn" type="submit" th:if="${section.published}" title="Скрыть раздел" aria-label="Скрыть раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/></svg></button>
+            <button class="mini-btn" type="submit" th:unless="${section.published}" title="Опубликовать раздел" aria-label="Опубликовать раздел"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/><line x1="3" y1="3" x2="21" y2="21"/></svg></button>
        </form>
-        <button class="btn btn-secondary" type="button" onclick="openModal('modal-move-section')">Перенести статьи и удалить</button>
+        <button class="mini-btn" type="button" onclick="openModal('modal-move-section')" title="Перенести статьи и удалить" aria-label="Перенести статьи и удалить"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 11V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M14 10V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M10 10.5V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2v8"/><path d="M18 8a2 2 0 1 1 4 0v6a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"/></svg></button>
        <form class="inline-form" th:action="@{/admin/content/sections/{id}/delete(id=${section.id})}" method="post"
              onsubmit="return confirm('Удалить раздел вместе со статьями?')">
            <input type="hidden" name="_csrf" th:value="${csrfToken}">
            <input type="hidden" name="back" th:value="${backParent}">
-            <button class="btn btn-danger" type="submit">Удалить раздел</button>
+            <button class="mini-btn danger" type="submit" title="Удалить раздел вместе со статьями" aria-label="Удалить раздел вместе со статьями"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M9 6V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2"/></svg></button>
        </form>
    </div>

    <div th:if="${currentUser != null and currentUser.admin}" class="card card-body text-sm text-muted mb-4">
-        Перетаскивайте статьи за значок ⠿, чтобы менять их порядок. Порядок сохраняется сразу.
+        Перетаскивайте статьи за значок руки, чтобы менять их порядок. Порядок сохраняется сразу.
    </div>
    <div th:if="${currentUser != null and currentUser.admin}" id="sort-status" class="sort-status" hidden>
        <span id="sort-status-text">Изменения не сохранены…</span>
@@ -52,7 +51,7 @@
                <td>
                    <span th:if="${currentUser != null and currentUser.admin}" class="drag-handle" draggable="true"
                          th:attr="data-drag-kind='article',data-drag-id=${article.id}"
-                          title="Перетащите, чтобы изменить порядок статей">⠿</span>
+                          title="Перетащите, чтобы изменить порядок статей"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 11V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M14 10V4a2 2 0 0 0-2-2a2 2 0 0 0-2 2"/><path d="M10 10.5V6a2 2 0 0 0-2-2a2 2 0 0 0-2 2v8"/><path d="M18 8a2 2 0 1 1 4 0v6a8 8 0 0 1-8 8h-2c-2.8 0-4.5-.86-5.99-2.34l-3.6-3.6a2 2 0 0 1 2.83-2.82L7 15"/></svg></span>
                    <a th:href="@{/learn/{c}/{s}/{a}(c=${chapter.slug}, s=${section.slug}, a=${article.slug})}"
                       th:text="${article.title}">—</a>
                    <span th:if="${!article.published}" class="badge badge-warn ml-1">скрыто</span>
@@ -65,9 +64,8 @@
                        <input type="hidden" name="id" th:value="${article.id}">
                        <input type="hidden" name="published" th:value="${!article.published}">
                        <input type="hidden" name="back" th:value="${back}">
-                        <button class="btn" type="submit"
-                                th:classappend="${article.published} ? 'btn-secondary' : 'btn-primary'"
-                                th:text="${article.published} ? 'Скрыть' : 'Опубликовать'">Скрыть</button>
+                        <button class="mini-btn" type="submit" th:if="${article.published}" title="Скрыть статью" aria-label="Скрыть статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/></svg></button>
+                        <button class="mini-btn" type="submit" th:unless="${article.published}" title="Опубликовать статью" aria-label="Опубликовать статью"><svg class="cell-ico" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 12s4-7 11-7 11 7 11 7-4 7-11 7S1 12 1 12z"/><circle cx="12" cy="12" r="3"/><line x1="3" y1="3" x2="21" y2="21"/></svg></button>
                    </form>
                    <form class="inline-form" th:action="@{/admin/content/articles/{id}/delete(id=${article.id})}" method="post"
                          onsubmit="return confirm('Удалить статью?')">