From d636223dad24db812dd725f3cf459ce5bb87c61f Mon Sep 17 00:00:00 2001
From: Darks <l.gatin@neuf.fr>
Date: Thu, 16 Jul 2020 19:08:42 +0200
Subject: [PATCH] enhancement: moved account icon to bottom of navbar

---
 app/static/css/navbar.css              |  5 ++++
 app/templates/base/navbar.html         | 33 ++++++++++++++------------
 app/templates/base/navbar/account.html |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app/static/css/navbar.css b/app/static/css/navbar.css
index 7cb19d3..fcdcf20 100644
--- a/app/static/css/navbar.css
+++ b/app/static/css/navbar.css
@@ -56,6 +56,11 @@ nav a:focus {
 	transition: opacity .15s ease; /* because Chrome sucks */
 }
 
+#light-menu li > a > img {
+	display: block; width: 60px; flex-shrink: 0; flex-grow: 0;
+	margin: 0 7px 5px 7px;
+	border-radius: 10%;
+}
 #light-menu li > a > svg {
 	display: block; width: 25px; flex-shrink: 0; flex-grow: 0;
 	margin: 0 7px;
diff --git a/app/templates/base/navbar.html b/app/templates/base/navbar.html
index 42c12f2..5a60938 100644
--- a/app/templates/base/navbar.html
+++ b/app/templates/base/navbar.html
@@ -4,19 +4,6 @@
 			<img src="{{ url_for('static',filename= 'images/logo_noshadow-small.png') }}" alt="logo"/>
 		</a>
 
-		<li>
-			{% if current_user.is_authenticated %}
-			<a href="{{ url_for('user', username=current_user.name) }}" role="button" label="Compte" tabindex="0">
-			{% else %}
-			<a href="{{ url_for('login') }}" role="button" label="Compte" tabindex="0">
-			{% endif %}
-				<svg viewBox="0 0 24 24">
-					<path d="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z"></path>
-				</svg>
-				<div>Compte</div>
-			</a>
-		</li>
-
 		<li>
 			<a role="button" label="Actualités" tabindex="0">
 				<svg viewBox="0 0 24 24">
@@ -70,11 +57,25 @@
 				<div>Outils</div>
 			</a>
 		</li>
+		
+		<li>
+			{% if current_user.is_authenticated %}
+			<a href="{{ url_for('user', username=current_user.name) }}" role="button" label="Compte" tabindex="0">
+				<img src="{{ url_for('avatar', filename=current_user.avatar) }}" alt="Avatar de {{ current_user.name }}">
+				<div>Compte</div>
+			</a>
+			{% else %}
+			<a href="{{ url_for('login') }}" role="button" label="Compte" tabindex="0">
+				<svg viewBox="0 0 24 24">
+					<path d="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z"></path>
+				</svg>
+				<div>Compte</div>
+			</a>
+			{% endif %}
+		</li>
 	</ul>
 
 	<div id=menu>
-		{% include "base/navbar/account.html" %}
-
 		{% include "base/navbar/news.html" %}
 
 		{% include "base/navbar/forum.html" %}
@@ -86,5 +87,7 @@
 		{% include "base/navbar/sprites.html" %}
 
 		{% include "base/navbar/tools.html" %}
+
+		{% include "base/navbar/account.html" %}
 	</div>
 </nav>
diff --git a/app/templates/base/navbar/account.html b/app/templates/base/navbar/account.html
index b071393..ef44842 100644
--- a/app/templates/base/navbar/account.html
+++ b/app/templates/base/navbar/account.html
@@ -2,7 +2,7 @@
 <div>
 	<h2>
 		<a href="{{ url_for('user', username=current_user.name) }}">
-			<img src="{{ url_for('avatar', filename=current_user.avatar) }}"></a>
+			<img src="{{ url_for('avatar', filename=current_user.avatar) }}" alt="Avatar de {{ current_user.name }}"></a>
 		<a href="{{ url_for('user', username=current_user.name) }}">
 			{{ current_user.name }}</a>
 	</h2>