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.
This commit is contained in:
parent
104452fa2f
commit
d473ba437c
|
@ -6,14 +6,14 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="small-12 medium-9 large-10 columns">
|
<div class="small-12 medium-9 large-10 columns">
|
||||||
<h2>Aktuelle Let's Plays</h2>
|
<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 }}
|
{{ range .data.LPs }}
|
||||||
<li>
|
<li>
|
||||||
<a class="th" href="/lets-play/{{ .Slug.String }}/">
|
<a class="th" href="/lets-play/{{ .Slug.String }}/">
|
||||||
{{ if .PosterS.Valid }}
|
{{ if .PosterS.Valid }}
|
||||||
<img src="{{ .PosterS.String }}" />
|
<img src="{{ .PosterS.String }}" />
|
||||||
{{ else }}
|
{{ 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 }}
|
{{ end }}
|
||||||
</a>
|
</a>
|
||||||
<br /><a href="/lets-play/{{ .Slug.String }}/"><strong>{{ .Name.String }}</strong></a>
|
<br /><a href="/lets-play/{{ .Slug.String }}/"><strong>{{ .Name.String }}</strong></a>
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
{{ end }}
|
{{ end }}
|
||||||
</ul>
|
</ul>
|
||||||
<h2>Aktuelle Episoden</h2>
|
<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 }}
|
{{ range .data.EPs }}
|
||||||
<li>
|
<li>
|
||||||
<a class="th" href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}/">
|
<a class="th" href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}/">
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
{{ if .data.LTs }}
|
{{ if .data.LTs }}
|
||||||
<h2>Aktuelle Let's Tests</h2>
|
<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 }}
|
{{ range .data.LTs }}
|
||||||
<li>
|
<li>
|
||||||
<a class="th" href="/testet/{{ .Slug.String }}/">
|
<a class="th" href="/testet/{{ .Slug.String }}/">
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-12 columns">
|
<div class="large-12 columns">
|
||||||
<h1>{{ .title }}</h1>
|
<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 }}
|
{{ range .data }}
|
||||||
<li>
|
<li>
|
||||||
<a class="th" href="/zeige/{{ .AT.Slug.String }}/">
|
<a class="th" href="/zeige/{{ .AT.Slug.String }}/">
|
||||||
|
|
|
@ -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>
|
||||||
<script src="/assets/js/elevator.min.js"></script>
|
<script src="/assets/js/elevator.min.js"></script>
|
||||||
<script>
|
<script>
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-12 columns">
|
<div class="large-12 columns">
|
||||||
<h1>{{ .title }}</h1>
|
<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 }}
|
{{ range .data }}
|
||||||
<li>
|
<li>
|
||||||
<a class="th" href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}/">
|
<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>
|
||||||
<a href="/lets-play/{{ .LP.Slug.String }}/"><strong>{{ .LP.Name.String }}</strong></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>
|
<br /><a href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}/">{{ .EP.Name.String }}</a>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<div class="row entry">
|
<div class="row entry">
|
||||||
<div class="large-12 columns">
|
<div class="large-12 columns">
|
||||||
<a href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}">
|
<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>
|
</a>
|
||||||
<h4><a href="/lets-play/{{ .LP.Slug.String }}/{{ .EP.Slug.String }}">{{ .EP.Name.String }}</a></h4>
|
<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>
|
<p class="show-for-medium-up">{{ .EP.Descr.String }}</p>
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-12 columns">
|
<div class="large-12 columns">
|
||||||
<h1>{{ .title }}</h1>
|
<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 }}
|
{{ range .data }}
|
||||||
<li>
|
<li>
|
||||||
<a class="th" href="/lets-play/{{ .LP.Slug.String }}/">
|
<a class="th" href="/lets-play/{{ .LP.Slug.String }}/">
|
||||||
{{ if .LP.PosterS.Valid }}
|
{{ if .LP.PosterS.Valid }}
|
||||||
<img src="{{ .LP.PosterS.String }}" />
|
<img src="{{ .LP.PosterS.String }}" />
|
||||||
{{ else }}
|
{{ 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 }}
|
{{ end }}
|
||||||
</a>
|
</a>
|
||||||
<br /><a href="/lets-play/{{ .LP.Slug.String }}/"><strong>{{ .LP.Name.String }}</strong></a>
|
<br /><a href="/lets-play/{{ .LP.Slug.String }}/"><strong>{{ .LP.Name.String }}</strong></a>
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
<iframe width="213" height="120" src="//www.youtube.com/embed/{{ .data.LT.Youtube.String }}" frameborder="0" allowfullscreen></iframe>
|
<iframe width="213" height="120" src="//www.youtube.com/embed/{{ .data.LT.Youtube.String }}" frameborder="0" allowfullscreen></iframe>
|
||||||
</div>
|
</div>
|
||||||
<div class="medium-3 medium-push-9 columns">
|
<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-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-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>
|
<h5><i class="fa fa-users fix-icon"></i> {{ .data.LT.Votes.Int64 }} Stimmen</h5>
|
||||||
|
@ -14,8 +13,4 @@
|
||||||
<p>{{ .data.DESC }}</p>
|
<p>{{ .data.DESC }}</p>
|
||||||
</div>
|
</div>
|
||||||
</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">×</a>
|
|
||||||
</div>
|
|
||||||
{{ template "footer.html" . }}
|
{{ template "footer.html" . }}
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-12 columns">
|
<div class="large-12 columns">
|
||||||
<h1>{{ .title }}</h1>
|
<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 }}
|
{{ range .data }}
|
||||||
<li>
|
<li>
|
||||||
<a class="th" href="/testet/{{ .LT.Slug.String }}/">
|
<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>
|
</a>
|
||||||
<br /><a href="/testet/{{ .LT.Slug.String }}/"><strong>{{ .LT.Name.String }}</strong></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>
|
<br />von <a href="/zeige/{{ .AT.Slug.String }}/">{{ .AT.Name.String }}</a>
|
||||||
|
|
|
@ -87,7 +87,7 @@ func GetAt(c *gin.Context) {
|
||||||
var LTs []database.LetsTest
|
var LTs []database.LetsTest
|
||||||
var EPs []database.Episode
|
var EPs []database.Episode
|
||||||
var DEPs []gin.H
|
var DEPs []gin.H
|
||||||
database.Db.Model(&AT).Limit(4).Order("aired desc").Related(&LPs).Related(<s).Related(&EPs)
|
database.Db.Model(&AT).Limit(5).Order("aired desc").Related(&LPs).Related(<s).Related(&EPs)
|
||||||
for _, EP := range EPs {
|
for _, EP := range EPs {
|
||||||
var ELP database.LetsPlay
|
var ELP database.LetsPlay
|
||||||
database.Db.Model(&EP).Related(&ELP)
|
database.Db.Model(&EP).Related(&ELP)
|
||||||
|
|
|
@ -41,10 +41,10 @@ func ResizeAvatar(url string) (string, string, error) {
|
||||||
var exists bool
|
var exists bool
|
||||||
if name, uname, exists = ImageNameGenerator(url); exists == true {
|
if name, uname, exists = ImageNameGenerator(url); exists == true {
|
||||||
<- isem
|
<- 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 + "-big.jpg")
|
||||||
out = append(out, name + "-small.png")
|
out = append(out, name + "-small.jpg")
|
||||||
size = append(size, "240x240")
|
size = append(size, "240x240")
|
||||||
size = append(size, "64x64")
|
size = append(size, "64x64")
|
||||||
err := ResizeImage(url, out, size)
|
err := ResizeImage(url, out, size)
|
||||||
|
@ -53,7 +53,7 @@ func ResizeAvatar(url string) (string, string, error) {
|
||||||
return "", "", err
|
return "", "", err
|
||||||
}
|
}
|
||||||
<- isem
|
<- isem
|
||||||
return uname + "-small.png", uname + "-big.png", err
|
return uname + "-small.jpg", uname + "-big.jpg", err
|
||||||
}
|
}
|
||||||
|
|
||||||
func ResizeFanArt(url string) (string, string, error) {
|
func ResizeFanArt(url string) (string, string, error) {
|
||||||
|
@ -65,19 +65,19 @@ func ResizeFanArt(url string) (string, string, error) {
|
||||||
var exists bool
|
var exists bool
|
||||||
if name, uname, exists = ImageNameGenerator(url); exists == true {
|
if name, uname, exists = ImageNameGenerator(url); exists == true {
|
||||||
<- isem
|
<- 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 + "-big.jpg")
|
||||||
out = append(out, name + "-small.png")
|
out = append(out, name + "-small.jpg")
|
||||||
size = append(size, "1920x1080")
|
size = append(size, "1920x1080")
|
||||||
size = append(size, "640x360")
|
size = append(size, "265x149")
|
||||||
err := ResizeImage(url, out, size)
|
err := ResizeImage(url, out, size)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
<- isem
|
<- isem
|
||||||
return "", "", err
|
return "", "", err
|
||||||
}
|
}
|
||||||
<- isem
|
<- isem
|
||||||
return uname + "-small.png", uname + "-big.png", err
|
return uname + "-small.jpg", uname + "-big.jpg", err
|
||||||
}
|
}
|
||||||
|
|
||||||
func ResizeCover(url string) (string, string, error) {
|
func ResizeCover(url string) (string, string, error) {
|
||||||
|
@ -89,19 +89,19 @@ func ResizeCover(url string) (string, string, error) {
|
||||||
var exists bool
|
var exists bool
|
||||||
if name, uname, exists = ImageNameGenerator(url); exists == true {
|
if name, uname, exists = ImageNameGenerator(url); exists == true {
|
||||||
<- isem
|
<- 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 + "-big.jpg")
|
||||||
out = append(out, name + "-small.png")
|
out = append(out, name + "-small.jpg")
|
||||||
size = append(size, "600x846")
|
size = append(size, "648x960")
|
||||||
size = append(size, "260x366")
|
size = append(size, "178x265")
|
||||||
err := ResizeImage(url, out, size)
|
err := ResizeImage(url, out, size)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
<- isem
|
<- isem
|
||||||
return "", "", err
|
return "", "", err
|
||||||
}
|
}
|
||||||
<- isem
|
<- isem
|
||||||
return uname + "-small.png", uname + "-big.png", err
|
return uname + "-small.jpg", uname + "-big.jpg", err
|
||||||
}
|
}
|
||||||
|
|
||||||
func ResizeThumb(url string) (string, string, error) {
|
func ResizeThumb(url string) (string, string, error) {
|
||||||
|
@ -113,19 +113,19 @@ func ResizeThumb(url string) (string, string, error) {
|
||||||
var exists bool
|
var exists bool
|
||||||
if name, uname, exists = ImageNameGenerator(url); exists == true {
|
if name, uname, exists = ImageNameGenerator(url); exists == true {
|
||||||
<- isem
|
<- 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 + "-big.jpg")
|
||||||
out = append(out, name + "-small.png")
|
out = append(out, name + "-small.jpg")
|
||||||
size = append(size, "1280x720")
|
size = append(size, "1280x720")
|
||||||
size = append(size, "640x360")
|
size = append(size, "265x149")
|
||||||
err := ResizeImage(url, out, size)
|
err := ResizeImage(url, out, size)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
<- isem
|
<- isem
|
||||||
return "", "", err
|
return "", "", err
|
||||||
}
|
}
|
||||||
<- isem
|
<- 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) {
|
func ResizeImage(url string, out []string, size []string) (error) {
|
||||||
|
@ -155,7 +155,7 @@ func ResizeImage(url string, out []string, size []string) (error) {
|
||||||
}
|
}
|
||||||
f.Close()
|
f.Close()
|
||||||
for i := 0; i < len(out); i++ {
|
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()
|
err = cmd.Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Reference in a new issue