From 59dfe79c92e727aedc889cff202624420330cd6f Mon Sep 17 00:00:00 2001
From: Reto Tschuppert <reto.tschuppert@seantis.ch>
Date: Mon, 2 Mar 2026 15:21:37 +0100
Subject: [PATCH] Proposal

---
 .../de_CH/LC_MESSAGES/onegov.election_day.po     |  6 ++++++
 src/onegov/election_day/templates/macros.pt      | 16 +++++++++++++---
 .../election_day/theme/styles/election_day.scss  |  4 ++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/onegov/election_day/locale/de_CH/LC_MESSAGES/onegov.election_day.po b/src/onegov/election_day/locale/de_CH/LC_MESSAGES/onegov.election_day.po
index 820f94a761..b2e56fcb67 100644
--- a/src/onegov/election_day/locale/de_CH/LC_MESSAGES/onegov.election_day.po
+++ b/src/onegov/election_day/locale/de_CH/LC_MESSAGES/onegov.election_day.po
@@ -1250,12 +1250,18 @@ msgstr "Initiative angenommen"
 msgid "Tie breaker in favor of the proposal"
 msgstr "Stichfrage zugunsten der Initiative"
 
+msgid "in favor of the proposal"
+msgstr "zugunsten der Initiative"
+
 msgid "Tie breaker in favor of the direct counter proposal"
 msgstr "Stichfrage zugunsten des Gegenentwurfs"
 
 msgid "Tie breaker in favor of the indirect counter proposal"
 msgstr "Stichfrage zugunsten des Gegenvorschlags"
 
+msgid "in favor of the counter proposal"
+msgstr "zugunsten des Gegenentwurfs"
+
 msgid "Download a PDF with all the results:"
 msgstr "Ein PDF mit allen Resultaten kann hier heruntergeladen werden:"
 
diff --git a/src/onegov/election_day/templates/macros.pt b/src/onegov/election_day/templates/macros.pt
index 76b772bdcf..2a3c34d654 100644
--- a/src/onegov/election_day/templates/macros.pt
+++ b/src/onegov/election_day/templates/macros.pt
@@ -873,13 +873,14 @@
 
 <metal:ballot-result-bar define-macro="ballot-result-bar">
     <div class="ballot-result-bar" tal:condition="layout.has_results and ballot">
+        <h2>${ballot.title}</h2>
         <ul class="percentages flex-container justify-between align-center">
             <li>
-                <span i18n:translate="">${layout.label('Yeas')}</span><br/>
+                <span i18n:translate="">${yeas_label|None or layout.label('Yeas')}</span><br/>
                 <span class="accepted" >${'{0:.2f}'.format(ballot.yeas_percentage)}%</span>
             </li>
             <li>
-                <span i18n:translate="">${layout.label('Nays')}</span><br/>
+                <span i18n:translate="">${nays_label|None or layout.label('Nays')}</span><br/>
                 <span class="rejected" >${'{0:.2f}'.format(ballot.nays_percentage)}%</span>
             </li>
         </ul>
@@ -1381,8 +1382,17 @@
         </tal:b>
     </h1>
 
+    <metal metal:use-macro="layout.macros['ballot-result-bar']" tal:define="ballot vote.proposal"/>
+    <ta:block tal:condition="vote.counter_proposal|None">
+        <metal metal:use-macro="layout.macros['ballot-result-bar']" tal:define="ballot vote.counter_proposal"/>
+    </ta:block>
+    <tal:block tal:condition="vote.tie_breaker|None">
+        <metal metal:use-macro="layout.macros['ballot-result-bar']" tal:define="ballot vote.tie_breaker;
+                                                                                yeas_label 'in favor of the proposal';
+                                                                                nays_label 'in favor of the counter proposal'"/>
+    </tal:block>
+
     <div class="clearfix"></div>
-    <metal metal:use-macro="layout.macros['ballot-result-bar']" />
     <tal:block tal:condition="not: layout.has_results and ballot">
         <hr>
     </tal:block>
diff --git a/src/onegov/election_day/theme/styles/election_day.scss b/src/onegov/election_day/theme/styles/election_day.scss
index ea85dc3db4..638289797f 100644
--- a/src/onegov/election_day/theme/styles/election_day.scss
+++ b/src/onegov/election_day/theme/styles/election_day.scss
@@ -59,6 +59,10 @@ html {
     color: $aluminum;
     margin-bottom: 2em;
 
+    h2 {
+        margin-top: 1.5rem;
+    }
+
     ul {
         margin: 0;
     }