started to move stylesheets into external files

uVote/page/default_bulletin/bars_user.tpl

@@ -1,6 +1,6 @@
 <h5>${bulletin_bars_title}</h5>
 ${urvote_bars_user}
-    <div class="progress" style="height: 20px; width: 350px;">
+    <div class="progress" id="progress_bars_user">
       <div class="bar bar-success" style="width: ${vote_yes_perc}%;">${vote_yes_perc}%</div>
       <div class="bar bar-danger" style="width: ${vote_no_perc}%;">${vote_no_perc}%</div>
       <div class="bar bar-info" style="width: ${vote_ent_perc}%;">${vote_ent_perc}%</div>

uVote/page/default_bulletin/bulletin.tpl

@@ -1,10 +1,10 @@
-<div style="float: left; width: 100%;"> 
+<div id="bulletin_main"> 
     <h4>${title}</h4>
     ${vote_buttons}
-    <div style="float: left;">
+    <div id="bulletin_left">
         <img src="${frontend_logos}icon_urn_${vote_class}.png"/>
     </div>
-    <div style="margin-top: 30px;">
+    <div id="bulletin_sub1">
         ${openvote_help_text}
         ${title}
         ${openvote_help_text1}
@@ -12,29 +12,29 @@
     <div>
         ${voice_weight}
     </div>
-    <div style="float: left; width: 50%; padding-top: 30px"> 
+    <div id="bulletin_sub2"> 
            ${bars_user}<br>      
            ${bars_bt}
     </div>
-    <div style="float: right; width: 50%; padding-top: 30px">   
+    <div id="bulletin_sub3">   
         ${icons_party}
         ${choice_party}
     </div>
-    <div class="divider" style="clear: both"></div>
+    <div id="divider"></div>
     <br>
-    <div style="padding-top: 30px;">
+    <div id="bulletin_sub4">
     <h4>Kommentare</h4>
-    <div style="padding-top: 20px;">
+    <div id="bulletin_sub5">
-        <div style="float: left; width: 40%">
+        <div id="bulletin_sub5_sub">
             <h5>Pro</h5>
             ${comments_pro}
         </div>
-        <div style="float: right; width: 40%">
+        <div id="bulletin_sub6">
             <h5>Contra</h5>
             ${comments_con}
         </div>
     </div>
-        <div style="clear: both"></div>
+        <div id="bulletin_sub7"></div>
         <div>
             <font size="2">Kommentar</font><br>
             <textarea id="c_txt_pro"></textarea><br>

uVote/page/default_bulletin/comment.tpl

@@ -1,15 +1,15 @@
-<div style="float: left; width: 90%;">
+<div id="comment_main">
-<div style="float: left"><font size="1">${timestamp}</font></div>
+<div id="comment_sub1">${timestamp}</div>
 <a style="float: right" class="btn btn-warning btn-mini c_spam" c_ID="${c_ID}"><i class="icon-white icon-exclamation-sign"></i></a>
-<div style="clear: both"></div>
+<div id="comment_sub2"></div>
 <div>${c_txt}</div>
 <br>
-<div style="">
+<div id="comment_sub3">
-    <font size="2">${count_up}</font>
+    ${count_up}
     <a class="btn btn-success btn-mini c_up" c_ID="${c_ID}"><i class="icon-white icon-thumbs-up"></i></a>
-    <font size="2">${count_down}</font>
+    ${count_down}
     <a class="btn btn-danger btn-mini c_down" c_ID="${c_ID}"><i class="icon-white icon-thumbs-down"></i></a>
-    <div style="float: right"><font size="1">Quelle:</font><font size="2">${c_src}</font></div>
+    <div id="comment_sub4">Quelle:<font size="2">${c_src}</font></div>
 </div>
 
 </div>

uVote/page/default_bulletin/css/bars_user.css

@@ -0,0 +1,4 @@
+.progress#progress_bars_user {
+    height: 20px; 
+    width: 350px;
+}

uVote/page/default_bulletin/css/bulletin.css

