From 1872b814dbfd935182d3e0b8166fbb67053d85ee Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Thu, 8 Aug 2013 08:03:30 +0200 Subject: Use django to protect forms (except create form, because of other work not commited) --- papillon/templates/edit.html | 1 + papillon/templates/editChoices.html | 1 + papillon/templates/editChoicesAdmin.html | 1 + papillon/templates/vote.html | 1 + 4 files changed, 4 insertions(+) diff --git a/papillon/templates/edit.html b/papillon/templates/edit.html index 647700d..19d621d 100644 --- a/papillon/templates/edit.html +++ b/papillon/templates/edit.html @@ -12,6 +12,7 @@ {% block content %}

{% trans "Edit poll" %}

+ {% csrf_token %} diff --git a/papillon/templates/editChoices.html b/papillon/templates/editChoices.html index 7e059a8..293f567 100644 --- a/papillon/templates/editChoices.html +++ b/papillon/templates/editChoices.html @@ -4,6 +4,7 @@

{% trans "New choice" %}

{%if form_new_choice.errors %}

{{form_new_choice.errors}}

{%endif%} + {% csrf_token %} {{form_new_choice.poll}} {{form_new_choice.order}}
diff --git a/papillon/templates/editChoicesAdmin.html b/papillon/templates/editChoicesAdmin.html index d296a16..78d3be5 100644 --- a/papillon/templates/editChoicesAdmin.html +++ b/papillon/templates/editChoicesAdmin.html @@ -28,6 +28,7 @@ {% for choice in choices %} + {% csrf_token %} {{choice.form.poll}}{{choice.form.order}} {%if not poll.dated_choices%}{%endif%} diff --git a/papillon/templates/vote.html b/papillon/templates/vote.html index 204f553..8861e6c 100644 --- a/papillon/templates/vote.html +++ b/papillon/templates/vote.html @@ -15,6 +15,7 @@ {% if not poll.open %}

{% trans "The current poll is closed."%}

{% endif %}

{{ poll.description|safe }}

