From: Guillaume Subiron Date: Tue, 29 May 2012 19:18:52 +0000 (+0200) Subject: Renaming X-Git-Url: http://git.cyclocoop.org/?p=cavote.git;a=commitdiff_plain;h=07a7e13f132e72a1586da7a55423abfdbd8d623f Renaming --- diff --git a/main.py b/main.py index 298c721..b00b879 100755 --- a/main.py +++ b/main.py @@ -50,7 +50,7 @@ def valid_login(username, password): return query_db('select * from users where email = ? and password = ?', [username, password], one=True) def connect_user(user): - session['user'] = user # :KLUDGE:maethor:120528: Stoquer toute la ligne de la table users dans la session, c'est un peu crade… + session['user'] = user # :KLUDGE:maethor:120528: Stoquer toute la ligne de la table users dans la session, c'est un peu crade #session['user']['id'] = user['id'] #session['user']['name'] = user['name'] #session['user']['email'] = user['email'] @@ -90,7 +90,7 @@ def password_lost(): if user is None: flash('Cet utilisateur n\'existe pas !', 'error') else: - # :TODO:maethor:120528: Générer la clé, la mettre dans la base de données et envoyer le mail + # :TODO:maethor:120528: Generer la cle, la mettre dans la base de données et envoyer le mail flash(u"Un mail a été envoyé à " + user['email'], 'info') return render_template('password_lost.html') @@ -109,13 +109,13 @@ def login_key(userid, key): # User settings @app.route('/user/') -def show_user(userid): +def user(userid): if int(userid) != session.get('user').get('id'): abort(401) - return render_template('show_user.html') + return render_template('user.html') @app.route('/user/settings/', methods=['GET', 'POST']) -def user_settings(userid): +def user_edit(userid): if int(userid) != session.get('user').get('id'): abort(401) if request.method == 'POST': @@ -125,7 +125,7 @@ def user_settings(userid): disconnect_user() # :TODO:maethor:120528: Maybe useless, but this is simple way to refresh session :D flash(u'Votre profil a été mis à jour !', 'success') return redirect(url_for('login')) - return render_template('user_settings.html') + return render_template('user_edit.html') @app.route('/user/password/', methods=['GET', 'POST']) def user_password(userid): @@ -139,20 +139,20 @@ def user_password(userid): flash(u'Votre mot de passe a été mis à jour.', 'success') else: flash(u'Les mots de passe sont différents.', 'error') - return render_template('user_settings.html') + return render_template('user_edit.html') #------------ # User admin -@app.route('/users/admin/list') +@app.route('/admin/users') def admin_users(): if not session.get('user').get('is_admin'): abort(401) users = query_db('select * from users order by id desc') return render_template('admin_users.html', users=users) -@app.route('/users/admin/add', methods=['GET', 'POST']) -def add_user(): +@app.route('/admin/users/add', methods=['GET', 'POST']) +def admin_user_add(): if not session.get('user').get('is_admin'): abort(401) if request.method == 'POST': @@ -170,20 +170,20 @@ def add_user(): return redirect(url_for('home')) else: flash(u"Vous devez spécifier une adresse email.", 'error') - return render_template('add_user.html') + return render_template('admin_user_new.html') #------------- # Roles admin -@app.route('/roles') -def show_roles(): +@app.route('/admin/roles') +def admin_roles(): if not session.get('user').get('is_admin'): abort(401) roles = query_db('select * from roles') - return render_template('show_roles.html', roles=roles) + return render_template('admin_roles.html', roles=roles) -@app.route('/roles/admin/add', methods=['POST']) -def add_role(): +@app.route('/admin/roles/add', methods=['POST']) +def admin_role_add(): if not session.get('user').get('is_admin'): abort(401) if request.method == 'POST': @@ -192,10 +192,10 @@ def add_role(): g.db.commit() else: flash(u"Vous devez spécifier un nom.", "error") - return redirect(url_for('show_roles')) + return redirect(url_for('admin_roles')) -@app.route('/roles/admin/delete/') -def del_role(idrole): +@app.route('/admin/roles/delete/') +def admin_role_del(idrole): if not session.get('user').get('is_admin'): abort(401) role = query_db('select * from roles where id = ?', [idrole], one=True) @@ -205,13 +205,13 @@ def del_role(idrole): abort(401) g.db.execute('delete from roles where id = ?', [idrole]) g.db.commit() - return redirect(url_for('show_roles')) + return redirect(url_for('admin_roles')) #------------ # Votes list @app.route('/votes/') -def show_votes(votes): +def votes(votes): today = date.today() active_button = votes basequery = 'select *, roles.name as rolename from votes join roles on roles.id=votes.id_role where is_open=1' @@ -223,7 +223,7 @@ def show_votes(votes): votes = query_db(basequery + ' and date_end >= (?) order by id desc', [today]) else: abort(404) - return render_template('show_votes.html', votes=votes, active_button=active_button) + return render_template('votes.html', votes=votes, active_button=active_button) #------ # Vote @@ -241,7 +241,7 @@ def can_vote(idvote, iduser=-1): return True # :TODO:maethor:20120529: Check others things @app.route('/vote/') -def show_vote(idvote): +def vote(idvote): vote = query_db('select *, roles.name as rolename from votes join roles on roles.id=votes.id_role where votes.id=?', [idvote], one=True) if vote is None: abort(404) @@ -255,15 +255,15 @@ def show_vote(idvote): #------------- # Votes admin -@app.route('/votes/admin/list') +@app.route('/admin/votes/list') def admin_votes(): if not session.get('user').get('is_admin'): abort(401) votes = query_db('select *, roles.name as rolename from votes join roles on roles.id=votes.id_role order by id desc') return render_template('admin_votes.html', votes=votes) -@app.route('/votes/admin/add', methods=['GET', 'POST']) -def add_vote(): +@app.route('/admin/votes/add', methods=['GET', 'POST']) +def admin_vote_add(): if not session.get('user').get('is_admin'): abort(401) if request.method == 'POST': @@ -292,14 +292,14 @@ def add_vote(): return redirect(url_for('home')) else: flash(u"Le vote a été créé", 'info') - return redirect(url_for('edit_vote', voteid=vote['id'])) + return redirect(url_for('admin_vote_edit', voteid=vote['id'])) else: flash(u'Vous devez spécifier un titre.', 'error') groups = query_db('select * from roles') - return render_template('new_vote.html', groups=groups) + return render_template('admin_vote_new.html', groups=groups) -@app.route('/votes/admin/edit/', methods=['GET', 'POST']) -def edit_vote(voteid): +@app.route('/admin/votes/edit/', methods=['GET', 'POST']) +def admin_vote_edit(voteid): if not session.get('user').get('is_admin'): abort(401) vote = query_db('select * from votes where id = ?', [voteid], one=True) @@ -329,10 +329,10 @@ def edit_vote(voteid): vote['duration'] = 15 group = query_db('select name from roles where id = ?', [vote['id_role']], one=True) choices = query_db('select * from choices where id_vote = ?', [voteid]) - return render_template('edit_vote.html', vote=vote, group=group, choices=choices) + return render_template('admin_vote_edit.html', vote=vote, group=group, choices=choices) -@app.route('/votes/admin/addchoice/', methods=['POST']) -def add_choice(voteid): +@app.route('/admin/votes/addchoice/', methods=['POST']) +def admin_vote_addchoice(voteid): if not session.get('user').get('is_admin'): abort(401) vote = query_db('select * from votes where id = ?', [voteid], one=True) @@ -340,10 +340,10 @@ def add_choice(voteid): abort(404) g.db.execute('insert into choices (name, id_vote) values (?, ?)', [request.form['title'], voteid]) g.db.commit() - return redirect(url_for('edit_vote', voteid=voteid)) + return redirect(url_for('admin_vote_edit', voteid=voteid)) -@app.route('/votes/admin/editchoice//', methods=['POST', 'DELETE']) -def edit_choice(voteid, choiceid): +@app.route('/admin/votes/editchoice//', methods=['POST', 'DELETE']) +def admin_vote_editchoice(voteid, choiceid): if not session.get('user').get('is_admin'): abort(401) choice = query_db('select * from choices where id = ? and id_vote = ?', [choiceid, voteid], one=True) @@ -355,10 +355,10 @@ def edit_choice(voteid, choiceid): elif request.method == 'DELETE': # :COMMENT:maethor:20120528: I can't find how to use it from template g.db.execute('delete from choices where id = ? and id_vote = ?', [choiceid, voteid]) g.db.commt() - return redirect(url_for('edit_vote', voteid=voteid)) + return redirect(url_for('admin_vote_edit', voteid=voteid)) -@app.route('/votes/admin/deletechoice//') -def delete_choice(voteid, choiceid): +@app.route('/admin/votes/deletechoice//') +def admin_vote_deletechoice(voteid, choiceid): if not session.get('user').get('is_admin'): abort(401) choice = query_db('select * from choices where id = ? and id_vote = ?', [choiceid, voteid], one=True) @@ -366,7 +366,7 @@ def delete_choice(voteid, choiceid): abort(404) g.db.execute('delete from choices where id = ? and id_vote = ?', [choiceid, voteid]) g.db.commit() - return redirect(url_for('edit_vote', voteid=voteid)) + return redirect(url_for('admin_vote_edit', voteid=voteid)) #------ # Main diff --git a/templates/add_user.html b/templates/add_user.html deleted file mode 100644 index f80a1b8..0000000 --- a/templates/add_user.html +++ /dev/null @@ -1,53 +0,0 @@ -{% extends "layout.html" %} -{% block body %} - -
-
-
-
Ajouter un utilisateur -
- -
- - * -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
-
-
- -{% endblock %} diff --git a/templates/admin_roles.html b/templates/admin_roles.html new file mode 100644 index 0000000..7772337 --- /dev/null +++ b/templates/admin_roles.html @@ -0,0 +1,48 @@ +{% extends "layout.html" %} +{% block subtitle %}Administrer les votes{% endblock %} +{% block body %} +
+
+

