Mercurial > kallithea
diff rhodecode/templates/changeset/changeset_file_comment.html @ 2286:9265958e33bb codereview
Show changes of status inside comments
- comments that change status are now associated with status object, and showed in comments blocks
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 17 May 2012 00:02:52 +0200 |
| parents | 76947224bf27 |
| children | d3f1b71099ab |
line wrap: on
line diff
--- a/rhodecode/templates/changeset/changeset_file_comment.html Wed May 16 23:17:13 2012 +0200 +++ b/rhodecode/templates/changeset/changeset_file_comment.html Thu May 17 00:02:52 2012 +0200 @@ -7,17 +7,24 @@ <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}"> <div class="comment-wrapp"> <div class="meta"> - <span class="user"> - <img src="${h.gravatar_url(co.author.email, 20)}" /> + <div style="float:left"> <img src="${h.gravatar_url(co.author.email, 20)}" /> </div> + <div class="user"> ${co.author.username} - </span> - <span class="date"> + </div> + <div class="date"> ${h.age(co.modified_at)} - </span> + </div> + %if co.status_change: + <div style="float:left" class="changeset-status-container"> + <div style="float:left;padding:0px 2px 0px 2px"><span style="font-size: 18px;">›</span></div> + <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change.status_lbl}</div> + <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change.status))}" /></div> + </div> + %endif %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id: - <span class="buttons"> + <div class="buttons"> <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span> - </span> + </div> %endif </div> <div class="text">