From 7c50b3cd02f6d60897e50b21d1298d75e5364e33 Mon Sep 17 00:00:00 2001
From: VladislavOstapov <vlados.ost.31@yandex.ru>
Date: Thu, 25 Jan 2024 18:40:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B2=D0=B8=D0=B7=D1=83=D0=B0=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=81=D0=B0=D0=B9=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/css/style.css        | 12 ++++++++++++
 templates/account/list.html |  2 +-
 templates/account/view.html | 11 +++--------
 templates/base.html         |  4 ++--
 users/models.py             |  7 +++++++
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/static/css/style.css b/static/css/style.css
index 20cc692..5c175ca 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -61,6 +61,18 @@ header * {
   color: var(--brand-text);
 }
 
+header > nav {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: center;
+  align-items: center;
+}
+
+header > nav > a {
+  margin: 0.5em;
+}
+
 .value-good {
   color: var(--text-good);
 }
diff --git a/templates/account/list.html b/templates/account/list.html
index f181536..b87aac0 100644
--- a/templates/account/list.html
+++ b/templates/account/list.html
@@ -42,7 +42,7 @@
         {% for u in users %}
         <tr>
             <td><a href="{% url 'account-view' u.login %}"> {{ u.login }} </a></td>
-            <td>{{ u.access_level }}</td>
+            <td>{{ u.readable_access_level }}</td>
             <td>{{ u.last_login }}</td>
             <td>{{ u.last_password_change }}</td>
             <td>{{ u.registered }}</td>
diff --git a/templates/account/view.html b/templates/account/view.html
index bcdfcf6..31d2c91 100644
--- a/templates/account/view.html
+++ b/templates/account/view.html
@@ -9,14 +9,10 @@
 </style>
 {% endblock %}
 
-{% block header %}
-<h1> Аккаунт {{ view_user.login }} </h1>
-{% endblock %}
+{% block header-title %} Аккаунт {{ view_user.login }} {% endblock %}
 
 {% block content %}
-<p><a href="{% url 'index' %}" class="value-good">Вернуться на главную</a></p>
-
-<p>Уровень доступа: {{ view_user.access_level }}</p>
+<p>Уровень доступа: {{ view_user.readable_access_level }}</p>
 <p>Последний вход: {{ view_user.last_login }}</p>
 <p>Последнее обновление пароля: {{ view_user.last_password_change }}
     {% if perms.users.change_user or view_user.login == user.login %}
@@ -25,9 +21,8 @@
 </p>
 <p>Зарегистрирован: {{ view_user.registered }}</p>
 
-{% if perms.users.delete_user %}
+{% if perms.users.delete_user and view_user.login != user.login %}
 <p><a href="{% url 'delete-account' view_user.login %}" class="value-bad">Удалить аккаунт</a></p>
 {% endif %}
 
-
 {% endblock %}
diff --git a/templates/base.html b/templates/base.html
index da22d4e..77cd694 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -14,11 +14,11 @@
         {% block header %}
         <h1>{% block header-title %} Мониторинг водозаборного узла {% endblock %}</h1>
         {% if user.is_authenticated %}
-        <div id="header-login-block">
+        <nav>
             <a href="/">На главную</a>
             <a href="{% url 'account-view' %}">{{ user.login }}</a>
             <a href="{% url 'logout' %}">Выход</a>
-        </div>
+        </nav>
         {% endif %}
         {% endblock %}
     </header>
diff --git a/users/models.py b/users/models.py
index f7cea95..68b978e 100644
--- a/users/models.py
+++ b/users/models.py
@@ -36,6 +36,13 @@ class User(AbstractBaseUser):
     def __str__(self):
         return self.login
 
+    def readable_access_level(self):
+        choices = UserAccessLevel.choices
+        for c in choices:
+            if c[0] == self.access_level:
+                return c[1]
+        return 'неизвестно'
+
     class Meta:
         default_permissions = ()