impressum &shitz

nu texts
This commit is contained in:
Nael 2014-03-07 03:10:17 +01:00
parent 07c1b8cf70
commit b77bd29479
10 changed files with 56 additions and 18 deletions

View File

@ -1,5 +1,5 @@
<h5>${bulletin_bars_title}</h5>
Ergebnis uVote
${urvote_bars_user}
<div class="progress" style="height: 20px; width: 350px;">
<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>

View File

@ -1,5 +1,8 @@
<div style="float: right;">
<h4>${title}</h4>
<div style="margin-top: 30px;">
${openvote_help_text}${title}${openvote_help_text1}
</div>
<div style="float: right; margin-top: 30px;">
<div>
${vote_buttons}
<div style="float: right;">
@ -23,7 +26,7 @@
</div>
</div>
<div style="float: left;">
<div style="float: left;">
${icons_party}
${choice_party}
</div>

View File

@ -47,9 +47,10 @@ class default_bulletin extends SYSTEM\PAGE\Page {
array( 'party' => $pv['party'],
'choice' => $this->get_party_per_poll($pv['choice']),
'choice_class' => $this->tablerow_class($pv['choice']),
'party_yes' => round($pv['votes_pro']/$pv['total']*100,0),
'party_no' => round($pv['votes_contra']/$pv['total']*100,0),
'party_ent' => round(($pv['nr_attending'] - $pv['votes_pro'] - $pv['votes_contra'])/$pv['total']*100,0)));
'party_yes' => $pv['votes_pro'] > 0 ? round($pv['votes_pro']/$pv['total']*100,0) : 'votes_pro',
'party_no' => $pv['votes_contra'] > 0 ? round($pv['votes_contra']/$pv['total']*100,0) : $pv['votes_contra'],
'party_off' => $pv['total'] > 0 ? round(($pv['total'] - $pv['nr_attending'])/$pv['total']*100,0) : $pv['total'],
'party_ent' => $pv['nr_attending'] > 0 ? round(($pv['nr_attending'] - $pv['votes_pro'] - $pv['votes_contra'])/$pv['nr_attending']*100,0) : $pv['nr_attending']));
}
return $result;
}
@ -68,9 +69,9 @@ class default_bulletin extends SYSTEM\PAGE\Page {
$result = "";
foreach($partyvotes as $vote){
$vote['party_yes'] = round($vote['votes_pro']/$vote['total']*100,0);
$vote['party_no'] = round($vote['votes_contra']/$vote['total']*100,0);
$vote['party_ent'] = round(($vote['nr_attending'] - $vote['votes_pro'] - $vote['votes_contra'])/$vote['total']*100,0);
$vote['party_yes'] = $vote['votes_pro'] > 0 ? round($vote['votes_pro']/$vote['total']*100,0) : $vote['votes_pro'];
$vote['party_no'] = $vote['votes_contra'] > 0 ? round($vote['votes_contra']/$vote['total']*100,0) : $vote['votes_contra'];
$vote['party_ent'] = $vote['nr_attending'] > 0 ? round(($vote['nr_attending'] - $vote['votes_pro'] - $vote['votes_contra'])/$vote['total']*100,0) : $vote['nr_attending'];
$result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/table_parties.tpl'), $vote);
}

View File

@ -1,3 +1,4 @@
<h5>${urvote_party_table_desc}</h5>
<div style="width: 500px; float: left">
<div style="float: left"><img src="${frontend_logos}icon_urn.png" width="30"/></div>
<div style="float: left"></div>

View File

@ -4,4 +4,5 @@
<div style="margin-left: 5px; width: 20px; float: left"class="badge badge-success">${party_yes}%</div>
<div style="margin-left: 5px; width: 20px; float: left"class="badge badge-important">${party_no}%</div>
<div style="margin-left: 5px; width: 20px; float: left"class="badge badge-info">${party_ent}%</div>
<div style="margin-left: 5px; width: 20px; float: left"class="badge ">${party_off}%</div>
</div>

View File

@ -21,6 +21,30 @@
</head>
<body style="background: ${frontend_logos}background.png; padding-top: 51px;">
<div class="modal fade" id="impressum" style="width: 1000px;">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Impressum</h4>
</div>
<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-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<div class="navbar navbar-inverse navbar-fixed-top" style="">
<div class="navbar-inner" style="padding-left: 50px; padding-right: 50px;">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@ -29,6 +53,8 @@
<span class="icon-bar"></span>
</button>
<a class="brand" href="" id="menu_uvote">uVote</a>
<a data-toggle="modal" class="brand" href="#impressum" id="impressum">impressum</a>
<div class="nav-collapse collapse">
<ul class="nav">
<!--
@ -40,12 +66,16 @@
${loginform}
</div>
</div>
</div>
<div id="site-content" style="padding: 0; margin: 0; margin-left: 40px;">
</div>
<div id="site-content" style="padding: 0; margin: 0; margin-left: 40px;">
<div id="user_main" style="position: absolute; padding: 0; padding-top: 0px; width: 50%;"></div>
<div id="list" style="padding: 0px; width: 50%; float: right;">
${votelist}
</div>
</div>
</div>
</body>
</html>

View File

@ -35,4 +35,4 @@
<div>
<span class="badge badge-info">${user_count}</span> Nutzer auf uVote
</div>
</div>

View File

@ -1,7 +1,7 @@
<div style="padding-bot: 20px;">
<font>Aktueller Status</font>
<h5>Aktueller Status</h5>
</div>
<div style="width: 300px; border-style: solid; border-width: 1px; padding: 5px;">
<div style="width: 280px; border-style: solid; border-width: 1px; padding: 5px;">
<font size="2">Teilnahme an aktuellen Abstimmungen</font>
<div class="progress" style="height: 20px;">
<div class="bar" style="width: ${vote_perc}%;">${vote_perc}%</div>

View File

@ -1,4 +1,4 @@
<div style="width: 300px; border-style: solid; border-width: 1px; padding: 5px;">
<div style="width: 280px; border-style: solid; border-width: 1px; padding: 5px;">
<font size="2">Abstimmungsquote seit Accounterstellung</font>
<div class="progress" style="height: 20px;">
<div class="bar" style="width: ${vote_perc}%;">${vote_perc}%</div>

View File

@ -1,10 +1,12 @@
<div id="statistics_uvote_users">
<h5>${urVote_title}</h5>
${urvote_body_text}
<div style="float: left;">
<table style="border-collapse: separate;
border-spacing: 10px 5px; width: 350px;">
<tr>
<font>${urVote_user_party_compare}</font>
<h5>${urVote_user_party_compare}</h5>
${urvote_user_party_compare_sub}
${choices_user_ID}
</tr>