default data im renderer, damit wir später krasse sachen machen können. es gibt jetzt eine globale navbar, damit man nicht mehr den zurückknopf drücken muss, um bis zur startseite zu kommen. ich habe einen großen D.

author: jan <jan@ruken.pw> 2015-12-26 10:41:42 (UTC)
committer: jan <jan@ruken.pw> 2015-12-26 10:41:42 (UTC)
commit: 6fabf512767b458a44b4b2547a7b07e9db71c00a (patch)
tree: a40522cc0a735d09fd79cca00c8133f41963b7ef /views
parent: fb0424cea33e1c48f940c485bff1f4d0aac31dc4 (diff)
5 files changed, 16 insertions, 47 deletions
diff --git a/views/dashboard.html b/views/dashboard.html
index a000b57..a9a01d9 100644
--- a/views/dashboard.html
+++ b/views/dashboard.html
@@ -6,10 +6,8 @@
                <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
        </head>
        <body>
+                        {{ template "navbar" . }}
                        <div class="container">
-                                <div class="row right-align">
-                                        <a class="waves-effect waves-teal btn-flat large" style="top: 24px; font-size: 18px" href="/logout">Ausloggen</a>
-                                </div>
                                <div class="row">
                                        {{ range $category := .categories }}
                                                <h2>{{ $category.Title }}</h2>
diff --git a/views/gril.html b/views/gril.html
index d62fc75..d623abf 100644
--- a/views/gril.html
+++ b/views/gril.html
@@ -8,12 +8,8 @@
                <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
        </head>
        <body>
+                        {{ template "navbar" . }}
                        <div class="container">
-                                {{ if .loggedIn }}
-                                <div class="row right-align">
-                                        <a class="waves-effect waves-teal btn-flat large" style="top: 24px; font-size: 18px" href="/logout">Ausloggen</a>
-                                </div>
-                                {{ end }}
                                <h1>{{ $gril.RomajiName }}<small>{{ $gril.KanjiName }}</small></h1>
                        </div>
        </body>
diff --git a/views/index.html b/views/index.html
deleted file mode 100644
index 81c801f..0000000
--- a/views/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{{ define "index" }}
-<html>
-        <head>
-                                {{ template "materialize" }}
-                <title>grilist</title>
-                <style>
-                        body {
-                                height: 100%;
-                                                                width: 100%;
-                                overflow: hidden;
-                        }
-                                                
-                                                h1 {
-                                                        font-size: 100px;
-                                                }
-                                                
-                                                h1 >small {
-                                                        margin-top: -50px;
-                                                        font-size: 20%;
-                                                }
-                </style>
-                <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
-        </head>
-        <body class="valign-wrapper center-align">
-                <div class="container">
-                                        <div class="center-align">
-                                                <h1>grilist<small class="blue-grey-text lighten-1">#tamtam</small></h1>
-                                                
-                                                <a class="btn waves-effect waves-light cyan lighten-3" href="/logout">Ausloggen</a>
-                                        </div>
-                </div>
-        </body>
-</html>
-{{ end }}
-\ No newline at end of file
diff --git a/views/list.html b/views/list.html
index 63cfd9c..fb5f7a3 100644
--- a/views/list.html
+++ b/views/list.html
@@ -8,12 +8,8 @@
                <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
        </head>
        <body>
+                        {{ template "navbar" . }}
                        <div class="container">
-                                {{ if .loggedIn }}
-                                <div class="row right-align">
-                                        <a class="waves-effect waves-teal btn-flat large" style="top: 24px; font-size: 18px" href="/logout">Ausloggen</a>
-                                </div>
-                                {{ end }}
                                <h1>{{ $list.Name }}<small>von xyz</small></h1><br />
                                <ul>
                                {{ range $lg := $list.Grils }}
diff --git a/views/navbar.html b/views/navbar.html
new file mode 100644
index 0000000..c4bbace
--- /dev/null
+++ b/views/navbar.html
@@ -0,0 +1,13 @@
+{{ define "navbar" }}
+                                <nav>
+                                        <div class="nav-wrapper purple lighten-2">
+                                        <a href="/" class="brand-logo center">grilist</a>
+                                        <ul id="nav-mobile" class="right hide-on-med-and-down">
+                                                {{ if .user }}
+                                                <li><a href="/">{{ .user.Name }}</a></li>
+                                                <li><a href="/logout">Ausloggen</a></li>
+                                                {{ end }}
+                                        </ul>
+                                        </div>
+                                </nav>
+{{ end }}
+\ No newline at end of file
author	jan <jan@ruken.pw>	2015-12-26 10:41:42 (UTC)
committer	jan <jan@ruken.pw>	2015-12-26 10:41:42 (UTC)
commit	6fabf512767b458a44b4b2547a7b07e9db71c00a (patch)
tree	a40522cc0a735d09fd79cca00c8133f41963b7ef /views
parent	fb0424cea33e1c48f940c485bff1f4d0aac31dc4 (diff)

