From e4720e7c78f235464176b2f997ba92cdb7b9d9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20=20MENAGER?= <herve.menager@pasteur.fr>
Date: Mon, 23 Jul 2018 10:11:49 +0200
Subject: [PATCH] put the login block to the top right of the screen
Former-commit-id: c0e9c8f9c4bb4f6357211b1aac2e0b654d0bd743
---
ippisite/ippidb/templates/base.html | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/ippisite/ippidb/templates/base.html b/ippisite/ippidb/templates/base.html
index 452972a0..30f6b5da 100644
--- a/ippisite/ippidb/templates/base.html
+++ b/ippisite/ippidb/templates/base.html
@@ -160,7 +160,6 @@
};
};
</script>
-
</head>
<body>
@@ -173,6 +172,16 @@
</a>
</div><!-- /.container-fluid -->
</div>
+ <nav class="fixed-top">
+ <ul class="nav justify-content-end">
+ {% if user.is_authenticated %}{{ user.perms }}
+ <li><i class="fas fa-user-circle"></i> {{ user.username }}<a class="ml-2" href="{% url 'logout' %}">logout</a></li>
+ {% else %}
+ <li><a href="/accounts/login/"><i class="fas fa-user-circle mr-2" title="Login"></i> LOGIN</a></li>
+ {% endif %}
+ </ul>
+ </nav>
+ </nav>
<div id="mainnav">
<nav class="main-nav">
<div>
@@ -192,12 +201,6 @@
<li>
<a href="/admin-session">Admin</a>
</li>
- {% if user.is_authenticated %}
- <li>Welcome {{ user.username }} !!! <a href="{% url 'logout' %}">logout</a></li>
- {% else %}
- <li><a href="{% provider_login_url 'github' %}"><i class="fab fa-github" title="Login with github"></i> Login with GitHub</a></li>
- <li><a href="{% provider_login_url 'orcid' %}"><i class="ai ai-orcid" title="Login with ORCID"></i> Login with ORCID</a></li>
- {% endif %}
</ul>
</div>
</nav>
--
GitLab