From e12abfb5a381bb755ed28b1fde3a90998cb57703 Mon Sep 17 00:00:00 2001 From: Virginia Dooley Date: Thu, 2 May 2024 18:33:31 +0100 Subject: [PATCH] Clean up formatting on voting system pages - Add page titles - Fix breadcrumbs - Separate sections with more spacing --- .../elections/templates/elections/ams.html | 8 +- .../elections/templates/elections/ams_cy.html | 199 ++++++++++-------- .../elections/templates/elections/fptp.html | 8 +- .../templates/elections/fptp_cy.html | 14 +- .../elections/templates/elections/stv.html | 7 + .../elections/templates/elections/stv_cy.html | 8 +- .../elections/templates/elections/sv.html | 8 +- .../elections/templates/elections/sv_cy.html | 15 +- .../_person_previous_elections_card.html | 4 - 9 files changed, 170 insertions(+), 101 deletions(-) diff --git a/wcivf/apps/elections/templates/elections/ams.html b/wcivf/apps/elections/templates/elections/ams.html index c77b15f9e..9dbc90358 100644 --- a/wcivf/apps/elections/templates/elections/ams.html +++ b/wcivf/apps/elections/templates/elections/ams.html @@ -2,10 +2,16 @@ {% load markdown_filter %} {% load humanize %} {% load i18n %} +{% block page_title %}The Additional Member System{% endblock page_title %} +{% block og_title_content %}The Additional Member System{% endblock og_title_content %} +{% block og_description_content %} + The Additional Member System{% endblock og_description_content %} +{% block twitter_title_content %}The Additional Member System{% endblock twitter_title_content %} +{% block twitter_description_content %}The Additional Member System{% endblock twitter_description_content %} {% block content %} - {% include "elections/includes/_voting_system_breadcrumbs.html" %} + {% include "elections/includes/_voting_system_breadcrumbs.html" with voting_system="The Additional Member System" %}
diff --git a/wcivf/apps/elections/templates/elections/ams_cy.html b/wcivf/apps/elections/templates/elections/ams_cy.html index cb8612962..32d3e79a8 100755 --- a/wcivf/apps/elections/templates/elections/ams_cy.html +++ b/wcivf/apps/elections/templates/elections/ams_cy.html @@ -1,4 +1,16 @@ -{% extends "base.html" %}{% load markdown_filter %}{% load humanize %}{% load i18n %}{% block content %} {% include "elections/includes/_voting_system_breadcrumbs.html" %} +{% extends "base.html" %} +{% load markdown_filter %} +{% load humanize %} +{% load i18n %} + +{% block page_title %}Y System Aelodau Ychwanegol{% endblock page_title %} +{% block og_title_content %}Y System Aelodau Ychwanegol{% endblock og_title_content %} +{% block og_description_content %}Y System Aelodau Ychwanegol{% endblock og_description_content %} +{% block twitter_title_content %}Y System Aelodau Ychwanegol{% endblock twitter_title_content %} +{% block twitter_description_content %}Y System Aelodau Ychwanegol{% endblock twitter_description_content %} + +{% block content %} + {% include "elections/includes/_voting_system_breadcrumbs.html" with voting_system="Y System Aelodau Ychwanegol" %}
@@ -12,7 +24,8 @@

Y System Aelodau Ychwanegol

Er enghraifft, bydd pleidleisiwr yn Paisley yn yr Alban yn derbyn papur pleidleisio sy'n rhestru'r holl ymgeiswyr sydd am gynrychioli Paisley yn Senedd yr Alban. Byddan nhw hefyd yn cael papur pleidleisio sy'n rhestru'r pleidiau a/neu ymgeiswyr annibynnol sy'n sefyll am y saith sedd ar gyfer Gorllewin yr Alban. Mae'r ymgeiswyr ar y papur pleidleisio rhanbarthol yn cael eu rhestru yn y drefn y mae eu pleidiau gwleidyddol am iddyn nhw gael eu hethol, ac nid yw pleidleiswyr yn cael unrhyw ddewis dros y drefn hon (gelwir hyn yn 'restr gaeedig').

- +
+

Dyrannu seddau

Bydd nifer cyffredinol y seddi etholaethol y mae plaid yn eu hennill yn cael effaith ar faint o gynrychiolwyr rhanbarthol a ddyrennir i’r blaid honno. Bwriad hyn yw dod â nifer y seddi a enillir gan blaid yn nes at y ganran o’r bleidlais gyffredinol a dderbyniwyd ganddyn nhw yn y rhanbarth. @@ -24,100 +37,104 @@

Dyrannu seddau

Dyrennir seddi ar ôl rowndiau cyfrif. Y pleidiau sydd â’r nifer uchaf o bleidleisiau ar ôl cymhwyso’r fformiwla uchod sy’n ennill y seddau rhanbarthol.

+
+

Enghraifft o etholiad

Yn rhanbarth Gorllewin yr Alban 2016, roedd canlyniadau’r prif bleidiau oedd fel a ganlyn (gyda chyfanswm y cwota pleidleisio ar gyfer rowndiau dilynol mewn cromfachau):

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+
-

