Login via E-Mail works now.

author: root 2015-10-27 10:58:11 +0100
committer: root 2015-10-27 10:58:11 +0100
commit: 18da65cb74262623719f291920f03ad6ae4a277c (patch)
tree: 9efb44d47cabb0c7a5ffe8b107ccb4005cf989d3 /static
parent: dc904a00f00e38f5db2f867bfc1d99f2ebd13cc7 (diff)
download: jungegemeinde-18da65cb74262623719f291920f03ad6ae4a277c.tar.gz
2 files changed, 260 insertions, 14 deletions
diff --git a/static/header.php b/static/header.php
index a3a712f..868ce8c 100644
--- a/static/header.php
+++ b/static/header.php
@@ -35,7 +35,7 @@
 						<a href="#" title="Much fancy, many amazing, wow" onclick="loadFancy();"><span class="glyphicon glyphicon-flag"></span> Fancy Mode</a>
 					</li>
 					<li class="dropdown">	
-						<?php
+						<?php /*
 						if ( $user->isLoggedIn() ) {
 							$_name = $user->username;
 							$_title = "Ändere dein Profil";
@@ -43,26 +43,28 @@
 							$_name = "Mitglied";
 							$_title = "Einloggen, registrieren, Profil";
 						}
+						*/
 						?>
-                                                <a href="<?php echo DOMAIN; ?>?page=account" title="<?php echo $_title; ?>"><span class="glyphicon glyphicon-user"></span> <?php echo $_name; ?> <span class="caret"></span></a>
-						<ul class="dropdown-menu" role="menu">
+                                                <!--a href="<?php echo DOMAIN; ?>?page=account" title="<?php echo $_title; ?>"><span class="glyphicon glyphicon-user"></span> <?php echo $_name; ?> <span class="caret"></span></a-->
+						<!--ul class="dropdown-menu" role="menu"-->
 							<li>
 						<?php
 						if ( $user->isLoggedIn() ) {
 						?>
-                                                	<a href="<?php echo DOMAIN; ?>?page=account" title="Ändere dein Passwort"><span class="glyphicon glyphicon-user"></span> Profil</a>
+							<a href="<?php echo DOMAIN; ?>?page=logout" title="Beende die Session"><span class="glyphicon glyphicon-off"></span> Logout</a>
+                                                	<!--a href="<?php echo DOMAIN; ?>?page=account" title="Ändere dein Passwort"><span class="glyphicon glyphicon-user"></span> Profil</a>
 							</li>
 							<li class="divider"></li>
 							<li>
-							<a href="<?php echo DOMAIN; ?>?page=logout" title="Beende die Session"><span class="glyphicon glyphicon-off"></span> Logout</a>
+							<a href="<?php echo DOMAIN; ?>?page=logout" title="Beende die Session"><span class="glyphicon glyphicon-off"></span> Logout</a-->
 						<?php
 						} else  {
 						?>
-                                               		<a href="<?php echo DOMAIN; ?>?page=register&goto=index" title="Registriere dich für unbeschränkten Zugang"><span class="glyphicon glyphicon-share-alt"></span> Register</a>
+                                               		<a href="<?php echo DOMAIN; ?>?page=login&goto=index" title="Login"><span class="glyphicon glyphicon-share-alt"></span> Login</a>
 							</li>
-							<li class="divider"></li>
+							<!--li class="divider"></li>
 							<li>
-							<a href="<?php echo DOMAIN; ?>?page=login&goto=index" title="Login"><span class="glyphicon glyphicon-log-in"></span> Login</a>
+							<a href="<?php echo DOMAIN; ?>?page=login&goto=index" title="Login"><span class="glyphicon glyphicon-log-in"></span> Login</a-->
 						<?php
 						}
 						?>
