zenermerps/GoGronkh
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Changing image file format to jpg

Browse source 
* Also changing sizes to be Kodi compatible
* Small improvements to keep the templates Retina compatible
with new picture sizes.
This commit is contained in:
Andreas Mieke 2015-09-26 12:55:12 +02:00
parent 104452fa2f
commit d473ba437c
10 changed files with 47 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gserver/templates/at.html
View file

@ -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 }}/">

2
gserver/templates/ats.html
View file

@ -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 }}/">

13
gserver/templates/footer.html
View file

@ -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>

4
gserver/templates/index.html
View file

@ -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>

2
gserver/templates/lp.html
View file

@ -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>

4
gserver/templates/lps.html
View file

@ -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>

5
gserver/templates/lt.html
View file

@ -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" . }}

4
gserver/templates/lts.html
View file

@ -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>

2
gserver/webapp.go
View file

@ -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)

42
image/image.go
View file

@ -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