@@ -0,0 +1,48 @@
+#bulletin_main {
+    float: left; 
+    width: 100%;
+}
+
+#bulletin_left {
+    float: left;
+}
+
+#bulletin_sub1 {
+    margin-top: 30px;
+}
+
+#bulletin_sub2 {
+    float: left; 
+    width: 50%; 
+    padding-top: 30px;
+}
+
+#bulletin_sub3 {
+    float: right; 
+    width: 50%; 
+    padding-top: 30px;
+}
+#divider {
+    clear: both;
+}
+
+#bulletin_sub4 {
+    padding-top: 30px;
+}
+#bulletin_sub5 {
+    padding-top: 20px;
+}
+
+#bulletin_sub5_sub {
+    float: left; 
+    width: 40%;
+}
+
+ #bulletin_sub6 {
+     float: right; 
+     width: 40%;
+ }
+ 
+ #bulletin_sub7 {
+     clear: both;
+ }

uVote/page/default_bulletin/css/comment.css

@@ -0,0 +1,22 @@
+#comment_main {
+    float: left; 
+    width: 90%;
+}
+
+#comment_sub1 {
+    float: left;
+    font-size: 1;
+}
+
+#comment_sub2 {
+    clear: both;
+}
+
+#comment_sub3 {
+    font-size: 2;
+}
+
+#comment_sub4 {
+    float: right;
+    font-size: 1;
+}

uVote/page/default_bulletin/default_bulletin.php

@@ -195,7 +195,9 @@ class default_bulletin extends SYSTEM\PAGE\Page {
     private function js(){        
         return  '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_bulletin/js/vote.js').'"></script>';}
     private function css(){  
-        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page\css\default_page.css').'" rel="stylesheet">';} 
+        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_bulletin\css\bars_user.css').'" rel="stylesheet">'.
+                '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_bulletin\css\bulletin.css').'" rel="stylesheet">'.
+                '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_bulletin\css\comment.css').'" rel="stylesheet">';} 
 
         
     

uVote/page/default_page/cover.tpl

@@ -1,6 +1,6 @@
-<div class="row" style="margin-right: 30px;">
+<div class="row">
     <img src="${frontend_logos}cover.png"/>
-    <div style="margin-right: 25px;">
+    <div id="cover_style">
         <img src="${frontend_logos}chrome.png" width="200px"/>
     </div>
 </div>

uVote/page/default_page/css/cover.css

@@ -0,0 +1,6 @@
+.row {
+    margin-right: 30px;
+}
+#cover_style {
+    margin-right: 25px;
+}

uVote/page/default_page/css/full_vote.css

@@ -0,0 +1,11 @@
+.row {
+    margin: 0;
+}
+
+.span6 {
+    float: right
+}
+
+.span6#iframe_ {
+    width: 50%;
+}

uVote/page/default_page/css/loggedinform.css

@@ -0,0 +1,9 @@
+.row#row_loggedinform {
+    padding-bottom: 20px;
+}
+
+.btn#btn_loggedinform {
+    margin-left: 150px; 
+    height: 100px; 
+    width: 100px;
+}

uVote/page/default_page/css/page.css

@@ -0,0 +1,35 @@
+body {
+    padding-top: 60px;
+}
+
+.main_container {
+}
+
+.modal {
+    float: left; 
+    display:none;
+}
+
+.navbar-inner { 
+    padding-left: 50px; 
+    padding-right: 50px;
+}
+
+#site-content {
+    padding: 0; 
+    margin: 0; 
+    margin-left: 35px;
+}
+            
+#user_main {
+    padding: 0; 
+    padding-top: 0px; 
+    width: 50%; 
+    float: left;
+}
+            
+#user_list { 
+    padding: 0px; 
+    width: 50%; 
+    float: right;
+}

uVote/page/default_page/css/register_form.css

@@ -0,0 +1,23 @@
+.btn#btn_register_form {
+    margin-top: 0;
+}
+
+.control-group{
+    margin: 0px; 
+    padding: 0px;
+}
+
+#remember_me {
+    margin-top: -1px;
+}
+
+#help-block-user-password-combi-wrong {
+    display: none;
+    color: red;
+}
+
+.btn btn-primary#btn-primary_register_form {
+    clear: left; 
+    height: 32px; 
+    font-size: 13px;
+}

