From 194591ef1c78ac694266a83231848019023a3fcf Mon Sep 17 00:00:00 2001
From: Ana <ana.charpentier@free.fr>
Date: Mon, 18 Apr 2016 16:30:06 +0200
Subject: modifs dans les templates : -suppression de load markup -il manquait
 un csrf dans vote.html -correction de l'anglais dans main.html

---
 papillon/polls/templates/polls/create.html           | 1 -
 papillon/polls/templates/polls/edit.html             | 1 -
 papillon/polls/templates/polls/editChoices.html      | 3 +--
 papillon/polls/templates/polls/editChoicesAdmin.html | 4 ++--
 papillon/polls/templates/polls/editChoicesUser.html  | 2 +-
 papillon/polls/templates/polls/main.html             | 2 +-
 papillon/polls/templates/polls/vote.html             | 1 +
 papillon/templates/base.html                         | 3 ++-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/papillon/polls/templates/polls/create.html b/papillon/polls/templates/polls/create.html
index 163ad17..bf4a674 100644
--- a/papillon/polls/templates/polls/create.html
+++ b/papillon/polls/templates/polls/create.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load markup %}
 
 {% block fullscript %}
    {{ form.media }}
diff --git a/papillon/polls/templates/polls/edit.html b/papillon/polls/templates/polls/edit.html
index 2dcdc73..998c41b 100644
--- a/papillon/polls/templates/polls/edit.html
+++ b/papillon/polls/templates/polls/edit.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load markup %}
 {% load i18n %}
 
 {% block fullscript %}
diff --git a/papillon/polls/templates/polls/editChoices.html b/papillon/polls/templates/polls/editChoices.html
index 9146e27..0b40897 100644
--- a/papillon/polls/templates/polls/editChoices.html
+++ b/papillon/polls/templates/polls/editChoices.html
@@ -1,5 +1,4 @@
-{% load markup %}
-{% load i18n %}
+{% load i18n %} 
 
 {%if form_new_choice.errors %} <p class='error'>{{form_new_choice.errors}}</p>{%endif%}
 <form class='new_poll' action="." method="post">
diff --git a/papillon/polls/templates/polls/editChoicesAdmin.html b/papillon/polls/templates/polls/editChoicesAdmin.html
index 7981498..dc0c4bd 100644
--- a/papillon/polls/templates/polls/editChoicesAdmin.html
+++ b/papillon/polls/templates/polls/editChoicesAdmin.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load markup %}
 {% load i18n %}
 
 {% block fullscript %}
@@ -16,7 +15,8 @@
     </p>
 {% else %}
     <h2>{% trans "Choice administration" %}</h2>
-    <p>{% trans "After you've finished to add or edit choices for this poll, click on:" %} <a href="{% url 'edit' poll.admin_url %}"><button>{% trans "Next"%}</button></a></p>
+    <p>{% trans "After you've finished to add or edit choices for this poll, click on:" %} 
+	<a href="{% url 'edit' poll.admin_url %}"><button>{% trans "Next"%}</button></a></p>
 {% endif %}
 
 {% include 'editChoices.html' %}
diff --git a/papillon/polls/templates/polls/editChoicesUser.html b/papillon/polls/templates/polls/editChoicesUser.html
index 958d05a..88cd4fd 100644
--- a/papillon/polls/templates/polls/editChoicesUser.html
+++ b/papillon/polls/templates/polls/editChoicesUser.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load markup %}
+
 {% load i18n %}
 
 {% block fullscript %}
diff --git a/papillon/polls/templates/polls/main.html b/papillon/polls/templates/polls/main.html
index 9a3adfb..e137a6d 100644
--- a/papillon/polls/templates/polls/main.html
+++ b/papillon/polls/templates/polls/main.html
@@ -4,7 +4,7 @@
 {% block content %}
 {% if error %}<p class='error'>{{error}}</p>{%endif%}
 <h2><a href="{% url 'create' %}">{%trans "Create a poll"%}</a></h2>
-<p>{% trans "Create a new sondage for take a decision, find a date for a meeting, etc." %} <a href='create'>{% trans "It's here!" %}</a></p>
+<p>{% trans "Create a new poll for having a decision, find a date for a meeting, etc." %} <a href='create'>{% trans "It's here!" %}</a></p>
 
 {% if public %}
 {% if polls %}<h2>{%trans "Public polls"%}</h2>{%endif%}
diff --git a/papillon/polls/templates/polls/vote.html b/papillon/polls/templates/polls/vote.html
index 4ab70fe..7321e2b 100644
--- a/papillon/polls/templates/polls/vote.html
+++ b/papillon/polls/templates/polls/vote.html
@@ -198,6 +198,7 @@
         </ul>
         {%if poll.open and max_comment_nb > poll.comments.count %}
             <form class="new_poll" method='post' action='.'>
+				{% csrf_token %}
                 <div class="field_label">{% trans "Add a comment"%}</div>
                 <div class="field_label">
                     <label for='comment_author'>{% trans "Author name" %}</label>
diff --git a/papillon/templates/base.html b/papillon/templates/base.html
index af4a815..bcb692f 100644
--- a/papillon/templates/base.html
+++ b/papillon/templates/base.html
@@ -1,4 +1,5 @@
-{% load staticfiles %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+{% load staticfiles %}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-- 
cgit v1.2.3