From 97a3a80150b7e3fbea29c198cd0b85670fb4ac58 Mon Sep 17 00:00:00 2001
From: Nael <t.rechel@gmx.de>
Date: Sat, 1 Mar 2014 16:36:18 +0100
Subject: [PATCH] corrected bar

---
 uVote/page/user_main_uVote/uVote.tpl             |  7 ++++---
 uVote/page/user_main_urVote/all_polls.tpl        | 14 ++++++++------
 uVote/page/user_main_urVote/urVote.tpl           |  2 +-
 uVote/page/user_main_urVote/user_main_urVote.php |  4 +++-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/uVote/page/user_main_uVote/uVote.tpl b/uVote/page/user_main_uVote/uVote.tpl
index fcda0fd..339476d 100644
--- a/uVote/page/user_main_uVote/uVote.tpl
+++ b/uVote/page/user_main_uVote/uVote.tpl
@@ -1,15 +1,16 @@
-<div style="float: left;">
+<div style="width: 50%; float: left;">
     
     <h5>Entscheidungsverhalten der uVote Community</h5>
-    <span style="float: left">
+    <span style="float: left,">
     ${votes_all}
     </span>
     <span style="">  Wie oft die uVote Community 
         <br>  insgesamt Dafür, Dagegen oder 
         <br>  Enthaltung gestimmt hat.</span>
 </div>
-<div style="float: right; margin-right: 50px;">
+<div style="width: 50%; float: right;">
     <h5>Entscheidungsverhalten des Bundestags</h5>
+    <br>
     <span style="float: left">
     ${votes_all_bt}
     </span>
diff --git a/uVote/page/user_main_urVote/all_polls.tpl b/uVote/page/user_main_urVote/all_polls.tpl
index ee3c9f4..474008d 100644
--- a/uVote/page/user_main_urVote/all_polls.tpl
+++ b/uVote/page/user_main_urVote/all_polls.tpl
@@ -1,7 +1,9 @@
-<h5>Deine aktuelle Abstimmungsquote</h5>
-<div style="float: left">Abgestimmt/</div>
-<div style="margin-left: 90px;">Offene Abstimmungen</div>
-<div class="progress" style="height: 30px;">   
-  <div class="bar bar-success" style="width: ${vote_perc}%;"></div>
-  <div class="bar bar-info" style="width: ${no_vote_perc}%;"></div>  
+<h5>Deine Abstimmungsquote</h5>
+<div style="">
+    <div style="float: left">Abgestimmt/</div>
+    <div style="margin-left: 90px;">Offen</div>
+    <div class="progress" style="height: 20px;">   
+      <div class="bar bar-success" style="width: ${vote_perc}%;">${voted}</div>
+      <div class="bar bar-info" style="width: ${no_vote_perc}%;">${not_voted}</div>  
+    </div>
 </div>
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/urVote.tpl b/uVote/page/user_main_urVote/urVote.tpl
index e4d58bb..59f468d 100644
--- a/uVote/page/user_main_urVote/urVote.tpl
+++ b/uVote/page/user_main_urVote/urVote.tpl
@@ -13,7 +13,7 @@
         </tr>               
     </table>
     </div>
-        <div style="float: left; padding-left: 50px;">
+        <div style="float: right;">
              ${user_temp_votes}
         </div>
 </div>
diff --git a/uVote/page/user_main_urVote/user_main_urVote.php b/uVote/page/user_main_urVote/user_main_urVote.php
index 1261ccc..956a30b 100644
--- a/uVote/page/user_main_urVote/user_main_urVote.php
+++ b/uVote/page/user_main_urVote/user_main_urVote.php
@@ -7,7 +7,9 @@ class user_main_urVote extends SYSTEM\PAGE\Page {
         $nv = $vars['not_voted'];
         return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/all_polls.tpl'),
                 array(  'vote_perc'=> round($v/($nv+$v)*100,0),
-                        'no_vote_perc'=> round($nv/($nv+$v)*100,0)));
+                        'no_vote_perc'=> round($nv/($nv+$v)*100,0),
+                        'voted'=> $v,
+                        'not_voted'=> $nv));
     }
 
         private function user_to_bt(){