shithub: hell

Info  •  Files  •  Log  •  Branches

template directly in page renderer

--- a/pages.go

+++ b/pages.go

@@ -156,9 +156,14 @@

 	if err != nil {

 		fmt.Printf("Couldn't load status page: %s\n", err)

 	}

+	formatter := &StatusFormatter{hc: statusData.hc, postContext: statusData.hc.ctxref}

+	templater := newStatusTemplateRenderer(formatter)

 	for i := range statuses {

-		item := makePageItem(statusData.hc.renderAndIncrement(statusData.hc.ctxref, statuses[i]) + "\n")

+		formatter.status = statuses[i]

+		line, _ := templater.render("$standard_status")

+		item := makePageItem(line)

 		itemArray = append(itemArray, item)

+		justIncrementPostref(statusData.hc.ctxref, statuses[i])

 	}

 	return &itemArray

 }

@@ -188,8 +193,7 @@

 	noticeArray := noticeData.hc.RenderNotificationsArray(notices)

 	var itemArray []PageItem

 	for i := range noticeArray {

-		itemtext, _ := hyphenate(noticeArray[i])

-		item := makePageItem(itemtext + "\n")

+		item := makePageItem(noticeArray[i])

 		itemArray = append(itemArray, item)

 	}

 	noticeData.page.MinID = ""

-- 

⑨