uVote/page/default_page/css/vote.css

@@ -0,0 +1,69 @@
+#vote_main {
+    margin-bottom: 5px; 
+    width: 100%; 
+    min-height: 125px; 
+    border: solid lightgray 1px; 
+    background: beige;
+}
+    
+#vote_sub1 {
+    float: left; 
+    width: 75%; 
+    padding: 5px; 
+    padding-top: 0;
+}
+
+#vote_sub2 {
+    margin: 0; 
+    padding: 0; 
+    float: right;
+}
+
+#vote_sub3 {
+    width: 100%; 
+    height: 125px; 
+    margin: 0; 
+    padding: 0;
+}
+
+#bt_vote_class_ {
+    float: left; 
+    width: 80px; 
+    border-left: 1px solid lightgray; 
+    padding-right: 2px; 
+    padding-left: 2px;
+}
+
+ #uv_vote_class_ {
+     float: left; 
+     height: 125px; 
+     width: 60px; 
+     border-left: 1px solid lightgray; 
+     padding-right: 2px; 
+     padding-left: 2px;
+ }
+ 
+#time_done {
+     background: white; 
+     margin: 0; 
+     padding: 0;
+}
+
+#vote_sub_3_1 {
+    width: 5px; 
+    margin: 0; 
+    padding: 0;
+}
+
+#vote_sub_3_2 {
+    width: 5px; 
+    margin: 0; 
+    padding: 0;
+}
+
+#time_left { 
+    background: blue; 
+    margin: 0; 
+    padding: 0;
+}
+            

uVote/page/default_page/css/vote_bt.css

@@ -0,0 +1,3 @@
+#vote_bt_span {
+    float:right;
+}

uVote/page/default_page/default_page.php

@@ -16,6 +16,15 @@ class default_page extends SYSTEM\PAGE\Page {
     
     private function css(){  
         return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css').'" rel="stylesheet">'.
+               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/page.css').'" rel="stylesheet">'.
+               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/full_vote.css').'" rel="stylesheet">'.
+               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/cover.css').'" rel="stylesheet">'.
+               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/vote.css').'" rel="stylesheet">'.
+               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/vote_bt.css').'" rel="stylesheet">'.
+               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/loggedinformtop.css').'" rel="stylesheet">'.
+               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/register_form.css').'" rel="stylesheet">'.
+               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/parties_on_vote.css').'" rel="stylesheet">'.
+               '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/loggedinform.css').'" rel="stylesheet">'.
                '<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap.min.css').'" rel="stylesheet">'.
                '<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-theme.min.css').'" rel="stylesheet">'.
                '<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-responsive.min.css').'" rel="stylesheet">';}        

uVote/page/default_page/full_vote.tpl

@@ -1,8 +1,8 @@
-<div class="row" style="margin: 0;">
+<div class="row">
-    <div class="span6" style="float: right">       
+    <div class="span6">       
         Quelle: <a href="${iframe_link}">${iframe_link} </a>
     </div>
-    <div class="span6" style="width: 50%;">          
+    <div class="span6" id="iframe_">          
         <iframe src="${iframe_link}" width="730" height="4000"></iframe>
     </div>
 </div>

uVote/page/default_page/loggedinform.tpl

@@ -12,7 +12,7 @@ Zum Umgang mit diesen Daten lesen sie bitte
 <br>
 unsere AGBs.
         <br>
-        <div class="row" style="padding-bottom: 20px;">
+        <div class="row" id="row_loggedinform" style="padding-bottom: 20px;">
         <div class="span">       
 <li class="dropdown">
                       <a href="#" role="button" class="btn" data-toggle="dropdown">Alter <b class="caret"></b></a>
@@ -56,7 +56,7 @@ unsere AGBs.
                     </li>
         </div>
         <div class="span">
-<button type="submit" align="right" class="btn" style=" margin-left: 150px; height: 100px; width: 100px;">Daten absenden</button>
+<button type="submit" align="right" class="btn" id="btn_loggedinform">Daten absenden</button>
         </div>
         </div>
       

