Merge branch 'develop' into feature/statistic/month_name_bug

# Conflicts:
#	main/extra_func.py

main/templates/base/menu.html

@@ -3,56 +3,62 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-  <nav class="navbar navbar-light" style="background-color: #113A60;">
+  <nav class="navbar navbar-light py-3" 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" style="margin-left: 15px" alt="" loading="lazy">
-      <t style="color:#FFFFFF">Access Controller</t>
+      <t class="px-2" style="color:#FFFFFF">Access Controller</t>
     </a>
     {% if request.user.is_authenticated %}
       <div class="btn-group" role="group" aria-label="Basic example" style="margin-right: 9px">
-        <a {% if profile_lit %}
+        {% url 'profile' as profile_url %}
+        <a {% if request.path == profile_url %}
             class="btn btn-primary"
           {% else %}
             class="btn btn-secondary"
           {% endif %}
-        href="{% url 'profile' %}">Профиль</a>
+        href="{{ profile_url }}">Профиль</a>
         {% if perms.main.has_control_access %}
-          <a {% if control_lit %}
+        {% url 'control' as control_url %}
+          <a {% if request.path == control_url %}
               class="btn btn-primary"
             {% else %}
               class="btn btn-secondary"
             {% endif %}
-          href="{% url 'control' %}">Управление</a>
-          <a {% if stats_lit %}
+          href="{{ control_url }}">Управление</a>
+          {% url 'statistic' as statistic_url %}
+          <a {% if request.path == statistic_url %}
               class="btn btn-primary"
             {% else %}
               class="btn btn-secondary"
             {% endif %}
-          href="{% url 'statistic' %}">Статистика</a>
+          href="{{ statistic_url }}">Статистика</a>
         {% else %}
-          <a {% if work_lit %}
+          {% url 'work' request.user.id as work_url %}
+          <a {% if request.path == work_url %}
               class="btn btn-primary"
             {% else %}
               class="btn btn-secondary"
             {% endif %}
-          href="{% url 'work' request.user.id %}">Запрос прав</a>
+          href="{{ work_url }}">Запрос прав</a>
         {% endif %}
         <a class="btn btn-secondary" href="{% url 'logout' %}">Выйти</a>
       </div>
     {% else %}
       <div class="btn-group" role="group" aria-label="Basic example" style="margin-right: 9px">
-        <a {% if login_lit %}
+        {% url 'login' as login_url %}
+        <a {% if request.path == login_url %}
             class="btn btn-primary"
           {% else %}
             class="btn btn-secondary"
           {% endif %}
-        href="/accounts/login">Войти</a>
-        <a {% if registration_lit %}
+        href="{{ login_url }}">Войти</a>
+        {% url 'registration' as registration_url %}
+        <a {% if request.path == registration_url %}
             class="btn btn-primary"
           {% else %}
             class="btn btn-secondary"
           {% endif %}
-        href="/accounts/register">Зарегистрироваться</a>
+        href="{{ registration_url }}">Зарегистрироваться</a>
       </div>
     {% endif %}
   </nav>

main/templates/pages/adm_ruleset.html

@@ -17,9 +17,9 @@
 <script src="https://unpkg.com/babel-standalone@6/babel.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
 
-<script src="{% static 'modules/notifications/dist/notifications.js' %}"></script>
 <script src="{% static 'main/js/control.js'%}" type="text/babel"></script>
-<script src="{% static 'main/js/notifications.js' %}"></script>
+<script src="{% static 'main/js/notifications.js' %}"></script>                     {#     Для     #}
+<script src="{% static 'modules/notifications/dist/notifications.js' %}"></script>  {# Уведомлений #}
 {% endblock%}
 {% block content %}
 <div class="container-md">

main/templates/pages/work.html

@@ -66,10 +66,11 @@
             <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>
+          <form method="post" action="{% url 'work_get_tickets' %}">
+            {% csrf_token %}
+            {{ get_tickets_form.count_tickets }}
+            <button type="submit" class="default-button">Взять тикеты в работу</button>
+          </form>
         </div>
       {% for message in messages %}
   <script>create_notification('{{message}}','','{{message.tags}}',2000)</script>