aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrtz12 <koenig@fagott.pw>2016-10-09 19:57:15 (UTC)
committerrtz12 <koenig@fagott.pw>2016-10-09 19:57:15 (UTC)
commit39d2fb85a23c23bce665ff7d1907c88375cd6b6b (patch)
tree080c33d1f044cd421c801f2fd4f6f494614b953a
parentb1efb9d79d999e1cb17c71308d65362043918865 (diff)
parentdd6e273eee44c5e8365f2ad34887e22ced2be691 (diff)
Merge branch 'master' of projekte.fagott.pw:grilist
-rw-r--r--tools/image-on-demand/main.go4
-rw-r--r--views/includes/card_gril.html2
-rw-r--r--views/pages/list.html2
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/image-on-demand/main.go b/tools/image-on-demand/main.go
index e2300b6..123ac4b 100644
--- a/tools/image-on-demand/main.go
+++ b/tools/image-on-demand/main.go
@@ -127,8 +127,8 @@ func loadList(name string) error {
127 127
128func main() { 128func main() {
129 IMAGE_TYPES = make(map[string]int) 129 IMAGE_TYPES = make(map[string]int)
130 IMAGE_TYPES["thumb"] = 0 130 IMAGE_TYPES["full"] = 0
131 IMAGE_TYPES["full"] = 1 131 IMAGE_TYPES["thumb"] = 1
132 files = make(map[string]map[int][]string) 132 files = make(map[string]map[int][]string)
133 if err := loadList("gril"); err != nil { 133 if err := loadList("gril"); err != nil {
134 log.Fatal(err) 134 log.Fatal(err)
diff --git a/views/includes/card_gril.html b/views/includes/card_gril.html
index 7e94d6e..2d57c3c 100644
--- a/views/includes/card_gril.html
+++ b/views/includes/card_gril.html
@@ -1,7 +1,7 @@
1{{ define "card_gril" }} 1{{ define "card_gril" }}
2<div class="card white"> 2<div class="card white">
3 <div class="center-align" style="padding-top: 8px"> 3 <div class="center-align" style="padding-top: 8px">
4 <img class="circle responsive-img" src="{{ .ImagePath false }}" /> 4 <img class="circle responsive-img" src="{{ .ImagePath true }}" />
5 </div> 5 </div>
6 <div class="card-content black-text"> 6 <div class="card-content black-text">
7 <span class="card-title">{{ .RomajiName }} <small class="grey-text">{{ .KanjiName }}</small></span> 7 <span class="card-title">{{ .RomajiName }} <small class="grey-text">{{ .KanjiName }}</small></span>
diff --git a/views/pages/list.html b/views/pages/list.html
index c608b77..7257f12 100644
--- a/views/pages/list.html
+++ b/views/pages/list.html
@@ -13,7 +13,7 @@
13 <body> 13 <body>
14 {{ template "navbar" . }} 14 {{ template "navbar" . }}
15 <div class="container"> 15 <div class="container">
16 <h1>{{ $list.Name }}<small>von <a href="/user/{{ $list.Owner.ID }}/{{ $list.Owner.GetName}}">{{ $list.Owner.GetName }}</a></small></h1> 16 <h1>{{ $list.Name }} <small>von <a href="/user/{{ $list.Owner.ID }}/{{ $list.Owner.GetName}}">{{ $list.Owner.GetName }}</a></small></h1>
17 <blockquote>{{ $list.Description }}</blockquote><br /> 17 <blockquote>{{ $list.Description }}</blockquote><br />
18 <div class="row"> 18 <div class="row">
19 <div class="col s12 {{ if ($user) and eq $user.ID $list.Owner.ID }}l8{{ end }}"> 19 <div class="col s12 {{ if ($user) and eq $user.ID $list.Owner.ID }}l8{{ end }}">