uVote/page/default_page/loginform.css

@@ -0,0 +1,20 @@
+#help-block {
+    float: left; 
+    padding: 0;
+}
+
+#controls {
+    float: left; 
+    margin-right: 10px;
+}
+
+ #controls2 {
+     float: left;
+     margin-right: 20px;
+ }
+ 
+.btn btn-primary#login_submit {
+    float: left; 
+    height: 32px; 
+    font-size: 13px;
+}

uVote/page/default_page/loginform.tpl

@@ -3,11 +3,11 @@
               <input class="span2" type="password" id="login_password" placeholder="Passwort">
               <button type="submit" class="btn">Login</button>
 </form> -->
-<form class="navbar-form pull-right" style="" id="form_login">
+<form class="navbar-form pull-right" id="form_login">
     <div class="control-group">
-        <div class="help-block"style="float: left; padding: 0;"></div>
+        <div id="help-block"></div>
         <input type="hidden" />
-        <div class="controls" style="float: left; margin-right: 10px;">
+        <div id="controls">
             <input  type="text"
                     size="20"
                     style=""
@@ -17,7 +17,7 @@
                     maxlength="16" data-validation-maxlength-message="${register_user_name_too_long}"
                     required data-validation-required-message="${register_user_name_required}"/>
         </div>
-        <div class="controls" style="float: left;margin-right: 20px;">
+        <div id="controls2" style="float: left;margin-right: 20px;">
             <input  type="password"
                     size="20"
                     style=""
@@ -28,8 +28,6 @@
                     required data-validation-required-message="${register_user_password_required}"/>
         </div>        
         
-        <button class="btn btn-primary" style="float: left; height: 32px; font-size: 13px;"
+        <button class="btn btn-primary" type="submit" id="login_submit">${login}</button>
-                type="submit"
-                id="login_submit">${login}</button>
     </div>
 </form>

uVote/page/default_page/page.tpl

@@ -20,50 +20,49 @@
 
     </head>
 
-    <body style="padding-top: 60px;">
+    <body>
-    <div class="modal fade" id="impressum" style="float: left; display:none;">
+    <div class="main_container">
-        <div class="modal-dialog">
+        <div class="modal fade" id="impressum">
-            <div class="modal-content">
+            <div class="modal-dialog">
-                <div class="modal-header">
+                <div class="modal-content">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <div class="modal-header">
-                    <h4 class="modal-title">Impressum</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                </div>
+                        <h4 class="modal-title">Impressum</h4>
-                <div class="modal-body">
-                    <div style="background: white;">
-                        ${impressum_header}
-                        ${impressum_1}
-                        ${impressum_2}
-                        ${impressum_3}
-                        ${impressum_4}
-                        ${impressum_5}
                     </div>
-                </div>
+                    <div class="modal-body">
-                <div class="modal-footer">
+                        <div style="background: white;">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                            ${impressum_header}
-                </div>
+                            ${impressum_1}
-        </div><!-- /.modal-content -->
+                            ${impressum_2}
-      </div><!-- /.modal-dialog -->
+                            ${impressum_3}
-    </div><!-- /.modal -->
+                            ${impressum_4}
-    
+                            ${impressum_5}
-        <div class="navbar navbar-inverse navbar-fixed-top" style="">
+                        </div>
-            <div class="navbar-inner" style="padding-left: 50px; padding-right: 50px;">                
+                    </div>
-                    <ul class="nav navbar-nav">              
+                    <div class="modal-footer">
-                        <li><a class="brand" href="" id="menu_uvote">uVote</a></li>
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                        <li><a data-toggle="modal" class="brand" href="#impressum" id="impressum"><font size="2">impressum</font></a></li>
+                    </div>
-                        ${loginform}
+            </div><!-- /.modal-content -->
-                    </ul>                    
+          </div><!-- /.modal-dialog -->
-                </div>                
+        </div><!-- /.modal -->
-            </div>
-        </div>
-                
-        <div id="site-content" style="padding: 0; margin: 0; margin-left: 35px;">
-            
-            <div id="user_main" style="position: absolute; padding: 0; padding-top: 0px; width: 49%;"></div>
-            
-            <div id="user_list" style="padding: 0px; width: 50%; float: right;">            
-                
-            </div>
-        </div>
 
