Frans Bergman 5 years ago
parent
commit
dbbd591150

+ 60 - 60
admin/actions/activate.php

@@ -1,60 +1,60 @@
-<?php
-  require 'app.php';
-
-  if (isset($_GET['key'])) {
-    $key = $_GET['key'];
-
-    $sql = "SELECT * FROM Activations WHERE Activation_key='$key'";
-    $query = $conn->query($sql);
-    if (!($row = $query->fetch_array())) {
-      die("No such key in database.");
-    }
-
-    $type = $row['Type'];
-    $value = $row['Val'];
-    $user = $row['User'];
-    if ($type == "Addresses") {
-      $values = json_decode($conn->query("SELECT * FROM Users WHERE User='$user'")->fetch_array()['Addresses'], true);
-      array_push($values, $value);
-      $value = json_encode($values);
-    }
-
-    $sql = "UPDATE Users SET $type='$value' WHERE User='$user'";
-    if ($conn->query($sql)) {
-      queue_message(new Message("Successfully activated $type.", "success"));
-      $sql = "DELETE FROM Activations WHERE Activation_key='$key'";
-      $conn->query($sql);
-      header("Location: ../index.php");
-    } else {
-      echo "Failed to activate $type. Error: " . $conn->error;
-    }
-  } else { ?>
-    <!DOCTYPE html>
-    <html>
-      <?php include '../pageparts/head.php'; ?>
-      <body>
-        <div class="container" style="margin-top: 100px;">
-          <div class="row">
-            <div class="col-lg-6 col-md-offset-3">
-              <div class="panel panel-default">
-                <div class="panel-heading">
-                  <i class="glyphicon glyphicon-lock"></i> No key specified
-                </div>
-                <div class="panel-body">
-                  <form role="form" action="" method="get">
-                    <div class="input-group" style="margin-bottom: 10px;">
-                      <span class="input-group-addon">Key:</span>
-                      <input class="form-control" placeholder="Activation key" name="key" autofocus="" type="text">
-                    </div>
-                    <input class="btn btn-primary btn-block" type="submit" value="Activate"/>
-	                </form>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </body>
-    </html>
-    <?php
-  }
-?>
+<?php
+  require 'app.php';
+
+  if (isset($_GET['key'])) {
+    $key = $_GET['key'];
+
+    $sql = "SELECT * FROM Activations WHERE Activation_key='$key'";
+    $query = $conn->query($sql);
+    if (!($row = $query->fetch_array())) {
+      die("No such key in database.");
+    }
+
+    $type = $row['Type'];
+    $value = $row['Val'];
+    $user = $row['User'];
+    if ($type == "Addresses") {
+      $values = json_decode($conn->query("SELECT * FROM Users WHERE User='$user'")->fetch_array()['Addresses'], true);
+      array_push($values, $value);
+      $value = json_encode($values);
+    }
+
+    $sql = "UPDATE Users SET $type='$value' WHERE User='$user'";
+    if ($conn->query($sql)) {
+      queue_message(new Message("Successfully activated $type.", "success"));
+      $sql = "DELETE FROM Activations WHERE Activation_key='$key'";
+      $conn->query($sql);
+      header("Location: ../index.php");
+    } else {
+      echo "Failed to activate $type. Error: " . $conn->error;
+    }
+  } else { ?>
+    <!DOCTYPE html>
+    <html>
+      <?php include '../pageparts/head.php'; ?>
+      <body>
+        <div class="container" style="margin-top: 100px;">
+          <div class="row">
+            <div class="col-lg-6 col-md-offset-3">
+              <div class="panel panel-default">
+                <div class="panel-heading">
+                  <i class="glyphicon glyphicon-lock"></i> No key specified
+                </div>
+                <div class="panel-body">
+                  <form role="form" action="" method="get">
+                    <div class="input-group" style="margin-bottom: 10px;">
+                      <span class="input-group-addon">Key:</span>
+                      <input class="form-control" placeholder="Activation key" name="key" autofocus="" type="text">
+                    </div>
+                    <input class="btn btn-primary btn-block" type="submit" value="Activate"/>
+	                </form>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </body>
+    </html>
+    <?php
+  }
+?>

