More styling fixes, and fix the file not found page

This commit is contained in:
2019-07-28 22:34:15 +02:00
parent 2241421761
commit 5aaf121a17
10 changed files with 106 additions and 60 deletions

View File

@@ -42,12 +42,14 @@ func (wc *WebController) serveFileViewer(w http.ResponseWriter, r *http.Request,
finfo = append(finfo, inf)
}
templateData := wc.newTemplateData(w, r)
if len(finfo) == 0 {
wc.serveNotFound(w, r)
w.WriteHeader(http.StatusNotFound)
wc.templates.Get().ExecuteTemplate(w, "file_not_found", templateData)
return
}
templateData := wc.newTemplateData(w, r)
templateData.OGData = metadataFromFile(*finfo[0])
var err error
if list {
@@ -58,7 +60,7 @@ func (wc *WebController) serveFileViewer(w http.ResponseWriter, r *http.Request,
APIResponse: map[string]interface{}{
"data": finfo,
"date_created": "now",
"title": "Concatenation of files",
"title": "Multiple files",
"date_lastview": "now",
"views": 0,
},

View File

@@ -14,15 +14,17 @@ import (
func (wc *WebController) serveListViewer(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
var api = pixelapi.New(wc.conf.APIURLInternal, "")
var list, err = api.GetList(p.ByName("id"))
var templateData = wc.newTemplateData(w, r)
if err != nil {
if err, ok := err.(pixelapi.Error); ok && err.ReqError {
log.Error("API request error occurred: %s", err.Value)
}
wc.serveNotFound(w, r)
w.WriteHeader(http.StatusNotFound)
wc.templates.Get().ExecuteTemplate(w, "list_not_found", templateData)
return
}
var templateData = wc.newTemplateData(w, r)
templateData.Title = fmt.Sprintf("%s ~ Pixeldrain list", list.Title)
templateData.OGData = metadataFromList(*list)
templateData.Other = viewerData{