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

Small fixes and adjustments to thread list.

Browse source
This commit is contained in:
Dominik Picheta 2018-05-09 19:16:12 +01:00
commit ca0de4d2ae
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
forum.nim
View file

@ -1050,9 +1050,10 @@ routes:
where thread = ?
order by creation asc limit 1;"""
const usersListQuery =
sql"""select distinct name, email, strftime('%s',lastOnline)
sql"""select distinct name, email, strftime('%s', lastOnline)
from person where id in
(select author from post where thread = ?);"""
(select author from post where thread = ?)
limit 5;""" # TODO: Order by most posts.
let thrCount = getValue(db, sql"select count(*) from thread;").parseInt()
let moreCount = max(0, thrCount - (start + count))

19
redesign/threadlist.nim
View file

@ -40,6 +40,7 @@ when defined(js):
img(src=user.avatarUrl, title=user.name)
if user.isOnline:
italic(class="avatar-presense online")
text " "
proc renderActivity(activity: int64): string =
let currentTime = getTime()
@ -66,11 +67,12 @@ when defined(js):
italic(class="fas fa-lock fa-xs")
text thread.topic
td():
tdiv(class="triangle",
style=style(
(StyleAttr.borderBottom, kstring"0.6rem solid " & thread.category.color)
)):
text thread.category.id
if thread.category.id.len > 0:
tdiv(class="triangle",
style=style(
(StyleAttr.borderBottom, kstring"0.6rem solid " & thread.category.color)
)):
text thread.category.id
genUserAvatars(thread.users)
td(): text $thread.replies
td(class=class({
@ -79,7 +81,7 @@ when defined(js):
"super-popular-text": thread.views > 5000
})):
if thread.views > 999:
text fmt"{thread.views/1000:.1f}"
text fmt"{thread.views/1000:.1f}k"
else:
text $thread.views
td(class=class({"text-success": isNew, "text-gray": not isNew})): # TODO: Colors.
@ -93,7 +95,7 @@ when defined(js):
tr:
th(text "Topic")
th(text "Category")
th(text "Users")
th(style=style((StyleAttr.width, kstring"8rem"))): text "Users"
th(text "Replies")
th(text "Views")
th(text "Activity")
@ -103,7 +105,8 @@ when defined(js):
let isLastVisit =
i+1 < list.threads.len and list.threads[i].activity < list.lastVisit
let isNew = thread.creation < list.lastVisit
genThread(thread, isNew, noBorder=isLastVisit)
genThread(thread, isNew,
noBorder=isLastVisit or i+1 == list.threads.len)
if isLastVisit:
tr(class="last-visit-separator"):
td(colspan="6"):