From d473ba437cdda2f9f635673006479904293ff917 Mon Sep 17 00:00:00 2001
From: Andreas Mieke <andreas@1750studios.com>
Date: Sat, 26 Sep 2015 12:55:12 +0200
Subject: [PATCH] Changing image file format to jpg * Also changing sizes to be
 Kodi compatible * Small improvements to keep the templates Retina compatible
 with new picture sizes.

---
 gserver/templates/at.html     |  8 +++----
 gserver/templates/ats.html    |  2 +-
 gserver/templates/footer.html | 13 +++++++++++
 gserver/templates/index.html  |  4 ++--
 gserver/templates/lp.html     |  2 +-
 gserver/templates/lps.html    |  4 ++--
 gserver/templates/lt.html     |  5 -----
 gserver/templates/lts.html    |  4 ++--
 gserver/webapp.go             |  2 +-
 image/image.go                | 42 +++++++++++++++++------------------
 10 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/gserver/templates/at.html b/gserver/templates/at.html
index 841c15d..744bf88 100644
--- a/gserver/templates/at.html
+++ b/gserver/templates/at.html
@@ -6,14 +6,14 @@
   </div>
   <div class="small-12 medium-9 large-10 columns">
     <h2>Aktuelle Let's Plays</h2>
-    <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-4">
+    <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-5">
       {{ range .data.LPs }}
       <li>
         <a class="th" href="/lets-play/{{ .Slug.String }}/">
           {{ if .PosterS.Valid }}
           <img src="{{ .PosterS.String }}" />
           {{ else }}
-          <img src="https://placeholdit.imgix.net/~text?txtsize=12&txt=Kein%20Cover&w=260&h=366" />
+          <img src="https://placeholdit.imgix.net/~text?txtsize=12&txt=Kein%20Cover&w=178&h=265" />
           {{ end }}
         </a>
         <br /><a href="/lets-play/{{ .Slug.String }}/"><strong>{{ .Name.String }}</strong></a>
@@ -21,7 +21,7 @@
       {{ end }}
     </ul>
     <h2>Aktuelle Episoden</h2>
-    <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-4">
+    <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-5">
       {{ range .data.EPs }}
       <li>
         <a class="th" href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}/">
@@ -34,7 +34,7 @@
     </ul>
     {{ if .data.LTs }}
     <h2>Aktuelle Let's Tests</h2>
-    <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-4">
+    <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-5">
       {{ range .data.LTs }}
       <li>
         <a class="th" href="/testet/{{ .Slug.String }}/">
diff --git a/gserver/templates/ats.html b/gserver/templates/ats.html
index 382c8af..228ce70 100644
--- a/gserver/templates/ats.html
+++ b/gserver/templates/ats.html
@@ -2,7 +2,7 @@
 <div class="row">
   <div class="large-12 columns">
     <h1>{{ .title }}</h1>
-    <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-4">
+    <ul class="small-block-grid-2 medium-block-grid-4 large-block-grid-6">
       {{ range .data }}
       <li>
         <a class="th" href="/zeige/{{ .AT.Slug.String }}/">
diff --git a/gserver/templates/footer.html b/gserver/templates/footer.html
index 4942ec6..1b494a8 100644
--- a/gserver/templates/footer.html
+++ b/gserver/templates/footer.html
@@ -60,6 +60,19 @@
           });
         });
       }
+
+      $(window).bind("load", function () {
+        var footer = $("footer.footer");
+        var pos = footer.position();
+        var height = $(window).height();
+        height = height - pos.top;
+        height = height - footer.height();
+        if (height > 0) {
+            footer.css({
+                'margin-top': height - 30 + 'px'
+            });
+        }
+      });
     </script>
     <script src="/assets/js/elevator.min.js"></script>
     <script>
