revert logo to png

2017-08-17 19:48:57 +02:00
parent 4d4bbda957
commit e5cd62bbed
8 changed files with 346 additions and 337 deletions
--- a/css/style.css
+++ b/css/style.css
@@ -7,21 +7,7 @@ body {
 }

 .statement {
-    min-height: 90px;
-}
-
-.btn.btn-default.listbtn {
-    height: 70px;
-    border-top-width: 1px;
-}
-
-.btn.btn-default.listbtn.listbtn-on {
-    border-color: #00CC66;
-}
-
-.img-list-logo-small {
-    width: 50px;
-    height: auto;
+  min-height: 135px;
 }

 #thesesbox{
@@ -34,7 +20,6 @@ body {
  background-color: #00CC66;
 }
 .pagination > .active.pagination-yes > a {
-    
  background-color: #00CC66;
  border-color: #00CC66;
 }
@@ -53,6 +38,16 @@ body {
  border-color: #00CC66;
 }

-.m-t-5 {
+.mt-5 {
  margin-top: 5px;
 }
+.mt-25 {
+  margin-top: 25px;
+}
+.mt-50 {
+  margin-top: 50px;
+}
+
+#logo {
+  position: absolute;
+}
--- a/faq.php
+++ b/faq.php
@@ -1,23 +1,23 @@
 <?php 
-	isset($_GET['from']) ? $back = $_GET['from'] : $back = "index.php";
-	if($back != 'index.php' and substr($back, 0, 14) != 'multiplier.php' and substr($back, 0, 10) != 'result.php' and substr($back, 0, 12) != 'mahlowat.php'){
+isset($_GET['from']) ? $back = $_GET['from'] : $back = "index.php";
+if($back != 'index.php' and substr($back, 0, 14) != 'multiplier.php' and substr($back, 0, 10) != 'result.php' and substr($back, 0, 12) != 'mahlowat.php'){
  $back = "index.php";
-	}
+}

-	$answerstring = '';
-	if(isset($_POST['ans'])){
+$answerstring = '';
+if(isset($_POST['ans'])){
  $answerstring = $_POST['ans'];
-	}
+}

-	$count = 'undefined';
-	if(isset($_POST['count'])){
+$count = 'undefined';
+if(isset($_POST['count'])){
  $count = $_POST['count'];
-	}
+}

 ?>
 <!DOCTYPE html>
 <html>
-  <head>
+<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" />
@@ -26,18 +26,20 @@
  <link rel="stylesheet" href="css/font-awesome.min.css">

  <link rel="stylesheet" type="text/css" href="css/style.css">
-  </head>
-  <body>
+</head>
+<body>

  <script src="js/jquery-2.0.2.min.js"></script>
  <script src="js/bootstrap.min.js"></script>
  <script src="js/mahlowat.js"></script>
  
-  <div class="container" style="margin-top: 20px;">
+  <div class="container mt-50">
    <div class="col-md-4 pull-right">
-      <a href="https://jef-sachsen.de/euromat"><img class="img-responsive" src="img/euromat.png" title="Euromat Logo" onclick="changeText()"/></a>
+      <a href="https://jef-sachsen.de/euromat">
+        <img id="logo" class="img-responsive" src="img/euromat.png" title="Euromat Logo"/>
+      </a>
    </div>
-      <div class="bottom-buffer top-buffer">
+    <div class="col-md-12">

      <h1>FAQ</h1>

@@ -105,4 +107,4 @@


  </body>
-</html>
+  </html>
--- a/generator.html
+++ b/generator.html
@@ -28,8 +28,8 @@
  <script src="js/bootstrap.min.js"></script>
  <script src="js/generator.js"></script>
  
-  <div class="container" style="margin-top: 20px;">
-	<div class="bottom-buffer top-buffer">
+  <div class="container mt-50">
+	<div class="col-md-12">
 	
 	<h1>Mahlowat - Generator</h1>
 	
--- a/img/euromat.svg
+++ b/img/euromat.svg
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@ $baseurl = "http://" . $_SERVER['SERVER_NAME'] . $uri_parts[0];
 ?>
 <!DOCTYPE html>
 <html>
