Skip to content

Commit

Permalink
Merge branch 'hotfix/ppcs-link-separation' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@VirginiaDooley
VirginiaDooley committed May 1, 2024
2 parents 13167f5 + b928d09 commit 02d8132
Show file tree
Hide file tree
Showing 8 changed files with 435 additions and 1,879 deletions.
344 changes: 210 additions & 134 deletions locale/cy/LC_MESSAGES/django.po
View file

Large diffs are not rendered by default.

1,858 changes: 171 additions & 1,687 deletions locale/en/LC_MESSAGES/django.po
View file

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions wcivf/apps/elections/templates/elections/includes/_polling_place.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,10 @@ <h3>{% trans "Vote before polling day" %}</h3>
<hr>
<h3>{% trans "Vote on polling day" %}</h3>
{% endif %}
{% blocktrans trimmed with polling_station_address=polling_station.station.properties.address|linebreaksbr %}
<p>
Your polling station is:
</p>
<address>{{ polling_station_address }}</address>
{% endblocktrans %}
<p>
{% trans "Your polling station is" %}:
</p>
<address>{{ polling_station_address }}</address>

<p>
{% blocktrans trimmed %}It will be open from <strong>7am to 10pm</strong>{% endblocktrans %}
Expand Down
6 changes: 1 addition & 5 deletions wcivf/apps/elections/templates/elections/includes/_single_ballot.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,7 @@ <h2>

{% if postelection.should_display_sopn_info and not postelection.should_show_candidates %}
<p>
{% if postelection.locked %}
{% blocktrans trimmed with sopn_url=postelection.ynr_sopn_link %}
The <a href="{{ sopn_url }}">official candidate list</a> has been published.
{% endblocktrans%}
{% else %}
{% if not postelection.locked %}
{% if postelection.past_expected_sopn_day %}
{% trans "The official candidate list should have been published on" %}
{% else %}
Expand Down
69 changes: 34 additions & 35 deletions wcivf/apps/parties/templates/parties/parties_view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,42 @@

<div class="ds-stack-smaller">
<h1>{% trans "UK political parties" %}</h1>
{% blocktrans trimmed %}
<p>The following is a list of all political parties represented by candidates in Democracy Club's UK election
database (est. 2015). This list includes registered and deregistered parties.</p>
<p>There are two party registers in the UK: a combined Great Britain register for England, Wales and Scotland, and a separate register for Northern Ireland. Parties in Great Britain can only field candidates in the nations they have specified in their entry.</p>
<p>A registered party may field candidates in elections.</p>
<p>A deregistered party may no longer field candidates in elections. A party can become deregistered through choice, or becuase it failed to renew its annual registration status. In some cases, parties have been deregistered and then subsequently reregistered; in these cases, the party will have an entry for each registration.</p>
<p>Party names and emblems are taken from the <a href="http://www.electoralcommission.org.uk/">Electoral
Commission's register of political parties.</a></p>
{% endblocktrans %}
<aside class="ds-filter" aria-labelledby="filter-label">
<div class="ds-filter-cluster">
<ul>
<li id="filter-label" class="ds-filter-label" aria-hidden="true">Filter:</li>
<li><a href="{{ photo_list_review_url }}" {% if request.get_full_path == photo_list_review_url %}aria-current="true" {% endif %}>All</a></li>
{% for shortcut in shortcuts.list %}
<li><a href="{{ photo_list_review_url }}?{{ shortcut.querystring }}" {% if shortcut.active %}aria-current="true" {% endif %}>{{ shortcut.label }}</a></li>
{% endfor %}
</ul>
</div>
<form>
<details {% if filter.data %}open=""{% endif %}>
<summary>Advanced filters</summary>
<div class="ds-advanced-filters">
<div class="ds-filter-cluster">
{% for field in filter.form.visible_fields %}
<ul aria-labelledby="adv-filter-label-{{ forloop.counter }}">
<li id="adv-filter-label-{{ forloop.counter }}" class="ds-filter-label" aria-hidden="true">{{ field.label }}:</li>
{{ field }}
</ul>
{% endfor %}
<p>{% blocktrans trimmed %}The following is a list of all political parties represented by candidates in Democracy Club's UK election
database (est. 2015). This list includes registered and deregistered parties. {% endblocktrans %}</p>
<p>{% blocktrans trimmed %}There are two party registers in the UK: a combined Great Britain register for England, Wales and Scotland, and a separate register for Northern Ireland. Parties in Great Britain can only field candidates in the nations they have specified in their entry.{% endblocktrans %}</p>
<p>{% trans "A registered party may field candidates in elections." %}</p>
<p>{% trans "A deregistered party may no longer field candidates in elections." %}
{% blocktrans trimmed %}A party can become deregistered through choice, or because it failed to renew its annual registration status.{% endblocktrans %}
{% blocktrans trimmed %}In some cases, parties have been deregistered and then subsequently reregistered; in these cases, the party will have an entry for each registration.{% endblocktrans %}</p>
<p>{% blocktrans trimmed %}Party names and emblems are taken from the <a href="http://www.electoralcommission.org.uk/">Electoral Commission's register of political parties.{% endblocktrans %}</a></p>
<aside class="ds-filter" aria-labelledby="filter-label">
<div class="ds-filter-cluster">
<ul>
<li id="filter-label" class="ds-filter-label" aria-hidden="true">Filter:</li>
<li><a href="{{ photo_list_review_url }}" {% if request.get_full_path == photo_list_review_url %}aria-current="true" {% endif %}>All</a></li>
{% for shortcut in shortcuts.list %}
<li><a href="{{ photo_list_review_url }}?{{ shortcut.querystring }}" {% if shortcut.active %}aria-current="true" {% endif %}>{{ shortcut.label }}</a></li>
{% endfor %}
</ul>
</div>
<form>
<details {% if filter.data %}open=""{% endif %}>
<summary>Advanced filters</summary>
<div class="ds-advanced-filters">
<div class="ds-filter-cluster">
{% for field in filter.form.visible_fields %}
<ul aria-labelledby="adv-filter-label-{{ forloop.counter }}">
<li id="adv-filter-label-{{ forloop.counter }}" class="ds-filter-label" aria-hidden="true">{{ field.label }}:</li>
{{ field }}
</ul>
{% endfor %}

