+
${icons_party}
${choice_party}
diff --git a/uVote/page/default_bulletin/default_bulletin.php b/uVote/page/default_bulletin/default_bulletin.php
index 5f8288a..eaa7509 100644
--- a/uVote/page/default_bulletin/default_bulletin.php
+++ b/uVote/page/default_bulletin/default_bulletin.php
@@ -47,9 +47,10 @@ class default_bulletin extends SYSTEM\PAGE\Page {
array( 'party' => $pv['party'],
'choice' => $this->get_party_per_poll($pv['choice']),
'choice_class' => $this->tablerow_class($pv['choice']),
- 'party_yes' => round($pv['votes_pro']/$pv['total']*100,0),
- 'party_no' => round($pv['votes_contra']/$pv['total']*100,0),
- 'party_ent' => round(($pv['nr_attending'] - $pv['votes_pro'] - $pv['votes_contra'])/$pv['total']*100,0)));
+ 'party_yes' => $pv['votes_pro'] > 0 ? round($pv['votes_pro']/$pv['total']*100,0) : 'votes_pro',
+ 'party_no' => $pv['votes_contra'] > 0 ? round($pv['votes_contra']/$pv['total']*100,0) : $pv['votes_contra'],
+ 'party_off' => $pv['total'] > 0 ? round(($pv['total'] - $pv['nr_attending'])/$pv['total']*100,0) : $pv['total'],
+ 'party_ent' => $pv['nr_attending'] > 0 ? round(($pv['nr_attending'] - $pv['votes_pro'] - $pv['votes_contra'])/$pv['nr_attending']*100,0) : $pv['nr_attending']));
}
return $result;
}
@@ -68,9 +69,9 @@ class default_bulletin extends SYSTEM\PAGE\Page {
$result = "";
foreach($partyvotes as $vote){
- $vote['party_yes'] = round($vote['votes_pro']/$vote['total']*100,0);
- $vote['party_no'] = round($vote['votes_contra']/$vote['total']*100,0);
- $vote['party_ent'] = round(($vote['nr_attending'] - $vote['votes_pro'] - $vote['votes_contra'])/$vote['total']*100,0);
+ $vote['party_yes'] = $vote['votes_pro'] > 0 ? round($vote['votes_pro']/$vote['total']*100,0) : $vote['votes_pro'];
+ $vote['party_no'] = $vote['votes_contra'] > 0 ? round($vote['votes_contra']/$vote['total']*100,0) : $vote['votes_contra'];
+ $vote['party_ent'] = $vote['nr_attending'] > 0 ? round(($vote['nr_attending'] - $vote['votes_pro'] - $vote['votes_contra'])/$vote['total']*100,0) : $vote['nr_attending'];
$result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/table_parties.tpl'), $vote);
}
diff --git a/uVote/page/default_bulletin/icons_table_parties.tpl b/uVote/page/default_bulletin/icons_table_parties.tpl
index 052468a..97038a8 100644
--- a/uVote/page/default_bulletin/icons_table_parties.tpl
+++ b/uVote/page/default_bulletin/icons_table_parties.tpl
@@ -1,3 +1,4 @@
+
${urvote_party_table_desc}
diff --git a/uVote/page/default_bulletin/vote_bt.tpl b/uVote/page/default_bulletin/vote_bt.tpl
index 2d5b9de..a25b758 100644
--- a/uVote/page/default_bulletin/vote_bt.tpl
+++ b/uVote/page/default_bulletin/vote_bt.tpl
@@ -4,4 +4,5 @@
${party_yes}%
${party_no}%
${party_ent}%
+
${party_off}%
\ No newline at end of file
diff --git a/uVote/page/default_page/page.tpl b/uVote/page/default_page/page.tpl
index a9a1520..b70d909 100644
--- a/uVote/page/default_page/page.tpl
+++ b/uVote/page/default_page/page.tpl
@@ -21,6 +21,30 @@
+
+
+
+
+
+
+ ${impressum_header}
+ ${impressum_1}
+ ${impressum_2}
+ ${impressum_3}
+ ${impressum_4}
+ ${impressum_5}
+
+
+
+
+
+
+