Merge branch 'master' of projekte.fagott.pw:grilist

author: rtz12 <koenig@fagott.pw> 2015-12-19 19:11:29 (UTC)
committer: rtz12 <koenig@fagott.pw> 2015-12-19 19:11:29 (UTC)
commit: 6a1a381ac4c2cd14637bc97e94450500e4e9f449 (patch)
tree: a06891c3b6784635b6d2883460b9d95791579267 /views
parent: a4114307d2d2527be6b33f7ef06615764f80a118 (diff)
parent: 999660a588f5a8a6c622df2e4f2d03445abfb3f0 (diff)
3 files changed, 89 insertions, 8 deletions
diff --git a/views/index.html b/views/index.html
new file mode 100644
index 0000000..fd8c87f
--- /dev/null
+++ b/views/index.html
@@ -0,0 +1,44 @@
+{{ define "index" }}
+<html>
+        <head>
+                <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
+                <title>grilist</title>
+                <style>
+                        body {
+                                height: 100%;
+                                overflow: hidden;
+                        }
+                        .benis {
+                                height: 100%;
+                                width: 100%;
+                                display: table;
+                        }
+                        .uguu {
+                                height: 100%;
+                                vertical-align: middle;
+                                display: table-cell;
+                        }
+                        h1 {
+                                font-family: 'Roboto', sans-serif;
+                                font-size: 88px;
+                                width: 100%;
+                                text-align: center;
+                        }
+                        h1 > small {
+                                font-size: 33%;
+                        }
+                </style>
+                <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+        </head>
+        <body>
+                <div class="benis">
+                        <div class="uguu">
+                                <h1>grilist<br /><small>#tamtam</small></h1>
+                        </div>
+                </div>
+        </body>
+</html>
+{{ end }}
+\ No newline at end of file
diff --git a/views/login.html b/views/login.html
index 7a08c41..33627cb 100644
--- a/views/login.html
+++ b/views/login.html
@@ -2,16 +2,48 @@
 <html>
        <head>
                <title>Grilist - Login</title>
+                {{ template "materialize" }}
+                <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
        </head>
        <body>
-                {{ if .error }}
+                <div class="row">
-                        <div style="color: red">Es gab einen Fehler: {{ .error }}</div>
+                        <div class="col s12 m6 offset-m3 l6 offset-l3">
-                {{ end }}
+                                <div class="row">
-                <form action="#" method="POST">
+                                        <h1 class="center-align">grilist</h1>
-                        <input name="username" type="text" placeholder="Username" value="{{ .previous_user }}"/><br />
+                                        {{ if .error }}
-                        <input name="password" type="password" placerholder="benis" /><br />
+                                        <div class="col s12 m8 offset-m2">
-                        <button type="submit">Einloggen</button>
+                                                <div class="card red lighten-2">
-                </form>
+                                                        <div class="card-content white-text">
+                                                                <span class="card-title">Fehler</span>
+                                                                <p>Es gab einen Fehler: {{ .error }}</p>
+                                                        </div>
+                                                </div>
+                                        </div>
+                                        {{ end }}
+                                        <form method="POST" name="login" action="#">
+                                                <div class="input-field col s12">
+                                                        <i class="material-icons prefix">perm_identity</i>
+                                                        <input name="username" type="text" placeholder="Username" class="validate" value="{{ .previous_user }}"/>
+                                                </div>
+                                                <div class="input-field col s12">
+                                                        <i class="material-icons prefix">lock_outline</i>
+                                                        <input name="password" type="password" placeholder="Password" class="validate" />
+                                                </div>
+                                                <div class="row col s12">
+                                                        <div class="col s4">
+                                                                <a class="waves-effect waves-teal btn-flat">Register</a>
+                                                        </div>
+                                                        <div class="right-align">
+                                                                <button class="btn waves-effect waves-light purple lighten-2" type="submit" name="action">
+                                                                        Login <i class="material-icons right">send</i>
+                                                                </button>
+                                                        </div>
+                                                </div>
+                                        </form>
+                                </div>
+                        </div>
+                </div>
        </body>
 </html>
 {{ end }}
 \ No newline at end of file
