diff --git a/cao_sunyata.sqlite b/cao_sunyata.sqlite index c9c5e7f..0e391be 100644 Binary files a/cao_sunyata.sqlite and b/cao_sunyata.sqlite differ diff --git a/cao_sunyata/models/entries.py b/cao_sunyata/models/entries.py index d49bdfc..572a521 100644 --- a/cao_sunyata/models/entries.py +++ b/cao_sunyata/models/entries.py @@ -157,10 +157,9 @@ def update_topic(request, topic, new_values): s += ",%s=:%s" % (param, param) else: s = "%s=:%s" % (param, param) - if topic == '0': - query = "INSERT INTO topics (topic, topic_name, topic_quote) VALUES ('{0}', '{1}', '{2}')".format( - topic, new_values['topic_name'], new_values['topic_quote'].replace("'","''")) + query = "INSERT INTO topics (topic, topic_name, topic_language, topic_quote) VALUES ('{0}', '{1}', '{2}', '{3}')".format( + topic, new_values['topic_name'], new_values['topic_language'], new_values['topic_quote'].replace("'","''")) else: new_values['topic'] = topic query = "UPDATE topics SET %s WHERE topic = :topic;" % s diff --git a/cao_sunyata/templates/blog.jinja2 b/cao_sunyata/templates/blog.jinja2 index 95a25da..5fc54d1 100644 --- a/cao_sunyata/templates/blog.jinja2 +++ b/cao_sunyata/templates/blog.jinja2 @@ -16,24 +16,31 @@ {% endif %} +

+ {{ entry.author }} - Publié le {{ entry.create_date }}
+


{{ body_html | safe }}


+ + {% if entry.source_link != '' %} + + {% endif %} + {% if entry.related %} + + {% endif %} +

- Auteur : {{ entry.author }}
- Publié le : {{ entry.create_date }}
{% if request.authenticated_userid %} Topic - Tag : {{ entry.topic_id }} - {{ entry.tag }}
- Statut : {{ entry.status }} + Language : {{ entry.language }}
+ Statut : {{ entry.status }}
{% endif %}

- diff --git a/cao_sunyata/templates/blog_edit.jinja2 b/cao_sunyata/templates/blog_edit.jinja2 index 56f06ca..1a0035e 100644 --- a/cao_sunyata/templates/blog_edit.jinja2 +++ b/cao_sunyata/templates/blog_edit.jinja2 @@ -34,6 +34,21 @@ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+ + +
+