diff --git a/gserver/templates/index.html b/gserver/templates/index.html
index 067563f..25fb181 100644
--- a/gserver/templates/index.html
+++ b/gserver/templates/index.html
@@ -2,11 +2,11 @@
 <div class="row">
   <div class="large-12 columns">
     <h1>{{ .title }}</h1>
-    <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-4">
+    <ul class="small-block-grid-2 medium-block-grid-4 large-block-grid-5">
       {{ range .data }}
       <li>
         <a class="th" href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}/">
-          <img src="{{ if .EP.ThumbS.Valid }}{{ .EP.ThumbS.String }}{{ else }}https://placeholdit.imgix.net/~text?txtsize=72&txt=Kein%20Thumbnail&w=640&h=360{{ end }}">
+          <img src="{{ if .EP.ThumbS.Valid }}{{ .EP.ThumbS.String }}{{ else }}https://placeholdit.imgix.net/~text?txtsize=72&txt=Kein%20Thumbnail&w=265&h=149{{ end }}">
         </a>
         <a href="/lets-play/{{ .LP.Slug.String }}/"><strong>{{ .LP.Name.String }}</strong></a>:
         <br /><a href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}/">{{ .EP.Name.String }}</a>
diff --git a/gserver/templates/lp.html b/gserver/templates/lp.html
index 6009b50..79d5d47 100644
--- a/gserver/templates/lp.html
+++ b/gserver/templates/lp.html
@@ -10,7 +10,7 @@
     <div class="row entry">
       <div class="large-12 columns">
         <a href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}">
-          <img src="{{ if .EP.ThumbS.Valid }}{{ .EP.ThumbS.String }}{{ else }}https://placeholdit.imgix.net/~text?txtsize=72&txt=Kein%20Thumbnail&w=640&h=360{{ end }}" />
+          <img src="{{ if .EP.ThumbS.Valid }}{{ .EP.ThumbS.String }}{{ else }}https://placeholdit.imgix.net/~text?txtsize=72&txt=Kein%20Thumbnail&w=265&h=149{{ end }}" />
         </a>
         <h4><a href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}">{{ .EP.Name.String }}</a></h4>
         <p class="show-for-medium-up">{{ .EP.Descr.String }}</p>
diff --git a/gserver/templates/lps.html b/gserver/templates/lps.html
index 5a89b20..0799351 100644
--- a/gserver/templates/lps.html
+++ b/gserver/templates/lps.html
@@ -2,14 +2,14 @@
 <div class="row">
   <div class="large-12 columns">
     <h1>{{ .title }}</h1>
-    <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-4">
+    <ul class="small-block-grid-3 medium-block-grid-5 large-block-grid-5">
       {{ range .data }}
       <li>
         <a class="th" href="/lets-play/{{ .LP.Slug.String }}/">
           {{ if .LP.PosterS.Valid }}
           <img src="{{ .LP.PosterS.String }}" />
           {{ else }}
-          <img src="https://placeholdit.imgix.net/~text?txtsize=24&txt=Kein%20Cover&w=260&h=366" />
+          <img src="https://placeholdit.imgix.net/~text?txtsize=24&txt=Kein%20Cover&w=178&h=265" />
           {{ end }}
         </a>
         <br /><a href="/lets-play/{{ .LP.Slug.String }}/"><strong>{{ .LP.Name.String }}</strong></a>
diff --git a/gserver/templates/lt.html b/gserver/templates/lt.html
index 544d6ce..d1730b3 100644
--- a/gserver/templates/lt.html
+++ b/gserver/templates/lt.html
@@ -4,7 +4,6 @@
     <iframe width="213" height="120" src="//www.youtube.com/embed/{{ .data.LT.Youtube.String }}" frameborder="0" allowfullscreen></iframe>
   </div>
   <div class="medium-3 medium-push-9 columns">
