final commit

This commit is contained in:
Naeltard 2015-10-25 04:21:14 +01:00
parent 6a152aeb50
commit 15a561cb15
3 changed files with 18 additions and 10 deletions

View File

@ -1,3 +1,3 @@
<?php
require_once dirname(__FILE__).'/system/autoload.inc';
require_once dirname(__FILE__).'/lib_font_awesome/autoload.inc';
require_once dirname(__FILE__).'/font_awesome/autoload.inc';

View File

@ -18,14 +18,24 @@
</div>
<div class="col-md-6" style="margin: 0; padding: 0; text-align: right;">
${loginform}
<br>
<li class="fa fa-facebook fa-lg"></li>
<br>
<li class="fa fa-twitter fa-lg"></li>
</div>
</div>
<div class="row" style="margin-bottom: 15px;">${menu}</div>
<div class="row" style="margin-bottom: 15px;">
<div class="col-md-6" style="margin: 0; padding: 0;">
${menu}
</div>
<div class="col-md-6" style="margin: 0; padding: 0;">
<div class="row">
<ul class="nav nav-pills pull-right">
<li> <a href="#"><span class="fa fa-facebook fa-lg"></span>&nbsp;&nbsp;facebook&nbsp;&nbsp;</a></li>
<li><a href="https://twitter.com/uvote_de" target="blank"><span class="fa fa-twitter fa-lg"></span>&nbsp;&nbsp;twitter</a></li>
</ul>
</div>
</div>
</div>
<div class="row" id="user_main"></div>
<a href="#!start(user_main(imp))">&nbsp;&nbsp;Impressum</a>
</div>

View File

@ -8,10 +8,8 @@
${title}
</div>
<div class="col-md-1">
<label class="label label-primary" style="padding: 5px">
<span class="glyphicon glyphicon-info-sign"></span>
${statusmarker}
</label>
<br>
<font size="1">${votecount}&nbsp;Stimme/n</font>
</div>
@ -19,8 +17,8 @@
<a href="#!start(poll);poll.${ID}" class="btn btn-primary btn-small" poll_ID="${ID}"><span class="glyphicon glyphicon-eye-open"></span>&nbsp;&nbsp;Abstimmen</a>
</div>
</div>
<br>
<div class="row" style="border-top: 1px solid #ccc">
<div class="row" style="border-bottom: 1px solid #ccc">
<div class="col-md-8" style="padding: 5px;">
${tags}
</div>