From d3939fa1ec0deadee12df5a6d811ad2fdc316a1b Mon Sep 17 00:00:00 2001
From: Kiselev Igor <igor.kiselev090@gmail.com>
Date: Fri, 28 May 2021 17:47:49 +0300
Subject: [PATCH 1/3] Added favicon

---
 main/templates/base/base.html |   1 +
 static/main/favs/favicon.ico  | Bin 0 -> 318 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 static/main/favs/favicon.ico

diff --git a/main/templates/base/base.html b/main/templates/base/base.html
index e82af52..7861c39 100644
--- a/main/templates/base/base.html
+++ b/main/templates/base/base.html
@@ -9,6 +9,7 @@
   <title>{% block title %}{% endblock %}</title>
   <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css"
     integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous">
+  <link rel="icon" href="static/main/favs/favicon.ico" type="image/x-icon">
 
   <style>
     .bd-placeholder-img {
diff --git a/static/main/favs/favicon.ico b/static/main/favs/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6161ce6bdf6457d1d9e93a952c2072e9ebb250c8
GIT binary patch
literal 318
zcmZ{cu@1pt5P&~n>L8uW#x5Sf>H)lh#cnVeL>iMAB`gL*BT@zfi-@#TG}4D?VzBiU
zxNB<=aeu!1{=5IbgMu8>G$og?3Qz$o!4#^3_W#8p3>clZ1ox0Ais&EL6rCQ&@JbMz
zX>2FdHe<S-Chb<8slR99?{HUhmd@;Vt>HovW4P)h7B4<7=d~JFJ|qdLb&J*->0stX
iUT03TcD~~E0_Aaop%1oVXLuLz<V}f{LB><=pSd?68d}N#

literal 0
HcmV?d00001


From e4da328cb68d321fd0ab141996e2a01cdbd9fec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=B5=D0=BD=D0=BA?=
 =?UTF-8?q?=D0=BE=20=D0=9E=D0=BB=D1=8C=D0=B3=D0=B0?=
 <stepanenko_olga@mail.ru>
Date: Sat, 29 May 2021 17:10:56 +0300
Subject: [PATCH 2/3] Add favicon to pages

---
 main/templates/base/menu.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main/templates/base/menu.html b/main/templates/base/menu.html
index 17c5f81..cc085bf 100644
--- a/main/templates/base/menu.html
+++ b/main/templates/base/menu.html
@@ -42,6 +42,8 @@
           href="{{ work_url }}">Запрос прав</a>
         {% endif %}
         <a class="btn btn-secondary" href="{% url 'logout' %}">Выйти</a>
+        <a class="btn btn-secondary"
+        href="https://actrl.cazzzer.com/docs/index.html"> Документация</a>
       </div>
     {% else %}
       <div class="btn-group" role="group" aria-label="Basic example" style="margin-right: 9px">

From 2037791ce8e5beac418e0f6f90bda3d677b72f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=B5=D0=BD=D0=BA?=
 =?UTF-8?q?=D0=BE=20=D0=9E=D0=BB=D1=8C=D0=B3=D0=B0?=
 <stepanenko_olga@mail.ru>
Date: Sat, 29 May 2021 17:20:35 +0300
Subject: [PATCH 3/3] Merge with dev

---
 main/templates/base/base.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/templates/base/base.html b/main/templates/base/base.html
index 7861c39..6c719cf 100644
--- a/main/templates/base/base.html
+++ b/main/templates/base/base.html
@@ -9,7 +9,8 @@
   <title>{% block title %}{% endblock %}</title>
   <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css"
     integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous">
-  <link rel="icon" href="static/main/favs/favicon.ico" type="image/x-icon">
+  <link rel="icon" href="{% static 'main/favs/favicon.ico'%}" type="image/x-icon">
+
 
   <style>
     .bd-placeholder-img {