More changes

This commit is contained in:
FM1337 2017-06-22 14:38:01 -03:00
parent d52fe46e9a
commit 752e3cc682
5 changed files with 19 additions and 31 deletions

View File

@ -1,43 +1,43 @@
component Postable(post arn.Postable, viewUser *arn.User, highlightAuthorID string) component Postable(post arn.Postable, highlightAuthorID string)
.post.mountable(data-highlight=post.Author().ID == highlightAuthorID) .post.mountable(data-highlight=post.Author().ID == highlightAuthorID)
.post-author .post-author
Avatar(post.Author()) Avatar(post.Author())
//- if post.recipient && post.recipient.ID !== post.author.ID //- if post.recipient && post.recipient.ID !== post.author.ID
//- a.user.post-recipient(href="/+" + post.recipient.nick, title=post.recipient.nick) //- a.user.post-recipient(href="/+" + post.recipient.nick, title=post.recipient.nick)
//- img.user-image(src=post.recipient.avatar ? (post.recipient.avatar + "?s=100&r=x&d=mm") : "/images/elements/no-gravatar.svg", alt=post.recipient.nick) //- img.user-image(src=post.recipient.avatar ? (post.recipient.avatar + "?s=100&r=x&d=mm") : "/images/elements/no-gravatar.svg", alt=post.recipient.nick)
.post-content .post-content
div(id="render-" + post.ID())!= aero.Markdown(post.Text()) div(id="render-" + post.ID())!= aero.Markdown(post.Text())
//- if user && user.ID === post.authorId //- if user && user.ID === post.authorId
//- textarea.post-input.hidden(id="source-" + post.ID)= post.text //- textarea.post-input.hidden(id="source-" + post.ID)= post.text
//- a.post-save.hidden(id="save-" + post.ID, onclick=`$.saveEdit("${type.toLowerCase()}", "${post.ID}")`) //- a.post-save.hidden(id="save-" + post.ID, onclick=`$.saveEdit("${type.toLowerCase()}", "${post.ID}")`)
//- i.fa.fa-save //- i.fa.fa-save
//- span Save //- span Save
.post-toolbar(id="toolbar-" + post.ID()) .post-toolbar(id="toolbar-" + post.ID())
.spacer .spacer
.post-likes(id="likes-" + post.ID(), title="Likes")= len(post.Likes()) .post-likes(id="likes-" + post.ID(), title="Likes")= len(post.Likes())
//- if user != nil //- if user != nil
//- if user.ID !== post.authorId //- if user.ID !== post.authorId
//- - var liked = post.likes && post.likes.indexOf(user.ID) !== -1 //- - var liked = post.likes && post.likes.indexOf(user.ID) !== -1
//- a.post-tool.post-like(id="like-" + post.ID, onclick=`$.like("${type.toLowerCase()}", "${post.ID}")`, title="Like", class=liked ? "hidden" : ") //- a.post-tool.post-like(id="like-" + post.ID, onclick=`$.like("${type.toLowerCase()}", "${post.ID}")`, title="Like", class=liked ? "hidden" : ")
//- i.fa.fa-thumbs-up.fa-fw //- i.fa.fa-thumbs-up.fa-fw
//- a.post-tool.post-unlike(id="unlike-" + post.ID, onclick=`$.unlike("${type.toLowerCase()}", "${post.ID}")`, title="Unlike", class=!liked ? "hidden" : ") //- a.post-tool.post-unlike(id="unlike-" + post.ID, onclick=`$.unlike("${type.toLowerCase()}", "${post.ID}")`, title="Unlike", class=!liked ? "hidden" : ")
//- i.fa.fa-thumbs-down.fa-fw //- i.fa.fa-thumbs-down.fa-fw
//- if type === "Posts" || type === "Threads" //- if type === "Posts" || type === "Threads"
//- if user.ID === post.authorId //- if user.ID === post.authorId
//- a.post-tool.post-edit(onclick=`$.edit("${post.ID}")`, title="Edit") //- a.post-tool.post-edit(onclick=`$.edit("${post.ID}")`, title="Edit")
//- i.fa.fa-pencil.fa-fw //- i.fa.fa-pencil.fa-fw
if post.Type() != "Thread" if post.Type() != "Thread"
a.post-tool.post-permalink.ajax(href=post.Link(), title="Permalink") a.post-tool.post-permalink.ajax(href=post.Link(), title="Permalink")
Icon("link") Icon("link")
//- if type === "Messages" && user && (user.ID === post.authorId || user.ID === post.recipientId) //- if type === "Messages" && user && (user.ID === post.authorId || user.ID === post.recipientId)
//- a.post-tool.post-delete(onclick=`if(confirm("Do you really want to delete this ${typeSingular.toLowerCase()} from ${post.author.nick}?")) $.delete${typeSingular}("${post.ID}")`, title="Delete") //- a.post-tool.post-delete(onclick=`if(confirm("Do you really want to delete this ${typeSingular.toLowerCase()} from ${post.author.nick}?")) $.delete${typeSingular}("${post.ID}")`, title="Delete")
//- i.fa.fa-trash.fa-fw //- i.fa.fa-trash.fa-fw

View File

@ -2,17 +2,4 @@ component PostableList(postables []arn.Postable)
.thread .thread
.posts .posts
each post in postables each post in postables
.post Postable(post, "")
.post-author
Avatar(post.Author())
.post-content
p!= aero.Markdown(post.Text())
.post-toolbar
.spacer
.post-likes= len(post.Likes())
a.post-tool.post-permalink.ajax(href=post.Link(), title="Permalink")
Icon("link")
a.post-link.side-note.ajax(href=post.Link())= post.Title()

View File

@ -1,5 +1,5 @@
component Post(post *arn.Post) component Post(post *arn.Post)
Postable(post.ToPostable(), nil, "") Postable(post.ToPostable(), "")
.side-note .side-note
a.ajax(href=post.Thread().Link())= post.Thread().Title a.ajax(href=post.Thread().Link())= post.Thread().Title

View File

@ -68,6 +68,7 @@ component Profile(viewUser *arn.User, user *arn.User, animeList *arn.AnimeList,
else else
each thread in threads each thread in threads
ThreadLink(thread) ThreadLink(thread)
.profile-category.mountable
h3 h3
a.ajax(href="/+" + viewUser.Nick + "/posts", title="View all posts") Posts a.ajax(href="/+" + viewUser.Nick + "/posts", title="View all posts") Posts
if len(posts) == 0 if len(posts) == 0
@ -78,7 +79,7 @@ component Profile(viewUser *arn.User, user *arn.User, animeList *arn.AnimeList,
.post-author .post-author
Avatar(post.Author()) Avatar(post.Author())
.post-content .post-content
p!= aero.Markdown(post.Text) .mountable!= aero.Markdown(post.Text)
.post-toolbar.active .post-toolbar.active
.spacer .spacer
.post-likes= len(post.Likes) .post-likes= len(post.Likes)

View File

@ -3,7 +3,7 @@ component Thread(thread *arn.Thread, posts []*arn.Post)
.thread .thread
.posts .posts
Postable(thread.ToPostable(), nil, thread.Author().ID) Postable(thread.ToPostable(), thread.Author().ID)
each post in posts each post in posts
Postable(post.ToPostable(), nil, thread.Author().ID) Postable(post.ToPostable(), thread.Author().ID)