+ 1 - 1
admin/actions/delete.php

@@ -14,7 +14,7 @@ if (isset($_GET['uid']) and isset($_GET['type'])) {
 		} else {
 			echo "Error deleting record: " . $conn->error;
 		}
-		echo $conn->error;
+		echo $conn->error;
 } else {
 	echo 'Something went wrong! (No type or no UID provided.)';
 }

+ 27 - 27
admin/actions/edit_user.php

@@ -1,27 +1,27 @@
-<?php
-  require 'app.php';
-
-  if (isset($_SESSION['user'])) { // Update account info
-    $username = $_SESSION['user'];
-    $userid = $_SESSION['userid'];
-    if (isset($_POST['newPass'])) {
-      changePassword($userid, $_POST['newPass'], $_POST['repeatNewPass'], $_POST['oldPass']);
-    } else if (isset($_POST['email'])) {
-      $mail = $_POST['email'];
-      if ($mail === $_POST['repeatEmail']) {
-        new_activation($username, "Email", $mail);
-      } else {
-        queue_message(new Message("Addresses do not match.", "danger"));
-      }
-    }
-    // TODO Admin can edit other users' permissions
-    if (isset($_POST['permissions'])) {
-      $object = (object) ['property' => 'Here we go'];
-    }
-
-    header("Location: ../account_settings");
-  } else {
-    echo "Not logged in.";
-  }
-
-?>
+<?php
+  require 'app.php';
+
+  if (isset($_SESSION['user'])) { // Update account info
+    $username = $_SESSION['user'];
+    $userid = $_SESSION['userid'];
+    if (isset($_POST['newPass'])) {
+      changePassword($userid, $_POST['newPass'], $_POST['repeatNewPass'], $_POST['oldPass']);
+    } else if (isset($_POST['email'])) {
+      $mail = $_POST['email'];
+      if ($mail === $_POST['repeatEmail']) {
+        new_activation($username, "Email", $mail);
+      } else {
+        queue_message(new Message("Addresses do not match.", "danger"));
+      }
+    }
+    // TODO Admin can edit other users' permissions
+    if (isset($_POST['permissions'])) {
+      $object = (object) ['property' => 'Here we go'];
+    }
+
+    header("Location: ../account_settings");
+  } else {
+    echo "Not logged in.";
+  }
+
+?>

+ 65 - 65
admin/actions/getList.php

