From 4a4c3cd52acac66d38830384bc90b2a96098f571 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 11 Jan 2021 20:10:10 +0100
Subject: [PATCH] =?UTF-8?q?Seznam=20u=C5=BEivatel=C5=AF/org=C5=AF=20ukazuj?=
=?UTF-8?q?e=20=C4=8Derven=C3=A9=20hv=C4=9Bzdi=C4=8Dky=20u=20neaktivn?=
=?UTF-8?q?=C3=ADch=20=C3=BA=C4=8Dt=C5=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/templates/base.html | 2 +-
mo/web/templates/org_orgs.html | 2 +-
mo/web/templates/org_users.html | 2 +-
static/mo.css | 6 ++++++
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/mo/web/templates/base.html b/mo/web/templates/base.html
index 7bb2f850..69152be2 100644
--- a/mo/web/templates/base.html
+++ b/mo/web/templates/base.html
@@ -3,7 +3,7 @@
<head>
<title>Odevzdávací systém MO</title>
<link rel=stylesheet href="{{ url_for('static', filename='bootstrap.min.css') }}" type='text/css' media=all>
- <link rel=stylesheet href="{{ url_for('static', filename='mo.css') }}?v=4" type='text/css' media=all>
+ <link rel=stylesheet href="{{ url_for('static', filename='mo.css') }}?v=5" type='text/css' media=all>
{% block head %}{% endblock %}
</head>
<body>
diff --git a/mo/web/templates/org_orgs.html b/mo/web/templates/org_orgs.html
index 09e52430..e4e20f74 100644
--- a/mo/web/templates/org_orgs.html
+++ b/mo/web/templates/org_orgs.html
@@ -46,7 +46,7 @@
{% for user in users %}
<tr>
<td>{{ user.first_name }}</td><td>{{ user.last_name }}</td>
- <td><a href="mailto:{{ user.email }}">{{ user.email }}</a></td>
+ <td><a href="mailto:{{ user.email }}">{{ user.email }}</a>{% if user.password_hash == None %}<span class="user-inactive" title='Účet dosud nebyl aktivován'> *</span>{% endif %}</td>
<td>{% if user.is_admin %}správce{% elif user.roles|count == 0 %}<i>žádná role</i>{% else %}
<ul>
{% for role in user.roles %}
diff --git a/mo/web/templates/org_users.html b/mo/web/templates/org_users.html
index c1ff6c00..e62052af 100644
--- a/mo/web/templates/org_users.html
+++ b/mo/web/templates/org_users.html
@@ -72,7 +72,7 @@
{% for user in users %}
<tr>
<td>{{ user.first_name }}</td><td>{{ user.last_name }}</td>
- <td><a href="mailto:{{ user.email }}">{{ user.email }}</a></td>
+ <td><a href="mailto:{{ user.email }}">{{ user.email }}</a>{% if user.password_hash == None %}<span class="user-inactive" title='Účet dosud nebyl aktivován'> *</span>{% endif %}</td>
<td><div class='btn-group'>
<a class="btn btn-xs btn-default" href="{{ url_for('org_user', id=user.user_id) }}">Detail</a>
{% if can_edit %}
diff --git a/static/mo.css b/static/mo.css
index 422daf27..1f353cb4 100644
--- a/static/mo.css
+++ b/static/mo.css
@@ -186,3 +186,9 @@ table.data tbody tr.job-failed {
table.data tbody tr.job-failed:hover {
background-color: #a66;
}
+
+/* Users */
+
+.user-inactive {
+ color: red;
+}
--
GitLab