+            <div class="navbar navbar-inverse navbar-fixed-top">
+                <div class="navbar-inner">                
+                        <ul class="nav navbar-nav">              
+                            <li><a class="brand" href="" id="menu_uvote">uVote</a></li>
+                            <li><a data-toggle="modal" class="brand" href="#impressum" id="impressum"><font size="2">impressum</font></a></li>
+                            ${loginform}
+                        </ul>                    
+                    </div>                
+                </div>
+
+            <div id="site-content">
+
+                <div id="user_main"></div>
+
+                <div id="user_list"></div>
+                
+            </div>
+        </div>
     </body>
 </html>

uVote/page/default_page/register_form.tpl

@@ -1,9 +1,7 @@
 <div>
-    
+    <a class="btn" id="btn_register_form" align="left"></a>
 
-    <a class="btn" style="margin-top: 0;" align="left"></a>
+      <div class="control-group" id="control-group_register_form">
-
-      <div class="control-group" style="margin: 0px; padding: 0px;">
         <div class="controls">
             <input  type="text"
                     size="30"
@@ -23,7 +21,7 @@
                     required data-validation-required-message="${login_password_required}"/>
         </div>
       </div>
-        <div class="control-group" style="margin: 0px;">
+        <div class="control-group" id="control-group_register_form2">
         <div class="controls">
             <input  type="password"
                     size="30"
@@ -33,13 +31,11 @@
                     data-validation-matches-message="${register_password_dont_math}"/>
 
         </div>
-        <label><input type="checkbox" id="remember_me" style="margin-top: -1px;">  ${login_rememberMe}</label>
+        <label><input type="checkbox" id="remember_me">  ${login_rememberMe}</label>
         <div class="help-block"></div>
-        <div id="help-block-user-password-combi-wrong" style="display: none"><font color="red">${login_not_successfull}</font></div>
+        <div id="help-block-user-password-combi-wrong">${login_not_successfull}</div>
         
-        <button class="btn btn-primary" style="clear: left; height: 32px; font-size: 13px;"
+        <button class="btn btn-primary" id="btn-primary_register_form" type="submit" id="login_submit">${login}</button>
-                type="submit"
-                id="login_submit">${login}</button>
                 <input type="hidden" />
     </div>
 

uVote/page/default_page/vote.tpl

@@ -1,5 +1,5 @@
-<div style="margin-bottom: 5px; width: 100%; min-height: 125px; border: solid lightgray 1px; background: beige;">
+<div id="vote_main">
-    <div style="float: left; width: 75%; padding: 5px; padding-top: 0;">       
+    <div id="vote_sub1">       
         <h5>${title}</h5>           
         <img src="${frontend_logos}icon_urn_${vote_class}.png">               
         <a class="btn btn-primary btn-small btn_vote" poll_ID="${ID}">${full_vote_btn}</a>
@@ -7,11 +7,11 @@
     </div>
     
     <div id="vote_data_panel${ID}" poll_ID="${ID}" style="display: none; float: left;">
-        <div class="${bt_vote_class}" style="float: left; width: 80px; border-left: 1px solid lightgray; padding-right: 2px; padding-left: 2px;">            
+        <div class="${bt_vote_class}" id="bt_vote_class_">            
             <img src="${frontend_logos}icon_bt.png" width="80">
             ${bt}            
         </div>
-        <div class="${uv_vote_class}" style="float: left; height: 125px; width: 60px; border-left: 1px solid lightgray; padding-right: 2px; padding-left: 2px;">          
+        <div class="${uv_vote_class}" id="uv_vote_class_">          
             <img src="${frontend_logos}icon_urn.png" width="20">
             <span style="">
                 <font size="2">uVote</font>
@@ -22,14 +22,14 @@
             </span>
         </div>          
     </div>
