diff --git a/deme_django/modules/poll/templates/poll/approvenpoll.html b/deme_django/modules/poll/templates/poll/approvenpoll.html index 2fe2abc6..d3377460 100644 --- a/deme_django/modules/poll/templates/poll/approvenpoll.html +++ b/deme_django/modules/poll/templates/poll/approvenpoll.html @@ -14,7 +14,7 @@ #label { font-size: 12px; - color: blue; + font-weight: bold; margin: 0; } @@ -22,13 +22,8 @@ margin-right: 6em; } -div.Beginning p{ - font-size: 10px; -} - div.Deadline p{ font-size: 20px; - color: red; } div.Instructions p{ @@ -147,15 +142,20 @@
Question
Deadline: {{ item.deadline }}
- {% endifagentcan %} +{% ifagentcan 'view Poll.deadline_date' item %} {{ item.deadline_date }} {% endifagentcan %} + {% ifagentcan 'view Poll.deadline_time' item %} at {{ item.deadline_time }} {% endifagentcan %} +
+Deadline
+{% ifagentcan 'view Poll.time_zone' item %} {{ item.time_zone }} {% endifagentcan %}
+Timezone
Poll started: {{ item.begins }}
+{{ item.begins }}
{% endifagentcan %} +Poll Started
You're response:
+ {% for key,value in responses.items %} + + {% ifequal cur_agent.pk key.pk %} +Poll: {{ item.poll }}
-Participant: {{ item.participant }}
-Proposition: {{ item.proposition }}
- - - - -{% endblock content %} \ No newline at end of file diff --git a/deme_django/modules/poll/templates/poll/propositionresponseapprove.html b/deme_django/modules/poll/templates/poll/propositionresponseapprove.html deleted file mode 100644 index 1641b34e..00000000 --- a/deme_django/modules/poll/templates/poll/propositionresponseapprove.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends layout %} -{% load item_tags %} -{% block content %} - -Poll: {{ item.poll }}
-Participant: {{ item.participant }}
-Proposition: {{ item.proposition }}
-Value: {{item.value}}
- - - - -{% endblock content %} \ No newline at end of file diff --git a/deme_django/modules/poll/templates/poll/propositionresponsechoose.html b/deme_django/modules/poll/templates/poll/propositionresponsechoose.html deleted file mode 100644 index 1641b34e..00000000 --- a/deme_django/modules/poll/templates/poll/propositionresponsechoose.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends layout %} -{% load item_tags %} -{% block content %} - -Poll: {{ item.poll }}
-Participant: {{ item.participant }}
-Proposition: {{ item.proposition }}
-Value: {{item.value}}
- - - - -{% endblock content %} \ No newline at end of file