jyapayne/nimforum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compiles with the latest compiler version

Browse source
This commit is contained in:
Araq 2014-07-10 00:19:22 +02:00
commit 42e74d230d
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
forum.nim
View file

@ -8,7 +8,9 @@
import import
os, strutils, times, md5, strtabs, cgi, math, db_sqlite, matchers, os, strutils, times, md5, strtabs, cgi, math, db_sqlite, matchers,
rst, rstgen, captchas, sockets, scgi, jester, htmlgen rst, rstgen, captchas, sockets, scgi, jester
from htmlgen import tr, th, td, span
const const
unselectedThread = -1 unselectedThread = -1
@ -500,8 +502,8 @@ proc genPagenumNav(c: var TForumData, stats: TForumStats): string =
firstTag = span("First") firstTag = span("First")
prevTag = span("Prev") prevTag = span("Prev")
else: else:
firstTag = a(href=firstUrl, "First") firstTag = htmlgen.a(href=firstUrl, "First")
prevTag = a(href=prevUrl, "Prev") prevTag = htmlgen.a(href=prevUrl, "Prev")
result.add(htmlgen.`div`(class = "left", result.add(htmlgen.`div`(class = "left",
firstTag, firstTag,
prevTag)) prevTag))
@ -512,8 +514,8 @@ proc genPagenumNav(c: var TForumData, stats: TForumStats): string =
lastTag = span("Last") lastTag = span("Last")
nextTag = span("Next") nextTag = span("Next")
else: else:
lastTag = a(href=lastUrl, "Last") lastTag = htmlgen.a(href=lastUrl, "Last")
nextTag = a(href=nextUrl, "Next") nextTag = htmlgen.a(href=nextUrl, "Next")
result.add(htmlgen.`div`(class = "right", result.add(htmlgen.`div`(class = "right",
nextTag, nextTag,
lastTag)) lastTag))
@ -530,7 +532,7 @@ proc genPagenumNav(c: var TForumData, stats: TForumStats): string =
else: else:
pageUrl = c.req.makeUri(firstUrl & "/" & $(i)) pageUrl = c.req.makeUri(firstUrl & "/" & $(i))
pages.add(a(href = pageUrl, $(i))) pages.add(htmlgen.a(href = pageUrl, $(i)))
result.add(htmlgen.`div`(class = "middle", result.add(htmlgen.`div`(class = "middle",
pages)) pages))
@ -569,7 +571,7 @@ proc genPagenumLocalNav(c: var TForumData, thrid: int): string =
if totalPagesInThread <= 1: return if totalPagesInThread <= 1: return
var i = 1 var i = 1
while i <= totalPagesInThread: while i <= totalPagesInThread:
result.add(a(href=c.req.makeUri(currentThrURL & $i), $i)) result.add(htmlgen.a(href=c.req.makeUri(currentThrURL & $i), $i))
if i == hmpp and totalPagesInThread-i > hmpp: if i == hmpp and totalPagesInThread-i > hmpp:
result.add(span("...")) result.add(span("..."))
# skip to the last 3 # skip to the last 3
@ -606,7 +608,7 @@ proc genProfile(c: var TForumData, ui: TUserInfo): string =
else: getGMTime(GetTime()) else: getGMTime(GetTime())
result.add(htmlgen.`div`(id = "info", result.add(htmlgen.`div`(id = "info",
table( htmlgen.table(
tr( tr(
th("Nickname"), th("Nickname"),
td(ui.nick) td(ui.nick)
@ -755,7 +757,7 @@ template handleError(action: string, topText: string, isEdit: bool): stmt =
body.add genPostPreview(c, @"subject", @"content", body.add genPostPreview(c, @"subject", @"content",
c.userName, $getGMTime(getTime())) c.userName, $getGMTime(getTime()))
body.add genFormPost(c, action, topText, reuseText, reuseText, isEdit) body.add genFormPost(c, action, topText, reuseText, reuseText, isEdit)
resp genMain(c, body, "Nimrod Forum - Error") resp genMain(c, body(), "Nimrod Forum - Error")
post "/dologin": post "/dologin":
createTFD() createTFD()