aboutsummaryrefslogtreecommitdiffstats
path: root/internal/web
diff options
context:
space:
mode:
Diffstat (limited to 'internal/web')
-rw-r--r--internal/web/handlers_blog.go19
-rw-r--r--internal/web/handlers_pages.go107
-rw-r--r--internal/web/handlers_posts.go6
-rw-r--r--internal/web/static/blog.css5
-rw-r--r--internal/web/static/dashboard.css17
-rw-r--r--internal/web/templates/blog/gallery.html9
-rw-r--r--internal/web/templates/dashboard/overview.html2
-rw-r--r--internal/web/templates/dashboard/page_form.html15
-rw-r--r--internal/web/templates/dashboard/pages.html6
-rw-r--r--internal/web/templates/dashboard/post_form.html2
-rw-r--r--internal/web/templates/dashboard/posts.html2
-rw-r--r--internal/web/web_test.go4
12 files changed, 165 insertions, 29 deletions
diff --git a/internal/web/handlers_blog.go b/internal/web/handlers_blog.go
index 55cec2e..006129c 100644
--- a/internal/web/handlers_blog.go
+++ b/internal/web/handlers_blog.go
@@ -107,6 +107,20 @@ func (s *Server) renderPage(w http.ResponseWriter, r *http.Request, page *store.
s.serverError(w, err)
return
}
+ v["page"] = page
+ if !page.ShowNotices {
+ v["notices"] = noNotices
+ }
+ if page.Kind == store.PageKindGallery { // a special page: its images instead of posts
+ images, err := blogStore(r).GalleryImages(r.Context(), page.ID, themeFiles(v["theme"].(Theme)))
+ if err != nil {
+ s.serverError(w, err)
+ return
+ }
+ v["images"] = images
+ s.render(w, r, "blog/gallery.html", v)
+ return
+ }
n, per := pageNum(r), v["theme"].(Theme).PostsPerPage
posts, total, err := blogStore(r).PublishedPosts(r.Context(), page.ID, per, (n-1)*per)
if err != nil {
@@ -115,10 +129,7 @@ func (s *Server) renderPage(w http.ResponseWriter, r *http.Request, page *store.
}
last := (total + per - 1) / per
fillExcerpts(v["theme"].(Theme), posts)
- v["page"], v["posts"], v["pageNum"], v["lastPage"] = page, posts, n, last
- if !page.ShowNotices {
- v["notices"] = noNotices
- }
+ v["posts"], v["pageNum"], v["lastPage"] = posts, n, last
// The pager appends ?p=N to base: no trailing slash, which /{page} would not match.
v["base"] = "/" + page.Slug
if page.IsHome {
diff --git a/internal/web/handlers_pages.go b/internal/web/handlers_pages.go
index b085b82..0a2c9c4 100644
--- a/internal/web/handlers_pages.go
+++ b/internal/web/handlers_pages.go
@@ -6,6 +6,7 @@ import (
"strconv"
"strings"
+ "github.com/google/uuid"
"github.com/gramanas/blogspace/internal/slug"
"github.com/gramanas/blogspace/internal/store"
)
@@ -38,19 +39,86 @@ func (s *Server) loadPage(w http.ResponseWriter, r *http.Request) *store.Page {
return p
}
+// pageKind reads a new page's kind from the form or query (?kind= on the
+// "New special page" link, a hidden field on the POST). An existing page
+// keeps its own.
+func pageKind(r *http.Request) string {
+ return pick(r.FormValue("kind"), store.PageKindPosts, store.PageKindGallery)
+}
+
+// themeFiles are the images the design uses (logo, favicon, header and
+// background image): decoration, not content, so a gallery never shows them.
+func themeFiles(t Theme) []uuid.UUID {
+ var ids []uuid.UUID
+ for _, v := range []string{t.Logo, t.Favicon, t.HeaderImage, t.BgImage} {
+ if id, err := uuid.Parse(v); err == nil {
+ ids = append(ids, id)
+ }
+ }
+ return ids
+}
+
+// pageFormData is what the page form needs besides the page. For a gallery
+// that is every library image but the theme's, and which ones the page
+// hides — an unsaved page hides none.
+func (s *Server) pageFormData(r *http.Request, p *store.Page) (map[string]any, error) {
+ d := map[string]any{"page": p}
+ if p.Kind != store.PageKindGallery {
+ return d, nil
+ }
+ images, _, err := blogStore(r).ListFiles(r.Context(), "image", "", 0, 0)
+ if err != nil {
+ return nil, err
+ }
+ skip := map[uuid.UUID]bool{}
+ for _, id := range themeFiles(ParseTheme(currentBlog(r).ThemeJSON)) {
+ skip[id] = true
+ }
+ shown := images[:0]
+ for _, f := range images {
+ if !skip[f.ID] {
+ shown = append(shown, f)
+ }
+ }
+ hidden := map[string]bool{}
+ if p.ID != 0 {
+ if hidden, err = blogStore(r).HiddenFiles(r.Context(), p.ID); err != nil {
+ return nil, err
+ }
+ }
+ d["images"], d["hidden"] = shown, hidden
+ return d, nil
+}
+
+// hiddenFromForm is the "hide" checkboxes of a gallery form as ids; junk is dropped.
+func hiddenFromForm(r *http.Request) []uuid.UUID {
+ ids := []uuid.UUID{}
+ for _, v := range r.Form["hide"] {
+ if id, err := uuid.Parse(v); err == nil {
+ ids = append(ids, id)
+ }
+ }
+ return ids
+}
+
func (s *Server) handlePageForm(w http.ResponseWriter, r *http.Request) {
- p := &store.Page{ShowInNav: true, ShowNotices: true}
+ p := &store.Page{Kind: pageKind(r), ShowInNav: true, ShowNotices: true}
if r.PathValue("id") != "" {
if p = s.loadPage(w, r); p == nil {
return
}
}
- s.render(w, r, "dashboard/page_form.html", map[string]any{"page": p})
+ d, err := s.pageFormData(r, p)
+ if err != nil {
+ s.serverError(w, err)
+ return
+ }
+ s.render(w, r, "dashboard/page_form.html", d)
}
func (s *Server) handlePageSave(w http.ResponseWriter, r *http.Request) {
blog := currentBlog(r)
- p := &store.Page{}
+ p := &store.Page{Kind: pageKind(r)}
if r.PathValue("id") != "" {
if p = s.loadPage(w, r); p == nil {
return
@@ -81,8 +149,25 @@ func (s *Server) handlePageSave(w http.ResponseWriter, r *http.Request) {
case !slug.Valid(p.Slug) || reservedPageSlugs[p.Slug]:
msg = s.tr(r, "Slug may only contain lowercase letters, digits and dashes (and not be a reserved word).")
}
+ // The rejected form is rendered with what was sent, ticks included.
+ fail := func(status int, msg string) {
+ d, err := s.pageFormData(r, p)
+ if err != nil {
+ s.serverError(w, err)
+ return
+ }
+ if p.Kind == store.PageKindGallery {
+ hidden := map[string]bool{}
+ for _, id := range hiddenFromForm(r) {
+ hidden[id.String()] = true
+ }
+ d["hidden"] = hidden
+ }
+ d["error"] = msg
+ s.renderStatus(w, r, status, "dashboard/page_form.html", d)
+ }
if msg != "" {
- s.renderStatus(w, r, http.StatusBadRequest, "dashboard/page_form.html", map[string]any{"page": p, "error": msg})
+ fail(http.StatusBadRequest, msg)
return
}
p.IntroMD = appendFile(p.IntroMD, img, p.Format)
@@ -106,12 +191,18 @@ func (s *Server) handlePageSave(w http.ResponseWriter, r *http.Request) {
}
if err != nil {
if errors.Is(err, store.ErrConflict) {
- s.renderStatus(w, r, http.StatusConflict, "dashboard/page_form.html", map[string]any{"page": p, "error": s.tr(r, "A page with that slug already exists.")})
+ fail(http.StatusConflict, s.tr(r, "A page with that slug already exists."))
return
}
s.serverError(w, err)
return
}
+ if p.Kind == store.PageKindGallery {
+ if err := blogStore(r).SetHiddenFiles(r.Context(), p.ID, hiddenFromForm(r)); err != nil {
+ s.serverError(w, err)
+ return
+ }
+ }
redirectOK(w, r, "/b/"+blog.Subdomain+"/pages/"+strconv.FormatInt(p.ID, 10)+"/edit", s.tr(r, "Saved. Refresh your blog to see it."))
}
@@ -120,8 +211,12 @@ func (s *Server) handlePageDeleteConfirm(w http.ResponseWriter, r *http.Request)
if p == nil {
return
}
+ what := s.trf(r, "the page “%s” and all %d of its posts", p.Title, p.PostCount)
+ if p.Special() {
+ what = s.trf(r, "the gallery page “%s”", p.Title)
+ }
s.render(w, r, "dashboard/confirm.html", map[string]any{
- "what": s.trf(r, "the page “%s” and all %d of its posts", p.Title, p.PostCount),
+ "what": what,
"action": r.URL.Path,
"back": "/b/" + currentBlog(r).Subdomain + "/pages",
"isHome": p.IsHome,
diff --git a/internal/web/handlers_posts.go b/internal/web/handlers_posts.go
index 8a54c31..0c34198 100644
--- a/internal/web/handlers_posts.go
+++ b/internal/web/handlers_posts.go
@@ -89,8 +89,8 @@ func (s *Server) handlePostForm(w http.ResponseWriter, r *http.Request) {
}
} else if pid, _ := strconv.ParseInt(r.URL.Query().Get("page"), 10, 64); pid != 0 {
p.PageID = pid
- } else if hp, err := blogStore(r).HomePage(r.Context()); err == nil {
- p.PageID = hp.ID
+ } else if hp, err := blogStore(r).HomePage(r.Context()); err == nil && !hp.Special() {
+ p.PageID = hp.ID // a gallery home page takes no posts: the select's first page stands in
}
d, err := s.postFormData(r, p)
if err != nil {
@@ -153,7 +153,7 @@ func (s *Server) handlePostSave(w http.ResponseWriter, r *http.Request) {
}
pageOK := false
for _, pg := range pages {
- if pg.ID == p.PageID {
+ if pg.ID == p.PageID && !pg.Special() {
pageOK = true
}
}
diff --git a/internal/web/static/blog.css b/internal/web/static/blog.css
index 8cd969e..aa8357e 100644
--- a/internal/web/static/blog.css
+++ b/internal/web/static/blog.css
@@ -56,6 +56,10 @@ img { max-width: 100%; height: auto; }
.post.has-thumb { overflow: hidden; }
.post-image { margin: 0 0 1em; }
.post-image img { display: block; max-width: 100%; margin: 0 auto; }
+/* gallery page: a masonry wall from CSS columns alone; without them the pictures simply stack */
+.gallery { -webkit-column-width: 220px; -moz-column-width: 220px; column-width: 220px; -webkit-column-gap: 1em; -moz-column-gap: 1em; column-gap: 1em; }
+.gallery a { display: block; margin: 0 0 1em; -webkit-column-break-inside: avoid; page-break-inside: avoid; break-inside: avoid; }
+.gallery img { display: block; width: 100%; }
.read-more { margin: 0.3em 0 0; font-weight: bold; }
.read-more a { text-decoration: none; }
.read-more a:hover { text-decoration: underline; }
@@ -158,6 +162,7 @@ img { max-width: 100%; height: auto; }
@media (max-width: 700px) {
.content { padding: 1em; }
.post-thumb { width: 40%; margin-left: 1em; }
+ .gallery { -webkit-column-width: 140px; -moz-column-width: 140px; column-width: 140px; }
.site-title { font-size: 1.5em; }
.ruled > .header-rule { display: none; } .ruled > .brand { white-space: normal; }
.cols { display: block; }
diff --git a/internal/web/static/dashboard.css b/internal/web/static/dashboard.css
index 4aa0213..70df6fa 100644
--- a/internal/web/static/dashboard.css
+++ b/internal/web/static/dashboard.css
@@ -278,11 +278,16 @@ textarea.mono { font-size: 0.9em; }
.picker-box { max-width: 860px; margin: 0 auto; background: var(--surface); border: 1px solid var(--border); border-radius: var(--radius); box-shadow: 0 8px 30px rgba(16, 24, 40, 0.25); padding: 1em 1.2em; }
.picker-head { display: flex; flex-wrap: wrap; align-items: center; gap: 0.6em; margin-bottom: 0.8em; }
.picker-head input { flex: 1 1 12em; width: auto; margin: 0; padding: 0.4em 0.6em; }
-.picker .picks { display: flex; flex-wrap: wrap; gap: 0.7em; }
-.picker .pick { width: 120px; margin: 0; padding: 0.4em; border: 1px solid var(--border); border-radius: var(--radius-sm); background: var(--surface); color: var(--text); text-align: center; font-size: 0.75em; font-weight: normal; cursor: pointer; }
-.picker .pick:hover { border-color: var(--accent); background: var(--surface-2); color: var(--text); }
-.picker .pick img { display: block; width: 100%; height: 64px; margin: 0 auto 0.3em; border: 1px solid var(--border); border-radius: 4px; background: var(--surface-2); object-fit: contain; }
-.picker .pick .name { display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+/* .imagegrid is the wall of thumbnails: the picker's choices and the gallery page's Hide grid */
+.imagegrid, .picker .picks { display: flex; flex-wrap: wrap; gap: 0.7em; }
+.imagegrid .pick, .picker .pick { display: block; width: 120px; margin: 0; padding: 0.4em; border: 1px solid var(--border); border-radius: var(--radius-sm); background: var(--surface); color: var(--text); text-align: center; font-size: 0.75em; font-weight: normal; cursor: pointer; }
+.imagegrid .pick:hover, .picker .pick:hover { border-color: var(--accent); background: var(--surface-2); color: var(--text); }
+.imagegrid .pick img, .picker .pick img { display: block; width: 100%; height: 64px; margin: 0 auto 0.3em; border: 1px solid var(--border); border-radius: 4px; background: var(--surface-2); object-fit: contain; }
+.imagegrid .pick .name, .picker .pick .name { display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.hidegrid { margin: 0 0 1em; }
+.hidegrid .hide { display: block; margin-top: 0.3em; }
+.hidegrid .hide input { width: auto; margin: 0 0.2em 0 0; vertical-align: middle; }
+.hidegrid .pick:has(:checked) img { opacity: 0.35; } /* a ticked card dims; the tick itself is the signal elsewhere */
.picker .pager { margin: 0.8em 0 0; }
.picker .pager button[disabled] { opacity: 0.4; cursor: default; }
.savebar { position: sticky; bottom: 0; z-index: 5; margin: 0; padding: 0.8em 0; background: var(--bg); border-top: 1px solid var(--border-strong); display: flex; flex-wrap: wrap; gap: 0.8em; align-items: center; }
@@ -303,7 +308,7 @@ details.reset { margin-top: 1.6em; }
.cols { grid-template-columns: 1fr; gap: 1.2em; }
.row { gap: 0; }
.row label { flex-basis: 100%; }
- .picker .pick { width: 46%; }
+ .imagegrid .pick, .picker .pick { width: 46%; }
.presets .preset { width: 46%; }
.sidenav { flex-wrap: nowrap; overflow-x: auto; white-space: nowrap; -webkit-overflow-scrolling: touch; margin: 0 -1em 1em; padding: 0 1em; }
.pickrow { flex-wrap: wrap; }
diff --git a/internal/web/templates/blog/gallery.html b/internal/web/templates/blog/gallery.html
new file mode 100644
index 0000000..4dbde13
--- /dev/null
+++ b/internal/web/templates/blog/gallery.html
@@ -0,0 +1,9 @@
+{{define "title"}}{{if not .Data.page.IsHome}}{{.Data.page.Title}} · {{end}}{{.Blog.Title}}{{end}}
+{{define "content"}}
+{{if not .Data.page.IsHome}}<h1 class="page-title">{{.Data.page.Title}}</h1>{{end}}
+{{if .Data.page.IntroHTML}}<div class="intro">{{html .Data.page.IntroHTML}}</div>{{end}}
+{{if .Data.images}}<div class="gallery">{{range .Data.images}}
+ <a href="/media/{{.ID}}"><img src="/media/{{.ID}}" alt="{{.Filename}}" loading="lazy"></a>{{end}}
+</div>{{else if not (or .Data.page.IntroHTML .Data.page.OutroHTML)}}<p class="muted">{{t "Nothing here yet."}}</p>{{end}}
+{{if .Data.page.OutroHTML}}<div class="outro">{{html .Data.page.OutroHTML}}</div>{{end}}
+{{end}}
diff --git a/internal/web/templates/dashboard/overview.html b/internal/web/templates/dashboard/overview.html
index e239445..2a797d8 100644
--- a/internal/web/templates/dashboard/overview.html
+++ b/internal/web/templates/dashboard/overview.html
@@ -12,7 +12,7 @@
<div class="card">
<h2>{{t "Pages"}}</h2>
<ul class="plain">
- {{range .Data.pages}}<li><a href="/b/{{$.Blog.Subdomain}}/posts?page={{.ID}}">{{.Title}}</a> <span class="muted">({{tf "%d posts" .PostCount}}{{if .IsHome}}, {{t "home"}}{{end}}{{if not .ShowInNav}}, {{t "hidden from menu"}}{{end}})</span></li>{{end}}
+ {{range .Data.pages}}<li><a href="{{if .Special}}/b/{{$.Blog.Subdomain}}/pages/{{.ID}}/edit{{else}}/b/{{$.Blog.Subdomain}}/posts?page={{.ID}}{{end}}">{{.Title}}</a> <span class="muted">({{if .Special}}{{t .Kind}}{{else}}{{tf "%d posts" .PostCount}}{{end}}{{if .IsHome}}, {{t "home"}}{{end}}{{if not .ShowInNav}}, {{t "hidden from menu"}}{{end}})</span></li>{{end}}
</ul>
</div>
</div>
diff --git a/internal/web/templates/dashboard/page_form.html b/internal/web/templates/dashboard/page_form.html
index 4ee720b..5b47d05 100644
--- a/internal/web/templates/dashboard/page_form.html
+++ b/internal/web/templates/dashboard/page_form.html
@@ -1,9 +1,12 @@
-{{define "title"}}{{if .Data.page.ID}}{{t "Edit page"}}{{else}}{{t "New page"}}{{end}} · {{.Blog.Title}}{{end}}
+{{define "title"}}{{template "pageformtitle" .}} · {{.Blog.Title}}{{end}}
+{{define "pageformtitle"}}{{if eq .Data.page.Kind "gallery"}}{{if .Data.page.ID}}{{t "Edit gallery page"}}{{else}}{{t "New gallery page"}}{{end}}{{else}}{{if .Data.page.ID}}{{t "Edit page"}}{{else}}{{t "New page"}}{{end}}{{end}}{{end}}
{{define "content"}}
<div class="card">
- <h1>{{if .Data.page.ID}}{{t "Edit page"}}{{else}}{{t "New page"}}{{end}}</h1>
+ <h1>{{template "pageformtitle" .}}</h1>
+ {{if eq .Data.page.Kind "gallery"}}<p class="lead muted">{{t "A gallery page shows every image in your files as a wall of pictures, newest first, between its intro and closing text."}}</p>{{end}}
<form method="post" enctype="multipart/form-data">
<input type="hidden" name="_csrf" value="{{.CSRF}}">
+ {{if not .Data.page.ID}}<input type="hidden" name="kind" value="{{.Data.page.Kind}}">{{end}}
<label>{{t "Title"}}<br><input name="title" value="{{.Data.page.Title}}" required maxlength="120"></label>
<label>{{t "Address"}} <span class="muted">({{t "leave empty to make one from the title; e.g."}} <code>about</code> → {{.BlogURL}}/about)</span><br>
<input name="slug" value="{{.Data.page.Slug}}" pattern="[a-z0-9]([a-z0-9-]*[a-z0-9])?" maxlength="80"></label>
@@ -11,6 +14,14 @@
{{template "editor" (dict "name" "intro" "value" .Data.page.IntroMD "format" .Data.page.Format "rows" 8 "tall" false "upload" (print "/b/" .Blog.Subdomain "/files/upload") "preview" (print "/b/" .Blog.Subdomain "/preview") "csrf" .CSRF)}}
<label for="ed-outro">{{t "Closing text"}} <span class="muted">({{t "shown after the posts, in the same format; optional"}})</span></label>
{{template "editor" (dict "name" "outro" "value" .Data.page.OutroMD "format" .Data.page.Format "formatof" "intro" "rows" 8 "tall" false "upload" (print "/b/" .Blog.Subdomain "/files/upload") "preview" (print "/b/" .Blog.Subdomain "/preview") "csrf" .CSRF)}}
+ {{if eq .Data.page.Kind "gallery"}}
+ <h2>{{t "Images"}}</h2>
+ <p class="muted small">{{t "Every image in your files is shown except the ones ticked here. The logo, favicon, header and background images are never shown."}}</p>
+ {{if .Data.images}}<div class="imagegrid hidegrid">
+ {{range .Data.images}}<label class="pick"><img src="/b/{{$.Blog.Subdomain}}/media/{{.ID}}" alt="" loading="lazy"><span class="name" title="{{.Filename}}">{{.Filename}}</span><span class="hide"><input type="checkbox" name="hide" value="{{.ID}}"{{if index $.Data.hidden .ID.String}} checked{{end}}> {{t "Hide"}}</span></label>{{end}}
+ </div>
+ {{else}}<p class="muted">{{t "No images in your files yet."}} <a href="/b/{{.Blog.Subdomain}}/files">{{t "Files"}}</a></p>{{end}}
+ {{end}}
<label class="check"><input type="checkbox" name="show_in_nav"{{if .Data.page.ShowInNav}} checked{{end}}> {{t "Show in menu"}}</label>
<label class="check"><input type="checkbox" name="show_notices"{{if .Data.page.ShowNotices}} checked{{end}}> {{t "Show announcements on this page"}}</label>
<p class="actionrow">
diff --git a/internal/web/templates/dashboard/pages.html b/internal/web/templates/dashboard/pages.html
index 6c3b56d..af3bb5e 100644
--- a/internal/web/templates/dashboard/pages.html
+++ b/internal/web/templates/dashboard/pages.html
@@ -2,7 +2,7 @@
{{define "content"}}
<div class="pagehead">
<h1>{{t "Pages"}}</h1>
- <div class="actions"><a class="btn" href="/b/{{.Blog.Subdomain}}/pages/new">+ {{t "New page"}}</a></div>
+ <div class="actions"><a class="btn" href="/b/{{.Blog.Subdomain}}/pages/new">+ {{t "New page"}}</a> <a class="btn secondary" href="/b/{{.Blog.Subdomain}}/pages/new?kind=gallery" title="{{t "A gallery of every image in your files"}}">+ {{t "New special page"}}</a></div>
<p class="lead muted">{{t "Each page holds its own list of posts. Which pages are in the menu, and in what order, is set on the"}} <a href="/b/{{.Blog.Subdomain}}/design#menu">{{t "Design"}}</a> {{t "tab."}}</p>
</div>
<div class="card">
@@ -14,9 +14,9 @@
<form method="post" action="/b/{{$.Blog.Subdomain}}/pages/{{.ID}}/move" class="inline"><input type="hidden" name="_csrf" value="{{$.CSRF}}"><input type="hidden" name="dir" value="down"><button class="mini" title="{{t "Move down"}}">&#9660;</button></form>
</td>
<td><a href="/b/{{$.Blog.Subdomain}}/pages/{{.ID}}/edit">{{.Title}}</a>
- {{if .IsHome}}<span class="tag">{{t "home"}}</span>{{end}}{{if not .ShowInNav}}<span class="tag off">{{t "not in menu"}}</span>{{end}}</td>
+ {{if .Special}}<span class="tag">{{t .Kind}}</span>{{end}}{{if .IsHome}}<span class="tag">{{t "home"}}</span>{{end}}{{if not .ShowInNav}}<span class="tag off">{{t "not in menu"}}</span>{{end}}</td>
<td><a href="{{$.BlogURL}}{{if .IsHome}}/{{else}}/{{.Slug}}{{end}}" target="_blank">{{if .IsHome}}/{{else}}/{{.Slug}}{{end}} &#8599;</a></td>
- <td><a href="/b/{{$.Blog.Subdomain}}/posts?page={{.ID}}">{{.PostCount}}</a></td>
+ <td>{{if .Special}}<span class="muted">&mdash;</span>{{else}}<a href="/b/{{$.Blog.Subdomain}}/posts?page={{.ID}}">{{.PostCount}}</a>{{end}}</td>
<td class="nowrap">
{{if not .IsHome}}<form method="post" action="/b/{{$.Blog.Subdomain}}/pages/{{.ID}}/home" class="inline"><input type="hidden" name="_csrf" value="{{$.CSRF}}"><button class="mini">{{t "Make home"}}</button></form>
<a class="danger" href="/b/{{$.Blog.Subdomain}}/pages/{{.ID}}/delete">{{t "delete"}}</a>{{end}}
diff --git a/internal/web/templates/dashboard/post_form.html b/internal/web/templates/dashboard/post_form.html
index e64a331..edb60fd 100644
--- a/internal/web/templates/dashboard/post_form.html
+++ b/internal/web/templates/dashboard/post_form.html
@@ -7,7 +7,7 @@
<label>{{t "Title"}}<br><input name="title" value="{{.Data.post.Title}}" required maxlength="200" autofocus></label>
<div class="row">
<label>{{t "Page"}}<br>
- <select name="page_id">{{range .Data.pages}}<option value="{{.ID}}"{{if eq .ID $.Data.post.PageID}} selected{{end}}>{{.Title}}</option>{{end}}</select>
+ <select name="page_id">{{range .Data.pages}}{{if not .Special}}<option value="{{.ID}}"{{if eq .ID $.Data.post.PageID}} selected{{end}}>{{.Title}}</option>{{end}}{{end}}</select>
</label>
<label>{{t "Address"}} <span class="muted">({{t "optional, made from the title"}})</span><br>
<input name="slug" value="{{.Data.post.Slug}}" pattern="[a-z0-9]([a-z0-9-]*[a-z0-9])?" maxlength="80"></label>
diff --git a/internal/web/templates/dashboard/posts.html b/internal/web/templates/dashboard/posts.html
index 983fbae..217c966 100644
--- a/internal/web/templates/dashboard/posts.html
+++ b/internal/web/templates/dashboard/posts.html
@@ -8,7 +8,7 @@
<label>{{t "Page:"}}
<select name="page" onchange="this.form.submit()">
<option value="0">{{t "All pages"}}</option>
- {{range .Data.pages}}<option value="{{.ID}}"{{if eq .ID $.Data.pageID}} selected{{end}}>{{.Title}}</option>{{end}}
+ {{range .Data.pages}}{{if not .Special}}<option value="{{.ID}}"{{if eq .ID $.Data.pageID}} selected{{end}}>{{.Title}}</option>{{end}}{{end}}
</select></label>
<noscript><button type="submit">{{t "Filter"}}</button></noscript>
</form>
diff --git a/internal/web/web_test.go b/internal/web/web_test.go
index 2f3bc4f..2d4df5c 100644
--- a/internal/web/web_test.go
+++ b/internal/web/web_test.go
@@ -643,7 +643,7 @@ func TestAllTemplatesParse(t *testing.T) {
for _, name := range []string{"auth/login.html", "dashboard/overview.html", "dashboard/pages.html", "dashboard/page_form.html",
"dashboard/posts.html", "dashboard/post_form.html", "dashboard/design.html", "dashboard/files.html", "dashboard/settings.html",
"dashboard/password.html", "dashboard/confirm.html", "dashboard/sections.html", "dashboard/section_form.html", "admin/index.html", "admin/new_user.html", "admin/delete_user.html",
- "blog/page.html", "blog/post.html", "blog/tag.html", "blog/search.html", "blog/404.html"} {
+ "blog/page.html", "blog/gallery.html", "blog/post.html", "blog/tag.html", "blog/search.html", "blog/404.html"} {
for _, l := range i18n.Languages() {
if _, err := tpl.get(l.Code, name); err != nil {
t.Errorf("%s (%s): %v", name, l.Code, err)
@@ -694,7 +694,7 @@ func TestGreekCatalogComplete(t *testing.T) {
for _, p := range Presets() {
used[p.Name] = true
}
- for _, k := range []string{"top", "bottom", store.RoleSuperadmin, store.RoleBlogger} {
+ for _, k := range []string{"top", "bottom", store.RoleSuperadmin, store.RoleBlogger, store.PageKindGallery} {
used[k] = true
}
have := map[string]bool{}
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-06 02:41:41 +0000