From 0a00051d30184c94a666638f66f1d145df855995 Mon Sep 17 00:00:00 2001
From: horus_arch
Date: Mon, 18 May 2015 14:38:35 +0200
Subject: Add tos, privacy policy, noscript alert and updated the mailgraph
 html.

---
 views/footer.html      | 31 +++++++++++++++++++++----------
 views/navbar.html      | 12 ++++++++++++
 views/navbar_de.html   | 14 +++++++++++++-
 views/password.html    |  2 +-
 views/password_de.html | 18 +++++++++---------
 views/privacy.html     | 42 ++++++++++++++++++++++++++++++++++++++++++
 views/privacy_de.html  | 42 ++++++++++++++++++++++++++++++++++++++++++
 views/register.html    | 16 +++++++++++++---
 views/register_de.html | 16 +++++++++++++---
 views/tos.html         | 38 ++++++++++++++++++++++++++++++++++++++
 views/tos_de.html      | 37 +++++++++++++++++++++++++++++++++++++
 11 files changed, 241 insertions(+), 27 deletions(-)
 create mode 100644 views/privacy.html
 create mode 100644 views/privacy_de.html
 create mode 100644 views/tos.html
 create mode 100644 views/tos_de.html

(limited to 'views')

diff --git a/views/footer.html b/views/footer.html
index db85f61..6581cac 100644
--- a/views/footer.html
+++ b/views/footer.html
@@ -2,9 +2,26 @@
 	<div class="container">
 		<div class="col-md-12">
 			<p class="sticky-footer">
-				<a class="footer-a" href="/statistics" title="Statistics"><span class="fa fa-bar-chart"></span> Statistics</a>
-				|
-				<span class="fa fa-copyright"></span> <a class='footer-a' href='//www.iamfabulous.de' title='Maximilian Möhring'>Maximilian M&ouml;hring <span class="fa fa-external-link"></span></a>
+{{if eq . "de"}}
+				<span class="fa fa-bar-chart"></span> <a class="footer-a" href="/statistics" title="Statistics"> Statistiken</a>
+				&nbsp; | &nbsp; 
+				<span class="fa fa-legal"></span> <a class="footer-a" href="/tos" title="Nutzungsbedingungen"> Nutzungsbedingugen</a>
+				&nbsp; | &nbsp; 
+				<span class="fa fa-user-secret"></span> <a class="footer-a" href="/privacy" title="Datenschutz Erklärung"> Datenschutz</a>
+{{else}}
+				<span class="fa fa-bar-chart"></span> <a class="footer-a" href="/statistics" title="Statistics"> Statistics</a>
+				&nbsp; | &nbsp; 
+				<span class="fa fa-legal"></span> <a class="footer-a" href="/tos" title="Terms of Service"> Terms of Service</a>
+				&nbsp; | &nbsp; 
+				<span class="fa fa-user-secret"></span> <a class="footer-a" href="/privacy" title="Privacy"> Privacy Policy</a>
+{{end}}
+				<span class="sm-display">
+					&nbsp; | &nbsp; 
+				</span>
+				
+				<span class="lg-pull-right">
+					<span class="fa fa-copyright"></span> <a class='footer-a' href='//www.iamfabulous.de' title='Maximilian Möhring'>Maximilian M&ouml;hring <span class="fa fa-external-link"></span></a>
+				</span>
 			</p>
 		</div>
 	</div>
@@ -19,6 +36,7 @@
 <script>
 	$(document).ready(function(){
 		$('.dropdown-toggle').dropdown();
+		$.material.init();
 	});
 	var _paq = _paq || [];
 	_paq.push(['trackPageView']);
@@ -28,13 +46,6 @@
 		_paq.push(['setTrackerUrl', u+'piwik.php']);
 		_paq.push(['setSiteId', 12]);
 		{{if .}}
-		/*
-		_paq.push([function () {
-		    if (!this.getCustomVariable(1)) {
-			    this.setCustomVariable(1, "Language", {{.}}, "visit");
-		    }
-		}]);
-		*/
 		_paq.push(['setCustomVariable', 1, "Language",{{.}}, "visit"]);
 		{{end}}
         	var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
