From de06b66b52c2e269bab93022f2fe46c7e02133f6 Mon Sep 17 00:00:00 2001
From: Horus3
Date: Fri, 27 Mar 2015 18:07:23 +0100
Subject: Updated the views and translation.

---
 views/about.html       |  2 +-
 views/about_de.html    |  2 +-
 views/alert.html       |  2 +-
 views/header.html      |  3 ++-
 views/howto.html       |  4 ++--
 views/howto_de.html    |  4 ++--
 views/index.html       |  2 +-
 views/index_de.html    |  2 +-
 views/navbar.html      |  6 +++---
 views/navbar_de.html   |  6 +++---
 views/password.html    |  2 +-
 views/password_de.html |  2 +-
 views/register.html    |  2 +-
 views/register_de.html |  2 +-
 views/server.html      |  4 ++--
 views/server_de.html   |  4 ++--
 views/user.html        | 10 ++++++----
 views/user_de.html     | 33 ++++++++++++++++-----------------
 18 files changed, 47 insertions(+), 45 deletions(-)

(limited to 'views')

diff --git a/views/about.html b/views/about.html
index 13b73ab..ad1cbad 100644
--- a/views/about.html
+++ b/views/about.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "About | Libremail"}}
 {{template "navbar.html"}}
 {{template "alert.html" .}}
 
diff --git a/views/about_de.html b/views/about_de.html
index bc7e970..d56ef4f 100644
--- a/views/about_de.html
+++ b/views/about_de.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "Über uns | Libremail"}}
 {{template "navbar_de.html"}}
 {{template "alert.html" .}}
 
diff --git a/views/alert.html b/views/alert.html
index 4e13eba..aa4dd1a 100644
--- a/views/alert.html
+++ b/views/alert.html
@@ -13,7 +13,7 @@
 {{if .Success}}
 <div class="container">
 	{{range .Success}}
-		<h4 class="col-md-12 alert alert-success alert-dismissible alert-lg shadow-z-2 btn-material-green" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
+		<h4 class="col-md-12 alert alert-success alert-dismissible alert-lg shadow-z-2 btn-material-light-green-500" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
 			<span class="text-center">
 	{{.}}
 			</span>
diff --git a/views/header.html b/views/header.html
index c461e82..c41b483 100644
--- a/views/header.html
+++ b/views/header.html
@@ -5,7 +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>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'>
diff --git a/views/howto.html b/views/howto.html
index deaf6f0..a25d734 100644
--- a/views/howto.html
+++ b/views/howto.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "How To | Libremail"}}
 {{template "navbar.html"}}
 {{template "alert.html" .}}
 
@@ -22,7 +22,7 @@
 				</p>
 				<br>
 				<h2 id="login">Login</h2>
-				<p>The easiest way is to use our webmail interface. You can find it <a href="https://webmail.iamfabulous.de/" title="Webmail" target="_blank">here <span class="fa fa-external-link"></span></a>.
+				<p>The easiest way is to use our webmail interface. You can find it <a href="https://iamfabulous.de/webmail" title="Webmail" target="_blank">here <span class="fa fa-external-link"></span></a>.
 				<br>
 				Log in with your full mail adress and your password.
 				<br>
diff --git a/views/howto_de.html b/views/howto_de.html
index 3f1ae53..2f46ffa 100644
--- a/views/howto_de.html
+++ b/views/howto_de.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "How To | Libremail"}}
 {{template "navbar_de.html"}}
 {{template "alert.html" .}}
 
@@ -22,7 +22,7 @@
 				</p>
 				<br>
 				<h2 id="login">Login</h2>
-				<p>Am einfachsten ist es, wenn Sie unser Webmail benutzen. Sie finden es <a href="https://webmail.iamfabulous.de/" title="Webmail" target="_blank">hier <span class="fa fa-external-link"></span></a>.
+				<p>Am einfachsten ist es, wenn Sie unser Webmail benutzen. Sie finden es <a href="https://iamfabulous.de/webmail" title="Webmail" target="_blank">hier <span class="fa fa-external-link"></span></a>.
 				<br>
 				Benutzen Sie ihre volle E-Mail Adresse und ihr Passwort als Login.
 				<br>
