taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding rich text for comments in issues, tasks and user stories

stable
Alejandro Alonso 2014-08-12 08:57:27 +02:00
parent 40a2211bc8
commit 290f5d8873
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/coffee/modules/common.coffee
View File

@ -139,7 +139,7 @@ ChangeDirective = ->
<% } %> <% } %>
<p class="comment"> <p class="comment">
<%- comment %> <%= comment %>
</p> </p>
<p class="date"> <p class="date">
<%- creationDate %> <%- creationDate %>
@ -162,7 +162,7 @@ ChangeDirective = ->
</span> </span>
</div> </div>
<p class="comment"> <p class="comment">
<%- comment %> <%= comment %>
</p> </p>
</div> </div>
""") """)
@ -280,7 +280,7 @@ ChangeDirective = ->
avatar: getUserAvatar(comment.user.pk) avatar: getUserAvatar(comment.user.pk)
userFullName: getUserFullName(comment.user.pk) userFullName: getUserFullName(comment.user.pk)
creationDate: moment(comment.created_at).format("YYYY/MM/DD HH:mm") creationDate: moment(comment.created_at).format("YYYY/MM/DD HH:mm")
comment: comment.comment comment: comment.comment_html
changesText: buildChangesText(comment) changesText: buildChangesText(comment)
hasChanges: countChanges(comment) > 0 hasChanges: countChanges(comment) > 0
}) })
@ -294,7 +294,7 @@ ChangeDirective = ->
avatar: getUserAvatar(change.user.pk) avatar: getUserAvatar(change.user.pk)
userFullName: getUserFullName(change.user.pk) userFullName: getUserFullName(change.user.pk)
creationDate: moment(change.created_at).format("YYYY/MM/DD HH:mm") creationDate: moment(change.created_at).format("YYYY/MM/DD HH:mm")
comment: change.comment comment: change.comment_html
}) })
$el.html(html) $el.html(html)

4
app/partials/views/modules/comments.jade
View File

@ -2,8 +2,8 @@
section.us-comments section.us-comments
div.add-comment(tg-check-permission, tg-toggle-comment, permission="modify_"+commentModel) div.add-comment(tg-check-permission, tg-toggle-comment, permission="modify_"+commentModel)
textarea(placeholder="Write here a new commet", ng-model="commentModel.comment") textarea(placeholder="Write here a new commet", ng-model="commentModel.comment", tg-markitup)
a.button.button-green(href="", title="Comment") Comment a.button.button-green.save-comment(href="", title="Comment") Comment
div.comment-list div.comment-list
//common.coffee //common.coffee
div.comment-single(tg-change, mode="comment", ng-model="comment", ng-repeat="comment in comments") div.comment-single(tg-change, mode="comment", ng-model="comment", ng-repeat="comment in comments")

2
app/styles/modules/common/comments.scss
View File

@ -6,7 +6,7 @@
margin-bottom: .5rem; margin-bottom: .5rem;
min-height: inherit; min-height: inherit;
} }
a { a.save-comment {
color: $white; color: $white;
float: right; float: right;
} }