diff --git a/views/navbar.html b/views/navbar.html
index 2b581f6..d90b6d6 100644
--- a/views/navbar.html
+++ b/views/navbar.html
@@ -41,4 +41,16 @@
 			</ul>
 		</div>
 	</div>
+	<noscript class="noscript">
+		<div class="container-fluid btn-danger">
+			<div class="container">
+				<div class="row">
+					<div class="col-md-12">
+						<h4>Disabling JavaScript is a great idea, though Libremail works best with JavaScript enabled.
+						</h4>
+					</div>
+				</div>
+			</div>
+		</div>
+	</noscript>
 </nav>
diff --git a/views/navbar_de.html b/views/navbar_de.html
index e5f35f7..186758f 100644
--- a/views/navbar_de.html
+++ b/views/navbar_de.html
@@ -14,7 +14,7 @@
 				<li>
 					<a class="" href="https://iamfabulous.de/webmail" title="Webmail"><span class="glyphicon glyphicon-envelope"></span> Login & E-Mail lesen</a>
 				</li>
-				<li><a class="" href="/register" title="Sign Up"><span class="fa fa-user-plus"></span> Neuen Account erstellen</a></li>
+				<li><a class="" href="/register" title="Sign Up"><span class="fa fa-user-plus"></span> Neue E-Mail</a></li>
 				<li><a class="" href="/password" title="Change Password"><span class="fa fa-lock"></span> Passwort ändern</a></li>
 			</ul>
 			<ul class="nav navbar-nav navbar-right">
@@ -41,4 +41,16 @@
 			</ul>
 		</div>
 	</div>
+	<noscript class="noscript">
+		<div class="container-fluid btn-danger">
+			<div class="container">
+				<div class="row">
+					<div class="col-md-12">
+						<h4>JavaScript zu deaktivieren ist eine gute Idee, aber Libremail funktioniert am besten, wenn Sie es aktivieren würden.
+						</h4>
+					</div>
+				</div>
+			</div>
+		</div>
+	</noscript>
 </nav>
diff --git a/views/password.html b/views/password.html
index 330f3e7..c5f6741 100644
--- a/views/password.html
+++ b/views/password.html
@@ -63,7 +63,7 @@
 		<div class="form-group">
 			<label class="col-md-4 control-label" for="submit"></label>
 			<div class="col-md-4">
-				<button class="btn btn-primary btn-raised btn-lg btn-block">Submit &raquo;</button>
+				<button class="btn btn-primary btn-raised btn-lg btn-block"><span class="fa fa-edit"></span> Submit &raquo;</button>
 			</div>
 		</div>
 
diff --git a/views/password_de.html b/views/password_de.html
index 66792d5..11ad57b 100644
--- a/views/password_de.html
+++ b/views/password_de.html
@@ -35,27 +35,27 @@
 
 		<!-- Text input-->
 		<div class="form-group">
-			<label class="col-md-4 control-label" for="Password">Aktuelles Passwort:</label>  
+			<label class="col-md-4 control-label" for="NewPassword">Neues Passwort:</label>  
 			<div class="col-md-4">
-				<input id="Password" name="Password" placeholder="Authentifizieren Sie sich." class="form-control input-md" required="" type="password">
+				<input id="NewPassword" name="NewPassword" placeholder="Ihr neues Passwort." class="form-control input-md" required="" type="password">
 			</div>
 		</div>
 
-		<br>
-
 		<!-- Text input-->
 		<div class="form-group">
-			<label class="col-md-4 control-label" for="NewPassword">Neues Passwort:</label>  
+			<label class="col-md-4 control-label" for="ConfirmPassword">Bestätige Passwort:</label>  
 			<div class="col-md-4">
-				<input id="NewPassword" name="NewPassword" placeholder="Ihr neues Passwort." class="form-control input-md" required="" type="password">
+				<input id="ConfirmPassword" name="ConfirmPassword" placeholder="Wiederholen Sie ihr neues Passwort." class="form-control input-md" required="" type="password">
 			</div>
 		</div>
 
+		<br>
+
 		<!-- Text input-->
 		<div class="form-group">