diff --git a/views/index.html b/views/index.html
index 727087a..52a2198 100644
--- a/views/index.html
+++ b/views/index.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "Libremail"}}
 {{template "navbar.html"}}
 {{template "alert.html" .}}
 
diff --git a/views/index_de.html b/views/index_de.html
index 810bae4..fb1d7d9 100644
--- a/views/index_de.html
+++ b/views/index_de.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "Libremail"}}
 {{template "navbar_de.html"}}
 {{template "alert.html" .}}
 
diff --git a/views/navbar.html b/views/navbar.html
index 78658d4..6cca286 100644
--- a/views/navbar.html
+++ b/views/navbar.html
@@ -21,15 +21,15 @@
 					<a class="" href="/server" title="Server"><span class="glyphicon glyphicon-cog"></span> Server</a>
 				</li>
 				<li>
-					<a class="" href="https://www.iamfabulous.de/contact/" title="Contact" target="_blank"><span class="glyphicon glyphicon-phone-alt"></span> Contact</a>
+					<a class="" href="https://iamfabulous.de/contact/" title="Contact" target="_blank"><span class="glyphicon glyphicon-phone-alt"></span> Contact</a>
 				</li>
 			</ul>
 			<ul class="nav navbar-nav navbar-right">
 				<li>
-					<a class="" href="/locale?to=de" title="English"><span class="fa fa-language"></span> en</a>
+					<a class="" href="/locale?to=de" title="Change to German"><span class="fa fa-language"></span> de</a>
 				</li>
 				<li>
-					<a class="" href="https://webmail.iamfabulous.de/" title="Webmail"><span class="glyphicon glyphicon-envelope"></span> Webmail</a>
+					<a class="" href="https://iamfabulous.de/webmail" title="Webmail"><span class="glyphicon glyphicon-envelope"></span> Webmail</a>
 				</li>
 				<li class="dropdown">
 					<a class="" href="/register" title="Sign Up" data-target="#" data-toggle="dropdown"><span class="glyphicon glyphicon-user"></span> User <span class="caret"></span></a>
diff --git a/views/navbar_de.html b/views/navbar_de.html
index da8f815..1ff6b52 100644
--- a/views/navbar_de.html
+++ b/views/navbar_de.html
@@ -21,15 +21,15 @@
 					<a class="" href="/server" title="Server"><span class="glyphicon glyphicon-cog"></span> Server</a>
 				</li>
 				<li>
-					<a class="" href="https://www.iamfabulous.de/contact/" title="Contact" target="_blank"><span class="glyphicon glyphicon-phone-alt"></span> Contact</a>
+					<a class="" href="https://iamfabulous.de/contact/" title="Contact" target="_blank"><span class="glyphicon glyphicon-phone-alt"></span> Contact</a>
 				</li>
 			</ul>
 			<ul class="nav navbar-nav navbar-right">
 				<li>
-					<a class="" href="/locale?to=en" title="German"><span class="fa fa-language"></span> de</a>
+					<a class="" href="/locale?to=en" title="Change to English"><span class="fa fa-language"></span> en</a>
 				</li>
 				<li>
-					<a class="" href="https://webmail.iamfabulous.de/" title="Webmail"><span class="glyphicon glyphicon-envelope"></span> Webmail</a>
+					<a class="" href="https://iamfabulous.de/webmail" title="Webmail"><span class="glyphicon glyphicon-envelope"></span> Webmail</a>
 				</li>
 				<li class="dropdown">
 					<a class="" href="/register" title="Nutzer" data-target="#" data-toggle="dropdown"><span class="glyphicon glyphicon-user"></span> Nutzer<span class="caret"></span></a>
