Reorder and restyle alert messages. Fixed bug in AuthUser(). Remove some unnecessary CSS.

14 files changed, 56 insertions, 235 deletions

diff --git a/handler.go b/handler.go
index 4597ae3..c99138e 100644
--- a/handler.go
+++ b/handler.go
@@ -52,8 +52,6 @@ func RegisterHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-
-	session.Save(r, w)
 }
 
 func CreateNewEntryHandler(w http.ResponseWriter, r *http.Request) {
diff --git a/server.go b/server.go
index 9c20797..dc95c51 100644
--- a/server.go
+++ b/server.go
@@ -66,9 +66,13 @@ func ChangePassword(email, oldPassword, newPassword string) error {
 	vU := VirtualUser{Email: email, Password: oldPassword}
 
 	if !vU.AuthUser() {
-		return errors.New("User/password does not match.")
+		return errors.New("User/Password do not match.")
 	}
 
+	vD := VirtualDomain{}
+	vD.Name = GetDomain(email)
+	vU.DomainId = vD.GetPrimaryKey()
+
 	if !vU.UpdatePassword(newPassword) {
 		return errors.New("There was an error.")
 	}
diff --git a/static/css/style.css b/static/css/style.css
index cc0e246..95942a9 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,3 +1,10 @@
+html {
+	position: relative;
+	min-height: 100%;
+}
+body {
+	margin-bottom: 100px;
+}
 .navbar-default .navbar-brand {
         color: white;
 }
@@ -14,48 +21,18 @@
 }
 .alert {
 	border-radius: 5px;
-}
-
-.alert-success {
-	background-color: #d0e9c6 !important;
-	color: #473835;
-}
-.panel-danger > .panel-heading {
-	/*
-        background-color: #dd5148;*/
-	color: #473835;
-	background-color: #ebcccc;
-}
-html {
-	position: relative;
-	min-height: 100%;
-}
-body {
-	margin-bottom: 100px;
+        color: white !important;
 }
 .delete  {
 	padding-top: 10%;
 }
-.alert-danger {
-	background-color: #ebcccc;
-	color: #473835;
-}
-textarea {
-  	box-shadow: 0 0px 10px rgba(0, 0, 0, 0.23), 0 0px 10px rgba(0, 0, 0, 0.16) !important;
-	background-color: #fff;
-	width: 100% !important;
-	height:200px !important; 
-}
 .hide {
 	display: none ;
 }
-
 .underline {
     text-decoration: underline;
 }
-
 .shadow-y-2{box-shadow:0 -3px 10px rgba(0,0,0,.23),0 -3px 10px rgba(0,0,0,.16)}
-
 .footer {
     position: absolute;
     bottom: 0;
@@ -72,22 +49,10 @@ textarea {
 .footer-a {
     color: white;
 }
-
 .footer-a:hover {
     color: white;
     text-decoration: underline;
 }
-.admin-link {
-	position: absolute;
-	bottom: 50px;
-	color: #009587;
-	/*
-	margin-top: 0;
-	margin: 10px ;
-	top: 100%;
-	padding-bottom: 0;
-	*/
-}
 .footer > .container {
 	padding-left: 0;
 }
diff --git a/user.go b/user.go
index f491eea..9f5064e 100644
--- a/user.go
+++ b/user.go
@@ -9,6 +9,9 @@ func (vU VirtualUser) HashPassword() string {
 }
 
 func (vU VirtualUser) AuthUser() bool {
+	if !vU.EmailExists() {
+		return false
+	}
 	passwd := vU.Password
 	Db.Where("email = ?", vU.Email).Find(&vU)
 	if vU.Password == passwd {
diff --git a/views/about.html b/views/about.html
index 2213ea3..13b73ab 100644
--- a/views/about.html
+++ b/views/about.html
@@ -1,29 +1,6 @@
 {{template "header.html"}}
 {{template "navbar.html"}}
-
-{{if .Error}}
-<div class="container">
-	<div class="row">
-	{{range .Error}}
-		<p id="dd-alert-danger" class="col-md-4 col-md-offset-4 alert alert-danger alert-dismissible shadow-z-2" role="alert">
-			<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
-{{if .Success}}
-<div class="container">
-	<div class="row">
-	{{range .Success}}
-		<p id="dd-alert-success" class="col-md-4 col-md-offset-4 alert alert-success alert-dismissible shadow-z-2" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
+{{template "alert.html" .}}
 
 <!--div class="jumbotron">
 	<div class="container">
diff --git a/views/alert.html b/views/alert.html
new file mode 100644
index 0000000..4e13eba
--- /dev/null
+++ b/views/alert.html
@@ -0,0 +1,24 @@
+{{if .Error}}
+<div class="container">
+	{{range .Error}}
+		<h4 class="col-md-12 alert alert-danger alert-dismissible alert-lg shadow-z-2 btn-material-red" 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>
+		</h4>
+	{{end}}
+</div>
+{{end}}
+{{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>
+			<span class="text-center">
+	{{.}}
+			</span>
+		</h4>
+	{{end}}
+</div>
+{{end}}
+
diff --git a/views/footer.html b/views/footer.html
index 4698b37..8f2c02e 100644
--- a/views/footer.html
+++ b/views/footer.html
@@ -1,6 +1,8 @@
 <footer class="footer shadow-y-2">
 	<div class="container">
-		<p class="pull-left sticky-footer"> Copyright 2015 | <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 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>
+		</div>
 	</div>
 </footer>
 
@@ -11,7 +13,9 @@
 <script src='/static/js/material.min.js'></script>
 <script src='/static/js/ripples.min.js'></script>
 <script>
-	$('.dropdown-toggle').dropdown()
+	$(document).ready(function(){
+		$('.dropdown-toggle').dropdown();
+	})
 </script>
   </body>
 </html>
diff --git a/views/howto.html b/views/howto.html
index 8ea9883..deaf6f0 100644
--- a/views/howto.html
+++ b/views/howto.html
@@ -1,29 +1,6 @@
 {{template "header.html"}}
 {{template "navbar.html"}}
-
-{{if .Error}}
-<div class="container">
-	<div class="row">
-	{{range .Error}}
-		<p id="dd-alert-danger" class="col-md-4 col-md-offset-4 alert alert-danger alert-dismissible shadow-z-2" role="alert">
-			<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
-{{if .Success}}
-<div class="container">
-	<div class="row">
-	{{range .Success}}
-		<p id="dd-alert-success" class="col-md-4 col-md-offset-4 alert alert-success alert-dismissible shadow-z-2" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
+{{template "alert.html" .}}
 
 <div class="container">
 	<div class="row">
diff --git a/views/index.html b/views/index.html
index ce34e05..727087a 100644
--- a/views/index.html
+++ b/views/index.html
@@ -1,29 +1,6 @@
 {{template "header.html"}}
 {{template "navbar.html"}}
-
-{{if .Error}}
-<div class="container">
-	<div class="row">
-	{{range .Error}}
-		<p id="dd-alert-danger" class="col-md-4 col-md-offset-4 alert alert-danger alert-dismissible shadow-z-2" role="alert">
-			<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
-{{if .Success}}
-<div class="container">
-	<div class="row">
-	{{range .Success}}
-		<p id="dd-alert-success" class="col-md-4 col-md-offset-4 alert alert-success alert-dismissible shadow-z-2" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
+{{template "alert.html" .}}
 
 <div class="jumbotron">
 	<div class="container">
diff --git a/views/login.html b/views/login.html
index d7a3865..ee22eca 100644
--- a/views/login.html
+++ b/views/login.html
@@ -1,25 +1,8 @@
 {{template "header.html"}}
 {{template "navbar.html"}}
-<div class="container">
-	<div class="row">
-{{range .Error}}
-<h4 class="col-md-4 col-md-offset-4 alert alert-danger alert-dismissible" role="alert">
-	<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-</h4>
-{{end}}
-{{range .Success}}
-<h4 class="col-md-4 col-md-offset-4 alert alert-success alert-dismissible" role="alert">
-	<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-</h4>
-{{end}}
-	</div>
-</div>
-<div class="container">
-	<div class="row">
-	</div>
-</div>
+{{template "alert.html" .}}
+
+
 <div class="container">
 	<div class="row">
 <form class="form-horizontal" method='post' action='/login'>
diff --git a/views/password.html b/views/password.html
index b57cf07..7bd995a 100644
--- a/views/password.html
+++ b/views/password.html
@@ -1,29 +1,6 @@
 {{template "header.html"}}
 {{template "navbar.html"}}
-
-{{if .Error}}
-<div class="container">
-	<div class="row">
-	{{range .Error}}
-		<p id="dd-alert-danger" class="col-md-4 col-md-offset-4 alert alert-danger alert-dismissible shadow-z-2" role="alert">
-			<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
-{{if .Success}}
-<div class="container">
-	<div class="row">
-	{{range .Success}}
-		<p id="dd-alert-success" class="col-md-4 col-md-offset-4 alert alert-success alert-dismissible shadow-z-2" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
+{{template "alert.html" .}}
 
 <div class="container">
 	<div class="row">
diff --git a/views/register.html b/views/register.html
index f62dd4a..4b1a525 100644
--- a/views/register.html
+++ b/views/register.html
@@ -1,29 +1,6 @@
 {{template "header.html"}}
 {{template "navbar.html"}}
-
-{{if .Error}}
-<div class="container">
-	<div class="row">
-	{{range .Error}}
-		<p id="dd-alert-danger" class="col-md-4 col-md-offset-4 alert alert-danger alert-dismissible shadow-z-2" role="alert">
-			<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
-{{if .Success}}
-<div class="container">
-	<div class="row">
-	{{range .Success}}
-		<p id="dd-alert-success" class="col-md-4 col-md-offset-4 alert alert-success alert-dismissible shadow-z-2" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
+{{template "alert.html" .}}
 
 <div class="container">
 	<div class="row">
diff --git a/views/server.html b/views/server.html
index c44f162..35f7247 100644
--- a/views/server.html
+++ b/views/server.html
@@ -1,29 +1,6 @@
 {{template "header.html"}}
 {{template "navbar.html"}}
-
-{{if .Error}}
-<div class="container">
-	<div class="row">
-	{{range .Error}}
-		<p id="dd-alert-danger" class="col-md-4 col-md-offset-4 alert alert-danger alert-dismissible shadow-z-2" role="alert">
-			<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
-{{if .Success}}
-<div class="container">
-	<div class="row">
-	{{range .Success}}
-		<p id="dd-alert-success" class="col-md-4 col-md-offset-4 alert alert-success alert-dismissible shadow-z-2" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
+{{template "alert.html" .}}
 
 <div class="container">
 	<div class="row">
diff --git a/views/user.html b/views/user.html
index f4a4331..45a85f1 100644
--- a/views/user.html
+++ b/views/user.html
@@ -1,28 +1,6 @@
 {{template "header.html"}}
 {{template "navbar.html"}}
-{{if .Error}}
-<div class="container">
-	<div class="row">
-	{{range .Error}}
-		<p id="dd-alert-danger" class="col-md-4 col-md-offset-4 alert alert-danger alert-dismissible shadow-z-2" role="alert">
-			<button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
-{{if .Success}}
-<div class="container">
-	<div class="row">
-	{{range .Success}}
-		<p id="dd-alert-success" class="col-md-4 col-md-offset-4 alert alert-success alert-dismissible shadow-z-2" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
-	{{.}}
-		</p>
-	{{end}}
-	</div>
-</div>
-{{end}}
+{{template "alert.html" .}}
 
 <div class="container">
 	<div class="row">