-			<label class="col-md-4 control-label" for="ConfirmPassword">Bestätige Passwort:</label>  
+			<label class="col-md-4 control-label" for="Password">Aktuelles Passwort:</label>  
 			<div class="col-md-4">
-				<input id="ConfirmPassword" name="ConfirmPassword" placeholder="Wiederholen Sie ihr neues Passwort." class="form-control input-md" required="" type="password">
+				<input id="Password" name="Password" placeholder="Authentifizieren Sie sich." class="form-control input-md" required="" type="password">
 			</div>
 		</div>
 
@@ -63,7 +63,7 @@
 		<div class="form-group">
 			<label class="col-md-4 control-label" for="submit"></label>
 			<div class="col-md-4">
-				<button class="btn btn-primary btn-raised btn-lg btn-block">Abschicken &raquo;</button>
+				<button class="btn btn-primary btn-raised btn-lg btn-block"><span class="fa fa-edit"></span> Abschicken &raquo;</button>
 			</div>
 		</div>
 
diff --git a/views/privacy.html b/views/privacy.html
new file mode 100644
index 0000000..538aa52
--- /dev/null
+++ b/views/privacy.html
@@ -0,0 +1,42 @@
+{{template "header.html" "Privacy Policy | Libremail"}}
+{{template "navbar.html"}}
+{{template "alert.html" .}}
+
+<div class="container">
+	<div class="row">
+		<div class="col-md-12">
+			<h1>Privacy Policy</h1>
+			<br>
+			<div class="well well-lg">
+				<h2 id="e-mails">E-Mails</h2>
+				<p>
+					We do not read your e-mails.
+				</p>
+				<br>
+				<h2 id="public_information">Public Information</h2>
+				<p>
+					We might make those information public at any time:
+					<ul>
+					<li>your registered mail address (existence of your email address can be checked during registration and password changing)</li>
+					<li>anonymized statistics, e.g. about disk space usage</li>
+					<li>anonymized data</li>
+					</ul>
+				</p>
+				<br>
+				<h2 id="website">Website</h2>
+				<p>
+					In common with other websites, log files are stored on the web server saving details such as the visitor's IP address, browser type, referring page and time of visit.
+					<br>
+					
+					Cookies may be used to remember and analyze visitor preferences when interacting with the website.
+				</p>
+				<br>
+				<h2 id="logs">Logs</h2>
+				<p>
+					The server software may store logs about usage, this includes e.g. the time of login. We are using those logs to debug the application and prevent spamming.
+				</p>
+			</div>
+		</div>
+	</div>
+</div>
+{{template "footer.html" .Language}}
diff --git a/views/privacy_de.html b/views/privacy_de.html
new file mode 100644
index 0000000..b6624b7
--- /dev/null
+++ b/views/privacy_de.html
@@ -0,0 +1,42 @@
+{{template "header.html" "Datenschutzerklärung | Libremail"}}
+{{template "navbar_de.html"}}
+{{template "alert.html" .}}
+
+<div class="container">
+	<div class="row">
+		<div class="col-md-12">
+			<h1>Datenschutzerklärung</h1>
+			<br>
+			<div class="well well-lg">
+				<h2 id="e-mails">E-Mails</h2>
+				<p>
+					Wir lesen nicht ihre E-Mails.
+				</p>
+				<br>
+				<h2 id="public_information">Öffentliche Informationen</h2>
+				<p>
+					Folgende Informationen können jederzeit veröffentlicht werden:
+					<ul>
+						<li>ihre registrierte E-Mail Adresse (die Existenz kann während der Registrierung oder beim Password wechseln kontrolliert werden)</li>
+						<li>anonymisierte Statistiken, z.B. über den Speicherverbrauch</li>
+						<li>andere anonymisierte Daten</li>
+					</ul>
+				</p>
+				<br>
+				<h2 id="website">Website</h2>
+				<p>
+					So wie bei andere Webseiten werden Zugriffe automatisch vom Webserver geloggt. Das schließt u.a. die Besucher IP Adresse ein, der Browser, der Referer sowie die Zeit des Besuchs.
+					<br>
+					Cookies werden benutzt um Besucher beim Besuch und Interaktion mit der Website wiederzuerkennen, sowie werden Statistiken über Nutzung der Website erhoben.
+					
+				</p>
+				<br>
+				<h2 id="logs">Logs</h2>
+				<p>
+					Die Server Software speichert automatisch Daten über die Benutzung des Services, das schließt u.a. den Zeitpunkt des Logins ein. Wir nutzen diese Logs um Fehler in der Anwendung zu finden, sowie um Spam und Ausnutzung zu erkennen und zu verhindern.
+				</p>
+			</div>
+		</div>
+	</div>
+</div>
+{{template "footer.html" .Language}}
diff --git a/views/register.html b/views/register.html
index 058857c..2bd62b0 100644
--- a/views/register.html
+++ b/views/register.html
@@ -29,7 +29,7 @@
 		<div class="form-group">
 			<label class="col-md-4 control-label" for="Email">Email:</label>  
 			<div class="col-md-4">
