There aren't any topics in this forum yet.`)
+var forum_40 []byte = []byte(` Start one?`)
+var forum_42 []byte = []byte(`
`)
+var forum_43 []byte = []byte(`
`)
diff --git a/template_topics.go b/template_topics.go
index 211401af..eaa49003 100644
--- a/template_topics.go
+++ b/template_topics.go
@@ -76,9 +76,9 @@ w.Write(topics_3)
}
}
w.Write(topics_4)
-if item.Avatar != "" {
+if item.Creator.Avatar != "" {
w.Write(topics_5)
-w.Write([]byte(item.Avatar))
+w.Write([]byte(item.Creator.Avatar))
w.Write(topics_6)
}
w.Write(topics_7)
@@ -98,23 +98,38 @@ w.Write([]byte(item.ForumName))
w.Write(topics_14)
}
w.Write(topics_15)
-w.Write([]byte(item.UserLink))
+w.Write([]byte(item.Creator.Link))
w.Write(topics_16)
-w.Write([]byte(item.CreatedByName))
+w.Write([]byte(item.Creator.Name))
w.Write(topics_17)
if item.Is_Closed {
w.Write(topics_18)
}
+if item.Sticky {
w.Write(topics_19)
}
-} else {
w.Write(topics_20)
-if tmpl_topics_vars.CurrentUser.Perms.CreateTopic {
+if item.LastUser.Avatar != "" {
w.Write(topics_21)
-}
+w.Write([]byte(item.LastUser.Avatar))
w.Write(topics_22)
}
w.Write(topics_23)
+w.Write([]byte(item.LastUser.Link))
+w.Write(topics_24)
+w.Write([]byte(item.LastUser.Name))
+w.Write(topics_25)
+w.Write([]byte(item.LastReplyAt))
+w.Write(topics_26)
+}
+} else {
+w.Write(topics_27)
+if tmpl_topics_vars.CurrentUser.Perms.CreateTopic {
+w.Write(topics_28)
+}
+w.Write(topics_29)
+}
+w.Write(topics_30)
w.Write(footer_0)
if tmpl_topics_vars.Header.Widgets.RightSidebar != "" {
w.Write(footer_1)
diff --git a/templates.go b/templates.go
index 4bdf5a21..403e848b 100644
--- a/templates.go
+++ b/templates.go
@@ -13,6 +13,7 @@ import (
"text/template/parse"
)
+// TO-DO: Turn this file into a library
var ctemplates []string
var tmpl_ptr_map map[string]interface{} = make(map[string]interface{})
var text_overlap_list map[string]int
@@ -58,6 +59,10 @@ type CTemplateSet struct
}
func (c *CTemplateSet) compile_template(name string, dir string, expects string, expectsInt interface{}, varList map[string]VarItem) (out string) {
+ if dev.DebugMode {
+ fmt.Println("Compiling template '" + name + "'")
+ }
+
c.dir = dir
c.doImports = true
c.funcMap = map[string]interface{}{
@@ -354,9 +359,14 @@ func (c *CTemplateSet) compile_subswitch(varholder string, holdreflect reflect.V
}
}
+ if !cur.IsValid() {
+ panic(varholder + varbit + "^\n" + "Invalid value. Maybe, it doesn't exist?")
+ }
+
cur = cur.FieldByName(id)
if cur.Kind() == reflect.Interface {
cur = cur.Elem()
+ // TO-DO: Surely, there's a better way of detecting this?
/*if cur.Kind() == reflect.String && cur.Type().Name() != "string" {
varbit = "string(" + varbit + "." + id + ")"*/
//if cur.Kind() == reflect.String && cur.Type().Name() != "string" {
@@ -800,6 +810,21 @@ func (c *CTemplateSet) compile_if_varsub(varname string, varholder string, templ
continue
}
+ // TO-DO: Fix this up so that it works for regular pointers and not just struct pointers. Ditto for the other cur.Kind() == reflect.Ptr we have in this file
+ if cur.Kind() == reflect.Ptr {
+ if dev.SuperDebug {
+ fmt.Println("Looping over pointer")
+ }
+ for cur.Kind() == reflect.Ptr {
+ cur = cur.Elem()
+ }
+
+ if dev.SuperDebug {
+ fmt.Println("Data Kind:",cur.Kind().String())
+ fmt.Println("Field Bit:",bit)
+ }
+ }
+
cur = cur.FieldByName(bit)
if cur.Kind() == reflect.Interface {
cur = cur.Elem()
diff --git a/templates/forum.html b/templates/forum.html
index 9c798209..5af2066c 100644
--- a/templates/forum.html
+++ b/templates/forum.html
@@ -15,15 +15,23 @@
{{end}}
- {{range .ItemList}}
-
+ {{range .ItemList}}
+ {{.PostCount}} replies {{.LastReplyAt}}{{.Title}}
- Starter: {{.CreatedByName}}
- {{if .Is_Closed}} | 🔒︎{{end}}
+ Starter: {{.Creator.Name}}
+ {{/** TO-DO: Avoid the double '|' when both .Is_Closed and .Sticky are set to true. We could probably do this with CSS **/}}
+ {{if .Is_Closed}} | 🔒︎{{end}}
+ {{if .Sticky}} | 📍︎{{end}}
+
+
+ {{.PostCount}} replies {{.LastReplyAt}}{{.Title}} {{if .ForumName}}{{.ForumName}}{{end}}
- Starter: {{.CreatedByName}}
- {{if .Is_Closed}} | 🔒︎{{end}}
+ Starter: {{.Creator.Name}}
+ {{/** TO-DO: Avoid the double '|' when both .Is_Closed and .Sticky are set to true. We could probably do this with CSS **/}}
+ {{if .Is_Closed}} | 🔒︎{{end}}
+ {{if .Sticky}} | 📍︎{{end}}
+
+