-        <div style="margin: 0; padding: 0; float: right;" >
+        <div id="vote_sub2">
-        <div class="poll_time" time="${time_end}" style="width: 100%; height: 125px; margin: 0; padding: 0;">
+        <div id="vote_sub3" class="poll_time" time="${time_end}">
-            <div id="time_done" style="height: ${time_done}%; background: white; margin: 0; padding: 0;">
+            <div id="time_done" style="height: ${time_done}%;">
-                <div style="width: 5px; margin: 0; padding: 0;">
+                <div id="vote_sub_3_1">
                 </div>
             </div>
-            <div id="time_left" style="height: ${time_left}%; background: blue; margin: 0; padding: 0;">
+            <div id="time_left" style="height: ${time_left}%;">
-                <div style="width: 5px; margin: 0; padding: 0;">
+                <div id="vote_sub_3_2">
                 </div>
             </div>
         </div>

uVote/page/default_page/vote_bt.tpl

@@ -1 +1,2 @@
-<img src="${frontend_logos}icon_${party}.png" width="30"><span class="badge ${choice_class}" style="float:right;">${choice}</span><br>
+<img src="${frontend_logos}icon_${party}.png" width="30">
+<span id="vote_bt_span" class="badge ${choice_class}">${choice}</span><br>

uVote/page/default_page/vote_uv.tpl

@@ -1 +1 @@
-<span class="badge ${badge}" style="">${perc}%</span>
+<span class="badge ${badge}">${perc}%</span>

uVote/page/default_register/css/register.css

@@ -0,0 +1,56 @@
+.panel-group#accordion {
+    padding-right: 30px;
+}
+
+#carousel-example-generic {
+    width: 50%; float: left;
+}
+
+#graph_bt_uv_overall {
+    float: left; 
+    width: 300px;
+}
+
+#register_username {
+    margin-bottom: 15px; 
+    float: left;
+}
+
+#register-help-block-username {
+    float: left; 
+    margin-top: 3px;
+}
+
+#register_email {
+    margin-bottom: 15px; 
+    float: left;
+}
+
+#register-help-block-email {
+    float: left; 
+    margin-top: 3px;
+}
+
+#change_user_password_sub {
+    clear: both;
+}
+
+#user_register_password1 {
+    margin-bottom: 15px; 
+    float: left;
+}
+
+#user_register_password2 {
+    margin-bottom: 15px; 
+    float: left;
+}
+
+#help-block_register {
+    float: left; 
+    margin-top: 3px;
+}
+
+#help-block_register2 {
+    float: left; 
+    margin-top: 3px;
+}

uVote/page/default_register/default_register.php