-				<input id="Email" name="Email" placeholder="Your desired mail address." class="form-control input-md" required="" type="text">
+				<input id="Email" name="Email" placeholder="Your desired mail address." class="form-control input-md" required="" type="email">
 			</div>
 		</div>
 
@@ -37,7 +37,7 @@
 		<div class="form-group">
 			<label class="col-md-4 control-label" for="ConfirmEmail">Confirm Email:</label>  
 			<div class="col-md-4">
-				<input id="ConfirmEmail" name="ConfirmEmail" placeholder="Confirm your choice." class="form-control input-md" required="" type="text">
+				<input id="ConfirmEmail" name="ConfirmEmail" placeholder="Confirm your choice." class="form-control input-md" required="" type="email">
 			</div>
 		</div>
 
@@ -57,11 +57,21 @@
 			</div>
 		</div>
 
+		<!-- Checkbox-->
+		<div class="form-group text-center">
+			<div class="checkbox">
+				<label>
+					<input type="checkbox" name="legal" required>
+					I accept the <a href="/tos" title="Terms of Service">Terms of Service</a> and the <a href="/privacy" title="Privacy Policy">Privacy Policy</a>.
+				</label>
+			</div>
+		</div>
+
 		<!-- Button -->
 		<div class="form-group">
 			<label class="col-md-4 control-label" for="submit"></label>
 			<div class="col-md-4">
-				<button class="btn btn-primary btn-raised btn-lg btn-block">Submit &raquo;</button>
+				<button class="btn btn-primary btn-raised btn-lg btn-block"><span class="fa fa-paper-plane-o"></span> Submit &raquo;</button>
 			</div>
 		</div>
 
diff --git a/views/register_de.html b/views/register_de.html
index 86b8afc..17d9550 100644
--- a/views/register_de.html
+++ b/views/register_de.html
@@ -29,7 +29,7 @@
 		<div class="form-group">
 			<label class="col-md-4 control-label" for="Email">Email:</label>  
 			<div class="col-md-4">
-				<input id="Email" name="Email" placeholder="Ihre neue E-Mail Adresse." class="form-control input-md" required="" type="text">
+				<input id="Email" name="Email" placeholder="Ihre neue E-Mail Adresse." class="form-control input-md" required="" type="email">
 			</div>
 		</div>
 
@@ -37,7 +37,7 @@
 		<div class="form-group">
 			<label class="col-md-4 control-label" for="ConfirmEmail">Bestätige Email:</label>  
 			<div class="col-md-4">
-				<input id="ConfirmEmail" name="ConfirmEmail" placeholder="Bitte wiederholen Sie ihre E-Mail Adresse." class="form-control input-md" required="" type="text">
+				<input id="ConfirmEmail" name="ConfirmEmail" placeholder="Bitte wiederholen Sie ihre E-Mail Adresse." class="form-control input-md" required="" type="email">
 			</div>
 		</div>
 
@@ -57,11 +57,21 @@
 			</div>
 		</div>
 
+		<!-- Checkbox-->
+		<div class="form-group text-center">
+			<div class="checkbox">
+				<label>
+					<input type="checkbox" name="legal" required>
+					Ich akzeptiere die <a href="/tos" title="Terms of Service">Nutzungsbedingungen</a> und die <a href="/privacy" title="Privacy Policy">Datenschutzerklärung</a>.
+				</label>
+			</div>
+		</div>
+
 		<!-- Button -->
 		<div class="form-group">
 			<label class="col-md-4 control-label" for="submit"></label>
 			<div class="col-md-4">
