##// END OF EJS Templates
added changeset status into changelog view
marcink -
r2239:493e03a4 codereview
parent child Browse files
Show More
@@ -334,7 +334,7 b' flash = _Flash()'
334 #==============================================================================
334 #==============================================================================
335 from rhodecode.lib.vcs.utils import author_name, author_email
335 from rhodecode.lib.vcs.utils import author_name, author_email
336 from rhodecode.lib.utils2 import credentials_filter, age as _age
336 from rhodecode.lib.utils2 import credentials_filter, age as _age
337 from rhodecode.model.db import User
337 from rhodecode.model.db import User, ChangesetStatus
338
338
339 age = lambda x: _age(x)
339 age = lambda x: _age(x)
340 capitalize = lambda x: x.capitalize()
340 capitalize = lambda x: x.capitalize()
@@ -943,3 +943,7 b' def rst_w_mentions(source):'
943
943
944 def changeset_status(repo, revision):
944 def changeset_status(repo, revision):
945 return ChangesetStatusModel().get_status(repo, revision)
945 return ChangesetStatusModel().get_status(repo, revision)
946
947
948 def changeset_status_lbl(changeset_status):
949 return dict(ChangesetStatus.STATUSES).get(changeset_status)
@@ -2453,11 +2453,25 b' h3.files_location {'
2453 float:right;
2453 float:right;
2454 height:14px;
2454 height:14px;
2455 }
2455 }
2456 .code-header .changeset-status-container{
2457 float:left;
2458 padding:2px 0px 0px 2px;
2459 }
2456 .right .changeset-status-container .changeset-status-lbl{
2460 .right .changeset-status-container .changeset-status-lbl{
2457 color: rgb(136, 136, 136);
2461 color: rgb(136, 136, 136);
2458 float: left;
2462 float: left;
2459 padding: 0px 4px 0px 0px;
2463 padding: 0px 4px 0px 0px;
2460 }
2464 }
2465 .code-header .changeset-status-container .changeset-status-lbl{
2466 float: left;
2467 padding: 0px 4px 0px 0px;
2468 }
2469 .right .changeset-status-container .changeset-status-ico{
2470 float: left;
2471 }
2472 .code-header .changeset-status-container .changeset-status-ico{
2473 float: left;
2474 }
2461 .right .comments-container{
2475 .right .comments-container{
2462 padding-right: 5px;
2476 padding-right: 5px;
2463 margin-top:1px;
2477 margin-top:1px;
@@ -77,8 +77,8 b''
77 </div>
77 </div>
78 <div class="changeset-status-container">
78 <div class="changeset-status-container">
79 %if c.statuses.get(cs.raw_id):
79 %if c.statuses.get(cs.raw_id):
80 <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
80 <div title="${_('Changeset status')}" class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div>
81 <div class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div>
81 <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /></div>
82 %endif
82 %endif
83 </div>
83 </div>
84 </div>
84 </div>
@@ -33,6 +33,12 b''
33 <div class="date">
33 <div class="date">
34 ${c.changeset.date}
34 ${c.changeset.date}
35 </div>
35 </div>
36 <div class="changeset-status-container">
37 %if c.statuses:
38 <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div>
39 <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[0])}" /></div>
40 %endif
41 </div>
36 <div class="diff-actions">
42 <div class="diff-actions">
37 <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>
43 <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>
38 <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>
44 <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>
General Comments 0
You need to be logged in to leave comments. Login now