diff --git a/conference.go b/conference.go index f5797a9..a5b40d5 100644 --- a/conference.go +++ b/conference.go @@ -489,7 +489,9 @@ func ReadPosts(ctxt ui.AmContext) (string, any, error) { postRange[0] = lastRead + 1 postRange[1] = topic.TopMessage count := postRange[1] - postRange[0] + 1 - if count > ctxt.Globals().PostsPerPage { + if count == 0 { + postRange[0] = max(postRange[1]-ctxt.Globals().PostsPerPage+1, 0) + } else if count > ctxt.Globals().PostsPerPage { postRange[0] = postRange[1] - ctxt.Globals().PostsPerPage + 1 } else if count < ctxt.Globals().PostsPerPage { pin = postRange[0] - 1 @@ -525,6 +527,7 @@ func ReadPosts(ctxt ui.AmContext) (string, any, error) { ctxt.VarMap().Set("pseud", pseud) // Render the output. + ctxt.VarMap().Set("advancedControls", ctxt.HasParameter("ac") && len(posts) == 1) ctxt.VarMap().Set("amsterdam_pageTitle", fmt.Sprintf("%s: %s", topic.Name, summaryLine)) ctxt.VarMap().Set("topicName", topic.Name) ctxt.VarMap().Set("summaryLine", summaryLine) diff --git a/ui/views/frame.jet b/ui/views/frame.jet index 05d5367..d3d1fbe 100644 --- a/ui/views/frame.jet +++ b/ui/views/frame.jet @@ -11,7 +11,7 @@ - {{ amsterdam_pageTitle }} - {{ GlobalConfig.Site.Title }} + {{ amsterdam_pageTitle | raw }} - {{ GlobalConfig.Site.Title }} {{ if isset(amsterdam_genRefresh) && GlobalConfig.Site.TopRefresh > 0 }} diff --git a/ui/views/posts.jet b/ui/views/posts.jet index e488ded..6c7a640 100644 --- a/ui/views/posts.jet +++ b/ui/views/posts.jet @@ -9,7 +9,7 @@
-

{{ topicName }}

+

{{ topicName | raw }}

{{ summaryLine }}
@@ -74,13 +74,31 @@
- {{ m := map("foo", "bar") }} - {{ range i, p := posts }} - {{ m = map("post_cur", p, "post_userName", post_getUserName(p, .), "post_text", post_getText(p, .), - "post_overrideLine", post_getOverrideLine(p, .), "post_overrideLink", post_getOverrideLink(p, post_topicPermalink)) }} - {{ .SubRender2("singlepost.jet", m) | raw }} - {{ if pin == p.Num }}
{{ end }} - {{ end }} + {{ if advancedControls }}
{{ end }} + {{ m := map("foo", "bar") }} + {{ range i, p := posts }} + {{ m = map("post_cur", p, "post_userName", post_getUserName(p, .), "post_text", post_getText(p, .), + "post_overrideLine", post_getOverrideLine(p, .), "post_overrideLink", post_getOverrideLink(p, post_topicPermalink)) }} + {{ .SubRender2("singlepost.jet", m) | raw }} + {{ if advancedControls }} +
+ + + + +
+ {{ end }} + {{ if pin == p.Num }}
{{ end }} + {{ end }} + {{ if advancedControls }}
{{ end }}
@@ -104,7 +122,7 @@
-

Post Message in "{{ topicName }}":

+

Post Message in "{{ topicName | raw }}":

diff --git a/ui/views/singlepost.jet b/ui/views/singlepost.jet index 8ef8419..4a6afb1 100644 --- a/ui/views/singlepost.jet +++ b/ui/views/singlepost.jet @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. *} -
+
{{ post_cur.Num }} of