</div>
</div>
</details>
</form>
</aside>
{% include "parties/party_list.html" with parties=queryset %}
</div>
</details>
</form>
</aside>
{% include "parties/party_list.html" with parties=queryset %}
</div>

{% endblock content %}
2 changes: 1 addition & 1 deletion wcivf/apps/people/templates/people/not_current_person_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h2 class="ds-candidate-name ds-h3">
{{ object.name }}
</h2>
{% if object.past_not_current_candidacies.count == 2 %}
{% blocktrans %}
{% blocktrans trimmed %}
<p>{{ person_name }} stood for election twice.</p>
{% endblocktrans %}
{% else %}
Expand Down
17 changes: 11 additions & 6 deletions wcivf/apps/ppc_2024/templates/ppc_2024/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,20 @@ <h2 class="ds-h4">{% trans "MPs standing down" %}</h2>

<h2 class="ds-h4">{% trans "Timetable" %}</h2>
<p>{% trans "Democracy Club's" %} <a href="https://election-timetable.democracyclub.org.uk/">
{% trans "general election timetable generator"%}</a> {% trans "provides an election timetable for any given date" %}.</p>
{% trans "general election timetable generator" %}</a> {% trans "provides an election timetable for any given date" %}.</p>


</details>


<h2>{% trans "The data" %}</h2>

<p>{% trans "The " %}<a href="{% url "ppc_2024:details" %}">{% trans "full list of prospective parliamentary candidates" %}</a> {% trans "is available as a browsable table or a CSV." %}</p>
<p>
{% url "ppc_2024:details" as details_url %}
{% blocktrans trimmed %}
The full list of prospective parliamentary candidates is available as a <a href="{{ details_url }}">browsable table</a> or a <a href="https://docs.google.com/spreadsheets/d/e/2PACX-1vRhZbBrU2AdJDYyBZViMs6irvH7zVUiZm2rDoADw5B18drp6hILJBr-duSXCmHJ18SmYWm3iq0bbfoR/pub?gid=0&single=true&output=csv">CSV</a>.
{% endblocktrans %}
</p>


{% if by_region %}
Expand Down Expand Up @@ -80,10 +85,10 @@ <h2>{% trans "The data" %}</h2>
{% if by_party %}
<div class="ds-table">
<table>
<caption>Candidate selections by political party</caption>
<caption>{% trans "Candidate selections by political party" %}</caption>
<tr>
<th>Party</th>
<th>Candidates</th>
<th>{% trans "Party" %}</th>
<th>{% trans "Candidates" %}</th>
</tr>
{% for party in by_party %}
<tr>
Expand All @@ -92,7 +97,7 @@ <h2>{% trans "The data" %}</h2>
</tr>
{% endfor %}
<tr>
<td>Total</td>
<td>{% trans "Total" %}</td>
<td>{{ person_count }}</td>
</tr>
</table>
Expand Down
8 changes: 3 additions & 5 deletions wcivf/apps/ppc_2024/templates/ppc_2024/ppcperson_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@

<h1>{% trans "UK Prospective Parliamentary Candidates" %}</h1>
<p>
{% blocktrans %}
Democracy Club's volunteers are collecting information on each candidate as they are announced.
The live table below displays all the candidates we are aware of. Where a candidate has a
recent electoral history, this is displayed on their Democracy Club profile, linked to from their name.
{% endblocktrans %}
{% trans "Democracy Club's volunteers are collecting information on each candidate as they are announced." %}
{% trans "The live table below displays all the candidates we are aware of." %}
{% trans "Where a candidate has a recent electoral history, this is displayed on their Democracy Club profile, linked to from their name." %}
</p>

<aside class="ds-filter" aria-labelledby="filter-label">
Expand Down

0 comments on commit 02d8132

Please sign in to comment.