This commit is contained in:
Nael 2013-07-05 20:52:16 +02:00
parent 736780de64
commit d98986a0e7
6 changed files with 24 additions and 11 deletions

View File

@ -0,0 +1,7 @@
<div class="span6" style="margin: 0;">
<div class="hero_unit" style="margin: 0; padding: 20px; background-color: gainsboro; width: 95%;"
<p>${text}</p>
<li class="divider"></li>
<p>${text}</p>
</div>
</div>

View File

@ -17,7 +17,7 @@ class default_page extends SYSTEM\PAGE\Page {
$result = "";
$votes = votes::getAllVotesOfGroup(1);
foreach($votes as $vote){
$vars = array('vote_title' => $vote['title'], 'vote_text' => $vote['text'], 'poll_ID' => $vote['ID']);
$vars = array('vote_title' => $vote['title'], 'vote_text' => $vote['text'], 'poll_ID' => $vote['ID'], 'time_end' => $vote['time_end']);
$result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vars);
}
return $result;

View File

@ -17,7 +17,7 @@ $(document).ready(function() {
});
$('.btn_openvoteinfo').click(function () {
alert ("#openvoteinfo"+$(this).attr('poll_ID'));
alert ("#openvoteinfo"+$(this).attr('poll_ID')('time_end'));
if($("#openvoteinfo"+$(this).attr('poll_ID')).not(":visible")){
load_openvoteinfo($(this).attr('poll_ID'));
}

View File

@ -1,3 +1,7 @@
<div class="span5" style="margin: 0;">
<div class="span6" style="margin: 0;">
<div class="hero_unit" style="margin: 0; padding: 20px; background-color: gainsboro; width: 95%;"
<p>${text}</p>
</div>
<li class="divider"></li>
<p>${text}</p>
</div>
</div>

View File

@ -66,7 +66,7 @@
<div class="hero-unit" style="height: 180px; background: white; margin: 0; margin-top: -18px; -webkit-box-shadow: 1px 1px 4px 1px rgba(0, 0, 0, 0.5); box-shadow: 1px 1px 4px 1px rgba(0, 0, 0, 0.5);">
<div class="row">
<img src="${PIC_PATH}logo2.png" width="600" style="margin-top: -40px;" />
<div class="hero-unit" style="margin: 0px; padding: 15px; float: right; margin-top: -61px; background-color: silver;">
<div class="hero-unit" style="margin: 0px; padding: 5px; float: right; margin-top: -61px; background-color: silver;">
<!-- margin-left: 600px; margin-right: -60px; padding: 5px; margin-top: -240px;-->
${registerform}

View File

@ -1,16 +1,18 @@
<div class="hero-unit" style="padding: 5px; background: white; margin-bottom: 8px; -webkit-box-shadow: 1px 1px 4px 1px rgba(0, 0, 0, 0.5);
<div class="hero-unit" style="padding: 5px; padding-bottom: 30px; background: white; margin-bottom: 8px; -webkit-box-shadow: 1px 1px 4px 1px rgba(0, 0, 0, 0.5);
box-shadow: 1px 1px 4px 1px rgba(0, 0, 0, 0.5);">
<div class="row" style="width: 100%; margin: auto;">
<div class="row" style="width: 100%; margin: auto;">
<button class="btn btn-mini btn_openvoteinfo" data-toggle="dropdown" poll_ID=${poll_ID} style="float: right;">
<span class="caret"></span>
</button>
<div class="span6">
<h3>${vote_title}</h3>
<div class="span5" id="openvoteinfo${poll_ID}" style="margin: 0; display: none;">
<div class="span5" id="openvoteinfo${poll_ID}{time_end}" style="margin: 0; display: none;">
</div>
<br>
<button class="btn btn-mini btn_openvoteinfo" data-toggle="dropdown" poll_ID=${poll_ID}>
<span class="caret"></span>
</button>
</div>
<div class="span5" style="margin-top: 15px;">