diff --git a/views/password.html b/views/password.html
index 7bd995a..c5bedee 100644
--- a/views/password.html
+++ b/views/password.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "Change Password | Libremail"}}
 {{template "navbar.html"}}
 {{template "alert.html" .}}
 
diff --git a/views/password_de.html b/views/password_de.html
index 81a4767..606ff4b 100644
--- a/views/password_de.html
+++ b/views/password_de.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "Passwort ändern | Libremail"}}
 {{template "navbar_de.html"}}
 {{template "alert.html" .}}
 
diff --git a/views/register.html b/views/register.html
index 4b1a525..c063fa0 100644
--- a/views/register.html
+++ b/views/register.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "Register | Libremail"}}
 {{template "navbar.html"}}
 {{template "alert.html" .}}
 
diff --git a/views/register_de.html b/views/register_de.html
index d621067..a6423d4 100644
--- a/views/register_de.html
+++ b/views/register_de.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "Registrierung | Libremail"}}
 {{template "navbar_de.html"}}
 {{template "alert.html" .}}
 
diff --git a/views/server.html b/views/server.html
index 35f7247..5b88502 100644
--- a/views/server.html
+++ b/views/server.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "Server Details | Libremail"}}
 {{template "navbar.html"}}
 {{template "alert.html" .}}
 
@@ -11,7 +11,7 @@
 				<ul class="list-unstyled">
 					<li>
 						<h2>Webmail</h2>
-						<p>You can use the webmail interface to browse your emails with your webbrowser of choice. Use <a href="https://webmail.iamfabulous.de/" title="Webmail">this link <span class="fa fa-external-link-square"></a> to open roundcube now.
+						<p>You can use the webmail interface to browse your emails with your webbrowser of choice. Use <a href="https://iamfabulous.de/webmail" title="Webmail">this link <span class="fa fa-external-link-square"></a> to open roundcube now.
 						<br>
 						<strong>Use your mail adress and the passwort as credentials to log in.</strong>
 						<br>
diff --git a/views/server_de.html b/views/server_de.html
index f57a5ef..770278e 100644
--- a/views/server_de.html
+++ b/views/server_de.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "Server Details | Libremail"}}
 {{template "navbar_de.html"}}
 {{template "alert.html" .}}
 
@@ -11,7 +11,7 @@
 				<ul class="list-unstyled">
 					<li>
 						<h2>Webmail</h2>
-						<p>Nutzen Sie ihren Browser um ihre E-Mails zu lesen. Unser Webmail finden sie unter <a href="https://webmail.iamfabulous.de/" title="Webmail">diesem Link <span class="fa fa-external-link-square"></a>. 
+						<p>Nutzen Sie ihren Browser um ihre E-Mails zu lesen. Unser Webmail finden sie unter <a href="https://iamfabulous.de/webmail" title="Webmail">diesem Link <span class="fa fa-external-link-square"></a>. 
 						<br>
 						<strong>Loggen Sie sich mit Ihrer kompletten E-Mail Adresse und ihrem Passwort ein.</strong>
 						<br>
diff --git a/views/user.html b/views/user.html
index 45a85f1..0d4f7c6 100644
--- a/views/user.html
+++ b/views/user.html
@@ -1,4 +1,4 @@
-{{template "header.html"}}
+{{template "header.html" "User | Libremail"}}
 {{template "navbar.html"}}
 {{template "alert.html" .}}
 
@@ -22,14 +22,16 @@
 				</p>
 				<br>
 				<h2 id="login">Login</h2>
-				<p>The easiest way is to use our webmail interface. You can find it <a href="https://webmail.iamfabulous.de/" title="Webmail" target="_blank">here <span class="fa fa-external-link"></span></a>.
+				<p>The easiest way is to use our webmail interface. You can find it <a href="https://iamfabulous.de/webmail" title="Webmail" target="_blank">here <span class="fa fa-external-link"></span></a>.
 				<br>
 				Log in with your full mail adress and your password.
 				<br>
