Mercurial > kallithea
changeset 4056:458fd829aa20
pull requests: add a 'Changeset status' comment on changeset status
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 12 Jun 2013 12:20:57 +0200 |
| parents | 9314f2645161 |
| children | 6eaee7e2829e |
| files | rhodecode/templates/changelog/changelog.html rhodecode/templates/changelog/changelog_summary_data.html rhodecode/templates/compare/compare_cs.html |
| diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/templates/changelog/changelog.html Thu Jun 27 23:28:56 2013 +0200 +++ b/rhodecode/templates/changelog/changelog.html Wed Jun 12 12:20:57 2013 +0200 @@ -75,11 +75,13 @@ %if c.statuses.get(cs.raw_id): <div class="changeset-status-ico"> %if c.statuses.get(cs.raw_id)[2]: - <a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> + <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /> </a> %else: - <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /> + <a class="tooltip" title="${_('Changeset status: %s') % c.statuses.get(cs.raw_id)[0]}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}"> + <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /> + </a> %endif </div> %endif @@ -103,7 +105,7 @@ <div class="extra-container"> %if c.comments.get(cs.raw_id): <div class="comments-container"> - <div class="comments-cnt" title="${('comments')}"> + <div class="comments-cnt" title="${_('Changeset has comments')}"> <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}"> ${len(c.comments[cs.raw_id])} </a>
--- a/rhodecode/templates/changelog/changelog_summary_data.html Thu Jun 27 23:28:56 2013 +0200 +++ b/rhodecode/templates/changelog/changelog_summary_data.html Wed Jun 12 12:20:57 2013 +0200 @@ -25,7 +25,7 @@ %if c.statuses.get(cs.raw_id): <div class="changeset-status-ico"> %if c.statuses.get(cs.raw_id)[2]: - <a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> + <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /> </a> %else:
--- a/rhodecode/templates/compare/compare_cs.html Thu Jun 27 23:28:56 2013 +0200 +++ b/rhodecode/templates/compare/compare_cs.html Wed Jun 12 12:20:57 2013 +0200 @@ -8,7 +8,7 @@ <tr> <td> %if cs.raw_id in c.statuses: - <div title="${c.statuses[cs.raw_id][1]}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" /></div> + <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" /></div> %endif </td> <td><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>