From 050315fd4253a962a5a2fa7fc69eb712bbf0ecdc Mon Sep 17 00:00:00 2001
From: horus_arch
Date: Sun, 29 Mar 2015 20:52:16 +0200
Subject: Add modified mailgraph.cgi. Update style.css. Complete test suite,
 every function should be tested.

---
 views/about.html     | 26 +++++++++++++++++++-------
 views/about_de.html  | 26 +++++++++++++++++++-------
 views/footer.html    |  6 +++++-
 views/header.html    |  2 --
 views/howto.html     |  1 +
 views/howto_de.html  |  1 +
 views/server.html    |  1 +
 views/server_de.html |  1 +
 views/user.html      |  1 +
 views/user_de.html   |  1 +
 10 files changed, 49 insertions(+), 17 deletions(-)

(limited to 'views')

diff --git a/views/about.html b/views/about.html
index ad1cbad..44c837d 100644
--- a/views/about.html
+++ b/views/about.html
@@ -2,13 +2,6 @@
 {{template "navbar.html"}}
 {{template "alert.html" .}}
 
-<!--div class="jumbotron">
-	<div class="container">
-		<h1>About</h1>
-		<p>Everything about Libremail</p>
-	</div>
-</div-->
-
 <div class="container">
 	<div class="row">
 	<div class="col-md-12">
@@ -40,6 +33,25 @@
 			<br>
 			<h2 id="sign_up">How to sign up?</h2>
 			<p>Please look <a href="/howto#create_new" title="How to sign up">here</a>.
+			<!--br>
+			<h2 id="software">Used Software</h2>
+			<p>
+				Postfix - SMTP
+				<br>
+				Dovecot - IMAP, POP3
+				<br>
+				Roundcube  - Webmali
+				<br>
+				MariaDB - Database
+				<br>
+				TumgreySPF - Greylisting
+				<br>
+				Libremail - Golang
+				<br>
+				Mailgraph - Statistics
+				<br>
+				Debian - Operating System
+			</p-->
 			<br>
 			<h2 id="warranty">Warranty</h2>
 			<p>
diff --git a/views/about_de.html b/views/about_de.html
index d56ef4f..0f46fed 100644
--- a/views/about_de.html
+++ b/views/about_de.html
@@ -2,13 +2,6 @@
 {{template "navbar_de.html"}}
 {{template "alert.html" .}}
 
-<!--div class="jumbotron">
-	<div class="container">
-		<h1>About</h1>
-		<p>Everything about Libremail</p>
-	</div>
-</div-->
-
 <div class="container">
 	<div class="row">
 	<div class="col-md-12">
@@ -42,6 +35,25 @@
 			<br>
 			<h2 id="sign_up">Wie erstelle ich eine neue Adresse?</h2>
 			<p>Schauen Sie <a href="/howto#create_new" title="How to sign up">hier</a> nach.</p>
+			<!--br>
+			<h2 id="software">Used Software</h2>
+			<p>
+				Postfix - SMTP
+				<br>
+				Dovecot - IMAP, POP3
+				<br>
+				Roundcube  - Webmali
+				<br>
+				MariaDB - Database
+				<br>
+				TumgreySPF - Greylisting
+				<br>
+				Libremail - Golang
+				<br>
+				Mailgraph - Statistics
+				<br>
+				Debian - Operating System
+			</p-->
 			<br>
 			<h2 id="warranty">Garantie</h2>
 			<p>
diff --git a/views/footer.html b/views/footer.html
index 8f2c02e..19c589b 100644
--- a/views/footer.html
+++ b/views/footer.html
@@ -1,7 +1,11 @@
 <footer class="footer shadow-y-2">
 	<div class="container">
 		<div class="col-md-12">
-			<p class="sticky-footer"> <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></p>
+			<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>
+			</p>
 		</div>
 	</div>
 </footer>
diff --git a/views/header.html b/views/header.html
index c41b483..8269f3d 100644
--- a/views/header.html
+++ b/views/header.html
@@ -5,10 +5,8 @@
     <meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name='viewport' content='width=device-width, initial-scale=1.0'>
-    <!--title>Libremail @ mail.iamfabulous.de</title-->
     <title>{{.}}</title>
     <link rel='stylesheet' href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css'>
-    <link rel='stylesheet' type='text/css' href='/static/css/bootstrap.min.css'>
     <link rel='stylesheet' type='text/css' href='/static/css/material-wfont.min.css'>
     <link rel='stylesheet' type='text/css' href='/static/css/material.min.css'>
     <link rel='stylesheet' type='text/css' href='/static/css/ripples.min.css'>
diff --git a/views/howto.html b/views/howto.html
index a25d734..ae8d9fe 100644
--- a/views/howto.html
+++ b/views/howto.html
@@ -6,6 +6,7 @@
 	<div class="row">
 		<div class="col-md-12">
 			<h1>How to</h1>
+			<br>
 			<div class="well well-lg">
 				<h2 id="create_new">Create new adress</h2>
 				<p>To create a new mail adress follow and fill out <a href="/register" title="Sign up">this</a> link.
diff --git a/views/howto_de.html b/views/howto_de.html
index 2f46ffa..5b0f9a5 100644
--- a/views/howto_de.html
+++ b/views/howto_de.html
@@ -6,6 +6,7 @@
 	<div class="row">
 		<div class="col-md-12">
 			<h1>How to</h1>
+			<br>
 			<div class="well well-lg">
 				<h2 id="create_new">Neue Adresse</h2>
 				<p>Um eine neue E-Mail Adresse auszufüllen folgen Sie <a href="/register" title="Sign up">diesem</a> link.
diff --git a/views/server.html b/views/server.html
index 5b88502..9326b5c 100644
--- a/views/server.html
+++ b/views/server.html
@@ -6,6 +6,7 @@
 	<div class="row">
 		<div class="col-md-12">
 			<h1>Server details</h1>
+			<br>
 			<div class="well well-lg">
 				<p>Everything you need to know to use Libremail.</p>
 				<ul class="list-unstyled">
diff --git a/views/server_de.html b/views/server_de.html
index 770278e..c4d2f6f 100644
--- a/views/server_de.html
+++ b/views/server_de.html
@@ -6,6 +6,7 @@
 	<div class="row">
 		<div class="col-md-12">
 			<h1>Server Details</h1>
+			<br>
 			<div class="well well-lg">
 				<p>Alles was Sie wissen müssen um Libremail zu benutzen.</p>
 				<ul class="list-unstyled">
diff --git a/views/user.html b/views/user.html
index 0d4f7c6..d8a5175 100644
--- a/views/user.html
+++ b/views/user.html
@@ -6,6 +6,7 @@
 	<div class="row">
 		<div class="col-md-12">
 			<h1>User</h1>
+			<br>
 			<div class="well well-lg">
 				<h2 id="change_password">Change Password</h2>
 				<p>
diff --git a/views/user_de.html b/views/user_de.html
index df1b5c4..fe5e1a1 100644
--- a/views/user_de.html
+++ b/views/user_de.html
@@ -6,6 +6,7 @@
 	<div class="row">
 		<div class="col-md-12">
 			<h1>Nutzer Übersicht</h1>
+			<br>
 			<div class="well well-lg">
 				<h2 id="change_password">Ändere das Passwort</h2>
 				<p>
-- 
cgit v1.2.3