-				<button class="btn btn-primary btn-raised btn-lg btn-block">Abschicken &raquo;</button>
+				<button class="btn btn-primary btn-raised btn-lg btn-block"><span class="fa fa-paper-plane-o"></span> Abschicken &raquo;</button>
 			</div>
 		</div>
 
diff --git a/views/tos.html b/views/tos.html
new file mode 100644
index 0000000..28fe737
--- /dev/null
+++ b/views/tos.html
@@ -0,0 +1,38 @@
+{{template "header.html" "Terms of Service | Libremail"}}
+{{template "navbar.html"}}
+{{template "alert.html" .}}
+
+<div class="container">
+	<div class="row">
+		<div class="col-md-12">
+			<h1>Terms of Service</h1>
+			<br>
+			<div class="well well-lg">
+				<h2 id="conditions">Conditions to Use</h2>
+				<p>
+					<ul>
+						<li>no spam</li>
+						<li>no content illegal in Germany or France</li>
+						<li>no getting use abuse complaints</li>
+						<li>no sending fake abuse complaints.</li>
+					</ul>
+					We will comply all federal laws regarding online content hosting and will report any illegal activity to the relevant authorities.
+					<strong></strong>
+				</p>
+				<br>
+				<h2 id="delivery_problems">Delivery Problems</h2>
+				<p>
+					Mail delivery is difficult and depends on a large amount of circumstances. Sometimes things will go wrong and not everytime we are at fault.
+					<br>
+					If you have any problems, get in contact.
+				</p>
+				<br>
+				<h2 id="warranty">Warranty</h2>
+				<p>
+					THERE IS ABSOLUT NO WARRANTY IN ANY WAY, BE IT UPTIME, BACKUP OR ABUSE. THE USER IS RESPONSIBLE FOR HIS OWN DOING.
+				</p>
+			</div>
+		</div>
+	</div>
+</div>
+{{template "footer.html" .Language}}
diff --git a/views/tos_de.html b/views/tos_de.html
new file mode 100644
index 0000000..39fd460
--- /dev/null
+++ b/views/tos_de.html
@@ -0,0 +1,37 @@
+{{template "header.html" "Nutzungsbedingungen | Libremail"}}
+{{template "navbar.html"}}
+{{template "alert.html" .}}
+
+<div class="container">
+	<div class="row">
+		<div class="col-md-12">
+			<h1>Nutzungsbedingungen</h1>
+			<br>
+			<div class="well well-lg">
+				<h2 id="conditions">Generelle Nutzungsbedingungen</h2>
+				<p>
+					<ul>
+						<li>kein Spam</li>
+						<li>kein Inhalt der in Deutschland oder Frankreich illegal ist</li>
+						<li>kein Missbrauch</li>
+						<li>kein Senden von gefälschten Beschwerdebriefen</li>
+					</ul>
+					Wir befolgen alle Gesetze bezüglich der Veröffentlich von Inhalten im Internet und werden alle illegalen Aktivitäten an die entsprechenden Behörden melden.
+				</p>
+				<br>
+				<h2 id="delivery_problems">Zustellungsprobleme</h2>
+				<p>
+					E-Mail Zustellung ist kompliziert und hängt von viele verschiedenen Faktoren ab. Manchmal gehen Sachen schief und nicht immer können wir es verhinden.
+					<br>
+					Wenn Sie ein Problem bemerken treten Sie in Kontakt mit uns über das Kontaktformular.
+				</p>
+				<br>
+				<h2 id="warranty">Garantie</h2>
+				<p>
+					ES WIRD KEINERLEI GARANTIE IN IRGENDEINER ART UND WEISE GEWÄHRLEISTET, SEI ES ERREICHBARKEIT, BACKUPS ODER MISSBRAUCH. JEDER NUTZER IST FÜR SEIN EIGENES VERHALTEN VERANTWORTLICH.
+				</p>
+			</div>
+		</div>
+	</div>
+</div>
+{{template "footer.html" .Language}}
-- 
cgit v1.2.3