Skip to content

Proposal #2373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tschuppi81 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Proposal #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/onegov/election_day/locale/de_CH/LC_MESSAGES/onegov.election_day.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"

Expand Down
16 changes: 13 additions & 3 deletions src/onegov/election_day/templates/macros.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions src/onegov/election_day/theme/styles/election_day.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ html {
color: $aluminum;
margin-bottom: 2em;

h2 {
margin-top: 1.5rem;
}

ul {
margin: 0;
}
Expand Down
Loading