+ {% csrf_token %}
+ / -
-- cgit v1.2.3 From ea9c3f5b669bfbf0a7be6ac5e8004e54ee9de0e6 Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Thu, 8 Aug 2013 18:49:28 +0200 Subject: Make design responsive --- papillon/static/styles.css | 58 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/papillon/static/styles.css b/papillon/static/styles.css index c918596..e337060 100644 --- a/papillon/static/styles.css +++ b/papillon/static/styles.css @@ -17,6 +17,22 @@ along with this program. If not, see . See the file COPYING for details. */ +@media only screen and (max-width: 600px){ + #main{ + width:100% !important; + background:white !important; + border:0px !important; + } + + .new_poll{ + width:100% !important; + } + .new_poll *{ + padding:0 !important; + margin:0!important; + } +} + /* colors */ body, #poll th, .highlight{ @@ -123,10 +139,11 @@ border:0; #main{ background-color:white; border:1px solid; -margin:20px; +margin:auto; background-image: url(bg.jpg); background-repeat:no-repeat; background-position:95% 10%; +width: 80%; } #header{ @@ -158,10 +175,43 @@ color:blue; } .new_poll{ -width:600px; + width:200px; + margin:auto; + padding:0; +} + +.help_button{ + float:right; + color:white; + background:green; + width:15px; + height:15px; + border-radius:25px; + text-align:center; } -.new_poll input{ +.new_poll .field_label{ + clear:both; + font-size:1.5em; + width:100%; + float:none; + margin-top:10px; +} + +.new_poll div, .new_poll input, .new_poll textarea{ + width:100%; +} + +.new_poll div { + float:left; +} + +.errorlist{ + color:red; + background-color:rgb(255,200,200); +} + +/*.new_poll input{ width:160px; } @@ -176,7 +226,7 @@ width:20px; .new_poll textarea{ width:160px; height:100px; -} +}*/ .datetime a img{ border:0; -- cgit v1.2.3 From f07d083cfdbd3e41c87754699893ab59e65b84a6 Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Thu, 8 Aug 2013 18:50:24 +0200 Subject: Ident code of base.html --- papillon/templates/base.html | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/papillon/templates/base.html b/papillon/templates/base.html index 16c9f14..6487b16 100644 --- a/papillon/templates/base.html +++ b/papillon/templates/base.html @@ -2,26 +2,26 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - {% block title %}Papillon{% endblock %} - {% block fullscript %}{% endblock %} + + {% block title %}Papillon{% endblock %} + {% block fullscript %}{% endblock %} -
- - -
-{% block content %}{% endblock %} -
- -
+
+ +
+

Papillon

+
+
+ {% block content %}{% endblock %} +
+ +
-- cgit v1.2.3 From 1cf61b611eaff0e42588cd311c6baa3df02055ab Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Thu, 8 Aug 2013 23:27:42 +0200 Subject: Remove table, indent code and update to new design --- papillon/templates/create.html | 46 ++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/papillon/templates/create.html b/papillon/templates/create.html index 224ae78..163ad17 100644 --- a/papillon/templates/create.html +++ b/papillon/templates/create.html @@ -8,26 +8,32 @@ {% block content %} -

{% trans "New poll" %}

- -
- {% for field in form %} - {% if field.is_hidden %} - {{field}} - {% else %} - - - - - - - {% endif %} - {% endfor %} - - - - -
{{field.errors}}
{{field.label_tag}}{{field}}{{field.help_text|markdown}}
+

{% trans "New poll" %}

+ + + {% csrf_token %} + {% for field in form %} + {% if field.is_hidden %} + {{field}} + {% else %} +
+ {{field.label_tag}} + ? +
+
+ {% if field.errors %} + Error(s) : +
    + {% for error in field.errors %} +
  1. {{ error|escape }}
    2. + {% endfor %} +
+ {% endif %} +
+ {{field}} + {% endif %} + {% endfor %} +
{% endblock %} -- cgit v1.2.3 From 8db18c880dd06def2c20e4d2ab5b49177f67badc Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Thu, 8 Aug 2013 23:32:27 +0200 Subject: Indent code and apply new design --- papillon/templates/edit.html | 83 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/papillon/templates/edit.html b/papillon/templates/edit.html index 19d621d..5a33ebd 100644 --- a/papillon/templates/edit.html +++ b/papillon/templates/edit.html @@ -11,48 +11,49 @@ {% block content %}

{% trans "Edit poll" %}

-
+ {% csrf_token %} - - - - - - - - - - - - - - - - - {% for field in form %} - {% if field.is_hidden %} - {{field}} - {% else %} - - - - - {% if field.help_text %}{%endif%} - - {% endif %} - {% endfor %} + +
+ + ? +
+ + +
+ + ? +
+ + +
+ + ? +
+ + + {% for field in form %} + {% if field.is_hidden %} + {{field}} + {% else %} + +
+ {{field.label_tag}} + ? +
+
+ {% if field.errors %} + Error(s) : +
    + {% for error in field.errors %} +
  1. {{ error|escape }}
    2. + {% endfor %} +
+ {% endif %} +
+ {{field}} + {% endif %} + {% endfor %} -- cgit v1.2.3 From 8d44f2e647a148df237bba2c28092f7f085770d8 Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Thu, 8 Aug 2013 23:32:48 +0200 Subject: Adjust size of new_poll form for big screen (>600 px) --- papillon/static/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/papillon/static/styles.css b/papillon/static/styles.css index e337060..07260f8 100644 --- a/papillon/static/styles.css +++ b/papillon/static/styles.css @@ -175,7 +175,7 @@ color:blue; } .new_poll{ - width:200px; + width:400px; margin:auto; padding:0; } -- cgit v1.2.3 From 061ddcd33f2fce2af2b5e4e641e5c3da966c265e Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Fri, 9 Aug 2013 00:26:55 +0200 Subject: Update code to new design and indent it (editChoices). --- papillon/templates/editChoices.html | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/papillon/templates/editChoices.html b/papillon/templates/editChoices.html index 293f567..84b2d45 100644 --- a/papillon/templates/editChoices.html +++ b/papillon/templates/editChoices.html @@ -1,20 +1,19 @@ {% load markup %} {% load i18n %} -

{% trans "New choice" %}

{%if form_new_choice.errors %}

{{form_new_choice.errors}}

{%endif%} - + {% csrf_token %} -{{form_new_choice.poll}} -{{form_new_choice.order}} -
-{{ base_url }} -

-{% trans "Copy this address and send it to voters who want to participate to this poll" %} -

