diff options
| author | Ana <ana.charpentier@free.fr> | 2016-04-18 15:55:44 +0200 |
|---|---|---|
| committer | Ana <ana.charpentier@free.fr> | 2016-04-18 15:55:44 +0200 |
| commit | 082ded5ae1c4b999c29e1f68d484ec1effbaa057 (patch) | |
| tree | 180f9a0495c39222c89abe2777cf125211cbb8aa | |
| parent | fe5b2c727c748f3f95010346dbcc7ba68e0cdb56 (diff) | |
| download | Papillon-082ded5ae1c4b999c29e1f68d484ec1effbaa057.tar.bz2 Papillon-082ded5ae1c4b999c29e1f68d484ec1effbaa057.zip | |
deplacement des templates dans polls/templates/polls/
| -rw-r--r-- | papillon/polls/templates/polls/500.html (renamed from papillon/templates/500.html) | 0 | ||||
| -rw-r--r-- | papillon/polls/templates/polls/category.html (renamed from papillon/templates/category.html) | 0 | ||||
| -rw-r--r-- | papillon/polls/templates/polls/create.html (renamed from papillon/templates/create.html) | 0 | ||||
| -rw-r--r-- | papillon/polls/templates/polls/edit.html (renamed from papillon/templates/edit.html) | 0 | ||||
| -rw-r--r-- | papillon/polls/templates/polls/editChoices.html (renamed from papillon/templates/editChoices.html) | 0 | ||||
| -rw-r--r-- | papillon/polls/templates/polls/editChoicesAdmin.html (renamed from papillon/templates/editChoicesAdmin.html) | 0 | ||||
| -rw-r--r-- | papillon/polls/templates/polls/editChoicesUser.html (renamed from papillon/templates/editChoicesUser.html) | 0 | ||||
| -rw-r--r-- | papillon/polls/templates/polls/feeds/poll_description.html | 8 | ||||
| -rw-r--r-- | papillon/polls/templates/polls/main.html (renamed from papillon/templates/main.html) | 0 | ||||
| -rw-r--r-- | papillon/polls/templates/polls/vote.html (renamed from papillon/templates/vote.html) | 0 |
10 files changed, 8 insertions, 0 deletions
diff --git a/papillon/templates/500.html b/papillon/polls/templates/polls/500.html index 8196c56..8196c56 100644 --- a/papillon/templates/500.html +++ b/papillon/polls/templates/polls/500.html diff --git a/papillon/templates/category.html b/papillon/polls/templates/polls/category.html index 8df695c..8df695c 100644 --- a/papillon/templates/category.html +++ b/papillon/polls/templates/polls/category.html diff --git a/papillon/templates/create.html b/papillon/polls/templates/polls/create.html index 163ad17..163ad17 100644 --- a/papillon/templates/create.html +++ b/papillon/polls/templates/polls/create.html diff --git a/papillon/templates/edit.html b/papillon/polls/templates/polls/edit.html index 2dcdc73..2dcdc73 100644 --- a/papillon/templates/edit.html +++ b/papillon/polls/templates/polls/edit.html diff --git a/papillon/templates/editChoices.html b/papillon/polls/templates/polls/editChoices.html index 9146e27..9146e27 100644 --- a/papillon/templates/editChoices.html +++ b/papillon/polls/templates/polls/editChoices.html diff --git a/papillon/templates/editChoicesAdmin.html b/papillon/polls/templates/polls/editChoicesAdmin.html index 7981498..7981498 100644 --- a/papillon/templates/editChoicesAdmin.html +++ b/papillon/polls/templates/polls/editChoicesAdmin.html diff --git a/papillon/templates/editChoicesUser.html b/papillon/polls/templates/polls/editChoicesUser.html index 958d05a..958d05a 100644 --- a/papillon/templates/editChoicesUser.html +++ b/papillon/polls/templates/polls/editChoicesUser.html diff --git a/papillon/polls/templates/polls/feeds/poll_description.html b/papillon/polls/templates/polls/feeds/poll_description.html new file mode 100644 index 0000000..7522a5a --- /dev/null +++ b/papillon/polls/templates/polls/feeds/poll_description.html @@ -0,0 +1,8 @@ +{% load i18n %} +<p>{% blocktrans with obj.user.name as voter_name %}{{ voter_name }} has added/modified a vote.{%endblocktrans%}</p> +<p>{% trans "Current results:" %}</p> +<ul> +{% for choice in obj.poll.getChoices %} + <li><strong>{{choice.name}}</strong>{% blocktrans count choice.getSum as sum %}: {{sum}} vote{%plural%}: {{sum}} votes{%endblocktrans%}</li> +{% endfor %} +</ul>
\ No newline at end of file diff --git a/papillon/templates/main.html b/papillon/polls/templates/polls/main.html index 9a3adfb..9a3adfb 100644 --- a/papillon/templates/main.html +++ b/papillon/polls/templates/polls/main.html diff --git a/papillon/templates/vote.html b/papillon/polls/templates/polls/vote.html index 4ab70fe..4ab70fe 100644 --- a/papillon/templates/vote.html +++ b/papillon/polls/templates/polls/vote.html |