-    {{ if .data.LT.PosterB.Valid }}<a class="th show-for-medium-up" href="{{ .data.LT.PosterB.String }}" data-reveal-id="coverModal">{{ end }}<img src="{{ .data.LT.PosterS.String }}" />{{ if .data.LT.PosterB.Valid }}</a>{{ end }}
     <h5><i class="fa fa-user fix-icon"></i> <a href="/zeige/{{ .data.AT.Slug.String }}/">{{ .data.AT.Name.String }}</a></h5>
     <h5><i class="fa fa-star fix-icon"></i> {{ .data.LT.Rating.Float64 }} von 10</h5>
     <h5><i class="fa fa-users fix-icon"></i> {{ .data.LT.Votes.Int64 }} Stimmen</h5>
@@ -14,8 +13,4 @@
     <p>{{ .data.DESC }}</p>
   </div>
 </div>
-<div id="coverModal" class="reveal-modal" data-reveal aria-labelledby="ltName" aria-hidden="true" role="dialog">
-  <img src="{{ .data.LT.PosterB.String }}">
-  <a class="close-reveal-modal" aria-label="Close">&#215;</a>
-</div>
 {{ template "footer.html" . }}
diff --git a/gserver/templates/lts.html b/gserver/templates/lts.html
index 2367d6e..1c7ebf8 100644
--- a/gserver/templates/lts.html
+++ b/gserver/templates/lts.html
@@ -2,11 +2,11 @@
 <div class="row">
   <div class="large-12 columns">
     <h1>{{ .title }}</h1>
-    <ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-4">
+    <ul class="small-block-grid-2 medium-block-grid-4 large-block-grid-5">
       {{ range .data }}
       <li>
         <a class="th" href="/testet/{{ .LT.Slug.String }}/">
-          <img src="{{ if .LT.ThumbS.Valid }}{{ .LT.ThumbS.String }}{{ else }}https://placeholdit.imgix.net/~text?txtsize=72&txt=Kein%20Thumbnail&w=640&h=360{{ end }}" /></a>
+          <img src="{{ if .LT.ThumbS.Valid }}{{ .LT.ThumbS.String }}{{ else }}https://placeholdit.imgix.net/~text?txtsize=72&txt=Kein%20Thumbnail&w=265&h=149{{ end }}" /></a>
         </a>
         <br /><a href="/testet/{{ .LT.Slug.String }}/"><strong>{{ .LT.Name.String }}</strong></a>
         <br />von <a href="/zeige/{{ .AT.Slug.String }}/">{{ .AT.Name.String }}</a>