-				<a class="btn btn-primary btn-raised" href="https://webmail.iamfabulous.de/" role="button">Webmail &raquo;</a>
+				<a class="btn btn-primary btn-raised" href="https://iamfabulous.de/webmail" role="button">Webmail &raquo;</a>
 				<br>
 				<br>
-				If you want to use your own client, see <a href="/server" title="Server">here</a> for connection details.
+				If you want to use your own client, see here for connection details.
+				<br>
+				<a class="btn btn-primary btn-raised" href="/server" role="button" title="Server | Connection details">Connection details &raquo;</a>
 				</p>
 				<!--p>
 					See <a href="/howto#login" title="How to login">here</a> for more details.
diff --git a/views/user_de.html b/views/user_de.html
index fb4382f..df1b5c4 100644
--- a/views/user_de.html
+++ b/views/user_de.html
@@ -1,41 +1,40 @@
-{{template "header.html"}}
+{{template "header.html" "Nutzer Übersicht | Libremail"}}
 {{template "navbar_de.html"}}
 {{template "alert.html" .}}
 
 <div class="container">
 	<div class="row">
 		<div class="col-md-12">
-			<h1>User</h1>
+			<h1>Nutzer Übersicht</h1>
 			<div class="well well-lg">
-				<h2 id="change_password">Change Password</h2>
+				<h2 id="change_password">Ändere das Passwort</h2>
 				<p>
-					You can change your password here.
+					Sie können hier ihr Passwort ändern.
 					<br>
-					<a class="btn btn-primary btn-raised" href="/password" role="button">Change Password &raquo;</a>
+					<a class="btn btn-primary btn-raised" href="/password" role="button">Ändere Passwort &raquo;</a>
 				</p>
 				<br>
-				<h2 id="sign_up">Create new adress</h2>
+				<h2 id="sign_up">Erstelle eine neue Adresse</h2>
 				<p>
-					Looking for a new adress? Click here.
+					
+					Sie wollen eine neue E-Mail Adresse? Klicken sie hier.
 					<br>
-					<a class="btn btn-primary btn-raised" href="/register" role="button">Create New Account&raquo;</a>
+					<a class="btn btn-primary btn-raised" href="/register" role="button">Neue E-Mail Adresse &raquo;</a>
 				</p>
 				<br>
 				<h2 id="login">Login</h2>
-				<p>The easiest way is to use our webmail interface. You can find it <a href="https://webmail.iamfabulous.de/" title="Webmail" target="_blank">here <span class="fa fa-external-link"></span></a>.
+				<p>
+					Verwalten Sie ihre neue E-Mail Adresse einfach über unser intuitives webbasiertes Portal. Sie finden es <a href="https://iamfabulous.de/webmail" title="Webmail" target="_blank">hier <span class="fa fa-external-link"></span></a>.
+				<br>
+				Loggen Sie sich mit Ihrer E-Mail Adresse und Ihrem Passwort ein.
 				<br>
-				Log in with your full mail adress and your password.
+				<a class="btn btn-primary btn-raised" href="https://iamfabulous.de/webmail" role="button">Webmail &raquo;</a>
 				<br>
-				<a class="btn btn-primary btn-raised" href="https://webmail.iamfabulous.de/" role="button">Webmail &raquo;</a>
 				<br>
+				Wenn Sie ihren eigenen Klienten nutzen wollen, schauen Sie hier für Verbindungsdetails.
 				<br>
-				If you want to use your own client, see <a href="/server" title="Server">here</a> for connection details.
+				<a class="btn btn-primary btn-raised" href="/server" role="button" title="Server | Verbindungsdetails">Verbindungsdetails &raquo;</a>
 				</p>
-				<!--p>
-					See <a href="/howto#login" title="How to login">here</a> for more details.
-					<br>
-					<a class="btn btn-primary btn-raised" href="/howto#login" role="button">Login &raquo;</a>
-				</p-->
 			</div>
 		</div>
 	</div>
-- 
cgit v1.2.3