Reformat templates to fit with the rest of the Sith

This commit is contained in:
Skia 2016-12-26 00:10:41 +01:00
parent 61e67898e1
commit bf4d0693c6
3 changed files with 36 additions and 28 deletions

View File

@ -7,9 +7,10 @@
{% block content %} {% block content %}
{%- if election.can_candidate(user) or user.can_edit(election) %} {%- if election.can_candidate(user) or user.can_edit(election) %}
<section class="election__add-candidature"> <section class="election__add-candidature">
<form action="{{url('election:candidate', election_id=election.id)}}" method="post">{{form.as_p()}} <form action="{{ url('election:candidate', election_id=election.id) }}" method="post">
<p><input type="submit" value="{% trans %}Candidate{% endtrans %}" /></p>
{% csrf_token %} {% csrf_token %}
{{ form.as_p() }}
<p><input type="submit" value="{% trans %}Candidate{% endtrans %}" /></p>
</form> </form>
</section> </section>
{%- else -%} {%- else -%}

View File

@ -239,10 +239,12 @@ th {
{% trans %}Polls closed {% endtrans %} {% trans %}Polls closed {% endtrans %}
{%- else %} {%- else %}
{% trans %}Polls will open {% endtrans %} {% trans %}Polls will open {% endtrans %}
<time datetime="{{ election.start_date }}">{{ election.start_date|localtime|date("l d F Y")}}</time>{% trans %} at {% endtrans %}<time>{{ election.start_date|localtime|time("G:i")}}</time> <time datetime="{{ election.start_date }}">{{ election.start_date|localtime|date(DATETIME_FORMAT)}}</time>
{% trans %} at {% endtrans %}<time>{{ election.start_date|localtime|time(DATETIME_FORMAT)}}</time>
{% trans %}and will close {% endtrans %} {% trans %}and will close {% endtrans %}
{%- endif %} {%- endif %}
<time datetime="{{ election.end_date }}">{{ election.end_date|localtime|date("l d F Y")}}</time>{% trans %} at {% endtrans %}<time>{{ election.end_date|localtime|time("G:i")}}</time> <time datetime="{{ election.end_date }}">{{ election.end_date|localtime|date(DATETIME_FORMAT)}}</time>
{% trans %} at {% endtrans %}<time>{{ election.end_date|localtime|time(DATETIME_FORMAT)}}</time>
</p> </p>
{%- if election.has_voted(user) %} {%- if election.has_voted(user) %}
<p class="election__elector-infos"> <p class="election__elector-infos">

View File

@ -27,17 +27,22 @@
</h4> </h4>
<p> <p>
{% trans %}Applications open from{% endtrans %} {% trans %}Applications open from{% endtrans %}
<time datetime="{{ election.start_candidature }}">{{ election.start_candidature|localtime|date("l d F Y") }}</time>{% trans %} at {% endtrans %}<time>{{ election.start_candidature|localtime|time("G:i") }}</time> <time datetime="{{ election.start_candidature }}">{{ election.start_candidature|localtime|date(DATETIME_FORMAT) }}</time>
{% trans %} at {% endtrans %}<time>{{ election.start_candidature|localtime|time(DATETIME_FORMAT) }}</time>
{% trans %}to{% endtrans %} {% trans %}to{% endtrans %}
<time datetime="{{ election.end_candidature }}">{{ election.end_candidature|localtime|date("l d F Y") }}</time>{% trans %} at {% endtrans %}<time>{{ election.end_candidature|time("G:i") }}</time> <time datetime="{{ election.end_candidature }}">{{ election.end_candidature|localtime|date(DATETIME_FORMAT) }}</time>
{% trans %} at {% endtrans %}<time>{{ election.end_candidature|time(DATETIME_FORMAT) }}</time>
</p> </p>
<p> <p>
{% trans %}Polls open from{% endtrans %} {% trans %}Polls open from{% endtrans %}
<time datetime="{{ election.start_date }}">{{ election.start_date|localtime|date("l d F Y") }}</time>{% trans %} at {% endtrans %}<time>{{ election.start_date|localtime|time("G:i") }}</time> <time datetime="{{ election.start_date }}">{{ election.start_date|localtime|date(DATETIME_FORMAT) }}</time>
{% trans %} at {% endtrans %}<time>{{ election.start_date|localtime|time(DATETIME_FORMAT) }}</time>
{% trans %}to{% endtrans %} {% trans %}to{% endtrans %}
<time datetime="{{ election.end_date }}">{{ election.end_date|localtime|date("l d F Y") }}</time>{% trans %} at {% endtrans %}<time>{{ election.end_date|localtime|time("G:i") }}</time> <time datetime="{{ election.end_date }}">{{ election.end_date|localtime|date(DATETIME_FORMAT) }}</time>
{% trans %} at {% endtrans %}<time>{{ election.end_date|localtime|time(DATETIME_FORMAT) }}</time>
</p> </p>
<p>{{ election.description }}</p> <p>{{ election.description }}</p>
</section> </section>
{%- endfor %} {%- endfor %}
{%- endblock %} {%- endblock %}