@@ -1,65 +1,65 @@
-<?php
-  require 'app.php';
-
-  $type = "";
-  if (isset($_GET['type']))
-    $type = $_GET['type'];
-  else
-    die("No type specified.");
-
-  if (!hasPermission("list.$type")) {
-		die("Not enough permissions.");
-	}
-?>
-    <?php
-    $result = $conn->query("SELECT * FROM $type ORDER BY listId");
-
-    if ($result === FALSE) {
-      $result = $conn->query("SELECT * FROM $type ORDER BY UID");
-    }
-
-    while($row = $result->fetch_array()) {
-      if (isset($row['name'])) {
-        $name = $row['name'];
-      } else {
-        $name = $row['User'];
-      }
-    	?>
-    	<tr id="<?php echo "Item_" . $row['UID'] ?>">
-    		<td><?php echo $name ?></td>
-    		<td>
-    			<!--Delete button-->
-    			<form>
-    				<input type="hidden" class="uid" name="uid" value="<?php echo $row['UID'] ?>"/>
-    				<button class="btn delete btn-danger" data-target="#delete-modal-<?php echo $row['UID'] ?>" data-toggle="modal" type="button"><i class="fa fa-trash-o"></i> Delete</button>
-            <!-- Modal -->
-            <div id="delete-modal-<?php echo $row['UID'] ?>" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="delete-modal-<?php echo $row['UID'] ?>">
-              <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                  <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="delete-modal-<?php echo $row['UID'] ?>">Confirm deletion</h4>
-                  </div>
-                  <div class="modal-body">
-                    Clicking 'Delete' will permanently delete the <?php echo strtolower($type) . " '$name'" ?>. Are you sure you want to do this?
-                  </div>
-                  <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                    <button data="<?php echo $row['UID'] ?>" data-dismiss="modal" type="button" class="delete-confirm btn btn-danger">Delete</button>
-                  </div>
-                </div>
-              </div>
-            </div>
-    			</form>
-    			<!--Edit button-->
-    			<form action="" method="get">
-    				<input type="hidden" name="p" value="edit"/>
-    				<input type="hidden" name="type" value="<?php echo $type; ?>"/>
-    				<input type="hidden" name="uid" value="<?php echo $row['UID'] ?>"/>
-    				<button class="btn btn-primary" type="submit"><i class="fa fa-pencil"></i> Edit</button>
-    			</form>
-    		</td>
-    	</tr>
-    	<?php
-    }
-?>
+<?php
+  require 'app.php';
+
+  $type = "";
+  if (isset($_GET['type']))
+    $type = $_GET['type'];
+  else
+    die("No type specified.");
+
+  if (!hasPermission("list.$type")) {
+		die("Not enough permissions.");
+	}
+?>
+    <?php
+    $result = $conn->query("SELECT * FROM $type ORDER BY listId");
+
+    if ($result === FALSE) {
+      $result = $conn->query("SELECT * FROM $type ORDER BY UID");
+    }
+
+    while($row = $result->fetch_array()) {
+      if (isset($row['name'])) {
+        $name = $row['name'];
+      } else {
+        $name = $row['User'];
+      }
+    	?>
+    	<tr id="<?php echo "Item_" . $row['UID'] ?>">
+    		<td><?php echo $name ?></td>
+    		<td>
+    			<!--Delete button-->
+    			<form>
+    				<input type="hidden" class="uid" name="uid" value="<?php echo $row['UID'] ?>"/>
+    				<button class="btn delete btn-danger" data-target="#delete-modal-<?php echo $row['UID'] ?>" data-toggle="modal" type="button"><i class="fa fa-trash-o"></i> Delete</button>
+            <!-- Modal -->
+            <div id="delete-modal-<?php echo $row['UID'] ?>" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="delete-modal-<?php echo $row['UID'] ?>">
+              <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                  <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title" id="delete-modal-<?php echo $row['UID'] ?>">Confirm deletion</h4>
+                  </div>
+                  <div class="modal-body">
+                    Clicking 'Delete' will permanently delete the <?php echo strtolower($type) . " '$name'" ?>. Are you sure you want to do this?
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button data="<?php echo $row['UID'] ?>" data-dismiss="modal" type="button" class="delete-confirm btn btn-danger">Delete</button>
+                  </div>
+                </div>
+              </div>
+            </div>
+    			</form>
+    			<!--Edit button-->
+    			<form action="" method="get">
+    				<input type="hidden" name="p" value="edit"/>
+    				<input type="hidden" name="type" value="<?php echo $type; ?>"/>
+    				<input type="hidden" name="uid" value="<?php echo $row['UID'] ?>"/>
+    				<button class="btn btn-primary" type="submit"><i class="fa fa-pencil"></i> Edit</button>
+    			</form>
+    		</td>
+    	</tr>
+    	<?php
+    }
+?>

+ 34 - 34
admin/actions/get_sections.php

