refactor the templates

4 files changed, 40 insertions, 90 deletions

diff --git a/famille.py b/famille.py
index 28c4232..cdf3ac9 100644
--- a/famille.py
+++ b/famille.py
@@ -152,9 +152,9 @@ def add_news():
         else:
             news = {'content': content,'content_cache': content_cache,
                     'title': request.form['title']}
-            return render_template("news/preview.html", news=news)
+            return render_template("news/news.html", news=news)
     elif request.method == 'GET':
-        return render_template("news/add.html")
+        return render_template("news/news.html")
 
 @app.route('/news/<int:news_id>/', methods=['GET', 'POST'])
 @login_required
@@ -187,7 +187,7 @@ def edit_news(news_id):
         news = query_db("SELECT * from news WHERE news.id = ?",
                         (news_id,), True)
         if news["user_id"] == session['user_id']:
-            return render_template('news/add.html', news=news)
+            return render_template('news/news.html', news=news)
     elif request.method == 'POST':
         title = request.form['title']
         content = request.form['content']
diff --git a/templates/news/add.html b/templates/news/add.html
deleted file mode 100644
index d280200..0000000
--- a/templates/news/add.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends 'layout.html' %}
-
-{% block content %}
-<div class="main row">
-  <div class="col-md-10">
-    <h2>{% if news %}Modifier{% else %}Ajouter{% endif %} une actualité</h2>
-    {% if news %}
-    <form class="news_add form-horizontal" role="form" action="{{ url_for('edit_news', news_id=news.id)}}" method="post">
-      <div class="form-group">
-        <label for="title" class="col-md-2">Titre :</label>
-        <div class="col-md-8">
-          <input id="title" type="text" name="title" class="form-control" value="{{news.title}}"/>
-        </div>
-      </div>
-      <div class="form-group">
-        <label for="content" class="col-md-2">Contenu :</label>
-        <div class="col-md-8">
-          <textarea rows="15" name="content" class="form-control">{{news.content}}</textarea>
-        </div>
-      </div>
-      <div class="col-md-offset-2">
-        <button type="submit" class="btn btn-primary"
-                name="Modifier">Modifier</button>
-      </div>
-    </form>
-    {% else %}
-    <p class="info">
-      Vous pouvez consulter la <a href="http://aful.org/wikis/interop/ReStructuredText">page d'aide</a> pour obtenir de l'aide sur la syntaxe et les commandes de mise en forme disponibles.
-    </p>
-    <form class="news_add form-horizontal" role="form" action="{{ url_for('add_news')}}" method="post">
-      <div class="form-group">
-        <label for="title" class="col-md-2">Titre :</label>
-        <div class="col-md-8">
-          <input id="title" type="text" name="title" class="form-control">
-        </div>
-      </div>
-      <div class="form-group">
-          <label for="content" class="col-md-2">Contenu :</label>
-          <div class="col-md-8">
-            <textarea rows="15" name="content" class="form-control"></textarea>
-          </div>
-      </div>
-      <div class="col-md-offset-2">
-        <button type="submit" class="btn btn-primary"
-                name="Add">Ajouter</button>
-        <button type="submit" class="btn btn-primary"
-                name="Preview">Aperçu</button>
-      </div>
-  </form>
-  {% endif %}
-{% endblock %}
diff --git a/templates/news/news.html b/templates/news/news.html
new file mode 100644
index 0000000..bf59233
--- /dev/null
+++ b/templates/news/news.html
@@ -0,0 +1,37 @@
+{% extends 'layout.html' %}
+
+{% block content %}
+<div class="row">
+  <div class="col-md-8">
+    <h2>{% if news %}Aperçu de l'actualité
+      {% else %}Ajouer  une actualité{% endif %}
+    </h2>
+    <p class="info">
+      Vous pouvez consulter la <a href="http://aful.org/wikis/interop/ReStructuredText">page d'aide</a> pour obtenir de l'aide sur la syntaxe et les commandes de mise en forme disponibles.
+    </p>
+    {% if news %}
+    <h2>{{news.title}}</h2>
+    <p >{{news.content_cache|safe}}</p>
+    <hr/>
+    {% endif %}
+    <form class="news_add form-horizontal" role="form" action="{{ url_for('edit_news', news_id=news.id) if news.id else url_for('add_news')}}" method="post">
+   <div class="form-group">
+    <label for="title" class="col-md-3">Titre :</label>
+    <div class="col-md-9">
+      <input id="title" type="text" name="title" class="form-control" value="{{news.title if news}}"/>
+    </div>
+   </div>
+   <div class="form-group">
+     <label for="content" class="col-md-3">Contenu :</label>
+     <div class="col-md-9">
+       <textarea rows="15" name="content" class="form-control">{{news.content if news}}</textarea>
+     </div>
+   </div>
+   <div class="col-md-offset-3">
+     <button type="submit" class="btn btn-primary"
+             name="Add">Ajouter</button>
+     <button type="submit" class="btn btn-primary"
+             name="Modifier">Aperçu</button>
+   </div>
+ </form>
+{% endblock %}
diff --git a/templates/news/preview.html b/templates/news/preview.html
deleted file mode 100644
index 0580910..0000000
--- a/templates/news/preview.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends 'layout.html' %}
-
-{% block content %}
-<div class="main row">
-  <div class="col-md-10">
-    <p class="info">
-      Vous pouvez consulter la <a href="http://aful.org/wikis/interop/ReStructuredText">page d'aide</a> pour obtenir de l'aide sur la syntaxe et les commandes de mise en forme disponibles.
-    </p>
-    <h2>Aperçu de l'actualité</h2>
-    <h1>{{news.title}}</h1>
-    <div class="news_content">
-      {{news.content_cache|safe}}
-    </div>
-    <hr/>
-    <h2>Ajouter une actualité</h2>
-    <form class="news_add form-horizontal" action="{{ url_for('add_news')}}" method="post">
-      <div class="form-group">
-        <label for="title" class="col-md-2">Titre :</label>
-        <div class="col-md-8">
-          <input id="title" type="text" name="title" class="form-control" value="{{news.title}}"/>
-        </div>
-      </div>
-      <div class="form-group">
-        <label for="content" class="col-md-2">Contenu :</label>
-        <div class="col-md-8">
-          <textarea rows="15" name="content" class="form-control">{{news.content}}</textarea>
-        </div>
-      </div>
-      <div class="col-md-offset-2">
-        <button type="submit" class="btn btn-primary"
-                name="Add">Ajouter</button>
-        <button type="submit" class="btn btn-primary"
-                name="Preview">Aperçu</button>
-      </div>
-    </form>
-{% endblock %}