Divers correctifs

- Le menu est utilisable sans Js (penser à mettre à jour les endpoints)
- Réorganisation des templates
- Ajout d'une page listant les outils

app/__init__.py

@@ -32,7 +32,7 @@ from app.models.forum import Forum
 from app.models.topic import Topic
 from app.models.notification import Notification
 
-from app.routes import index, search, users  # To load routes at initialization
+from app.routes import index, search, users, tools  # To load routes at initialization
 from app.routes.account import login, account, notification
 from app.routes.admin import index, groups, account, trophies, forums
 from app.routes.forum import index

app/routes/account/account.py

@@ -32,7 +32,7 @@ def edit_account():
         else:
             flash('Erreur lors de la modification', 'error')
 
-    return render('account.html', form=form)
+    return render('account/account.html', form=form)
 
 
 @app.route('/account/delete', methods=['GET', 'POST'])
@@ -49,7 +49,7 @@ def delete_account():
         else:
             flash('Erreur lors de la suppression du compte', 'error')
             del_form.delete.data = False  # Force to tick to delete the account
-    return render('delete_account.html', del_form=del_form)
+    return render('account/delete_account.html', del_form=del_form)
 
 
 @app.route('/register', methods=['GET', 'POST'])
@@ -68,7 +68,7 @@ def register():
             ldap.set_password(member, form.password.data)
         flash('Inscription réussie', 'ok')
         return redirect(url_for('validation') + "?email=" + form.email.data)
-    return render('register.html', title='Register', form=form)
+    return render('account/register.html', title='Register', form=form)
 
 
 @app.route('/register/validation/', methods=['GET', 'POST'])
@@ -76,4 +76,4 @@ def validation():
     mail = request.args['email']
     if current_user.is_authenticated:
         return redirect(url_for('index'))
-    return render('validation.html', mail=mail)
+    return render('account/validation.html', mail=mail)

app/routes/account/login.py

@@ -54,7 +54,7 @@ def login():
             return redirect(request.referrer)
         return redirect(url_for('index'))
 
-    return render('login.html', form=form)
+    return render('account/login.html', form=form)
 
 
 @app.route('/logout')

app/routes/tools.py

@@ -0,0 +1,8 @@
+from app import app
+
+from app.utils.render import render
+
+
+@app.route('/tools')
+def tools():
+    return render('tools.html')

app/routes/users.py

@@ -9,7 +9,7 @@ from app.utils.render import render
 def user(username):
     norm = unicode_names.normalize(username)
     member = Member.query.filter_by(norm=norm).first_or_404()
-    return render('user.html', member=member)
+    return render('account/user.html', member=member)
 
 
 @app.route('/user/id/<int:user_id>')

app/static/scripts/trigger_menu.js

@@ -5,6 +5,8 @@ var b = document.querySelectorAll('#light-menu a');
 for(var i = 1; i < b.length; i++) {
 	b[i].setAttribute('onfocus', "this.setAttribute('f', 'true');");
 	b[i].setAttribute('onblur', "this.setAttribute('f', 'false');");
+	b[i].removeAttribute('href');
+	console.log("Removed");
 }
 
 var trigger_menu = function(active) {

app/templates/account/user.html

@@ -9,7 +9,7 @@
 <section>
   {{ widget_member.profile(member) }}
 
-  {% if current_user.is_authenticated and current_user.priv('access-admin-panel') %}
+  {% if current_user.is_authenticated and (current_user == member or current_user.priv('access-admin-panel')) %}
   <div><a href="{{ url_for('adm_edit_account', user_id=member.id) }}">Modifier</a></div>
   {% endif %}
 

app/templates/base/navbar.html

@@ -5,7 +5,11 @@
 		</a>
 
 		<li>
-			<a role="button" label="Compte" tabindex="0">
+			{% 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 fill="#ffffff" 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>
@@ -23,7 +27,7 @@
 		</li>
 
 		<li>
-			<a role="button" label="Forum" tabindex="0">
+			<a href="{{ url_for('forum_index') }}" role="button" label="Forum" tabindex="0">
 				<svg viewBox="0 0 24 24">
 					<path fill="#ffffff" d="M17,12V3A1,1 0 0,0 16,2H3A1,1 0 0,0 2,3V17L6,13H16A1,1 0 0,0 17,12M21,6H19V15H6V17A1,1 0 0,0 7,18H18L22,22V7A1,1 0 0,0 21,6Z"></path>
 				</svg>
@@ -59,7 +63,7 @@
 		</li>
 
 		<li>
-			<a role="button" label="Outils" tabindex="0">
+			<a href="{{ url_for('tools') }}" role="button" label="Outils" tabindex="0">
 				<svg viewBox="0 0 24 24">
 					<path fill="#ffffff" d="M22.7,19L13.6,9.9C14.5,7.6 14,4.9 12.1,3C10.1,1 7.1,0.6 4.7,1.7L9,6L6,9L1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1C4.8,14 7.5,14.5 9.8,13.6L18.9,22.7C19.3,23.1 19.9,23.1 20.3,22.7L22.6,20.4C23.1,20 23.1,19.3 22.7,19Z"></path>
 				</svg>

app/templates/tools.html

@@ -0,0 +1,18 @@
+{% extends "base/base.html" %}
+
+{% block title %}
+<h1>Outils</h1>
+{% endblock %}
+
+{% block content %}
+<section>
+  <p>Planète Casio met à votre disposition divers outils. Pour vous connecter,
+      utilisez votre identifiant unique et votre mot de passe habituel.
+    <ul>
+      <li><a href="https://gitea.planet-casio.com">Gitea</a> (forge Git)</li>
+      <li><a href="https://wiki.planet-casio.com">Wiki</a> (wiki répétoriant tout un tas de trucs)</li>
+      <li><a href="https://bible.planet-casio.com">Bible</a> (la bible du programmeur Casio bas niveau)</li>
+    </ul>
+  </p>
+</section>
+{% endblock %}