Changeset - 6c505fe11f0f
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 13 years ago 2013-04-05 14:03:20
marcin@python-works.com
bring back review status in main changelog
2 files changed with 22 insertions and 4 deletions:
rhodecode/public/css/style.css
10
4
rhodecode/templates/changelog/changelog.html
12
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -2476,130 +2476,136 @@ h3.files_location {
 
}
 

			




	
	
	
		
 
#graph_nodes {

			




	
	
	
		
 
    position: absolute;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content,

			




	
	
	
		
 
#graph .info_box,

			




	
	
	
		
 
#graph .container_header {

			




	
	
	
		
 
    margin-left: 100px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph .container_header {

			




	
	
	
		
 
    padding: 10px;

			




	
	
	
		
 
    height: 25px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #rev_range_container {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    margin: 0px 0px 0px 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #rev_range_clear {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    margin: 0px 0px 0px 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets {

			




	
	
	
		
 
    table-layout: fixed;

			




	
	
	
		
 
    border-collapse: collapse;

			




	
	
	
		
 
    border-left: none;

			




	
	
	
		
 
    border-right: none;

			




	
	
	
		
 
    border-color: #cdcdcd;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets td {

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    text-overflow: ellipsis;

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
    height: 31px;

			




	
	
	
		
 
    border-color: #cdcdcd;

			




	
	
	
		
 
    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;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .hash {

			




	
	
	
		
 
    width: 100px;

			




	
	
	
		
 
    font-size: 0.85em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets .container .date {

			




	
	
	
		
 
    width: 76px;

			




	
	
	
		
 
    color: #666;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets .container .right {

			




	
	
	
		
 
    width: 120px;

			




	
	
	
		
 
    padding-right: 0px;

			




	
	
	
		
 
    overflow: visible;

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .mid {

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .log-container {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets td.checkbox {

			




	
	
	
		
 
    width: 20px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .changeset_range {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    margin: 6px 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .author img {

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .author .user {

			




	
	
	
		
 
    color: #444444;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .mid .message {

			




	
	
	
		
 
    white-space: pre-wrap;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    height: 1.1em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .extra-container {

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    position: absolute;

			




	
	
	
		
 
    top: -15px;

			




	
	
	
		
 
    right: 0;

			




	
	
	
		
 
    padding-left: 5px;

			




	
	
	
		
 
    background: #FFFFFF;

			




	
	
	
		
 
    height: 41px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .comments-container,

			




	
	
	
		
 
#graph_content .logtags {

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .comments-container {

			




	
	
	
		
 
    margin: 0.8em 0;

			




	
	
	
		
 
    margin-right: 0.5em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content  .tagcontainer {

			




	
	
	
		
 
    width: 80px;

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
    float: right;

			




        

    


    
    

    

        

                

                    rhodecode/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -12,96 +12,108 @@ ${_('%s Changelog') % c.repo_name} &midd

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.context_bar('changelog')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        % if c.pagination:

			




	
	
	
		
 
            <div id="graph">

			




	
	
	
		
 
                <div class="info_box" style="clear: both;padding: 10px 6px;min-height: 12px;text-align: right;">

			




	
	
	
		
 
                    <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>

			




	
	
	
		
 
                    <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>

			




	
	
	
		
 

			




	
	
	
		
 
                    %if c.rhodecode_db_repo.fork:

			




	
	
	
		
 
                        <a id="compare_fork" title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default',merge=1)}" class="ui-btn small">${_('Compare fork with parent')}</a>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                    %if h.is_hg(c.rhodecode_repo):

			




	
	
	
		
 
                    <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="ui-btn small">${_('Open new pull request')}</a>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="container_header">

			




	
	
	
		
 
                    ${h.form(h.url.current(),method='get')}

			




	
	
	
		
 
                    <div style="float:left">

			




	
	
	
		
 
                        ${h.submit('set',_('Show'),class_="ui-btn")}

			




	
	
	
		
 
                        ${h.text('size',size=1,value=c.size)}

			




	
	
	
		
 
                        ${_('revisions')}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    ${h.end_form()}

			




	
	
	
		
 
                    <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div id="graph_nodes">

			




	
	
	
		
 
                    <canvas id="graph_canvas"></canvas>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div id="graph_content">

			




	
	
	
		
 

			




	
	
	
		
 
                <table id="changesets">

			




	
	
	
		
 
                <tbody>

			




	
	
	
		
 
                %for cnt,cs in enumerate(c.pagination):

			




	
	
	
		
 
                    <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)}"/>

			




	
	
	
		
 
                            <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">

			




	
	
	
		
 
                            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">

			




	
	
	
		
 
                                <span class="changeset_hash">${h.show_id(cs)}</span>

			




	
	
	
		
 
                            </a>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="date">

			




	
	
	
		
 
                            <div class="date">${h.age(cs.date,True)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="mid">

			




	
	
	
		
 
                            <div class="log-container">

			




	
	
	
		
 
                                <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                                <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>

			




	
	
	
		
 
                                <div class="extra-container">

			




	
	
	
		
 
                                    %if c.comments.get(cs.raw_id,[]):

			




	
	
	
		
 
                                        <div class="comments-container">

			




	
	
	
		
 
                                            <div class="comments-cnt" title="${('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>

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if h.is_hg(c.rhodecode_repo):

			




	
	
	
		
 
                                        %for book in cs.bookmarks:

			




	
	
	
		
 
                                            <div class="bookbook" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                                                ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        %endfor

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %for tag in cs.tags:

			




	
	
	
		
 
                                        <div class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                                            ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endfor

			




	
	
	
		
 
                                    %if (not c.branch_name) and cs.branch:

			




	
	
	
		
 
                                        <div class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




	
	
	
		
 
                                            ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.