diff options
| -rw-r--r-- | famille.py | 11 | ||||
| -rw-r--r-- | schema.sql | 2 | ||||
| -rw-r--r-- | templates/layout.html | 4 | ||||
| -rw-r--r-- | templates/news/add.html | 33 | ||||
| -rw-r--r-- | templates/news/list.html | 16 | ||||
| -rw-r--r-- | templates/news/show.html | 2 |
6 files changed, 49 insertions, 19 deletions
@@ -34,7 +34,7 @@ def query_db(query, args=(), one=False): @app.before_request def before_request(): conn = sqlite3.connect(app.config['DATABASE']) - conn.row_factory = sqlite3.Row + conn.row_factory = sqlite3.Row g.db = conn @app.teardown_appcontext @@ -111,6 +111,11 @@ def edit_news(news_id): g.db.commit() return redirect(url_for('show_news', news_id=news_id)) +@app.route('/user/<int:user_id>/') +@login_required +def view_user(user_id): + pass + @app.route('/login/', methods=['GET', 'POST']) def login(): if 'user_name' in session: @@ -120,10 +125,10 @@ def login(): if request.method == 'POST': username = request.form['username'] password = hashlib.md5(request.form['password']).hexdigest(); - user = query_db('select * from users where name = ?', (username,), True) + user = query_db('select * from users where user_name = ?', (username,), True) if user: if user['password'] == password: - session['user_name'] = user['name'] + session['user_name'] = user['user_name'] session['user_id'] = user['id'] return redirect(url_for('list_news')) else: @@ -1,7 +1,7 @@ drop table if exists users; create table users ( id integer primary key autoincrement, - name string not null, + user_name string not null, password string not null ); diff --git a/templates/layout.html b/templates/layout.html index 39e00a8..dc9be11 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -11,8 +11,8 @@ <div class="container"> <div class="sheet"> <div class="top"> - {{session['user_name']}} - (<a href="/user/edit">Mon compte</a> | <a href="/logout">Se déconnecter</a>)</p> + <p><strong>{{session['user_name']}}</strong> + (<a href="/user/edit">Mon compte</a> | <a href="/logout">Se déconnecter</a>)</p> </div> <div class="main_menu"> <table> diff --git a/templates/news/add.html b/templates/news/add.html index 53fb682..91ee8ba 100644 --- a/templates/news/add.html +++ b/templates/news/add.html @@ -1,13 +1,32 @@ {% extends 'layout.html' %} {% block content %} +<h2>{% if news %}Modifier{% else %}Ajouter{% endif %} une actualité</h2> +<p class="info"> + Vous pouvez consulter la <a href="/home/help">page d'aide</a> pour obtenir de l'aide sur la syntaxe et les commandes de mise en forme disponibles. +</p> {% if news %} -<form action="{{ url_for('edit_news', news_id=news.id)}}" method="post"> -{% else %} -<form action="{{ url_for('add_news')}}" method="post"> -{% endif %} - <input type=text size=80 name=title value="{% if news %}{{news.title}}{% endif %}"/><br/> - <textarea name=content rows=20 cols=80>{% if news %}{{news.content}}{% endif %}</textarea> -<input type="submit" value="Submit" /> +<form class="news_add" action="{{ url_for('edit_news', news_id=news.id)}}" method="post"> + <p> + <label for="title">Titre :</label> + <input id="title" type="text" name="title" size="64" value="{{news.title}}"> + </p> + <label for="content">Contenu :</label> + <textarea rows="25" name="content">{{news.content}}</textarea> + <p class="submit"> + <input type="submit" value="Modifier"> + </p> + {% else %} +<form class="news_add" action="{{ url_for('add_news')}}" method="post"> + <p> + <label for="title">Titre :</label> + <input id="title" type="text" name="title" size="64"> + </p> + <label for="content">Contenu :</label> + <textarea rows="25" name="content"></textarea> + <p class="submit"> + <input type="submit" value="Ajouter"> + </p> + {% endif %} </form> {% endblock %} diff --git a/templates/news/list.html b/templates/news/list.html index a5a367a..c7ea740 100644 --- a/templates/news/list.html +++ b/templates/news/list.html @@ -1,15 +1,21 @@ {% extends 'layout.html' %} {% block content %} +<div class="second_menu"> + <a href="/news/add/">Ajouter une actualité</a> +</div> <div class="news"> {% for news in news %} <div class="news_head"> - <h2><a href="{{ url_for('show_news', news_id = news.id)}}"> - {{ news.title }}</a> - </h2> - <p>Posté par <a href="">{{ news.name }}</a> le {{news.date|format_date}}</p> + <h2><a href="{{url_for('show_news', news_id = news.id)}}">{{ news.title }}</a> + </h2> + {% if news.user_name==session.user_name %} + <div style="float:right"> + <a href="{{ url_for('edit_news', news_id = news.id)}}">Modifier cette actualité</a> + </div> + {% endif %} + <p>Posté par <a href="{{ url_for('view_user', user_id = news.user_id)}}">{{ news.user_name }}</a> le {{news.date|format_date}}</p> </div> - <div class="news_content"> {{ news.content_cache|safe }} </div> diff --git a/templates/news/show.html b/templates/news/show.html index 7e03b5d..782b0a4 100644 --- a/templates/news/show.html +++ b/templates/news/show.html @@ -20,7 +20,7 @@ <h2 id="comments">Commentaires</h2> {% for comment in comments %} <h3 class="comment"> - Posté par <a href="">{{comment.name}}</a> le {{comment.date|format_date}} + Posté par <a href="{{url_for('view_user', comment.user_name)}}">{{comment.user_name}}</a> le {{comment.date|format_date}} </h3> <div class="comment_content"/> {{comment.content_cache|safe}} |