Merge branch 'develop' into feature/docker

main/templates/base/menu.html

@@ -5,23 +5,48 @@
 
   <nav class="navbar navbar-light" style="background-color: #113A60;">
     <a class="navbar-brand" href="{% url 'index' %}">
-      <img src="{% static 'main/img/logo_real.png' %}" width="107" height="22" class="d-inline-block align-top" alt="" loading="lazy">
+      <img src="{% static 'main/img/logo_real.png' %}" width="107" height="22" class="d-inline-block align-top" style="margin-left: 15px" alt="" loading="lazy">
       <t style="color:#FFFFFF">Access Controller</t>
     </a>
     {% if request.user.is_authenticated %}
-      <div class="btn-group" role="group" aria-label="Basic example">
-        <a class="btn btn-secondary" href="{% url 'profile' %}">Профиль</a>
+      <div class="btn-group" role="group" aria-label="Basic example" style="margin-right: 9px">
+        <a {% if profile_lit %}
+            class="btn btn-primary"
+          {% else %}
+            class="btn btn-secondary"
+          {% endif %}
+          href="{% url 'profile' %}">Профиль</a>
         {% if perms.main.has_control_access %}
-        <a class="btn btn-secondary" href="{% url 'control' %}">Управление</a>
+          <a {% if control_lit %}
+              class="btn btn-primary"
+            {% else %}
+              class="btn btn-secondary"
+            {% endif %}
+            href="{% url 'control' %}">Управление</a>
         {% else %}
-        <a class="btn btn-secondary" href="{% url 'work' request.user.id %}">Запрос прав</a>
+          <a {% if work_lit %}
+              class="btn btn-primary"
+            {% else %}
+              class="btn btn-secondary"
+            {% endif %}
+            href="{% url 'work' request.user.id %}">Запрос прав</a>
         {% endif %}
         <a class="btn btn-secondary" href="{% url 'logout' %}">Выйти</a>
       </div>
     {% else %}
-      <div class="btn-group" role="group" aria-label="Basic example">
-        <a class="btn btn-secondary" href="/accounts/login">Войти</a>
-        <a class="btn btn-secondary" href="/accounts/register">Зарегистрироваться</a>
+      <div class="btn-group" role="group" aria-label="Basic example" style="margin-right: 9px">
+        <a {% if login_lit %}
+            class="btn btn-primary"
+          {% else %}
+            class="btn btn-secondary"
+          {% endif %}
+          href="/accounts/login">Войти</a>
+        <a {% if registration_lit %}
+            class="btn btn-primary"
+          {% else %}
+            class="btn btn-secondary"
+          {% endif %}
+          href="/accounts/register">Зарегистрироваться</a>
       </div>
     {% endif %}
   </nav>

main/templates/django_registration/registration_error.html

@@ -0,0 +1,15 @@
+{% extends 'base/base.html' %}
+{% load static %}
+
+{% block title %}
+  Регистрация завершена
+{% endblock %}
+
+{% block heading %}
+  Регистрация
+{% endblock %}
+
+{% block content %}
+    <br>
+    <h4> Произошла ошибка при отправке электронного сообщения.</h4>
+{% endblock %}

main/templates/pages/adm_ruleset.html

@@ -34,7 +34,7 @@
         <h6 class="table-title">Список сотрудников</h6>
 
         {% block table %}
-        <table class="light-table">
+        <table class="table table-dark light-table">
 
             <thead>
               <th>Name</th>
@@ -42,8 +42,8 @@
               <th>Role</th>
               <th>Checked</th>
             </thead>
-            <tbody id="tbody">
-            </tbody>
+            <tbody id="tbody"></tbody>
+
         </table>
         <p id="loading">Данные загружаются...</p>
         {% endblock %}

main/templates/pages/work.html

@@ -60,6 +60,12 @@
             <a href="/work/become_engineer" class="request-acess-button default-button">Получить права инженера</a>
             <a href="/work/hand_over" class="hand-over-acess-button default-button">Сдать права инженера</a>
         </div>
+        <div class="col-10">
+            <form method="GET" action="/work/get_tickets">
+                <input class="form-control mb-3" type="number" min="1" value="1" name="count_tickets">
+                <button type="submit" class="default-button">Взять тикеты в работу</button>
+            </form>
+        </div>
     </div>
   {% include 'base/success_messages.html' %}
 </div>