Merge branch 'develop' into feature/statistic/main

# Conflicts:
#	main/models.py
#	main/views.py

main/templates/base/success_messages.html

@@ -0,0 +1,14 @@
+<div class="mt-5">
+  {% for message in messages %}
+    <div
+      class="alert alert-{{ message.tags }} alert-dismissible fade show p-2"
+      role="alert"
+      style="display: flex; align-items: center; justify-content: space-between;"
+    >
+      {{ message }}
+      <div>
+        <button type="button" class="btn btn-light p-2" data-bs-dismiss="alert" aria-label="Close">X</button>
+      </div>
+    </div>
+  {% endfor %}
+</div>

main/templates/pages/adm_ruleset.html

@@ -20,6 +20,10 @@
 {% block content %}
 <div class="container-md">
 
+    <div class="new-section">
+        <p class="row page-description">Свободных Мест: {{ licences_remaining }}</p>
+    </div>
+
   {% block form %}
   <form method="post">
     {% csrf_token %}
@@ -97,12 +101,13 @@
         <button type="submit" name="light_agent" class="hand-over-acess-button default-button">
           Назначить выбранных на роль легкого агента
         </button>
-
       </div>
     </div>
     {% endblock %}
   </form>
   {% endblock %}
+
+  {% include 'base/success_messages.html' %}
 </div>
 
 <script src="{% static 'main/js/control.js'%}" type="text/babel"></script>

main/templates/pages/work.html

@@ -14,7 +14,7 @@
 <div class="container-md">
 
     <div class="new-section">
-        <p class="row page-description">Основаная информация о странице</p>
+        <p class="row page-description">Свободных Мест: {{ licences_remaining }}</p>
     </div>
 
     <div class="row justify-content-center new-section">
@@ -61,6 +61,7 @@
             <a href="/work/hand_over" class="hand-over-acess-button default-button">Сдать права инженера</a>
         </div>
     </div>
+  {% include 'base/success_messages.html' %}
 </div>
 {% endblock %}