@@ -1,34 +1,34 @@
-<?php
-  require "app.php";
-
-  if (!hasPermission("edit.Page")) {
-		die("Not enough permissions.");
-	}
-
-  if (isset($_GET['listall'])) {
-    $query = $conn->query("SELECT UID, name FROM Section");
-    $sectionlist = array();
-
-    while ($row = $query->fetch_array()) {
-      $sectionlist[$row['UID']] = $row['name'];
-    }
-
-    echo json_encode($sectionlist);
-  } else if (isset($_GET['getids'])) {
-    $sectionnames = json_decode($_GET['getids']);
-
-    $sectionids = array();
-
-    foreach ($sectionnames as $sectionname)
-      array_push($sectionids, $conn->query("SELECT UID FROM Section WHERE name='$sectionname'")->fetch_array()['UID']);
-
-    echo json_encode($sectionids);
-  } else {
-    $sections = json_decode($_GET['sections']);
-
-    $app = new App(true);
-    foreach ($sections as $section) {
-      $app->addSection($section);
-    }
-  }
-?>
+<?php
+  require "app.php";
+
+  if (!hasPermission("edit.Page")) {
+		die("Not enough permissions.");
+	}
+
+  if (isset($_GET['listall'])) {
+    $query = $conn->query("SELECT UID, name FROM Section");
+    $sectionlist = array();
+
+    while ($row = $query->fetch_array()) {
+      $sectionlist[$row['UID']] = $row['name'];
+    }
+
+    echo json_encode($sectionlist);
+  } else if (isset($_GET['getids'])) {
+    $sectionnames = json_decode($_GET['getids']);
+
+    $sectionids = array();
+
+    foreach ($sectionnames as $sectionname)
+      array_push($sectionids, $conn->query("SELECT UID FROM Section WHERE name='$sectionname'")->fetch_array()['UID']);
+
+    echo json_encode($sectionids);
+  } else {
+    $sections = json_decode($_GET['sections']);
+
+    $app = new App(true);
+    foreach ($sections as $section) {
+      $app->addSection($section);
+    }
+  }
+?>

+ 24 - 24
admin/actions/updateListOrder.php

@@ -1,24 +1,24 @@
-<?php
-  require "app.php";
-
-  $type = "";
-  if (isset($_GET['type']))
-    $type = $_GET['type'];
-  else
-    die("No type specified.");
-
-  if (!hasPermission("list.$type")) {
-		die("Not enough permissions.");
-	}
-
-  $updateRecordsArray = $_POST['Item'];
-
-  $listingCounter = 1;
-  foreach ($updateRecordsArray as $recordIDValue) {
-  	$query = "UPDATE $type SET listId='$listingCounter' WHERE UID='$recordIDValue'";
-  	$conn->query($query) or die('Error, insert query failed');
-  	$listingCounter = $listingCounter + 1;
-  }
-
-  echo "Successfully saved order!";
-?>
+<?php
+  require "app.php";
+
+  $type = "";
+  if (isset($_GET['type']))
+    $type = $_GET['type'];
+  else
+    die("No type specified.");
+
+  if (!hasPermission("list.$type")) {
+		die("Not enough permissions.");
+	}
+
+  $updateRecordsArray = $_POST['Item'];
+
+  $listingCounter = 1;
+  foreach ($updateRecordsArray as $recordIDValue) {
+  	$query = "UPDATE $type SET listId='$listingCounter' WHERE UID='$recordIDValue'";
+  	$conn->query($query) or die('Error, insert query failed');
+  	$listingCounter = $listingCounter + 1;
+  }
+
+  echo "Successfully saved order!";
+?>

+ 44 - 44
admin/pageparts/sidemenu.php

