replaced SubRender mechanism with standard Jet include directives
This commit is contained in:
+3
-3
@@ -90,16 +90,16 @@
|
||||
{{ end }}
|
||||
{{ .SetScratch("__menu", m) }}
|
||||
{{ if m.Tag == "community" }}
|
||||
{{ .SubRender("menu_left_comm.jet") | raw }}
|
||||
{{ include "menu_left_comm.jet" }}
|
||||
{{ else }}
|
||||
{{ .SubRender("menu_left.jet") | raw }}
|
||||
{{ include "menu_left.jet" }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
</div>
|
||||
|
||||
<!-- MAIN CONTENT -->
|
||||
<div class="flex-1 bg-white">
|
||||
{{ .SubRender(amsterdam_innerPage) | raw }}
|
||||
{{ include amsterdam_innerPage }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
+11
-4
@@ -99,11 +99,18 @@
|
||||
<!-- Messages -->
|
||||
<div class="space-y-6 mb-8">
|
||||
{{ if advancedControls }}<div class="flex gap-4">{{ end }}
|
||||
{{ m := map("foo", "bar") }}
|
||||
{{ post_cur := nil }}
|
||||
{{ post_userName := "" }}
|
||||
{{ post_text := "" }}
|
||||
{{ post_overrideLine := "" }}
|
||||
{{ post_overrideLink := "" }}
|
||||
{{ 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 }}
|
||||
{{ 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) }}
|
||||
{{ include "singlepost.jet" }}
|
||||
{{ if advancedControls }}
|
||||
<div class="flex flex-col gap-2">
|
||||
{{ if canHide }}
|
||||
|
||||
+11
-2
@@ -19,11 +19,20 @@
|
||||
|
||||
<!-- Messages -->
|
||||
<div class="space-y-6 mb-8">
|
||||
{{ m := map("foo", "bar") }}
|
||||
{{ post_cur := nil }}
|
||||
{{ post_userName := "" }}
|
||||
{{ post_text := "" }}
|
||||
{{ post_overrideLine := "" }}
|
||||
{{ post_overrideLink := "" }}
|
||||
{{ 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 }}
|
||||
{{ 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) }}
|
||||
{{ include "singlepost.jet" }}
|
||||
{{ end }}
|
||||
</div>
|
||||
|
||||
|
||||
+3
-4
@@ -49,10 +49,9 @@
|
||||
|
||||
<!-- RIGHT SIDEBAR -->
|
||||
<div class="w-80 p-4">
|
||||
{{ ctxt := . }}
|
||||
{{ range sideboxes }}
|
||||
{{ ctxt.SetScratch("__sidebox", .) }}
|
||||
{{ ctxt.SubRender(.TemplateName) | raw }}
|
||||
{{ range i, s := sideboxes }}
|
||||
{{ .SetScratch("__sidebox", s) }}
|
||||
{{ include s.TemplateName }}
|
||||
{{ end }}
|
||||
|
||||
{{ if !.CurrentUser().IsAnon }}
|
||||
|
||||
Reference in New Issue
Block a user