Mercurial > kallithea
changeset 3756:a7d69146021b
#819 review status is showed in the main changelog
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 05 Apr 2013 14:03:20 +0200 |
| parents | f5b204789b46 |
| children | e3857cbb6d10 |
| files | rhodecode/public/css/style.css rhodecode/templates/changelog/changelog.html |
| diffstat | 2 files changed, 22 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Mon Apr 15 02:11:06 2013 +0200 +++ b/rhodecode/public/css/style.css Fri Apr 05 14:03:20 2013 +0200 @@ -2521,6 +2521,16 @@ text-align: left; } +#graph_content .container .checkbox { + width: 12px; + font-size: 0.85em; +} + +#graph_content .container .status { + width: 14px; + font-size: 0.85em; +} + #graph_content .container .author { width: 105px; } @@ -2551,10 +2561,6 @@ position: relative; } -#graph_content #changesets td.checkbox { - width: 20px; -} - #graph_content .container .changeset_range { float: left; margin: 6px 3px;
--- a/rhodecode/templates/changelog/changelog.html Mon Apr 15 02:11:06 2013 +0200 +++ b/rhodecode/templates/changelog/changelog.html Fri Apr 05 14:03:20 2013 +0200 @@ -57,6 +57,18 @@ <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}"> <td class="checkbox"> ${h.checkbox(cs.raw_id,class_="changeset_range")} + <td class="status"> + %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])}"> + <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])}" /> + %endif + </div> + %endif </td> <td class="author"> <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>