Mercurial > kallithea
changeset 2239:493e03a4d268 codereview
added changeset status into changelog view
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 05 May 2012 22:59:43 +0200 |
| parents | 09fd90d91b6a |
| children | 87664e60bbc0 |
| files | rhodecode/lib/helpers.py rhodecode/public/css/style.css rhodecode/templates/changelog/changelog.html rhodecode/templates/changeset/changeset.html |
| diffstat | 4 files changed, 27 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/helpers.py Sat May 05 22:22:53 2012 +0200 +++ b/rhodecode/lib/helpers.py Sat May 05 22:59:43 2012 +0200 @@ -334,7 +334,7 @@ #============================================================================== from rhodecode.lib.vcs.utils import author_name, author_email from rhodecode.lib.utils2 import credentials_filter, age as _age -from rhodecode.model.db import User +from rhodecode.model.db import User, ChangesetStatus age = lambda x: _age(x) capitalize = lambda x: x.capitalize() @@ -943,3 +943,7 @@ def changeset_status(repo, revision): return ChangesetStatusModel().get_status(repo, revision) + + +def changeset_status_lbl(changeset_status): + return dict(ChangesetStatus.STATUSES).get(changeset_status)
--- a/rhodecode/public/css/style.css Sat May 05 22:22:53 2012 +0200 +++ b/rhodecode/public/css/style.css Sat May 05 22:59:43 2012 +0200 @@ -2453,11 +2453,25 @@ float:right; height:14px; } +.code-header .changeset-status-container{ + float:left; + padding:2px 0px 0px 2px; +} .right .changeset-status-container .changeset-status-lbl{ color: rgb(136, 136, 136); float: left; padding: 0px 4px 0px 0px; } +.code-header .changeset-status-container .changeset-status-lbl{ + float: left; + padding: 0px 4px 0px 0px; +} +.right .changeset-status-container .changeset-status-ico{ + float: left; +} +.code-header .changeset-status-container .changeset-status-ico{ + float: left; +} .right .comments-container{ padding-right: 5px; margin-top:1px;
--- a/rhodecode/templates/changelog/changelog.html Sat May 05 22:22:53 2012 +0200 +++ b/rhodecode/templates/changelog/changelog.html Sat May 05 22:59:43 2012 +0200 @@ -77,8 +77,8 @@ </div> <div class="changeset-status-container"> %if c.statuses.get(cs.raw_id): - <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /> - <div class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div> + <div title="${_('Changeset status')}" class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div> + <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /></div> %endif </div> </div>
--- a/rhodecode/templates/changeset/changeset.html Sat May 05 22:22:53 2012 +0200 +++ b/rhodecode/templates/changeset/changeset.html Sat May 05 22:59:43 2012 +0200 @@ -33,6 +33,12 @@ <div class="date"> ${c.changeset.date} </div> + <div class="changeset-status-container"> + %if c.statuses: + <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div> + <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[0])}" /></div> + %endif + </div> <div class="diff-actions"> <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a> <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>