-  <head>
+<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" />
@@ -22,29 +22,31 @@ $baseurl = "http://" . $_SERVER['SERVER_NAME'] . $uri_parts[0];
  <link rel="stylesheet" type="text/css" href="css/style.css">
  <link href="shariff/shariff.min.css" rel="stylesheet">
  <script src="js/jquery-2.0.2.min.js"></script>
-  </head>
-  <body>
-    <div class="container">
+</head>
+<body>
+  <div class="container mt-25">
+
+    <div class="jumbotron">
      <div class="row">
-        <div class="col-md-8 col-md-offset-2">
-          <img class="img-responsive" src="img/euromat.png" title="EUromat Logo"/>
+        <div class="col-md-6 col-md-offset-3">
+          <img class="img-responsive" src="img/euromat.png" title="Euromat Logo"/>
        </div>
-      </div>
-      <div class="row">
-        <div class="col-xs-12">
-          <h1>Der <strong>#EUromat</strong></h1>
+        <div class="col-md-12 mt-50">
          <p>Der EUromat ist ein technisches Hilfsmittel, das es ermöglicht, zu europapolitischen Themen die eigenen Standpunkte mit denen der Parteien abzugleichen, die zur Bundestagswahl antreten.</p>
          <p>Er ist selbstverständlich nur als Automat ohne Hirn zu verstehen und spricht keine Wahlempfehlungen aus.</p>
          <p>Für ihre Stellungnahmen zu den Thesen sind die Parteien selbst verantwortlich.</p>
          <p class="text-center"><a class="btn btn-large btn-primary" href="mahlowat.php" title="EUromat starten">Mit der Befragung beginnen!</a></p>
        </div>
      </div>
+      
+    </div>
+
    <p class="text-center">
      <a href="faq.php" title="Fragen und Antworten"><small>FAQ</small></a>
    </p>
    <div class="shariff" data-url="<?php echo $baseurl; ?>" data-referrer-track=null></div>
  </div>
-  </div>
+</div>
 </div>
 <script src="shariff/shariff.min.js"></script>
 </body>
--- a/mahlowat.php
+++ b/mahlowat.php
@@ -83,26 +83,26 @@ if(!$data_content){
      </div>
    </div>
    <div class="row">
-      <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1 m-t-5">
+      <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1 mt-5">
          <button id="weight" type="button" class="btn btn-default btn-block" data-toggle="button">These doppelt gewichten</button>
      </div>
    </div>
    <div class="row">
-      <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1 m-t-5">
+      <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1 mt-5">
          <button id='yes' type='submit' class='btn btn-success btn-block' name='yes' onclick="nextThesis('a')">
            <i class="fa fa-thumbs-up fa-lg"></i> Zustimmung
          </button>
      </div>
    </div>
    <div class="row">
-      <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1 m-t-5">
+      <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1 mt-5">
          <button id='neutral' type='submit' class='btn btn-warning btn-block' name='neutral' onclick="nextThesis('b')">
            <i class="fa fa-asterisk fa-lg"></i> Neutral
          </button>
      </div>
    </div>
    <div class="row">
-        <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1 m-t-5">
+        <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1 mt-5">
          <button id='no' type='submit' class='btn btn-danger btn-block' name='no' onclick="nextThesis('c')">
            <i class="fa fa-thumbs-down fa-lg"></i> Ablehnung
          </button>
@@ -110,7 +110,7 @@ if(!$data_content){
    </div>
    
    <div class="row">
-      <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1 m-t-5">
+      <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1 mt-5">
          <button id='skip' type='submit' class='btn btn-default btn-block' name='skip' onclick="nextThesis('d')">
            Überspringen <i class="fa fa-step-forward fa-lg"></i>
           </button>
--- a/multiplier.php
+++ b/multiplier.php
@@ -1,12 +1,12 @@
 <?php
-    include 'includes/functions.php';
-    include 'includes/elements.php';
+include 'includes/functions.php';
+include 'includes/elements.php';
    #include 'includes/theses.php';

-    $data_content = file_get_contents("config/data.json");
-    if (!$data_content) {
+$data_content = file_get_contents("config/data.json");
+if (!$data_content) {
  echo "ERROR READING CONFIG";
-    } else {
+} else {
  $data = json_decode($data_content, true);


@@ -42,13 +42,13 @@
      $emph[$i] = 1;
    }
  }
-    }
+}


 ?>
 <!DOCTYPE html>
 <html>