@@ -2,10 +2,13 @@
 
 class default_register extends SYSTEM\PAGE\Page {
       
+    private function css(){  
+        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_register/css/register.css').'" rel="stylesheet">';}
 
      public function html(){
         $vars = array();
         $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
+        $vars['css'] = $this->css();
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(100));
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_register/register.tpl'), $vars);

uVote/page/default_register/register.tpl

@@ -1,4 +1,4 @@
-    <div class="panel-group" id="accordion" style="padding-right: 30px;">
+    <div class="panel-group" id="accordion">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h4 class="panel-title">
@@ -20,7 +20,7 @@
             </div>
             <div id="collapse_gallery" class="panel-collapse collapse">
                 <div class="panel-body">
-                    <div id="carousel-example-generic" class="carousel slide" data-ride="carousel"  style="width: 50%; float: left;">
+                    <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
                         <!-- Indicators -->
                         <ol class="carousel-indicators">
                           <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
@@ -46,7 +46,7 @@
                           <span class="glyphicon glyphicon-chevron-right"></span>
                         </a>
                     </div>
-                    <div id="graph_bt_uv_overall" style="float: left; width: 300px;"></div>
+                    <div id="graph_bt_uv_overall"></div>
                     <script type="text/javascript" language="JavaScript">load_visualisation('graph_bt_uv_overall',84600);</script>
                 </div>
             </div>
@@ -69,13 +69,12 @@
                                            <div class="control-group controls">
                                                 <input  type="text"
                                                         size="30"
-                                                        style="margin-bottom: 15px; float: left;"
                                                         id="register_username"
                                                         placeholder="${ari_name}"
                                                         minlength="3" data-validation-minlength-message="${register_user_name_too_short}"
                                                         required data-validation-required-message="${register_user_name_required}"/>
                                                 <br/>
-                                                <div id="register-help-block-username" class="help-block" style="float: left; margin-top: 3px;"></div>
+                                                <div id="register-help-block-username" class="help-block"></div>
                                             </div>
                                        </td>
                                     </tr>
@@ -85,13 +84,12 @@
                                             <div class="control-group controls">
                                                 <input  type="email"
                                                         size="30"
-                                                        style="margin-bottom: 15px; float: left;"
                                                         id="register_email"
                                                         placeholder="${ari_mail}"
                                                         data-validation-email-message="${mail_format_wrong}"
                                                         required data-validation-required-message="${register_email_required}"/>
                                                 <br/>
-                                                <div id="register-help-block-email" class="help-block" style="float: left; margin-top: 3px;"></div>
+                                                <div id="register-help-block-email" class="help-block"></div>
                                             </div>
                                        </td>
                                     </tr>
@@ -99,29 +97,27 @@
                                        <th>${user_password_register}</th>
                                        <td>
                                             <div class="control-group" id="change_user_password">
-                                                  <div class="control-group controls" style="clear: both">
+                                                  <div class="control-group controls" id="change_user_password_sub">
                                                       <input  type="password"
                                                               size="30"
-                                                              style="margin-bottom: 15px; float: left;"
                                                               id="user_register_password1"
                                                               name="user_register_password1"
                                                               placeholder="${ari_pass}"
                                                               minlength="5" data-validation-minlength-message="${register_password_too_short}"
                                                               required data-validation-required-message="${register_password_required}"/>
                                                       <br/>
-                                                      <div class="help-block" style="float: left; margin-top: 3px;"></div>
+                                                      <div class="help-block" id="help-block_register"></div>
                                                   </div>
                                                   <div class="control-group controls" style="clear: both">
                                                       <input  type="password"
                                                               size="30"
-                                                              style="margin-bottom: 15px; float: left;"
                                                               id="user_register_password2"
                                                               name="user_register_password2"
                                                               placeholder="${ari_pass}"
                                                               data-validation-matches-match="user_register_password1"
                                                               data-validation-matches-message="${register_password_dont_match}"/>
                                                       <br/>
-                                                      <div class="help-block" style="float: left; margin-top: 3px;"></div>
+                                                      <div class="help-block" id="help-block_register2"></div>
                                                   </div>
                                              </div>
                                        </td>

uVote/page/user_list/css/list_menu.css

@@ -0,0 +1,7 @@
+#tabbable_list_menu {
+    padding-right: 50px;
+}
+
+#tab-content_list_menu {
+    padding-top: 10px;
+}

uVote/page/user_list/list_menu.tpl

@@ -1,9 +1,9 @@
-<div class="tabbable" style="padding-right: 50px;">
+<div class="tabbable" id="tabbable_list_menu">
     <ul class="nav nav-tabs" id="tabs_user_list">
         <li class="active"><a href="#tab_active" action="user_list_active">aktive Abstimmungen</a></li>
         <li class=""><a href="#tab_ended" action="user_list_ended">abgelaufene Abstimmungen</a></li>       
     </ul>
-    <div class="tab-content" style="padding-top: 10px;">        
+    <div class="tab-content" id="tab-content_list_menu">        
         <div class="tab-pane active" id="tab_active">${active}</div>
         <div class="tab-pane" id="tab_ended" style="overflow: hidden;"></div>
     </div>

uVote/page/user_list/user_list.php

@@ -1,10 +1,15 @@
 <?php
 
 class user_list extends SYSTEM\PAGE\Page {      
+    
+     private function css(){  
+        return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'user_list/css/list_menu.css').'" rel="stylesheet">';}
+    
     public function html(){ 
         $vars = array();
 
         $uv = new user_list_active();
+        $vars['css'] = $this->css();
         $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; 
         $vars['active'] = $uv->html();