Groupes

+
+ {% if not roles %} +
Il n'y a aucun role.
+ {% else %} + + + + + + + + + + + {% for role in roles %} + + + + + + + {% endfor %} + +
NomMembresVotesActions
{{ role.name }}TODOTODO{% if role.system %}system{% else %}Supprimer{% endif %}
+

+ Les groupes « system » ne sont pas modifiables. +

+ {% endif %} +
+ +
+
+
Ajouter un groupe +
+ + +
+
+
+
+{% endblock %} + diff --git a/templates/admin_user_new.html b/templates/admin_user_new.html new file mode 100644 index 0000000..e3678d0 --- /dev/null +++ b/templates/admin_user_new.html @@ -0,0 +1,53 @@ +{% extends "layout.html" %} +{% block body %} + +
+
+
+
Ajouter un utilisateur +
+ +
+ + * +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+ +{% endblock %} diff --git a/templates/admin_vote_edit.html b/templates/admin_vote_edit.html new file mode 100644 index 0000000..841e15b --- /dev/null +++ b/templates/admin_vote_edit.html @@ -0,0 +1,143 @@ +{% extends "layout.html" %} +{% block body %} + +
+
+
+
Édition du vote +
+ +
+ + * +
+
+
+ +
+ +
+
+
+
+
+ + Informations +
+
+
+
+ +
+ +
+
+
+ +
+ +