- Rhanbarth Gorllewin yr Alban, etholiadau Senedd yr Alban 2016 -

-
PlaidSeddi etholaethol a enillwyd (cyfanswm o 10)Pleidleisiau a enillwydCwota rownd gyntafCwota'r ail rowndCwota'r drydedd rowndCwota'r bedwaredd rowndCwota'r bumed rowndCwota'r chweched rowndCwota'r seithfed rowndSeddi Rhanbarthol a Enillwyd
SNP8135,82715,091Dim newidDim newidDim newidDim newidDim newidDim newid0
Llafur172,54436,272 (etholwyd)24,18118,136Dim newid (etholwyd)Dim newidDim newid (etholwyd)Dim newi3
Ceidwadwyr171,52835,764Dim newid (etholwyd)23,842 (etholwyd)17,882Dim newid (etholwyd)3,576Dim newid3
Y Blaid Werdd017,218Dim newidDim newidDim newidDim newidDim newidDim newidDim newid (etholwyd)1
Dem. Rhydd.012,097Dim newidDim newidDim newidDim newidDim newidDim newidDim newid0
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
+

+ Rhanbarth Gorllewin yr Alban, etholiadau Senedd yr Alban 2016 +

+
PlaidSeddi etholaethol a enillwyd (cyfanswm o 10)Pleidleisiau a enillwydCwota rownd gyntafCwota'r ail rowndCwota'r drydedd rowndCwota'r bedwaredd rowndCwota'r bumed rowndCwota'r chweched rowndCwota'r seithfed rowndSeddi Rhanbarthol a Enillwyd
SNP8135,82715,091Dim newidDim newidDim newidDim newidDim newidDim newid0
Llafur172,54436,272 (etholwyd)24,18118,136Dim newid (etholwyd)Dim newidDim newid (etholwyd)Dim newi3
Ceidwadwyr171,52835,764Dim newid (etholwyd)23,842 (etholwyd)17,882Dim newid (etholwyd)3,576Dim newid3
Y Blaid Werdd017,218Dim newidDim newidDim newidDim newidDim newidDim newidDim newid (etholwyd)1
Dem. Rhydd.012,097Dim newidDim newidDim newidDim newidDim newidDim newidDim newid0
-
+ + +
+

Er mai'r SNP enillodd y nifer fwyaf o bleidleisiau, gan eu bod wedi ennill wyth allan o'r deg sedd etholaethol, roedd eu cwota o 15,092, yn is na bron pob un o'r pleidiau eraill. O ganlyniad, ni chawson nhw unrhyw seddi rhanbarthol. diff --git a/wcivf/apps/elections/templates/elections/fptp.html b/wcivf/apps/elections/templates/elections/fptp.html index 476bd3a39..7db22ee9b 100644 --- a/wcivf/apps/elections/templates/elections/fptp.html +++ b/wcivf/apps/elections/templates/elections/fptp.html @@ -3,9 +3,15 @@ {% load humanize %} {% load i18n %} +{% block page_title %}First-past-the-post (FPTP){% endblock page_title %} +{% block og_title_content %}YFirst-past-the-post (FPTP){% endblock og_title_content %} +{% block og_description_content %}YFirst-past-the-post (FPTP){% endblock og_description_content %} +{% block twitter_title_content %}YFirst-past-the-post (FPTP){% endblock twitter_title_content %} +{% block twitter_description_content %}YFirst-past-the-post (FPTP){% endblock twitter_description_content %} + {% block content %} - {% include "elections/includes/_voting_system_breadcrumbs.html" %} + {% include "elections/includes/_voting_system_breadcrumbs.html" with voting_system="First-past-the-post (FPTP)"%}

