From c8e739a86dce84078b4c7acdbc71e1670085856d Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Wed, 19 Feb 2014 04:08:58 +0100
Subject: [PATCH] uvote style + ideas

---
 uVote/page/default_page/default_page.php |  1 +
 uVote/page/default_page/page.tpl         |  2 +-
 uVote/page/default_page/vote.tpl         | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/uVote/page/default_page/default_page.php b/uVote/page/default_page/default_page.php
index db4b92b..d72ea37 100644
--- a/uVote/page/default_page/default_page.php
+++ b/uVote/page/default_page/default_page.php
@@ -37,6 +37,7 @@ class default_page extends SYSTEM\PAGE\Page {
             $time_remain = strtotime($vote['time_end'])-  microtime(true);
             $time_span = strtotime($vote['time_end']) - strtotime($vote['time_start']);
             $vote['vote_class'] = $this->tablerow_class(votes::getUserPollData($vote['ID']));
+            $vote['bt_vote_class'] = $this->tablerow_class($vote['bt_choice']);
             $vote['full_vote_btn'] = $time_remain > 0 ? 'Abstimmen' : 'Ansehen';
             $vote['time_left'] = round($time_remain/($time_span+1)*100,0);
             $vote['time_done'] = 100-$vote['time_left'];
diff --git a/uVote/page/default_page/page.tpl b/uVote/page/default_page/page.tpl
index 23ce690..416bac3 100644
--- a/uVote/page/default_page/page.tpl
+++ b/uVote/page/default_page/page.tpl
@@ -47,7 +47,7 @@
         </div>
         <div class="box" style="margin-top: 0; clear: both;">
             <div id="site-content" style="padding: 0; margin: 0; margin-left: 40px;">         
-                <div id="user_main" style="padding: 0px; width: 600px; float: left;"></div>
+                <div id="user_main" style="padding: 0px; width: 50%; float: left;"></div>
                 <div id="list" style="padding: 0px; width: 50%; float: right;">            
                     ${votelist}
                 </div>
diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl
index 055e262..a186738 100644
--- a/uVote/page/default_page/vote.tpl
+++ b/uVote/page/default_page/vote.tpl
@@ -1,12 +1,19 @@
-<table class="table" style="display: table; margin-bottom: 5px; float: left; width: 95%; height: 100px;"> 
-    <div style="margin: 0; margin-top: 5px; margin-bottom: 8px;">    
+<table style="margin-bottom: 5px; float: left; width: 95%; height: 100px; border: solid lightgray 1px; background: beige;">     
     <tr>        
-        <td class="" style="">
-            <a class="btn btn-primary btn-small btn_vote" style="float:right" poll_ID="${ID}">${full_vote_btn}</a>
+        <td style="padding: 5px;">            
             <h4>${title}</h4>
-             Nr.${ID}         
+            Nr.${ID}
+            <a class="btn btn-primary btn-small btn_vote" style="float:right" poll_ID="${ID}">${full_vote_btn}</a>
+        </td>
+        <td class="${bt_vote_class}" style="width: 75px; margin-top: 10px; border-left: 1px solid lightgray;">            
+            cdu<span class="badge badge-success" style="float:right;">5</span><br/>
+            csu<span class="badge badge-important" style="float:right;">5</span><br/>
+            spd<span class="badge" style="float:right;">5</span><br/>
+            grüne<span class="badge badge-success" style="float:right;">5</span><br/>
+            linke<span class="badge badge-important" style="float:right;">5</span>
+        </td>
+        <td class="${vote_class}" style="width: 20px; margin-top: 10px; border-left: 1px solid lightgray;">            
         </td>
-        <td class="${vote_class}" style="width: 20px; margin-top: 10px; border-left: 2px solid black;"></td>
         <td style="margin: 0; padding: 0; width: 3px;" >
             <table class="poll_time" time="${time_end}" style="width: 100%; height: 100%; margin: 0; padding: 0;">
                 <tr id="time_done" style="height: ${time_done}%; background: white; margin: 0; padding: 0;"><td style="width: 1px; margin: 0; padding: 0;"></td></tr>