fedora_elections/templates/admin/all_elections.html | 4 ++--
fedora_elections/templates/admin/election_form.html | 4 ++--
fedora_elections/templates/admin/view_election.html | 4 ++--
fedora_elections/templates/archive.html | 4 ++--
fedora_elections/templates/index.html | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 38dbc1107e3c6a4a16225dbf2021b970a0bbb7e2
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Wed Jul 23 14:28:29 2014 +0200
Fix the display for the start_date and end_date to always have them specify it opens at 00:00 and closes at 23:59:59
diff --git a/fedora_elections/templates/admin/all_elections.html b/fedora_elections/templates/admin/all_elections.html
index c19c831..952245b 100644
--- a/fedora_elections/templates/admin/all_elections.html
+++ b/fedora_elections/templates/admin/all_elections.html
@@ -30,8 +30,8 @@
{{ election.shortdesc }}
</a>
</td>
- <td>{{ election.start_date }}</td>
- <td>{{ election.end_date }}</td>
+ <td>{{ election.start_date.strftime('%Y-%m-%d') }} 00:00 </td>
+ <td>{{ election.end_date.strftime('%Y-%m-%d') }} 23:59 </td>
<td>{{ election.status }}</td>
</tr>
{% endfor %}
diff --git a/fedora_elections/templates/admin/view_election.html b/fedora_elections/templates/admin/view_election.html
index 2247754..c283de7 100644
--- a/fedora_elections/templates/admin/view_election.html
+++ b/fedora_elections/templates/admin/view_election.html
@@ -11,8 +11,8 @@
</a>
</p>
<ul>
- <li>Start date: {{ election.start_date }}</li>
- <li>End date: {{ election.end_date }}</li>
+ <li>Start date: {{ election.start_date.strftime('%Y-%m-%d') }} 00:00 </li>
+ <li>End date: {{ election.end_date.strftime('%Y-%m-%d') }} 23:59 </li>
<li>Number elected: {{ election.seats_elected }}</li>
<li>Election type: {{ election.voting_type }}</li>
<li>Maximum number of votes: {{ election.max_votes }}</li>
diff --git a/fedora_elections/templates/archive.html b/fedora_elections/templates/archive.html
index ea5d6db..61699de 100644
--- a/fedora_elections/templates/archive.html
+++ b/fedora_elections/templates/archive.html
@@ -15,8 +15,8 @@
{% for election in elections %}
<tr>
<td>{{election.shortdesc}}</td>
- <td>{{election.start_date}}</td>
- <td>{{election.end_date}}</td>
+ <td>{{ election.start_date.strftime('%Y-%m-%d') }} 00:00 </td>
+ <td>{{ election.end_date.strftime('%Y-%m-%d') }} 23:59 </td>
<td>
<a href="{{ url_for('about_election', election_alias=election.alias) }}">
More information
diff --git a/fedora_elections/templates/index.html b/fedora_elections/templates/index.html
index 1381b41..64b526b 100644
--- a/fedora_elections/templates/index.html
+++ b/fedora_elections/templates/index.html
@@ -18,8 +18,8 @@
{% for election in election_list %}
<tr>
<td>{{ election.shortdesc }}</td>
- <td>{{ election.start_date }}</td>
- <td>{{ election.end_date }}</td>
+ <td>{{ election.start_date.strftime('%Y-%m-%d') }} 00:00 </td>
+ <td>{{ election.end_date.strftime('%Y-%m-%d') }} 23:59 </td>
<td>{{ election.status }}</td>
<td>
<a href="{{ url_for('about_election', election_alias=election.alias) }}">
commit c7ecd6e25352ef4c5f6f2b5395d102cffda2b8c6
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Wed Jul 23 14:27:28 2014 +0200
Fix displaying the information after the field when adding/editing an election
diff --git a/fedora_elections/templates/admin/election_form.html b/fedora_elections/templates/admin/election_form.html
index fceb75a..a3dcde8 100644
--- a/fedora_elections/templates/admin/election_form.html
+++ b/fedora_elections/templates/admin/election_form.html
@@ -17,8 +17,8 @@
{{ render_field_in_row(form.voting_type) }}
{{ render_field_in_row(form.max_votes) }}
{{ render_field_in_row(form.url) }}
- {{ render_field_in_row(form.start_date, " at 00:00:00 UTC") }}
- {{ render_field_in_row(form.end_date, " at 23:59:59 UTC") }}
+ {{ render_field_in_row(form.start_date, after=" at 00:00:00 UTC") }}
+ {{ render_field_in_row(form.end_date, after=" at 23:59:59 UTC") }}
{{ render_field_in_row(form.seats_elected) }}
{{ render_field_in_row(form.candidates_are_fasusers) }}
{{ render_field_in_row(form.embargoed) }}