@@ -1,44 +1,44 @@
-<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
-  <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="index.php">Tankernn Administration</a>
-  </div>
-
-  <ul class="nav navbar-top-links navbar-right">
-    <li class="dropdown">
-      <a aria-expanded="false" class="dropdown-toggle" data-toggle="dropdown" href="#">
-        <i class="fa fa-user fa-fw"></i>  <i class="fa fa-caret-down"></i>
-      </a>
-      <ul class="dropdown-menu dropdown-user">
-        <li><a href="?p=account_settings"><i class="fa fa-cog"></i> Account Settings</a></li>
-        <li class="divider"></li>
-        <li><a href="http://login.tankernn.eu/logout.php"><i class="fa fa-sign-out fa-fw"></i> Logout</a></li>
-      </ul>
-    </li>
-  </ul>
-
-  <div class="navbar-default sidebar" role="navigation">
-    <div class="sidebar-nav navbar-collapse">
-      <ul id="side-menu" class="nav in">
-        <li><a href="?p=dashboard"><i class="fa fa-dashboard"></i> Dashboard</a></li>
-        <li <?php if ($_GET['p'] === "list") echo "class='active'"; ?>>
-            <a href="#"><i class="fa fa-edit"></i> Edit<span class="fa arrow"></span></a>
-            <ul class="nav nav-second-level collapse">
-              <li><a href="?p=list&type=Menu"><i class="fa fa-bars"></i> Edit Menu</a></li>
-              <li><a href="?p=list&type=Component"><i class="fa fa-puzzle-piece"></i> Edit Component</a></li>
-              <li><a href="?p=list&type=Page"><i class="fa fa-file"></i> Edit Pages</a></li>
-              <li><a href="?p=list&type=Section"><i class="fa fa-file-code-o"></i> Edit Sections</a></li>
-              <li><a href="?p=list&type=Users"><i class="fa fa-user"></i> Edit User Permissions</a></li>
-            </ul>
-            <!-- /.nav-second-level -->
-        </li>
-        <li><a href="?p=edit&type=CSS"><i class="fa fa-file-text"></i> Edit CSS</a></li>
-      </ul>
-    </div>
-  </div>
-</nav>
+<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
+  <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="index.php">Tankernn Administration</a>
+  </div>
+
+  <ul class="nav navbar-top-links navbar-right">
+    <li class="dropdown">
+      <a aria-expanded="false" class="dropdown-toggle" data-toggle="dropdown" href="#">
+        <i class="fa fa-user fa-fw"></i>  <i class="fa fa-caret-down"></i>
+      </a>
+      <ul class="dropdown-menu dropdown-user">
+        <li><a href="?p=account_settings"><i class="fa fa-cog"></i> Account Settings</a></li>
+        <li class="divider"></li>
+        <li><a href="http://login.tankernn.eu/logout.php"><i class="fa fa-sign-out fa-fw"></i> Logout</a></li>
+      </ul>
+    </li>
+  </ul>
+
+  <div class="navbar-default sidebar" role="navigation">
+    <div class="sidebar-nav navbar-collapse">
+      <ul id="side-menu" class="nav in">
+        <li><a href="?p=dashboard"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+        <li <?php if ($_GET['p'] === "list") echo "class='active'"; ?>>
+            <a href="#"><i class="fa fa-edit"></i> Edit<span class="fa arrow"></span></a>
+            <ul class="nav nav-second-level collapse">
+              <li><a href="?p=list&type=Menu"><i class="fa fa-bars"></i> Edit Menu</a></li>
+              <li><a href="?p=list&type=Component"><i class="fa fa-puzzle-piece"></i> Edit Component</a></li>
+              <li><a href="?p=list&type=Page"><i class="fa fa-file"></i> Edit Pages</a></li>
+              <li><a href="?p=list&type=Section"><i class="fa fa-file-code-o"></i> Edit Sections</a></li>
+              <li><a href="?p=list&type=Users"><i class="fa fa-user"></i> Edit User Permissions</a></li>
+            </ul>
+            <!-- /.nav-second-level -->
+        </li>
+        <li><a href="?p=edit&type=CSS"><i class="fa fa-file-text"></i> Edit CSS</a></li>
+      </ul>
+    </div>
+  </div>
+</nav>

+ 58 - 58
admin/pages/account_settings.php

