From 525fdda2aaae3adc8534ebda777dedddb17ef25f Mon Sep 17 00:00:00 2001
From: Adrien Dorsaz <adrien@adorsaz.ch>
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:"%}<br/>
+    {%trans "Choice value:"%}<br/>
     {{form_new_choice.name}}
     {%trans "Max number of votes (optional):"%}<br/>
     {{form_new_choice.limit}}<br/>
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 @@
             <table>
               <tr>
                {%if not poll.dated_choices%}<th style="word-wrap:none;">{% trans "Position" %}</th>{%endif%}
-               <th>{% trans "Name" %}</th>
+               <th>{% trans "Value" %}</th>
                <th>{% trans "Max votes" %}</th>
                <th width="60px;">{% trans "Delete?"%} <span class="help_button" title='{% trans "To remove a choice, check this box on the good line and click on Edit."%}'>?</span></th>
               </tr>
-- 
cgit v1.2.3