diff --git a/wcivf/apps/elections/templates/elections/fptp_cy.html b/wcivf/apps/elections/templates/elections/fptp_cy.html index caba4c341..fd4722550 100755 --- a/wcivf/apps/elections/templates/elections/fptp_cy.html +++ b/wcivf/apps/elections/templates/elections/fptp_cy.html @@ -1,4 +1,16 @@ -{% extends "base.html" %}{% load markdown_filter %}{% load humanize %}{% load i18n %}{% block content %} {% include "elections/includes/_voting_system_breadcrumbs.html" %} +{% extends "base.html" %} +{% load markdown_filter %} +{% load humanize %} +{% load i18n %} + +{% block page_title %}Cyntaf i'r felin (FPTP){% endblock page_title %} +{% block og_title_content %}Cyntaf i'r felin (FPTP){% endblock og_title_content %} +{% block og_description_content %}Cyntaf i'r felin (FPTP){% endblock og_description_content %} +{% block twitter_title_content %}Cyntaf i'r felin (FPTP){% endblock twitter_title_content %} +{% block twitter_description_content %}Cyntaf i'r felin (FPTP){% endblock twitter_description_content %} + +{% block content %} + {% include "elections/includes/_voting_system_breadcrumbs.html" with voting_system="Cyntaf i'r felin (FPTP)"%}
diff --git a/wcivf/apps/elections/templates/elections/stv.html b/wcivf/apps/elections/templates/elections/stv.html index 45669cab9..1f6b0148d 100644 --- a/wcivf/apps/elections/templates/elections/stv.html +++ b/wcivf/apps/elections/templates/elections/stv.html @@ -3,6 +3,13 @@ {% load humanize %} {% load i18n %} +{% block page_title %}Single Transferable Vote (STV){% endblock page_title %} +{% block og_title_content %}Single Transferable Vote (STV){% endblock og_title_content %} +{% block og_description_content %}Single Transferable Vote (STV){% endblock og_description_content %} +{% block twitter_title_content %}Single Transferable Vote (STV){% endblock twitter_title_content %} +{% block twitter_description_content %}Single Transferable Vote (STV){% endblock twitter_description_content %} + + {% block content %} {% include "elections/includes/_voting_system_breadcrumbs.html" %} diff --git a/wcivf/apps/elections/templates/elections/stv_cy.html b/wcivf/apps/elections/templates/elections/stv_cy.html index d45e3d2df..bdb8aa922 100644 --- a/wcivf/apps/elections/templates/elections/stv_cy.html +++ b/wcivf/apps/elections/templates/elections/stv_cy.html @@ -3,8 +3,14 @@ {% load humanize %} {% load i18n %} +{% block page_title %}Pleidlais Sengl Drosglwyddadwy (PSD){% endblock page_title %} +{% block og_title_content %}Pleidlais Sengl Drosglwyddadwy (PSD){% endblock og_title_content %} +{% block og_description_content %}Pleidlais Sengl Drosglwyddadwy (PSD){% endblock og_description_content %} +{% block twitter_title_content %}Pleidlais Sengl Drosglwyddadwy (PSD){% endblock twitter_title_content %} +{% block twitter_description_content %}Pleidlais Sengl Drosglwyddadwy (PSD){% endblock twitter_description_content %} + {% block content %} - {% include "elections/includes/_voting_system_breadcrumbs.html" %} + {% include "elections/includes/_voting_system_breadcrumbs.html" with voting_system="Pleidlais Sengl Drosglwyddadwy (PSD)"%}
diff --git a/wcivf/apps/elections/templates/elections/sv.html b/wcivf/apps/elections/templates/elections/sv.html index 148c33f0a..687afcade 100644 --- a/wcivf/apps/elections/templates/elections/sv.html +++ b/wcivf/apps/elections/templates/elections/sv.html @@ -3,9 +3,15 @@ {% load humanize %} {% load i18n %} +{% block page_title %}Supplementary Vote{% endblock page_title %} +{% block og_title_content %}Supplementary Vote{% endblock og_title_content %} +{% block og_description_content %}Supplementary Vote{% endblock og_description_content %} +{% block twitter_title_content %}Supplementary Vote{% endblock twitter_title_content %} +{% block twitter_description_content %}Supplementary Vote{% endblock twitter_description_content %} + {% block content %} - {% include "elections/includes/_voting_system_breadcrumbs.html" %} + {% include "elections/includes/_voting_system_breadcrumbs.html" with voting_system="Supplementary Vote" %}
diff --git a/wcivf/apps/elections/templates/elections/sv_cy.html b/wcivf/apps/elections/templates/elections/sv_cy.html index a9c670527..beb1cdccc 100755 --- a/wcivf/apps/elections/templates/elections/sv_cy.html +++ b/wcivf/apps/elections/templates/elections/sv_cy.html @@ -1,4 +1,17 @@ -{% extends "base.html" %}{% load markdown_filter %}{% load humanize %}{% load i18n %}{% block content %} {% include "elections/includes/_voting_system_breadcrumbs.html" %} +{% extends "base.html" %} +{% load markdown_filter %} +{% load humanize %} +{% load i18n %} + +{% block page_title %}Pleidlais Atodol{% endblock page_title %} +{% block og_title_content %}Pleidlais Atodol{% endblock og_title_content %} +{% block og_description_content %}Pleidlais Atodol{% endblock og_description_content %} +{% block twitter_title_content %}Pleidlais Atodol{% endblock twitter_title_content %} +{% block twitter_description_content %}Pleidlais Atodol{% endblock twitter_description_content %} + + +{% block content %} + {% include "elections/includes/_voting_system_breadcrumbs.html" with voting_system="Pleidlais Atodol" %}
diff --git a/wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html b/wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html index 95b161607..fa3b4d381 100644 --- a/wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html +++ b/wcivf/apps/people/templates/people/includes/_person_previous_elections_card.html @@ -38,10 +38,6 @@ {% if person_post.votes_cast %} {{ person_post.get_results_rank }} - {% elif person_post.election.voting_system == "SV"|"STV" %} - {% blocktrans trimmed with voting_system=person_post.election.voting_system %} - We do not collect voting data for {{voting_system}} elections - {% endblocktrans %} {% else %} {% if person_post.election.voting_system == "sv" %} {% trans "We do not collect voting data for Supplementary Vote elections." %}