Migration to sqlite - Hide results to new voters

5 files changed, 17 insertions, 16 deletions

diff --git a/templates/base.html b/templates/base.html
index 3a0b3b7..377cf28 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -18,7 +18,7 @@
 {% block content %}{% endblock %}
 </div>
 <div id="footer">
-<a href='http://redmine.peacefrogs.net/projects/show/papillon'>Papillon</a> - <a href='http://www.gnu.org/licenses/agpl.html'>Copyright</a> © 2008 <a href='http://redmine.peacefrogs.net/projects/show/papillon'>Papillon project</a>
+<a href='http://redmine.peacefrogs.net/projects/show/papillon'>Papillon</a> - <a href='http://www.gnu.org/licenses/gpl.html'>Copyright</a> © 2008 <a href='http://redmine.peacefrogs.net/projects/show/papillon'>Papillon project</a>
 </div>
 </div>
 </body>
diff --git a/templates/category.html b/templates/category.html
index f649565..7b26d48 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -8,7 +8,7 @@
 {% if polls %}<h2>{%trans "Polls"%}</h2>{%endif%}
 {% for poll in polls %}
 <div class='poll-description'>
- <p><a href='/papillon/poll/{{poll.base_url}}'>{{poll.name}}</a></p>
+ <p><a href='http://{{root_url}}poll/{{poll.base_url}}'>{{poll.name}}</a></p>
  <p>{{poll.description}}</p>
 </div>
 {% endfor %}
diff --git a/templates/createOrEdit.html b/templates/createOrEdit.html
index 3e88bfe..033edec 100644
--- a/templates/createOrEdit.html
+++ b/templates/createOrEdit.html
@@ -52,11 +52,11 @@
   </tr>{% endif %}
 
   <tr>
-   <td><label for='poll_public'>{% trans "Public" %}</label></td>
+   <td><label for='poll_public'>{% trans "Visibility" %}</label></td>
    <td colspan='2'>
     <select name='poll_public'>
-     <option value='1'{%if poll.public %} selected='selected'{%endif%}>{%trans "Yes"%}</option>
-     <option value='0'{%if not poll.public %} selected='selected'{%endif%}>{%trans "No"%}</option>
+     <option value='0'{%if not poll.public %} selected='selected'{%endif%}>{%trans "Private"%}</option>
+     <option value='1'{%if poll.public %} selected='selected'{%endif%}>{%trans "Public"%}</option>
     </select>
    </td>
    <td class='form_description'>{% trans "If the poll is public it is available on the main page" %}</td>
diff --git a/templates/main.html b/templates/main.html
index 6c1e09d..43586f4 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -6,10 +6,10 @@
 <h2><a href='edit/0'>{%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='edit/0'>{% trans "Create it!" %}</a></p>
 
-{% if polls %}<h2>{%trans "Polls"%}</h2>{%endif%}
+{% if polls %}<h2>{%trans "Public polls"%}</h2>{%endif%}
 {% for poll in polls %}
 <div class='poll-description'>
- <p><a href='/papillon/poll/{{poll.base_url}}'>{{poll.name}}</a></p>
+ <p><a href='poll/{{poll.base_url}}'>{{poll.name}}</a></p>
  <p>{{poll.description}}</p>
 </div>
 {% endfor %}
diff --git a/templates/vote.html b/templates/vote.html
index 803813e..21b8a0d 100644
--- a/templates/vote.html
+++ b/templates/vote.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block content %}
- <h2>{{poll_type_name}} - {{poll.name}}</h2>
+ <h2>{%if poll.category %}{{poll.category.name}} - {%endif%}{{poll.name}}</h2>
 {% if error %}<p class='alert'>{{ error }}</p>{% endif %}
 {% if not poll.open %}<p class='alert'>{% trans "The current poll is closed."%}</p>{% endif %}
  <p>{{ poll.description }}</p>
@@ -14,6 +14,7 @@
   <td class='simple'></td>
   {% for choice in choices %}<th>{{choice.name}}{% if choice.limit %} ({% trans "max" %} {{choice.limit}}){%endif%}</th>
  {% endfor %}</tr>
+ {% if not hide_vote %}
  {% for voter in voters %}<tr{% if voter.highlight %} class='highlighted_voter'{% endif %}>
  {% ifequal current_voter_id voter.id %}
   <input type='hidden' name='voter' value='{{voter.id}}'/>
@@ -52,8 +53,8 @@
   {%endfor%}
   {%endifequal%}
  </tr>{%endfor%}
- {%if not current_voter_id%}
- {% if poll.open %}
+ {%endif%}
+ {%if not current_voter_id%}{% if poll.open %}
  <tr>
   <td class='simple'></td>
   <td><input type='text' name='author_name'/></td>
@@ -73,13 +74,12 @@
   {% endif %}
   </td>{%endfor%}
  </tr>
- {%endif%}
- {%endif%}
- <tr id='sum'>
+ {%endif%}{%endif%}
+ {% if not hide_vote %}<tr id='sum'>
   <td class='simple'></td><th>{% trans "Sum" %}</th>
   {% for choice in choices %}<td{%if choice.highlight %} class='highlight'{%endif%}>{{choice.sum}}</td>
   {% endfor %}
- </tr>
+ </tr>{%endif%}
  </table>
  {% if poll.open %}
  <input type='submit' value='{%if current_voter_id%}{% trans "Edit" %}{%else%}{% trans "Participate" %}{%endif%}'/>
@@ -87,7 +87,8 @@
  </div>
  <hr class='spacer'/>
  </form>
- <div id='syndication'>
-  {% trans "Remain informed of poll evolution:" %} <a href="/papillon/feeds/poll/{{poll.base_url}}/">{%trans "Syndication"%}</a>
+ <div class='footnote'>
+ {%if hide_vote%}<p>{% trans "You have already vote? You are enough wise not to be influenced by other votes? You can display result by clicking" %} <a href='?display_result=1'>{% trans "here" %}</a>.</p>{%else%}
+ <p>{% trans "Remain informed of poll evolution:" %} <a href="http://{{root_url}}feeds/poll/{{poll.base_url}}/">{%trans "Syndication"%}</a></p>{%endif%}
  </div>
 {% endblock %}