-  <head>
+<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" />
@@ -57,8 +57,8 @@
  <link href="css/jef.min.css" rel="stylesheet" media="screen">
  <link rel="stylesheet" href="css/font-awesome.min.css">
  <link rel="stylesheet" type="text/css" href="css/style.css">
-  </head>
-  <body>
+</head>
+<body>

  <script src="js/jquery-2.0.2.min.js"></script>
  <script src="js/bootstrap.min.js"></script>
@@ -94,14 +94,16 @@
        });
      </script>
      <?php
-} ?>
+    } ?>

-  <div class="container">
+    <div class="container mt-50">
      <div class="col-md-4 pull-right">
-      <a href="https://jef-sachsen.de/euromat"><img class="img-responsive" src="img/euromat.png" title="Euromat Logo" onclick="changeText()"/></a>
+        <a href="https://jef-sachsen.de/euromat">
+          <img id="logo" class="img-responsive" src="img/euromat.png" title="Euromat Logo"/>
+        </a>
      </div>

-      <div class="bottom-buffer top-buffer">
+      <div class="col-md-8">

        <h1>Ergebnisse</h1>
        <p>Klicke auf die Titel, um die zugehörige These anzuzeigen.</p>
@@ -198,4 +200,4 @@
        }
      </script>
    </body>
-</html>
+    </html>
--- a/result.php
+++ b/result.php
@@ -109,12 +109,14 @@ if(!$data_content){
 </head>
 <body>

-  <div class="container" style="margin-top: 20px;">
+  <div class="container mt-50">
    <div class="col-md-4 pull-right">
-      <a href="https://jef-sachsen.de/euromat"><img class="img-responsive" src="img/euromat.png" title="Euromat Logo" onclick="changeText()"/></a>
+      <a href="https://jef-sachsen.de/euromat">
+        <img id="logo" class="img-responsive" src="img/euromat.png" title="Euromat Logo"/>
+      </a>
    </div>

-    <div class="bottom-buffer top-buffer">
+    <div class="col-md-12">
      <?php 
      if($bars_only){
        echo "<h1>Ergebnis</h1>";
@@ -165,7 +167,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="container">
+        <div id="result-bars" class="container-fluid mt-25">
          <?php
          $top = calculate_points($data['answers'][0], $answers);
          for($i = 0; $i < sizeof($data['answers']); $i++){
@@ -177,20 +179,25 @@ if(!$data_content){
        </div>

        <?php if(!$bars_only){?>
-        <div id="result-table">
+        <div id="result-table" class="container-fluid mt-25">
          <p>Thesen mit <i class='fa fa-star fa-lg'></i> fandest du besonders wichtig. Wenn du auf den Button mit dem Namen der These klickst, bekommst du die Statements der Listen in einer Übersicht angezeigt. Über die folgenden Schalter kannst Du einzelne Listen ein- oder ausblenden:</p>
-          <div class="well">
+          <ul class="nav nav-pills">
            <?php 
            for($i = 0; $i < sizeof($data['lists']); $i = $i + 1){
              $classname = string_to_css_classname($data['lists'][$i]['name']);
              $list_logo = $data['lists'][$i]['logo'];
              $list_name_short = $data['lists'][$i]['name_x'];
-              echo "<button class='btn btn-default listbtn listbtn-on listbtn-$classname' onclick='toggleColumn(\"$classname\")'><img class='img-responsive img-list-logo-small' src='img/lists/$list_logo' title='$list_name_short Logo'></button>";
+              echo "
+              <li role='presentation' class='active listbtn-$classname'>
+                <a onclick='toggleColumn(\"$classname\")'>
+                  $list_name_short
+                </a>
+              </li>
+              ";
            }
            ?>
-          </div>
-
-          <table class="table" id="resulttable">
+          </ul>
+          <table class="table mt-25" id="resulttable">
            <?php 

            print_result_detail_table($answers, $data);
@@ -255,7 +262,7 @@ if(!$data_content){

    function toggleColumn(listname){
      $('.list-'+listname).toggle(200);
-      $('.listbtn-'+listname).toggleClass('listbtn-on');
+      $('.listbtn-'+listname).toggleClass('active');
    }

    function showOverview(){