diff --git a/mssql.go b/mssql.go index 473059ca..2df58dde 100644 --- a/mssql.go +++ b/mssql.go @@ -73,7 +73,7 @@ func initMSSQL() (err error) { // TODO: Is there a less noisy way of doing this for tests? /*log.Print("Preparing getActivityFeedByWatcher statement.") - stmts.getActivityFeedByWatcherStmt, err = db.Prepare("SELECT activity_stream_matches.asid, activity_stream.actor, activity_stream.targetUser, activity_stream.event, activity_stream.elementType, activity_stream.elementID FROM [activity_stream_matches] INNER JOIN [activity_stream] ON activity_stream_matches.asid = activity_stream.asid AND activity_stream_matches.watcher != activity_stream.actor WHERE [watcher] = ? ORDER BY activity_stream.asid DESC OFFSET 0 ROWS FETCH NEXT 16 ROWS ONLY") + stmts.getActivityFeedByWatcherStmt, err = db.Prepare("SELECT activity_stream_matches.asid, activity_stream.actor, activity_stream.targetUser, activity_stream.event, activity_stream.elementType, activity_stream.elementID, activity_stream.createdAt FROM [activity_stream_matches] INNER JOIN [activity_stream] ON activity_stream_matches.asid = activity_stream.asid AND activity_stream_matches.watcher != activity_stream.actor WHERE [watcher] = ? ORDER BY activity_stream.asid DESC OFFSET 0 ROWS FETCH NEXT 16 ROWS ONLY") if err != nil { return err } diff --git a/templates/header.html b/templates/header.html index c2c81a5d..092c8d35 100644 --- a/templates/header.html +++ b/templates/header.html @@ -26,7 +26,7 @@ - {{if not .CurrentUser.IsSuperMod}}{{end}}{{flush}} + {{/**{{if not .CurrentUser.IsSuperMod}}{{end}}**/}}{{flush}}
{{/****/}}
{{dock "leftOfNav" .Header }}
@@ -40,7 +40,7 @@
-
+
{{/****/}} {{/** TODO: Make this a separate template and load it via the theme docks, here for now so we can rapidly prototype the Nox theme **/}} diff --git a/templates/topic_alt.html b/templates/topic_alt.html index d6ee7373..2be3ac21 100644 --- a/templates/topic_alt.html +++ b/templates/topic_alt.html @@ -27,7 +27,7 @@ {{end}} {{.Topic.ViewCount}} {{/** TODO: Inline this CSS **/}} - {{if .Topic.IsClosed}}🔒︎{{end}} + {{if .Topic.IsClosed}}🔒︎{{end}}
@@ -89,7 +89,7 @@
{{if .CurrentUser.Loggedin}} - {{if .CurrentUser.Perms.LikeItem}}{{end}} + {{if .CurrentUser.Perms.LikeItem}}{{end}} {{if not .Topic.IsClosed or .CurrentUser.Perms.CloseTopic}} {{if .CurrentUser.Perms.EditTopic}}{{end}} diff --git a/templates/topic_alt_posts.html b/templates/topic_alt_posts.html index 68383ae2..e0b138c6 100644 --- a/templates/topic_alt_posts.html +++ b/templates/topic_alt_posts.html @@ -31,7 +31,7 @@
{{if $.CurrentUser.Loggedin}} - {{if $.CurrentUser.Perms.LikeItem}}{{end}} + {{if $.CurrentUser.Perms.LikeItem}}{{end}} {{if not $.Topic.IsClosed or $.CurrentUser.Perms.CloseTopic}} {{if $.CurrentUser.Perms.EditReply}}{{end}}