From ac1ee887205d068b7b1c1df690f157dda506e419 Mon Sep 17 00:00:00 2001
From: Horus3
Date: Mon, 23 Mar 2015 16:22:21 +0100
Subject: Reorder and restyle alert messages. Fixed bug in AuthUser(). Remove
 some unnecessary CSS.

---
 views/about.html    | 25 +------------------------
 views/alert.html    | 24 ++++++++++++++++++++++++
 views/footer.html   |  8 ++++++--
 views/howto.html    | 25 +------------------------
 views/index.html    | 25 +------------------------
 views/login.html    | 23 +++--------------------
 views/password.html | 25 +------------------------
 views/register.html | 25 +------------------------
 views/server.html   | 25 +------------------------
 views/user.html     | 24 +-----------------------
 10 files changed, 40 insertions(+), 189 deletions(-)
 create mode 100644 views/alert.html

(limited to 'views')

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">
-- 
cgit v1.2.3