Groupe d'utilisateur concernés par le vote et ayant le droit de voter

+
+
+
+ +
+ + Du {{ vote.date_begin }} au {{ vote.date_end }} +
+
+
+
+
+
+
+ + Options +
+
+
+
+ +
+ + + +
+
+
+
+
+
+
+ +
+ +
+
+
+ + +
+
+
+
+ +
+
Choix + + + + + + + {% for choice in choices %} + + + + + + + {% endfor %} + + + + + + + +
Titre + Actions +
+ Supprimer
+ +
+
+
+
+ +{% endblock %} diff --git a/templates/admin_vote_new.html b/templates/admin_vote_new.html new file mode 100644 index 0000000..a9019bb --- /dev/null +++ b/templates/admin_vote_new.html @@ -0,0 +1,77 @@ +{% extends "layout.html" %} +{% block body %} + +
+
+
+
Ajouter un vote +
+ +
+ + * +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +

Groupe d'utilisateur concernés par le vote et ayant le droit de voter

+
+
+
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+
+
+
+
+ +{% endblock %} diff --git a/templates/admin_votes.html b/templates/admin_votes.html index e32ff33..9ce015a 100644 --- a/templates/admin_votes.html +++ b/templates/admin_votes.html @@ -31,7 +31,7 @@ {% if vote.is_public %}public{% endif %} {% if vote.is_multiplechoice %}choix multiple{% endif %} - Éditer + Éditer {% endfor %} diff --git a/templates/edit_vote.html b/templates/edit_vote.html deleted file mode 100644 index c5dde3d..0000000 --- a/templates/edit_vote.html +++ /dev/null @@ -1,143 +0,0 @@ -{% extends "layout.html" %} -{% block body %} - -
-
-
-
Édition du vote -
- -
- - * -
-
-
- -
- -
-
-
-
-
- + Informations -
-
-
-
- -
- -
-
-
- -
- -

Groupe d'utilisateur concernés par le vote et ayant le droit de voter

-
-
-
- -
- - Du {{ vote.date_begin }} au {{ vote.date_end }} -
-
-
-
-
-
-
- + Options -
-
-
-
- -
- - - -
-
-
-
-
-
-
- -
- -
-
-
- - -
-
-
-
- -
-
Choix - - - - - - - {% for choice in choices %} - - - - - - - {% endfor %} - - - - - - - -
Titre - Actions -
- Supprimer
- -
-
-
-
- -{% endblock %} diff --git a/templates/layout.html b/templates/layout.html index de19320..1c6f7bd 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -20,28 +20,28 @@
Accueil - Votes en cours - Archives + Votes en cours + Archives {% if session.user and session.user.is_admin %} Admin {% endif %}
{% if 'user' in session %} - {{ session.user.name }} + {{ session.user.name }} diff --git a/templates/new_vote.html b/templates/new_vote.html deleted file mode 100644 index dd24bce..0000000 --- a/templates/new_vote.html +++ /dev/null @@ -1,77 +0,0 @@ -{% extends "layout.html" %} -{% block body %} - -
-
-
-
Ajouter un vote -
- -
- - * -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -

Groupe d'utilisateur concernés par le vote et ayant le droit de voter

-
-
-
- -
- -
-
-
- -
- - - -
-
-
- -
-
-
-
-
- -{% endblock %} diff --git a/templates/show_roles.html b/templates/show_roles.html deleted file mode 100644 index 3a7af9f..0000000 --- a/templates/show_roles.html +++ /dev/null @@ -1,48 +0,0 @@ -{% extends "layout.html" %} -{% block subtitle %}Administrer les votes{% endblock %} -{% block body %} -
-
-

Groupes

-
- {% if not roles %} -
Il n'y a aucun role.
- {% else %} - - - - - - - - - - - {% for role in roles %} - - - - - - - {% endfor %} - -
NomMembresVotesActions
{{ role.name }}TODOTODO{% if role.system %}system{% else %}Supprimer{% endif %}
-

- Les groupes « system » ne sont pas modifiables. -

- {% endif %} -
- -
-
-
Ajouter un groupe -
- - -
-
-
-
-{% endblock %} - diff --git a/templates/show_user.html b/templates/show_user.html deleted file mode 100644 index 3ce7513..0000000 --- a/templates/show_user.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "layout.html" %} -{% block body %} -

{{ session.user.name }}

-
-
-
Email : -
{{ session.user.email }} -
Association : -
{{ session.user.organization }} -
Groupes : -
à venir -
- Modifier -
-{% endblock %} - diff --git a/templates/show_votes.html b/templates/show_votes.html deleted file mode 100644 index 90fd1f8..0000000 --- a/templates/show_votes.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "layout.html" %} -{% block subtitle %} -Liste des votes -{% endblock %} -{% block body %} - {% for vote in votes %} -
-
-
-

{{ vote.title }}

-
-
-
-
-
-

Deadline : {{ vote.date_end }}

-

Groupe : {{ vote.rolename }}

-

Categorie : {{ vote.category }}

-
-
-

Notes

-

- {{ vote.description|safe }} -

-
-
- {% else %} -
Il n'y a pas encore de votes. Désolé.
- {% endfor %} -{% endblock %} diff --git a/templates/user.html b/templates/user.html new file mode 100644 index 0000000..e639252 --- /dev/null +++ b/templates/user.html @@ -0,0 +1,16 @@ +{% extends "layout.html" %} +{% block body %} +

{{ session.user.name }}

+
+
+
Email : +
{{ session.user.email }} +
Association : +
{{ session.user.organization }} +
Groupes : +
à venir +
+ Modifier +
+{% endblock %} + diff --git a/templates/user_edit.html b/templates/user_edit.html new file mode 100644 index 0000000..ce02061 --- /dev/null +++ b/templates/user_edit.html @@ -0,0 +1,61 @@ +{% extends "layout.html" %} +{% block body %} +

{{ session.username }}

+
+
+
+
Mise à jour du profil utilisateur +
Attention : À l'issue de ce formulaire, vous devrez vous reconnecter
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ + +
+
+
+
+ +
+
+
Modification du mot de passe +
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+
+
+
+{% endblock %} + diff --git a/templates/user_settings.html b/templates/user_settings.html deleted file mode 100644 index a4d497a..0000000 --- a/templates/user_settings.html +++ /dev/null @@ -1,61 +0,0 @@ -{% extends "layout.html" %} -{% block body %} -

{{ session.username }}

-
-
-
-
Mise à jour du profil utilisateur -
Attention : À l'issue de ce formulaire, vous devrez vous reconnecter
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
- - -
-
-
-
- -
-
-
Modification du mot de passe -
- -
- -
-
-
- -
- -
-
-
- - -
-
-
-
-
-{% endblock %} - diff --git a/templates/votes.html b/templates/votes.html new file mode 100644 index 0000000..d770c2b --- /dev/null +++ b/templates/votes.html @@ -0,0 +1,30 @@ +{% extends "layout.html" %} +{% block subtitle %} +Liste des votes +{% endblock %} +{% block body %} + {% for vote in votes %} +
+
+
+

{{ vote.title }}

+
+
+
+
+
+

Deadline : {{ vote.date_end }}

+

Groupe : {{ vote.rolename }}

+

Categorie : {{ vote.category }}

+
+
+

Notes

+

+ {{ vote.description|safe }} +

+
+
+ {% else %} +
Il n'y a pas encore de votes. Désolé.
+ {% endfor %} +{% endblock %}