diff --git a/gserver/webapp.go b/gserver/webapp.go
index 057632d..107ac2c 100644
--- a/gserver/webapp.go
+++ b/gserver/webapp.go
@@ -87,7 +87,7 @@ func GetAt(c *gin.Context) {
             var LTs []database.LetsTest
             var EPs []database.Episode
             var DEPs []gin.H
-            database.Db.Model(&AT).Limit(4).Order("aired desc").Related(&LPs).Related(&LTs).Related(&EPs)
+            database.Db.Model(&AT).Limit(5).Order("aired desc").Related(&LPs).Related(&LTs).Related(&EPs)
             for _, EP := range EPs {
                 var ELP database.LetsPlay
                 database.Db.Model(&EP).Related(&ELP)
diff --git a/image/image.go b/image/image.go
index 48df747..6ba68e6 100644
--- a/image/image.go
+++ b/image/image.go
@@ -41,10 +41,10 @@ func ResizeAvatar(url string) (string, string, error) {
     var exists bool
     if name, uname, exists = ImageNameGenerator(url); exists == true {
         <- isem
-        return uname + "-small.png", uname + "-big.png", nil
+        return uname + "-small.jpg", uname + "-big.jpg", nil
     }
-    out = append(out, name + "-big.png")
-    out = append(out, name + "-small.png")
+    out = append(out, name + "-big.jpg")
+    out = append(out, name + "-small.jpg")
     size = append(size, "240x240")
     size = append(size, "64x64")
     err := ResizeImage(url, out, size)
@@ -53,7 +53,7 @@ func ResizeAvatar(url string) (string, string, error) {
         return "", "", err
     }
     <- isem
-    return uname + "-small.png", uname + "-big.png", err
+    return uname + "-small.jpg", uname + "-big.jpg", err
 }
 
 func ResizeFanArt(url string) (string, string, error) {
@@ -65,19 +65,19 @@ func ResizeFanArt(url string) (string, string, error) {
     var exists bool
     if name, uname, exists = ImageNameGenerator(url); exists == true {
         <- isem
-        return uname + "-small.png", uname + "-big.png", nil
+        return uname + "-small.jpg", uname + "-big.jpg", nil
     }
-    out = append(out, name + "-big.png")
-    out = append(out, name + "-small.png")
+    out = append(out, name + "-big.jpg")
+    out = append(out, name + "-small.jpg")
     size = append(size, "1920x1080")
-    size = append(size, "640x360")
+    size = append(size, "265x149")
     err := ResizeImage(url, out, size)
     if err != nil {
         <- isem
         return "", "", err
     }
     <- isem
-    return uname + "-small.png", uname + "-big.png", err
+    return uname + "-small.jpg", uname + "-big.jpg", err
 }
 
 func ResizeCover(url string) (string, string, error) {
@@ -89,19 +89,19 @@ func ResizeCover(url string) (string, string, error) {
     var exists bool
     if name, uname, exists = ImageNameGenerator(url); exists == true {
         <- isem
-        return uname + "-small.png", uname + "-big.png", nil
+        return uname + "-small.jpg", uname + "-big.jpg", nil
     }
-    out = append(out, name + "-big.png")
-    out = append(out, name + "-small.png")
-    size = append(size, "600x846")
-    size = append(size, "260x366")
+    out = append(out, name + "-big.jpg")
+    out = append(out, name + "-small.jpg")
+    size = append(size, "648x960")
+    size = append(size, "178x265")
     err := ResizeImage(url, out, size)
     if err != nil {
         <- isem
         return "", "", err
     }
     <- isem
-    return uname + "-small.png", uname + "-big.png", err
+    return uname + "-small.jpg", uname + "-big.jpg", err
 }
 
 func ResizeThumb(url string) (string, string, error) {
@@ -113,19 +113,19 @@ func ResizeThumb(url string) (string, string, error) {
     var exists bool
     if name, uname, exists = ImageNameGenerator(url); exists == true {
         <- isem
-        return uname + "-small.png", uname + "-big.png", nil
+        return uname + "-small.jpg", uname + "-big.jpg", nil
     }
-    out = append(out, name + "-big.png")
-    out = append(out, name + "-small.png")
+    out = append(out, name + "-big.jpg")
+    out = append(out, name + "-small.jpg")
     size = append(size, "1280x720")
-    size = append(size, "640x360")
+    size = append(size, "265x149")
     err := ResizeImage(url, out, size)
     if err != nil {
         <- isem
         return "", "", err
     }
     <- isem
-    return uname + "-small.png", uname + "-big.png", err
+    return uname + "-small.jpg", uname + "-big.jpg", err
 }
 
 func ResizeImage(url string, out []string, size []string) (error) {
@@ -155,7 +155,7 @@ func ResizeImage(url string, out []string, size []string) (error) {
     }
     f.Close()
     for i := 0; i < len(out); i++ {
-        cmd := exec.Command("convert", tfile, "-resize", size[i] + "^", "-interlace", "PNG", "-colors", "255", "-gravity", "center", "-crop", size[i] + "+0+0", "+repage", "PNG8:" + out[i])
+        cmd := exec.Command("convert", tfile, "-resize", size[i] + "^", "-quality", "70", "-gravity", "center", "-crop", size[i] + "+0+0", "+repage", out[i])
         err = cmd.Run()
         if err != nil {
             return err