@@ -1,58 +1,58 @@
-<?php
-if (!isset($_SESSION['user'])) {
-  die("Not logged in");
-}
-?>
-
-<div class="row">
-	<div class="col-lg-12">
-      <h1 class="page-header">Account Settings</h1>
-  </div>
-  <!-- /.col-lg-12 -->
-</div>
-<div class="row">
-  <div class="col-lg-6">
-    <div class="panel panel-default">
-    	<div class="panel-heading"><i class="fa fa-lock"></i> Change password</div>
-      <form action="actions/edit_user.php" method="post">
-      	<div class="panel-body">
-            <div class="input-group">
-          		<span class="input-group-addon" id="old-addon">Old password</span>
-          		<input name="oldPass" type="password" class="form-control" placeholder="Your current password" aria-describedby="old-addon">
-          	</div>
-            <div class="input-group">
-          		<span class="input-group-addon" id="new-addon">New password</span>
-          		<input name="newPass" type="password" class="form-control" placeholder="Your desired new password" aria-describedby="new-addon">
-          	</div>
-            <div class="input-group">
-          		<span class="input-group-addon" id="repeat-new-addon">Repeat new password</span>
-          		<input name="repeatNewPass" type="password" class="form-control" placeholder="Repeat your new password" aria-describedby="repeat-new-addon">
-          	</div>
-        </div>
-        <div class="panel-footer"><input class="btn btn-primary" type="submit"/></div>
-      </form>
-    </div>
-  </div>
-  <!-- /.col-lg-6 -->
-  <div class="col-lg-6">
-    <div class="panel panel-default">
-      <div class="panel-heading"><i class="fa fa-envelope"></i> Change E-mail</div>
-      <form action="actions/edit_user.php" method="post">
-        <div class="panel-body">
-            <div class="input-group">
-              <span class="input-group-addon" id="mail-addon">New E-mail address</span>
-              <input name="email" type="email" class="form-control" placeholder="Your new E-mail" aria-describedby="mail-addon">
-            </div>
-            <div class="input-group">
-              <span class="input-group-addon" id="repeat-mail-addon">Repeat new E-mail</span>
-              <input name="repeatEmail" type="email" class="form-control" placeholder="Repeat your new Email" aria-describedby="repeat-mail-addon">
-            </div>
-        </div>
-        <div class="panel-footer">
-          <input class="btn btn-primary" type="submit"/>
-        </div>
-      </form>
-    </div>
-  </div>
-  <!-- /.col-lg-6 -->
-</div>
+<?php
+if (!isset($_SESSION['user'])) {
+  die("Not logged in");
+}
+?>
+
+<div class="row">
+	<div class="col-lg-12">
+      <h1 class="page-header">Account Settings</h1>
+  </div>
+  <!-- /.col-lg-12 -->
+</div>
+<div class="row">
+  <div class="col-lg-6">
+    <div class="panel panel-default">
+    	<div class="panel-heading"><i class="fa fa-lock"></i> Change password</div>
+      <form action="actions/edit_user.php" method="post">
+      	<div class="panel-body">
+            <div class="input-group">
+          		<span class="input-group-addon" id="old-addon">Old password</span>
+          		<input name="oldPass" type="password" class="form-control" placeholder="Your current password" aria-describedby="old-addon">
+          	</div>
+            <div class="input-group">
+          		<span class="input-group-addon" id="new-addon">New password</span>
+          		<input name="newPass" type="password" class="form-control" placeholder="Your desired new password" aria-describedby="new-addon">
+          	</div>
+            <div class="input-group">
+          		<span class="input-group-addon" id="repeat-new-addon">Repeat new password</span>
+          		<input name="repeatNewPass" type="password" class="form-control" placeholder="Repeat your new password" aria-describedby="repeat-new-addon">
+          	</div>
+        </div>
+        <div class="panel-footer"><input class="btn btn-primary" type="submit"/></div>
+      </form>
+    </div>
+  </div>
+  <!-- /.col-lg-6 -->
+  <div class="col-lg-6">
+    <div class="panel panel-default">
+      <div class="panel-heading"><i class="fa fa-envelope"></i> Change E-mail</div>
+      <form action="actions/edit_user.php" method="post">
+        <div class="panel-body">
+            <div class="input-group">
+              <span class="input-group-addon" id="mail-addon">New E-mail address</span>
+              <input name="email" type="email" class="form-control" placeholder="Your new E-mail" aria-describedby="mail-addon">
+            </div>
+            <div class="input-group">
+              <span class="input-group-addon" id="repeat-mail-addon">Repeat new E-mail</span>
+              <input name="repeatEmail" type="email" class="form-control" placeholder="Repeat your new Email" aria-describedby="repeat-mail-addon">
+            </div>
+        </div>
+        <div class="panel-footer">
+          <input class="btn btn-primary" type="submit"/>
+        </div>
+      </form>
+    </div>
+  </div>
+  <!-- /.col-lg-6 -->
+</div>

