jef-sachsen/EUromat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into feat_9

Browse Source
This commit is contained in:
Karl-Martin Zimmermann
2017-08-16 08:16:28 +02:00
parent ec2255a811 085a0aa992
commit 8a658ef8ee
7 changed files with 81 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
faq.php
View File

@@ -20,7 +20,7 @@
<head>
<title>EUromat - FAQ</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<meta content="">
<link href="css/jef.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" href="css/font-awesome.min.css">

1
generator.html
View File

@@ -3,6 +3,7 @@
<head>
<title>mahlowat - Generator</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<meta content="">
<link href="css/bootstrap.min.css" rel="stylesheet" media="screen">

139
includes/elements.php
View File

@@ -8,73 +8,78 @@ function print_result_detail_table($answers, $data){
for($i = 0; $i < sizeof($data['lists']); $i = $i + 1) {
$classname = string_to_css_classname($data['lists'][$i]['name']);
echo "
<th class='hidden-xs hidden-sm list-$classname'>
{$data['lists'][$i]['name_x']} (".calculate_points($data['answers'][$i], $answers).")
</th>";
}
echo "</tr>\n";
for($i = 0; $i < $theses_count; $i = $i + 1){
char_to_multiply($answers[$i]) == 2 ? $star = '<i class="fa fa-star" aria-hidden="true"></i> ' : $star = '';
char_to_multiply($answers[$i]) == 2 ? $tdcl = ' class="info"' : $tdcl = '';
$labelclass = code_to_labelclass(char_to_value($answers[$i]));
echo "<tr$tdcl>\n";
echo '
<td>
<a id="thesis'.$i.'" class="btn '.code_to_btnclass(char_to_value($answers[$i])).' btn-block" onclick="toggleNext(this)">'.$star.$data['theses'][$i]['s'].'</a>
</td>';
for($listid = 0; $listid < sizeof($data['lists']); $listid = $listid + 1){
echo get_list_result_td($data, $listid, $i);
}
echo "</tr>\n";
// Statements
echo "
<tr class='multheseslong'>
<td class='mtl' colspan='".(sizeof($data['lists'])+1)."'>
<!-- <span class='label $labelclass'>These ".($i+1).": ".$data['theses'][$i]['s']."</span><br>-->
<p class='well'>".$data['theses'][$i]['l']."</p>
<p><strong>Statements der Parteien:</strong></p>";
for($listid = 0; $listid < sizeof($data['lists']); $listid = $listid + 1){
echo get_list_statement($data, $listid ,$i);
}
echo "</td></tr>\n";
}
}
<th class='hidden-xs hidden-sm list-$classname'>
{$data['lists'][$i]['name_x']} (".calculate_points($data['answers'][$i], $answers).")
</th>";
}
echo "</tr>\n";
function print_list_result_bar($data, $listindex, $answers, $class){
$list_name = $data['lists'][$listindex]['name'];
$hint = $data['lists'][$listindex]['hint'];
$list_points = calculate_points($data['answers'][$listindex], $answers);
$ach_points = count_achievable_points($answers);
if($ach_points != 0){
$list_percentage = intval( 100 * $list_points / $ach_points);
} else {
$list_percentage = 0;
}
$hintElement = '';
if($hint != ''){
$hintElement = "
<br><div>".$hint."</div>
";
for($i = 0; $i < $theses_count; $i = $i + 1){
char_to_multiply($answers[$i]) == 2 ? $star = '<i class="fa fa-star" aria-hidden="true"></i> ' : $star = '';
char_to_multiply($answers[$i]) == 2 ? $tdcl = ' class="info"' : $tdcl = '';
$labelclass = code_to_labelclass(char_to_value($answers[$i]));
echo "<tr$tdcl>\n";
echo '
<td>
<a id="thesis'.$i.'" class="btn '.code_to_btnclass(char_to_value($answers[$i])).' btn-block" onclick="toggleNext(this)">'.$star.$data['theses'][$i]['s'].'</a>
</td>';
for($listid = 0; $listid < sizeof($data['lists']); $listid = $listid + 1){
echo get_list_result_td($data, $listid, $i);
}
echo "
<tr class='$class'>
<td>
<b>$list_name</b>$hintElement
</td>
<td>$list_points von $ach_points</td>
<td>
<div class='progress'>
<div class='progress-bar' role='progressbar' aria-valuenow='$list_points' aria-valuemin='0' aria-valuemax='$ach_points' style='width: $list_percentage%;'>
$list_percentage %
</div>
</div>
</td>
</tr>";
echo "</tr>\n";
}
// Statements
echo "
<tr class='multheseslong'>
<td class='mtl' colspan='".(sizeof($data['lists'])+1)."'>
<!-- <span class='label $labelclass'>These ".($i+1).": ".$data['theses'][$i]['s']."</span><br>-->
<p class='well'>".$data['theses'][$i]['l']."</p>
<p><strong>Statements der Parteien:</strong></p>";
for($listid = 0; $listid < sizeof($data['lists']); $listid = $listid + 1){
echo get_list_statement($data, $listid ,$i);
}
echo "</td></tr>\n";
}
}
function print_list_result_bar($data, $listindex, $answers, $class){
$list_name = $data['lists'][$listindex]['name'];
$hint = $data['lists'][$listindex]['hint'];
$list_points = calculate_points($data['answers'][$listindex], $answers);
$ach_points = count_achievable_points($answers);
if($ach_points != 0){
$list_percentage = intval( 100 * $list_points / $ach_points);
} else {
$list_percentage = 0;
}
$hintElement = '';
if($hint != ''){
$hintElement = "
<div class='panel-footer'>".$hint."</div>
";
}
echo "
<div class='row'>
<div class='col-md-8 col-md-offset-2'>
<div class='panel panel-default'>
<div class='panel-heading'>
<h3 class='panel-title'>$list_name <small>($list_points von $ach_points)</small></h3>
</div>
<div class='panel-body'>
<div class='progress'>
<div class='progress-bar' role='progressbar' aria-valuenow='$list_points' aria-valuemin='0' aria-valuemax='$ach_points' style='width: $list_percentage%;'>
$list_percentage %
</div>
</div>
</div>
$hintElement
</div>
</div>
</div>
";
}
/* unused
function print_list_result_bar_tricolore($list, $votes, $emph, $class){
@@ -120,6 +125,10 @@ function print_list_result_bar_tricolore($list, $votes, $emph, $class){
$listclass = "list-".str_replace(' ','',$data['lists'][$listid]['name']);
$prefix = "";
if(trim($etext) == ''){
$etext = "Zu dieser These hat die Partei kein Statement abgegeben.";
}
if($vote === 'skip'){
$prefix = "<span class='label label-default'>$name</span>\n";
}
@@ -217,4 +226,4 @@ function print_list_result_bar_tricolore($list, $votes, $emph, $class){
echo '</div>';
}
?>
?>

2
index.php
View File

@@ -7,7 +7,7 @@ $baseurl = "http://" . $_SERVER['SERVER_NAME'] . $uri_parts[0];
<head>
<title>EUromat - Der Bundestagswahl-Helfer zum Thema Europa</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<meta content="EUromat">
<meta name="image_src" content="img/euromat.png"/>
<meta name="description" content="Der EUromat ist ein Angebot JEF Sachsen zur Bundestagswahl. Er ermöglicht es, zu europapolitischen Themen die eigenen Standpunkte mit denen der Parteien abzugleichen, die zur Wahl antreten."/>

2
mahlowat.php
View File

@@ -45,7 +45,7 @@ if(!$data_content){
<head>
<title>EUromat - Der Bundestagswahl-Helfer zum Thema Europa</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<meta content="Mahlowat">
<link href="css/jef.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" href="css/font-awesome.min.css">

2
multiplier.php
View File

@@ -51,7 +51,7 @@
<head>
<title>EUromat - Ergebnis</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<meta content="">
<link href="css/jef.min.css" rel="stylesheet" media="screen">

11
result.php
View File

@@ -81,6 +81,7 @@ if(!$data_content){
<head>
<title>EUromat - Ergebnis</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<meta content="EUromat">
<meta name="image_src" content="img/euromat.png"/>
@@ -164,13 +165,7 @@ if(!$data_content){
<p>Nicht zufrieden mit dem Ergebnis? Vielleicht willst du die Thesen <a href="multiplier.php" onclick="callPage(event, 'multiplier.php', <?php echo "'$answerstring', '$count'";?>)" title="Gewichtung ändern">anders gewichten</a>.</p>
<?php } ?>
<div id="result-bars" class="table-responsive">
<table class="table table-bordered table-hover table-condensed table-striped">
<tr>
<th>Liste</th>
<th>Punkte</th>
<th>Prozent</th>
</tr>
<div id="result-bars" class="container">
<?php
$top = calculate_points($data['answers'][0], $answers);
for($i = 0; $i < sizeof($data['answers']); $i++){
@@ -179,8 +174,6 @@ if(!$data_content){
echo "\n";
}
?>
</table>
</div>
<?php if(!$bars_only){?>