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

Minor fixes with markdown texts in 'Comments' and 'Activity' tabs

stable
David Barragán Merino 2014-08-20 11:25:10 +02:00
parent 6201415452
commit f59c7726c5
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ ChangeDirective = ->
</a> </a>
</div> </div>
<div class="comment-content"> <div class="comment-content">
<a class="username" href="TODO" title="<%- userFullName %>"> <a class="username" href="" title="<%- userFullName %>">
<%- userFullName %> <%- userFullName %>
</a> </a>
<% if(hasChanges){ %> <% if(hasChanges){ %>
@ -138,12 +138,12 @@ ChangeDirective = ->
</div> </div>
<% } %> <% } %>
<p class="comment"> <div class="comment wysiwyg">
<%= comment %> <%= comment %>
</p> </div>
<p class="date"> <div class="date">
<%- creationDate %> <%- creationDate %>
</p> </div>
</div> </div>
""") """)
changeBaseTemplate = _.template(""" changeBaseTemplate = _.template("""
@ -154,16 +154,16 @@ ChangeDirective = ->
</div> </div>
<div class="activity-content"> <div class="activity-content">
<div class="activity-username"> <div class="activity-username">
<a class="username" href="TODO" title="<%- userFullName %>"> <a class="username" href="" title="<%- userFullName %>">
<%- userFullName %> <%- userFullName %>
</a> </a>
<span class="date"> <span class="date">
<%- creationDate %> <%- creationDate %>
</span> </span>
</div> </div>
<p class="comment"> <div class="comment wysiwyg">
<%= comment %> <%= comment %>
</p> </div>
</div> </div>
""") """)
standardChangeFromToTemplate = _.template(""" standardChangeFromToTemplate = _.template("""
@ -310,12 +310,12 @@ ChangeDirective = ->
prettyPrintModification = (value) -> prettyPrintModification = (value) ->
if typeIsArray(value) if typeIsArray(value)
if value.length == 0 if value.length == 0
#TODO i18n #TODO i18n
return "None" return "None"
else return value.join(", ")
return value.join(", ")
if value == "" if value == ""
#TODO i18n
return "None" return "None"
return value return value

8
app/partials/views/modules/activity.jade
View File

@ -1,6 +1,8 @@
section.us-activity.hidden section.us-activity.hidden
//- modules/common.coffee - ChangeDirective
div.activity-single(tg-change, ng-model="change", mode="activity", ng-repeat="change in history") div.activity-single(tg-change, ng-model="change", mode="activity", ng-repeat="change in history")
//a.more-activity(href="", title="show more comments") //- TODO
// span show previous activity //- a.more-activity(href="", title="show more comments")
// span.prev-activity-num (3 more) //- span show previous activity
//- span.prev-activity-num (3 more)

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

@ -5,9 +5,10 @@ section.us-comments
textarea(placeholder="Write here a new commet", ng-model="commentModel.comment", tg-markitup) textarea(placeholder="Write here a new commet", ng-model="commentModel.comment", tg-markitup)
a.button.button-green.save-comment(href="", title="Comment") Comment a.button.button-green.save-comment(href="", title="Comment") Comment
div.comment-list div.comment-list
//common.coffee //- modules/common.coffee - ChangeDirective
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")
//a.more-comments(href="", title="show more comments") //- TODO
//span show previous comments //- a.more-comments(href="", title="show more comments")
//span.prev-comments-num (3 more) //- span show previous comments
//- span.prev-comments-num (3 more)