+ 174 - 174
stylesheets/StyleSheet.css

@@ -1,175 +1,175 @@
-/*
-Main CSS file for tankernn.eu
-Backgrund from http://www.facets.la/wallpapers/
-*/
-@font-face {
-  font-family: "Open Sans";
-  src:  url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Regular-webfont.eot?#iefix) format("embedded-opentype"),
-        url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Regular-webfont.woff) format("woff"),
-        url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Regular-webfont.ttf) format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}
-@font-face {
-  font-family: "Open Sans";
-  src:  url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Bold-webfont.eot#iefix) format("embedded-opentype"),
-        url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Bold-webfont.woff) format("woff"),
-        url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Bold-webfont.ttf) format("truetype");
-  font-weight: bold;
-  font-style: normal;
-}
-
-@keyframes goRight {
-  0% {left: -500px}
-  100% {left: 100%}
-}
-
-body {
-  font-family: "Open Sans", sans-serif;
-  font-size: 20px;
-  background-color: #00a4e1;
-  color: #777;
-  border-collapse: collapse;
-}
-
-body * {
-  transition: 0.5s;
-}
-
-main .container {
-  padding-top: 40px;
-  padding-bottom: 40px;
-}
-
-.meta > div > div {
-  background: #FFF;
-  border-radius: 10px;
-  border: 1px solid transparent;
-  padding: 0 20px 20px;
-  margin-bottom: 20px;
-}
-
-/*#### Header styling ####*/
-
-nav {
-  background-color: white;
-  border-bottom: 3px solid #337AB7;
-}
-
-.navbar-toggle .icon-bar {
-  background-color: darkgray;
-}
-
-.login {
-  float: right;
-  padding-top: 5px;
-  padding-right: 10px;
-}
-
-/*#### Menu ####*/
-
-nav ul li:hover a {
-  background-color: transparent !important;
-}
-
-nav ul li a {
-  z-index: 5;
-}
-
-#menuselector {
-  background-color: #337AB7;
-  position: absolute;
-  z-index: 4;
-  display: none;
-}
-
-/*#### Structural Styling ####*/
-
-h1, h2, h3, h4, h5, h6 {
-  color: black;
-}
-
-footer {
-  font-family: Arial, inherit;
-  font-size: 18px;
-  background-color: #393939;
-  color: white;
-  padding-top: 20px;
-  padding-bottom: 20px;
-}
-
-footer a, footer a:hover {
-  color: white;
-}
-
-footer ul li {
-  list-style: none;
-}
-
-/*#### Various Styling ###*/
-
-#snakeCanvas {
-  border: 1px solid black;
-}
-
-.coral {
-  animation: goRight linear 3s 1;
-  position: fixed;
-  left: -500px;
-}
-
-.error {
-  background-color: #D9534F;
-  color: white;
-}
-
-li.L0, li.L1, li.L2, li.L3,
-li.L5, li.L6, li.L7, li.L8
-{ list-style-type: decimal !important }
-
-.prettyprint {
-  background-color: #fdfdfd;
-  font-family: Courier;
-  padding: 2px;
-  border-radius: 5px;
-  white-space: pre-wrap;
-
-  -moz-tab-size:  4;
-  -o-tab-size:  4;
-  tab-size:  4;
-}
-
-.download-button {
-  font-size: 26px;
-  padding: 15px 100px;
-  font-weight: bold;
-  background-color: #0085B7;
-  color: white;
-  transition: 0.5s;
-
-  text-decoration: none;
-
-  margin-top: 5px;
-  margin-bottom: 5px;
-  display: inline-block;
-
-  border: 2px solid #0085B7;
-  border-radius: 10px;
-}
-
-.download-button:hover {
-  background-color: transparent;
-
-  text-decoration: none;
-  color: #0085B7;
-}
-
-@media screen and (min-width: 765px) {
-  .navbar-nav {
-  	float: right;
-  }
-  
-  #menuselector {
-  	display: block;
-  }
+/*
+Main CSS file for tankernn.eu
+Backgrund from http://www.facets.la/wallpapers/
+*/
+@font-face {
+  font-family: "Open Sans";
+  src:  url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Regular-webfont.eot?#iefix) format("embedded-opentype"),
+        url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Regular-webfont.woff) format("woff"),
+        url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Regular-webfont.ttf) format("truetype");
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: "Open Sans";
+  src:  url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Bold-webfont.eot#iefix) format("embedded-opentype"),
+        url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Bold-webfont.woff) format("woff"),
+        url(https://mozorg.cdn.mozilla.net/media/fonts/OpenSans-Bold-webfont.ttf) format("truetype");
+  font-weight: bold;
+  font-style: normal;
+}
+
+@keyframes goRight {
+  0% {left: -500px}
+  100% {left: 100%}
+}
+
+body {
+  font-family: "Open Sans", sans-serif;
+  font-size: 20px;
+  background-color: #00a4e1;
+  color: #777;
+  border-collapse: collapse;
+}
+
+body * {
+  transition: 0.5s;
+}
+
+main .container {
+  padding-top: 40px;
+  padding-bottom: 40px;
+}
+
+.meta > div > div {
+  background: #FFF;
+  border-radius: 10px;
+  border: 1px solid transparent;
+  padding: 0 20px 20px;
+  margin-bottom: 20px;
+}
+
+/*#### Header styling ####*/
+
+nav {
+  background-color: white;
+  border-bottom: 3px solid #337AB7;
+}
+
+.navbar-toggle .icon-bar {
+  background-color: darkgray;
+}
+
+.login {
+  float: right;
+  padding-top: 5px;
+  padding-right: 10px;
+}
+
+/*#### Menu ####*/
+
+nav ul li:hover a {
+  background-color: transparent !important;
+}
+
+nav ul li a {
+  z-index: 5;
+}
+
+#menuselector {
+  background-color: #337AB7;
+  position: absolute;
+  z-index: 4;
+  display: none;
+}
+
+/*#### Structural Styling ####*/
+
+h1, h2, h3, h4, h5, h6 {
+  color: black;
+}
+
+footer {
+  font-family: Arial, inherit;
+  font-size: 18px;
+  background-color: #393939;
+  color: white;
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+
+footer a, footer a:hover {
+  color: white;
+}
+
+footer ul li {
+  list-style: none;
+}
+
+/*#### Various Styling ###*/
+
+#snakeCanvas {
+  border: 1px solid black;
+}
+
+.coral {
+  animation: goRight linear 3s 1;
+  position: fixed;
+  left: -500px;
+}
+
+.error {
+  background-color: #D9534F;
+  color: white;
+}
+
+li.L0, li.L1, li.L2, li.L3,
+li.L5, li.L6, li.L7, li.L8
+{ list-style-type: decimal !important }
+
+.prettyprint {
+  background-color: #fdfdfd;
+  font-family: Courier;
+  padding: 2px;
+  border-radius: 5px;
+  white-space: pre-wrap;
+
+  -moz-tab-size:  4;
+  -o-tab-size:  4;
+  tab-size:  4;
+}
+
+.download-button {
+  font-size: 26px;
+  padding: 15px 100px;
+  font-weight: bold;
+  background-color: #0085B7;
+  color: white;
+  transition: 0.5s;
+
+  text-decoration: none;
+
+  margin-top: 5px;
+  margin-bottom: 5px;
+  display: inline-block;
+
+  border: 2px solid #0085B7;
+  border-radius: 10px;
+}
+
+.download-button:hover {
+  background-color: transparent;
+
+  text-decoration: none;
+  color: #0085B7;
+}
+
+@media screen and (min-width: 765px) {
+  .navbar-nav {
+  	float: right;
+  }
+  
+  #menuselector {
+  	display: block;
+  }
 }