-{{ edit_url }} -

- {% trans "Address to modify the current poll" %} -

-{{choices_url }} -

- {% trans "Address to modify choices of the current poll." %} -

{{field.errors}}
{{field.label_tag}}{{field}}{{field.help_text|markdown}}
- - - - - - - - -

{% trans "Setting a new choice. Optionally you can set a limit of vote for this choice. This limit is usefull for limited resources allocation." %}

{{form_new_choice.name}}{%trans "Limited to"%} {{form_new_choice.limit}} {%trans "vote(s)"%}
+
+ {% trans "Add new choice" %} ? +
+ {{form_new_choice.poll}} + {{form_new_choice.order}} + + {%trans "Choice name:"%}
+ {{form_new_choice.name}} + {%trans "Max number of votes (optional):"%}
+ {{form_new_choice.limit}}
+ +
-- cgit v1.2.3 From bc605b5804dc081ae03ad2aae96141fb21621e09 Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Fri, 9 Aug 2013 00:27:14 +0200 Subject: Update design and indent code (editChoicesAdmin) --- papillon/templates/editChoicesAdmin.html | 68 +++++++++++++++++++------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/papillon/templates/editChoicesAdmin.html b/papillon/templates/editChoicesAdmin.html index 78d3be5..3ded310 100644 --- a/papillon/templates/editChoicesAdmin.html +++ b/papillon/templates/editChoicesAdmin.html @@ -10,36 +10,50 @@ {% endblock %} {% block content %} -{% if not choices %}

-{% blocktrans %}As long as no options were added to the poll, it will not be available.{% endblocktrans %} -

{% else %} -

{% trans "Complete/Finalise the poll" %}

-

+{% if not choices %} +

+ {% blocktrans %}As long as no options were added to the poll, it will not be available.{% endblocktrans %} +

+{% else %} +

{% trans "Choice administration" %}

+

{% trans "After you've finished to add or edit choices for this poll, click on:" %}

{% endif %} + {% include 'editChoices.html' %} + {% if choices %} -

{% trans "Available choices" %}