diff --git a/views/materialize.html b/views/materialize.html
new file mode 100644
index 0000000..3648dc5
--- /dev/null
+++ b/views/materialize.html
@@ -0,0 +1,5 @@
+{{define "materialize"}}
+        <link rel="stylesheet" href="/assets/css/materialize.css">
+        <script src="/assets/js/materialize.min.js"></script>
+        <meta name="viewport" content="width=device_width, initial-scale=1.0" />
+{{end}}
+\ No newline at end of file
author	rtz12 <koenig@fagott.pw>	2015-12-19 19:11:29 (UTC)
committer	rtz12 <koenig@fagott.pw>	2015-12-19 19:11:29 (UTC)
commit	6a1a381ac4c2cd14637bc97e94450500e4e9f449 (patch)
tree	a06891c3b6784635b6d2883460b9d95791579267 /views
parent	a4114307d2d2527be6b33f7ef06615764f80a118 (diff)
parent	999660a588f5a8a6c622df2e4f2d03445abfb3f0 (diff)

diff --git a/views/index.html b/views/index.html new file mode 100644 index 0000000..fd8c87f --- /dev/null +++ b/views/index.html
@@ -0,0 +1,44 @@
		1	{{ define "index" }}
		2	<html>
		3	<head>
		4	<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
		5	<title>grilist</title>
		6	<style>
		7	body {
		8	height: 100%;
		9	overflow: hidden;
		10	}
		11
		12	.benis {
		13	height: 100%;
		14	width: 100%;
		15	display: table;
		16	}
		17
		18	.uguu {
		19	height: 100%;
		20	vertical-align: middle;
		21	display: table-cell;
		22	}
		23
		24	h1 {
		25	font-family: 'Roboto', sans-serif;
		26	font-size: 88px;
		27	width: 100%;
		28	text-align: center;
		29	}
		30	h1 > small {
		31	font-size: 33%;
		32	}
		33	</style>
		34	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
		35	</head>
		36	<body>
		37	<div class="benis">
		38	<div class="uguu">
		39	<h1>grilist<br /><small>#tamtam</small></h1>
		40	</div>
		41	</div>
		42	</body>
		43	</html>
		44	{{ end }} \ No newline at end of file


diff --git a/views/login.html b/views/login.html index 7a08c41..33627cb 100644 --- a/views/login.html +++ b/views/login.html
@@ -2,16 +2,48 @@
2	<html>	2	<html>
3	<head>	3	<head>
4	<title>Grilist - Login</title>	4	<title>Grilist - Login</title>
		5	{{ template "materialize" }}
		6	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
5	</head>	7	</head>
6	<body>	8	<body>
7	{{ if .error }}	9	<div class="row">
8	<div style="color: red">Es gab einen Fehler: {{ .error }}</div>	10	<div class="col s12 m6 offset-m3 l6 offset-l3">
9	{{ end }}	11	<div class="row">
10	<form action="#" method="POST">	12	<h1 class="center-align">grilist</h1>
11	<input name="username" type="text" placeholder="Username" value="{{ .previous_user }}"/><br />	13	{{ if .error }}
12	<input name="password" type="password" placerholder="benis" /><br />	14	<div class="col s12 m8 offset-m2">
13	<button type="submit">Einloggen</button>	15	<div class="card red lighten-2">
14	</form>	16	<div class="card-content white-text">
		17	<span class="card-title">Fehler</span>
		18	<p>Es gab einen Fehler: {{ .error }}</p>
		19	</div>
		20	</div>
		21	</div>
		22	{{ end }}
		23
		24	<form method="POST" name="login" action="#">
		25	<div class="input-field col s12">
		26	<i class="material-icons prefix">perm_identity</i>
		27	<input name="username" type="text" placeholder="Username" class="validate" value="{{ .previous_user }}"/>
		28	</div>
		29	<div class="input-field col s12">
		30	<i class="material-icons prefix">lock_outline</i>
		31	<input name="password" type="password" placeholder="Password" class="validate" />
		32	</div>
		33	<div class="row col s12">
		34	<div class="col s4">
		35	<a class="waves-effect waves-teal btn-flat">Register</a>
		36	</div>
		37	<div class="right-align">
		38	<button class="btn waves-effect waves-light purple lighten-2" type="submit" name="action">
		39	Login <i class="material-icons right">send</i>
		40	</button>
		41	</div>
		42	</div>
		43	</form>
		44	</div>
		45	</div>
		46	</div>
15	</body>	47	</body>
16	</html>	48	</html>
17	{{ end }} \ No newline at end of file	49	{{ end }} \ No newline at end of file


diff --git a/views/materialize.html b/views/materialize.html new file mode 100644 index 0000000..3648dc5 --- /dev/null +++ b/views/materialize.html
@@ -0,0 +1,5 @@
		1	{{define "materialize"}}
		2	<link rel="stylesheet" href="/assets/css/materialize.css">
		3	<script src="/assets/js/materialize.min.js"></script>
		4	<meta name="viewport" content="width=device_width, initial-scale=1.0" />
		5	{{end}} \ No newline at end of file