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

5 files changed, 29 insertions, 6 deletions

diff --git a/assets_src/css/materialize_extend.css b/assets_src/css/materialize_extend.css
index f06d042..46f92ee 100644
--- a/assets_src/css/materialize_extend.css
+++ b/assets_src/css/materialize_extend.css
@@ -1,3 +1,23 @@
 span.badge.new.no-caption::after {
         content: "";
 }
+
+/* some flexy flexbox stuff */
+.flex {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: stretch;
+}
+
+.flex .flex-card {
+  display: flex;
+  margin-right: 16px;
+  max-width: 400px;
+}
+
+.flex .flex-card .card {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
diff --git a/frontend/renderer.go b/frontend/renderer.go
index 7d3a161..6fada60 100644
--- a/frontend/renderer.go
+++ b/frontend/renderer.go
@@ -19,6 +19,7 @@ type Action struct {
 // Card ist eine Karte im Materialize-Design.
 type Card struct {
         Title       string
+        SubTitle                *string
         Image       string
         Description string
         Size        string
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index ada4c4b..94d485e 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -84,6 +84,7 @@ func (m *Module) getListGrils(list *models.List) error {
         defer rows.Close()
         list.Grils = list.Grils[:0]
         var ids []int
+        grilMap := make(map[int]*models.ListGril)
         for rows.Next() {
                 var grilID int
                 lg := &models.ListGril{}
@@ -93,6 +94,7 @@ func (m *Module) getListGrils(list *models.List) error {
                         continue
                 }
                 ids = append(ids, grilID)
+                grilMap[grilID] = lg
 
                 list.Grils = append(list.Grils, lg)
         }
@@ -103,8 +105,8 @@ func (m *Module) getListGrils(list *models.List) error {
                 return err
         }
 
-        for id, gril := range grils {
-                list.Grils[id].Gril = gril
+        for _, gril := range grils {
+                grilMap[gril.ID].Gril = gril
         }
 
         sort.Sort(ListGrils(list.Grils))
diff --git a/views/includes/card.html b/views/includes/card.html
index a96cb49..41ad2ce 100644
--- a/views/includes/card.html
+++ b/views/includes/card.html
@@ -1,6 +1,6 @@
 {{ define "card" }}
 {{ $card := . }}
-<div class="col s12 m6 l4">
+<div class="flex-card">
         <div class="card white">
                 <div class="card-content black-text">
                         {{ if $card.Image }}
@@ -8,10 +8,10 @@
                                 <img class="circle responsive-img card-image" src="{{ $card.Image }}" />
                         </div>
                         {{ end }}
-                        <span class="card-title">{{ $card.Title | html }}</span>
+                        <span class="card-title valign-wrapper">{{ $card.Title | html }}{{ if $card.SubTitle }}{{ $card.SubTitle | html }}{{ end }}</span>
                         <p>{{ $card.Description | html }}</p>
                 </div>
-                <div class="card-action">
+                <div class="card-action pull-down">
                         {{ range $action := $card.Actions }}
                                 {{ if $action.Disabled }}
                                         <span>{{ $action.Name | html }}</span>
diff --git a/views/pages/dashboard.html b/views/pages/dashboard.html
index 589b0fd..2eacaba 100644
--- a/views/pages/dashboard.html
+++ b/views/pages/dashboard.html
@@ -11,7 +11,7 @@
                         <div class="row">
                         {{ range $category := .categories }}
                                 <h2>{{ $category.Title }}</h2>
-                                <div class="row">
+                                <div class="flex">
                                 {{ range $category.Cards }}
                                         {{ template "card" . }}
                                 {{ end }}