- - - {%if not poll.dated_choices%}{%endif%} - - - - - {% for choice in choices %} - - {% csrf_token %} - {{choice.form.poll}}{{choice.form.order}} - {%if not poll.dated_choices%}{%endif%} - - - - - - - {% endfor %} -
{% trans "Up/down" %}{% trans "Label" %}{% trans "Limit" %}{% trans "Delete?"%}
+ - / -{{choice.form.name}}{% trans "Limited to"%} {{choice.form.limit}} {% trans "vote(s)" %}
+
+
{% trans "Edit available choices" %}
+
+ + + {%if not poll.dated_choices%}{%endif%} + + + + + {% for choice in choices %} + + {% csrf_token %} + {{choice.form.poll}}{{choice.form.order}} + {%if not poll.dated_choices%} + + {%endif%} + + + + + + + {% endfor %} +
{% trans "Position" %}{% trans "Name" %}{% trans "Max votes" %}{% trans "Delete?"%} ?
+ ↑ +
+ ↓ + 		{{choice.form.name}}{{choice.form.limit}}
+
+
+
{% endif %} {% endblock %} -- cgit v1.2.3 From 036730a335e4a4804a2e1274a8b3eb76c7c2b8b6 Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Fri, 9 Aug 2013 00:30:36 +0200 Subject: Update design for choice administration --- papillon/static/styles.css | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/papillon/static/styles.css b/papillon/static/styles.css index 07260f8..93f82a8 100644 --- a/papillon/static/styles.css +++ b/papillon/static/styles.css @@ -190,44 +190,33 @@ color:blue; text-align:center; } -.new_poll .field_label{ +.field_label{ clear:both; font-size:1.5em; width:100%; - float:none; + float:none !important; margin-top:10px; } -.new_poll div, .new_poll input, .new_poll textarea{ +.new_poll table form tr { + margin:5px 0px !important; + padding:0px; +} + +.new_poll div, .new_poll input, .new_poll textarea, .new_poll table{ width:100%; + margin:5px 0px; } .new_poll div { float:left; } -.errorlist{ +.errorlist, .error{ color:red; background-color:rgb(255,200,200); } -/*.new_poll input{ -width:160px; -} - -.new_poll .submit{ -width:auto; -} - -.new_poll input.limit{ -width:20px; -} - -.new_poll textarea{ -width:160px; -height:100px; -}*/ - .datetime a img{ border:0; } -- cgit v1.2.3 From 893bd76849960af8e65842689bb901a5d0d5bbea Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Fri, 9 Aug 2013 00:37:31 +0200 Subject: Fix bug with newest django 1.5 url function (forgott before) --- papillon/templates/editChoicesUser.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/papillon/templates/editChoicesUser.html b/papillon/templates/editChoicesUser.html index cff888c..174c02f 100644 --- a/papillon/templates/editChoicesUser.html +++ b/papillon/templates/editChoicesUser.html @@ -3,7 +3,7 @@ {% load i18n %} {% block fullscript %} - + {{ form_new_choice.media }} -- cgit v1.2.3 From df9b2f33da2f17bd82dbc627ae9b25d295820aed Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Fri, 9 Aug 2013 00:37:52 +0200 Subject: Indent and update design for editChoiceUser --- papillon/templates/editChoicesUser.html | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/papillon/templates/editChoicesUser.html b/papillon/templates/editChoicesUser.html index 174c02f..958d05a 100644 --- a/papillon/templates/editChoicesUser.html +++ b/papillon/templates/editChoicesUser.html @@ -12,16 +12,20 @@ {% block content %}

{%trans "Return to the poll"%}

{% trans "Choices" %}

-{% if choices %} - - - - - {% for choice in choices %} - - - {% endfor %} -
{% trans "Label" %}{% trans "Limit" %}
{%if poll.dated_choices%}{{choice.date|date:_("DATETIME_FORMAT")}}{%else%}{{choice.name}}{%endif%}{% if choice.limit %}{% trans "Limited to"%} {{choice.limit}} {% trans "vote(s)" %}{% endif %}
+{% if choices %} +
+
{% trans "Current choices" %}
+ + + + + + {% for choice in choices %} + + + {% endfor %} +
{% trans "Name" %}{% trans "Limit" %}
{%if poll.dated_choices%}{{choice.date|date:_("DATETIME_FORMAT")}}{%else%}{{choice.name}}{%endif%}{% if choice.limit %}{% trans "Limited to"%} {{choice.limit}} {% trans "vote(s)" %}{% endif %}
+
{% endif %} {% include 'editChoices.html' %} {% endblock %} -- cgit v1.2.3 From 030ab12b940e926acbb835cf7706204f81cbe4f3 Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Fri, 9 Aug 2013 01:38:28 +0200 Subject: Indent and update design for vote --- papillon/templates/vote.html | 337 ++++++++++++++++++++++++++----------------- 1 file changed, 201 insertions(+), 136 deletions(-) diff --git a/papillon/templates/vote.html b/papillon/templates/vote.html index 8861e6c..4ab70fe 100644 --- a/papillon/templates/vote.html +++ b/papillon/templates/vote.html @@ -10,140 +10,205 @@ {% endblock %} {% block content %} -

{%if poll.category %}{{poll.category.name}} - {%endif%}{{poll.name}}

-{% if error %}

{{ error }}

{% endif %} -{% if not poll.open %}

{% trans "The current poll is closed."%}

{% endif %} -

{{ poll.description|safe }}

-
- {% csrf_token %} -
- - - - - {% for choice in choices %} - {% endfor %} - {% if not hide_vote %} - {% for voter in voters %} -{% ifequal current_voter_id voter.id %} - - - - {% for vote in voter.votes %} - {%endfor%} -{%else%} - - - {% for vote in voter.votes %} - {% ifequal poll.type 'V' %} - - {% else %} - - {% endifequal %} - {%endfor%} - {%endifequal%} - {%endfor%} - {%endif%} - {%if not current_voter_id%}{% if poll.open %} - - - - {%for choice in choices%}{%endfor%} - - {%endif%}{%endif%} - {% if not hide_vote %} - - {% for choice in choices %}{{choice.getSum}} - {% endfor %} - {%endif%} - {% if poll.open %} - - - {% endif %} -
{%if poll.dated_choices%}{{choice.date|date:"D d M Y H:i"}}{%else%}{{choice.name}}{%endif%}{% if choice.limit %} ({% trans "max" %} {{choice.limit}}){%endif%}
- {% if vote.choice.available or vote.value %} - {% ifequal poll.type 'P' %} - - {% endifequal %} - {% ifequal poll.type 'O' %} - - {% endifequal %} - {% ifequal poll.type 'B' %} - - {% endifequal %} - {% ifequal poll.type 'V' %} - - {% endifequal %} - {% else %} - {% trans "Limit reached" %} - {% endif %} - {% if poll.open %}{% trans "Edit" %}{%else%} {%endif%}{{voter.user.name}} - {%if vote.value%}{{vote.value}}{%else%}0{%endif%} - {%ifequal poll.type 'B'%} - {%for VOT in VOTE%} - {%ifequal VOT.0 vote.value%}{{VOT.1.1}}{%endifequal%}{%endfor%} - {%else%} - {%for VOT in VOTE%} - {%ifequal VOT.0 vote.value%}{{VOT.1.0}}{%endifequal%}{%endfor%} - {%endifequal%} -
- {% if choice.available %} - {% ifequal poll.type 'P' %} - {% endifequal %} - {% ifequal poll.type 'O' %} - {% endifequal %} - {% ifequal poll.type 'B' %} - - {% endifequal %} - {% ifequal poll.type 'V' %} - - {% endifequal %} - {% else %} - {% trans "Limit reached" %} - {% endif %} -
{% trans "Sum" %}
-
-
-
- {%if poll.opened_admin%} -

{%trans "Add a new choice to this poll?"%}

{%endif%} -
- {%if hide_vote%}

{% trans "You have already vote? You are enough wise not to be influenced by other votes? You can display result by clicking" %} {% trans "here" %}.

{%else%} -

{% trans "Remain informed of poll evolution:" %} {%trans "syndication"%}

{%endif%} -
-{%if not hide_vote and max_comment_nb %} -

{%trans "Comments"%} ({% blocktrans %}{{max_comment_nb}} max{% endblocktrans %})

-
- {%if poll.open and max_comment_nb > poll.comments.count %}
- - - - - - - - - - -
-
{%endif%} -
    {%for comment in comments%} -

  • {{comment.author_name}}, {{comment.date|date:_("DATETIME_FORMAT")}} :

    - {{comment.text|safe}}
    • {%endfor%} -
-
{%endif%} +

{%if poll.category %}{{poll.category.name}} - {%endif%}{{poll.name}}

+ {% if error %}

{{ error }}

{% endif %} + {% if not poll.open %}

{% trans "The current poll is closed."%}

{% endif %} + +

{% trans "Description" %}

+

{{ poll.description|safe }}

+ +

{% trans "Participation" %}

+
+ {% csrf_token %} +
+ + + + + {% for choice in choices %} + + {% endfor %} + + + {% if not hide_vote %} + {% for voter in voters %} + + {% ifequal current_voter_id voter.id %} + + + + {% for vote in voter.votes %} + + {%endfor%} + {%else%} + + + {% for vote in voter.votes %} + {% ifequal poll.type 'V' %} + + {% else %} + + {% endifequal %} + {%endfor%} + {%endifequal%} + + {%endfor%} + {%endif%} + + + {%if not current_voter_id%} + {% if poll.open %} + + + + {%for choice in choices%} + + {%endfor%} + + {%endif%} + {%endif%} + + + {% if not hide_vote %} + + + + {% for choice in choices %} + {{choice.getSum}} + {% endfor %} + + {%endif%} + + + {% if poll.open %} + + + + + {% endif %} +
+ {%if poll.dated_choices%} + {{choice.date|date:"D d M Y H:i"}} + {%else%} + {{choice.name}} + {%endif%} + {% if choice.limit %} + ({% trans "max" %} {{choice.limit}}) + {%endif%} +
+ {% if vote.choice.available or vote.value %} + {% ifequal poll.type 'P' %} + + {% endifequal %} + {% ifequal poll.type 'O' %} + + {% endifequal %} + {% ifequal poll.type 'B' %} + + {% endifequal %} + {% ifequal poll.type 'V' %} + + {% endifequal %} + {% else %} + {% trans "Limit reached" %} + {% endif %} + {% if poll.open %}{% trans "Edit" %}{%else%} {%endif%}{{voter.user.name}} + {%if vote.value%}{{vote.value}}{%else%}0{%endif%} + + {%ifequal poll.type 'B'%} + {%for VOT in VOTE%} + {%ifequal VOT.0 vote.value%} + {{VOT.1.1}} + {%endifequal%} + {%endfor%} + {%else%} + {%for VOT in VOTE%} + {%ifequal VOT.0 vote.value%} + {{VOT.1.0}} + {%endifequal%} + {%endfor%} + {%endifequal%} +
+ {% if choice.available %} + {% ifequal poll.type 'P' %} + + {% endifequal %} + {% ifequal poll.type 'O' %} + + {% endifequal %} + {% ifequal poll.type 'B' %} + + {% endifequal %} + {% ifequal poll.type 'V' %} + + {% endifequal %} + {% else %} + {% trans "Limit reached" %} + {% endif %} +
{% trans "Sum" %}
+ +
+
+
+
+ + {%if poll.opened_admin%} +

{%trans "Add a new choice to this poll?"%}

+ {%endif%} + +
+ {%if hide_vote%} +

+ {% trans "You have already vote? You are enough wise not to be influenced by other votes? You can display result by clicking" %} + {% trans "here" %}. +

+ {%else%} +

+ {% trans "Remain informed of poll evolution:" %} + {%trans "RSS syndication"%} +

+ {%endif%} +
+ + {%if not hide_vote and max_comment_nb %} +

{%trans "Comments"%} ({% blocktrans %}{{max_comment_nb}} max{% endblocktrans %})

+
    + {%for comment in comments%} +
  • +

    {{comment.author_name}}, {{comment.date|date:_("DATETIME_FORMAT")}} :

    + {{comment.text|safe}} +
    • + {%endfor%} +
+ {%if poll.open and max_comment_nb > poll.comments.count %} +
+
{% trans "Add a comment"%}
+
+ +
+ +
+ +
+ + +
+ {%endif%} + {%endif%} {% endblock %} -- cgit v1.2.3 From 525fdda2aaae3adc8534ebda777dedddb17ef25f Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Fri, 9 Aug 2013 01:38:50 +0200 Subject: Remove unused design and fix some labels --- papillon/static/styles.css | 22 +++------------------- papillon/templates/editChoices.html | 2 +- papillon/templates/editChoicesAdmin.html | 2 +- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/papillon/static/styles.css b/papillon/static/styles.css index 93f82a8..1b8ae7d 100644 --- a/papillon/static/styles.css +++ b/papillon/static/styles.css @@ -256,6 +256,7 @@ float:left; #poll{ text-align:center; +margin:auto; } #poll a{ @@ -313,7 +314,7 @@ color:white; } .footnote{ -font-size:10px; +font-size:0.9em; padding:10px; } @@ -334,7 +335,7 @@ padding:2px; } -.comments ul{ +ul.comments{ list-style-type:None; margin:4px; padding:0; @@ -351,23 +352,6 @@ margin:0; padding:0; } -.comments input{ -width:160px; -} - -.comments textarea{ -width:160px; -height:100px; -} - -.comments #tdsubmit{ -text-align:center; -} - -.comments .submit{ -width:auto; -} - /* CALENDARS & CLOCKS IMPORTED FROM ADMIN */ diff --git a/papillon/templates/editChoices.html b/papillon/templates/editChoices.html index 84b2d45..9146e27 100644 --- a/papillon/templates/editChoices.html +++ b/papillon/templates/editChoices.html @@ -10,7 +10,7 @@ {{form_new_choice.poll}} {{form_new_choice.order}} - {%trans "Choice name:"%}
+ {%trans "Choice value:"%}
{{form_new_choice.name}} {%trans "Max number of votes (optional):"%}
{{form_new_choice.limit}}
diff --git a/papillon/templates/editChoicesAdmin.html b/papillon/templates/editChoicesAdmin.html index 3ded310..0a8c611 100644 --- a/papillon/templates/editChoicesAdmin.html +++ b/papillon/templates/editChoicesAdmin.html @@ -28,7 +28,7 @@ {%if not poll.dated_choices%}{%endif%} - + -- cgit v1.2.3
{% trans "Position" %}{% trans "Name" %}{% trans "Value" %} {% trans "Max votes" %} {% trans "Delete?"%} ?