diff --git a/static/mail_template.php b/static/mail_template.php
index 5907ce7..87b216b 100644
--- a/static/mail_template.php
+++ b/static/mail_template.php
@@ -1,6 +1,250 @@
-Hallo <?php echo $name; ?>, <br>
-<br>
-um dich auf der Website der JG einzuloggen bitte folge <a href="https://jungegemeinde.iamfabulous.de/?page=verify&name=<?php echo $email; ?>&hash=<?php echo $hash?>" title="Einloggen">diesen Link</a>.
-<br>
-Viele Grüße, <br>
-JG Adlershof
+<!doctype html>
+<html>
+<head>
+<meta name="viewport" content="width=device-width">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Junge Gemeinde Adlershof | Login</title>
+<style>
+/* -------------------------------------
+    GLOBAL
+------------------------------------- */
+* {
+  font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
+  font-size: 100%;
+  line-height: 1.6em;
+  margin: 0;
+  padding: 0;
+}
+
+img {
+  max-width: 600px;
+  width: 100%;
+}
+
+body {
+  -webkit-font-smoothing: antialiased;
+  height: 100%;
+  -webkit-text-size-adjust: none;
+  width: 100% !important;
+}
+
+
+/* -------------------------------------
+    ELEMENTS
+------------------------------------- */
+a {
+  color: #3083D6;
+}
+
+.btn-primary {
+  Margin-bottom: 10px;
+  width: auto !important;
+}
+
+.btn-primary td {
+  background-color: #3083D6; 
+  border-radius: 25px;
+  font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; 
+  font-size: 14px; 
+  text-align: center;
+  vertical-align: top; 
+}
+
+.btn-primary td a {
+  background-color: #3083D6;
+  border: solid 1px #3083D6;
+  border-radius: 25px;
+  border-width: 10px 20px;
+  display: inline-block;
+  color: #ffffff;
+  cursor: pointer;
+  font-weight: bold;
+  line-height: 2;
+  text-decoration: none;
+}
+
+.last {
+  margin-bottom: 0;
+}
+
+.first {
+  margin-top: 0;
+}
+
+.padding {
+  padding: 10px 0;
+}
+
+
+/* -------------------------------------
+    BODY
+------------------------------------- */
+table.body-wrap {
+  padding: 20px;
+  width: 100%;
+}
+
+table.body-wrap .container {
+  border: 1px solid #f0f0f0;
+}
+
+
+/* -------------------------------------
+    FOOTER
+------------------------------------- */
+table.footer-wrap {
+  clear: both !important;
+  width: 100%;  
+}
+
+.footer-wrap .container p {
+  color: #666666;
+  font-size: 12px;
+  
+}
+
+table.footer-wrap a {
+  color: #999999;
+}
+
+
+/* -------------------------------------
+    TYPOGRAPHY
+------------------------------------- */
+h1, 
+h2, 
+h3 {
+  color: #111111;
+  font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-weight: 200;
+  line-height: 1.2em;
+  margin: 40px 0 10px;
+}
+
+h1 {
+  font-size: 36px;
+}
+h2 {
+  font-size: 28px;
+}
+h3 {
+  font-size: 22px;
+}
+
+p, 
+ul, 
+ol {
+  font-size: 14px;
+  font-weight: normal;
+  margin-bottom: 10px;
+}
+
+ul li, 
+ol li {
+  margin-left: 5px;
+  list-style-position: inside;
+}
+
+/* ---------------------------------------------------
+    RESPONSIVENESS
+------------------------------------------------------ */
+
+/* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
+.container {
+  clear: both !important;
+  display: block !important;
+  Margin: 0 auto !important;
+  max-width: 600px !important;
+}
+
+/* Set the padding on the td rather than the div for Outlook compatibility */
+.body-wrap .container {
+  padding: 20px;
+}
+
+/* This should also be a block element, so that it will fill 100% of the .container */
+.content {
+  display: block;
+  margin: 0 auto;
+  max-width: 600px;
+}
+
+/* Let's make sure tables in the content area are 100% wide */
+.content table {
+  width: 100%;
+}
+
+</style>
+</head>
+
+<body bgcolor="#f6f6f6">
+
+<!-- body -->
+<table class="body-wrap" bgcolor="#f6f6f6">
+  <tr>
+    <td></td>
+    <td class="container" bgcolor="#FFFFFF">
+
+      <!-- content -->
+      <div class="content">
+      <table>
+        <tr>
+          <td>
+ 	    <h1>JG Adlershof</h1>
+	    <p>Hallo <strong><?php echo htmlentities($name); ?></strong>,</p>
+            <p>um dich auf der Website der Jungen Gemeinde einzuloggen, folge bitte diesem Link:</p>
+            <!-- button -->
+            <table class="btn-primary" cellpadding="0" cellspacing="0" border="0">
+              <tr>
+                <td>
+			<a href="https://jungegemeinde.iamfabulous.de/?page=action&task=verify&email=<?php echo htmlentities($email); ?>&hash=<?php echo $hash; ?>&goto=<?php echo htmlentities($_GET['goto']); ?>" title="Einloggen">Hier klicken um zur Website der Jungen Gemeinde zu kommen</a>
+                </td>
+              </tr>
+            </table>
+            <!-- /button -->
+	    <p>Der Link verf&auml;llt innerhalb 24h.</p>
+	    <p>Sollte der Link nicht funktionieren, dein Authentifizierungscode lautet <strong><?php echo $hash; ?></strong>.</p>
+            <!--p>Wenn du diese E-Mail nicht erwartet hast, bitte ignoriere sie.</p-->
+	    <p>Viele Gr<?php echo htmlentities("üß"); ?>, <br>
+	    JG Adlershof</p>
+            <p><a href="https://jungegemeinde.iamfabulous.de/" title="Website der JG">Website der JG</a></p>
+            <p><a href="https://lists.iamfabulous.de/mailman/private/jungegemeinde" title="Archiv der Mailing Liste">Archiv der Mailing Liste</a></p>
+          </td>
+        </tr>
+      </table>
+      </div>
+      <!-- /content -->
+      
+    </td>
+    <td></td>
+  </tr>
+</table>
+<!-- /body -->
+
+<!-- footer -->
+<table class="footer-wrap">
+  <tr>
+    <td></td>
+    <td class="container">
+      
+      <!-- content -->
+      <div class="content">
+        <table>
+          <tr>
+            <td align="center">
+              <p><a href="https://www.iamfabulous.de/">Maximilian M&ouml;hring</a>
+              </p>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <!-- /content -->
+      
+    </td>
+    <td></td>
+  </tr>
+</table>
+<!-- /footer -->
+
+</body>
+</html>
author	root	2015-10-27 10:58:11 +0100
committer	root	2015-10-27 10:58:11 +0100
commit	18da65cb74262623719f291920f03ad6ae4a277c (patch)
tree	9efb44d47cabb0c7a5ffe8b107ccb4005cf989d3 /static
parent	dc904a00f00e38f5db2f867bfc1d99f2ebd13cc7 (diff)
download	jungegemeinde-18da65cb74262623719f291920f03ad6ae4a277c.tar.gz