diff --git a/views/dashboard.html b/views/dashboard.html index a000b57..a9a01d9 100644 --- a/views/dashboard.html +++ b/views/dashboard.html
@@ -6,10 +6,8 @@
6	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">	6	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
7	</head>	7	</head>
8	<body>	8	<body>
		9	{{ template "navbar" . }}
9	<div class="container">	10	<div class="container">
10	<div class="row right-align">
11	<a class="waves-effect waves-teal btn-flat large" style="top: 24px; font-size: 18px" href="/logout">Ausloggen</a>
12	</div>
13	<div class="row">	11	<div class="row">
14	{{ range $category := .categories }}	12	{{ range $category := .categories }}
15	<h2>{{ $category.Title }}</h2>	13	<h2>{{ $category.Title }}</h2>


diff --git a/views/gril.html b/views/gril.html index d62fc75..d623abf 100644 --- a/views/gril.html +++ b/views/gril.html
@@ -8,12 +8,8 @@
8	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">	8	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
9	</head>	9	</head>
10	<body>	10	<body>
		11	{{ template "navbar" . }}
11	<div class="container">	12	<div class="container">
12	{{ if .loggedIn }}
13	<div class="row right-align">
14	<a class="waves-effect waves-teal btn-flat large" style="top: 24px; font-size: 18px" href="/logout">Ausloggen</a>
15	</div>
16	{{ end }}
17	<h1>{{ $gril.RomajiName }}<small>{{ $gril.KanjiName }}</small></h1>	13	<h1>{{ $gril.RomajiName }}<small>{{ $gril.KanjiName }}</small></h1>
18	</div>	14	</div>
19	</body>	15	</body>


diff --git a/views/index.html b/views/index.html deleted file mode 100644 index 81c801f..0000000 --- a/views/index.html +++ /dev/null
@@ -1,34 +0,0 @@
1	{{ define "index" }}
2	<html>
3	<head>
4	{{ template "materialize" }}
5	<title>grilist</title>
6	<style>
7	body {
8	height: 100%;
9	width: 100%;
10	overflow: hidden;
11	}
12
13	h1 {
14	font-size: 100px;
15	}
16
17	h1 >small {
18	margin-top: -50px;
19	font-size: 20%;
20	}
21	</style>
22	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
23	</head>
24	<body class="valign-wrapper center-align">
25	<div class="container">
26	<div class="center-align">
27	<h1>grilist<small class="blue-grey-text lighten-1">#tamtam</small></h1>
28
29	<a class="btn waves-effect waves-light cyan lighten-3" href="/logout">Ausloggen</a>
30	</div>
31	</div>
32	</body>
33	</html>
34	{{ end }} \ No newline at end of file


diff --git a/views/list.html b/views/list.html index 63cfd9c..fb5f7a3 100644 --- a/views/list.html +++ b/views/list.html
@@ -8,12 +8,8 @@
8	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">	8	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
9	</head>	9	</head>
10	<body>	10	<body>
		11	{{ template "navbar" . }}
11	<div class="container">	12	<div class="container">
12	{{ if .loggedIn }}
13	<div class="row right-align">
14	<a class="waves-effect waves-teal btn-flat large" style="top: 24px; font-size: 18px" href="/logout">Ausloggen</a>
15	</div>
16	{{ end }}
17	<h1>{{ $list.Name }}<small>von xyz</small></h1><br />	13	<h1>{{ $list.Name }}<small>von xyz</small></h1><br />
18	<ul>	14	<ul>
19	{{ range $lg := $list.Grils }}	15	{{ range $lg := $list.Grils }}


diff --git a/views/navbar.html b/views/navbar.html new file mode 100644 index 0000000..c4bbace --- /dev/null +++ b/views/navbar.html
@@ -0,0 +1,13 @@
		1	{{ define "navbar" }}
		2	<nav>
		3	<div class="nav-wrapper purple lighten-2">
		4	<a href="/" class="brand-logo center">grilist</a>
		5	<ul id="nav-mobile" class="right hide-on-med-and-down">
		6	{{ if .user }}
		7	<li><a href="/">{{ .user.Name }}</a></li>
		8	<li><a href="/logout">Ausloggen</a></li>
		9	{{ end }}
		10	</ul>
		11	</div>
		12	</nav>
		13	{{ end }} \ No newline at end of file