aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg/view/album.go5
-rw-r--r--pkg/view/media.go11
-rw-r--r--templates/album.qtpl2
-rw-r--r--templates/media.qtpl2
-rw-r--r--templates/mosaic.qtpl6
5 files changed, 13 insertions, 13 deletions
diff --git a/pkg/view/album.go b/pkg/view/album.go
index a96b9bd..9e70b4b 100644
--- a/pkg/view/album.go
+++ b/pkg/view/album.go
@@ -85,8 +85,9 @@ func (self *AlbumView) Index(w http.ResponseWriter, r *http.Request) error {
Albums: albums,
Name: album.Name,
Next: &repository.Pagination{
- Size: p.Size,
- Page: p.Page + 1,
+ Size: p.Size,
+ Page: p.Page + 1,
+ AlbumID: &album.ID,
},
Settings: settings,
}
diff --git a/pkg/view/media.go b/pkg/view/media.go
index d5aace2..f490ce1 100644
--- a/pkg/view/media.go
+++ b/pkg/view/media.go
@@ -44,8 +44,7 @@ func getPagination(r *http.Request) *repository.Pagination {
}
if albumIDStr == "" {
- id := uint(0)
- albumID = &id
+ albumID = nil
} else if p, err := strconv.Atoi(albumIDStr); err == nil {
id := uint(p)
albumID = &id
@@ -133,9 +132,9 @@ func (self *MediaView) GetThumbnail(w http.ResponseWriter, r *http.Request) erro
}
func (self *MediaView) SetMyselfIn(r *ext.Router) {
- r.GET("/media", self.Index)
- r.POST("/media", self.Index)
+ r.GET("/media/", self.Index)
+ r.POST("/media/", self.Index)
- r.GET("/media/image", self.GetImage)
- r.GET("/media/thumbnail", self.GetThumbnail)
+ r.GET("/media/image/", self.GetImage)
+ r.GET("/media/thumbnail/", self.GetThumbnail)
}
diff --git a/templates/album.qtpl b/templates/album.qtpl
index 1f25bf6..835db57 100644
--- a/templates/album.qtpl
+++ b/templates/album.qtpl
@@ -30,7 +30,7 @@ func (m *AlbumPage) PreloadAttr() string {
{%= Mosaic(p.Medias, p.PreloadAttr()) %}
</div>
<div>
- <a href="/media?page={%d p.Next.Page %}" class="button is-pulled-right">next</a>
+ <a href="/album/?albumId={%s FromUInttoString(p.Next.AlbumID) %}&page={%d p.Next.Page %}" class="button is-pulled-right">next</a>
</div>
{% endfunc %}
diff --git a/templates/media.qtpl b/templates/media.qtpl
index 737d03d..4251deb 100644
--- a/templates/media.qtpl
+++ b/templates/media.qtpl
@@ -22,7 +22,7 @@ func (m *MediaPage) PreloadAttr() string {
{%= Mosaic(p.Medias, p.PreloadAttr()) %}
</div>
<div>
- <a href="/media?page={%d p.Next.Page %}" class="button is-pulled-right">next</a>
+ <a href="/media/?page={%d p.Next.Page %}" class="button is-pulled-right">next</a>
</div>
{% endfunc %}
diff --git a/templates/mosaic.qtpl b/templates/mosaic.qtpl
index 18dbcba..3e6ccf8 100644
--- a/templates/mosaic.qtpl
+++ b/templates/mosaic.qtpl
@@ -8,12 +8,12 @@
{% for _, media := range c %}
<div class="card-image">
{% if media.IsVideo() %}
- <video class="image is-fit" controls muted="true" poster="/media/thumbnail?path_hash={%s media.PathHash %}" preload="{%s preloadAttr %}">
- <source src="/media/image?path_hash={%s media.PathHash %}" type="{%s media.MIMEType %}">
+ <video class="image is-fit" controls muted="true" poster="/media/thumbnail/?path_hash={%s media.PathHash %}" preload="{%s preloadAttr %}">
+ <source src="/media/image/?path_hash={%s media.PathHash %}" type="{%s media.MIMEType %}">
</video>
{% else %}
<figure class="image is-fit">
- <img src="/media/thumbnail?path_hash={%s media.PathHash %}">
+ <img src="/media/thumbnail/?path_hash={%s media.PathHash %}">
</figure>
{% endif %}
</div>