Merge branch 'develop' into feature/react_test

# Conflicts:
#	static/main/js/control_page/control.js

main/templates/pages/adm_ruleset.html

@@ -25,7 +25,7 @@
     </div>
 
   {% for message in messages %}
-  <script>create_notification('{{message}}','','{{message.tags}}',5000)</script>
+  <script>create_notification('{{message}}','','{{message.tags}}',2000)</script>
   {% endfor %}
 
   {% block form %}

main/templates/pages/profile.html

@@ -31,6 +31,7 @@
         alt="Нет изображения"
       >
     </div>
+    <a href="{%url 'password_change' %}">Сменить пароль</a>
   </div>
   <div class="col">
     <h5><span class="badge bg-secondary text-light">Имя пользователя</span> {{ profile.name }}</h5>

main/templates/pages/work.html

@@ -72,7 +72,7 @@
             </form>
         </div>
       {% for message in messages %}
-  <script>create_notification('{{message}}','','{{message.tags}}',5000)</script>
+  <script>create_notification('{{message}}','','{{message.tags}}',2000)</script>
   {% endfor %}
     </div>
 </div>

main/templates/registration/password_change_done.html

@@ -0,0 +1,12 @@
+{% extends "base/base.html" %}
+{% load static %}
+
+{% block title %}Пароль успешно изменен{% endblock title %}
+
+{% block heading %}Пароль успешно изменен{% endblock %}
+
+{% block content %}
+<div>
+<h4>Ваш пароль был изменен.</h4>
+</div>
+{% endblock content %}

main/templates/registration/password_change_form.html

@@ -0,0 +1,14 @@
+{% extends "base/base.html" %}
+{% load static %}
+
+{% block title %}Изменение пароля{% endblock title %}
+
+{% block heading %}Сменить пароль{% endblock %}
+
+{% block content %}
+    <form method="post">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="submit" value="Сменить" class="btn btn-success">
+    </form>
+{% endblock content %}

main/tests.py

@@ -1,3 +1,2 @@
-from django.test import TestCase
-
-# Create your tests here.
+from django.test import TestCase, Client
+import access_controller.settings as sets