Merge branch 'dev' of https://github.com/NyaaPantsu/nyaa into dev

NyaaPantsu · Jul 22, 2017 · df45959 · df45959
2 parents 0f0b658 + 3807c69
commit df45959
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/controllers/search/search.go b/controllers/search/search.go
@@ -50,7 +50,7 @@ func SearchHandler(c *gin.Context) {
 
 	maxPages := math.Ceil(float64(nbTorrents) / float64(searchParam.Max))
 	if pagenum > int(maxPages) {
-		c.AbortWithError(http.StatusNotFound, errors.New("Page superior to the maximum number of pages"))
+		templates.Static(c, "errors/no_results.jet.html")
 		return
 	}
 

diff --git a/public/img/no_results.jpg b/public/img/no_results.jpg
diff --git a/templates/errors/no_results.jet.html b/templates/errors/no_results.jet.html
@@ -0,0 +1,9 @@
+{{ extends "layouts/index_site" }}
+{{block title()}}{{ T("err_no_results")}}{{end}}
+{{block content_body()}}
+    <div style="text-align: center;">
+        <h1>{{ T("err_no_results")}}</h1>
+        <img src="/img/no_results.jpg" />
+    </div>
+{{end}}
+{{block mascot()}}<br>{{end}}
diff --git a/translations/en-us.all.json b/translations/en-us.all.json
@@ -195,6 +195,10 @@
     "id": "error_500",
     "translation": "Error 500"
   },
+  {
+    "id": "err_no_results",
+    "translation": "No results found"
+  },
   {
     "id": "upload",
     "translation": "Upload"