kallithea Changeset - 493e03a4d268

Changeset - 493e03a4d268

Parent rev.

Child rev.

[Not reviewed]

codereview

0 4 0

Marcin Kuzminski - 14 years ago 2012-05-05 22:59:43
marcin@python-works.com

added changeset status into changelog view

4 files changed with 27 insertions and 3 deletions:

rhodecode/lib/helpers.py

rhodecode/public/css/style.css

rhodecode/templates/changelog/changelog.html

rhodecode/templates/changeset/changeset.html

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -331,13 +331,13 @@ flash = _Flash() @@
 #==============================================================================
 # SCM FILTERS available via h.
 #==============================================================================
 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()
 email = author_email
 short_id = lambda x: x[:12]
 hide_credentials = lambda x: ''.join(credentials_filter(x))
@@ @@ -940,6 +940,10 @@ def rst_w_mentions(source): @@
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst_with_mentions(source))
 def changeset_status(repo, revision):
     return ChangesetStatusModel().get_status(repo, revision)
 def changeset_status_lbl(changeset_status):
     return dict(ChangesetStatus.STATUSES).get(changeset_status)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2450,17 +2450,31 @@ h3.files_location { @@
 .right .changeset-status-container{
     padding-right: 5px;
     margin-top:1px;
     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;
 	float:right;
 	height:14px;
+}

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -74,14 +74,14 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
                                               </a>
                                             </div>
                                         %endif
                                         </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>
 								   %if cs.parents:
 									%for p_cs in reversed(cs.parents):
 										<div class="parent">${_('Parent')}

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -30,12 +30,18 @@ @@
                 <div class="hash">
                  r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
                 </div>
                 <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>
                   ${c.ignorews_url(request.GET)}
                   ${c.context_url(request.GET)}
                 </div>

0 comments (0 inline, 0 general)