Changeset - 776097776185
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 8 years ago 2017-06-14 02:20:54
mads@kiilerich.com
changelog: fix location of tags after b99cd2bc7540 removed too much markup
2 files changed with 11 insertions and 4 deletions:
kallithea/public/css/style.css
9
4
kallithea/templates/changelog/changelog.html
2
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -1482,156 +1482,161 @@ BIN_FILENODE = 6
 
    height: 16px;
 
    margin-top: 7px;
 
    text-align: left;
 
}
 

			




	
	
	
		
 
#graph {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_nodes {

			




	
	
	
		
 
    position: absolute;

			




	
	
	
		
 
    width: 100px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content,

			




	
	
	
		
 
#graph_content_pr,

			




	
	
	
		
 
#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 {

			




	
	
	
		
 
    border-collapse: collapse;

			




	
	
	
		
 
    border: none;

			




	
	
	
		
 
    border-color: #cdcdcd;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
tr.mergerow > td.author .user,

			




	
	
	
		
 
tr.mergerow > td.mid > .message,

			




	
	
	
		
 
tr.mergerow > td.mid > .message > a,

			




	
	
	
		
 
tr.mergerow > td.mid .message,

			




	
	
	
		
 
tr.mergerow > td.mid .message > a,

			




	
	
	
		
 
tr.out-of-range > td.author .user,

			




	
	
	
		
 
tr.out-of-range > td.mid > .message,

			




	
	
	
		
 
tr.out-of-range > td.mid > .message > a {

			




	
	
	
		
 
tr.out-of-range > td.mid .message,

			




	
	
	
		
 
tr.out-of-range > td.mid .message > a {

			




	
	
	
		
 
    color: #aaa !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets td {

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    text-overflow: ellipsis;

			




	
	
	
		
 
    white-space: nowrap;

			




	
	
	
		
 
    height: 31px;

			




	
	
	
		
 
    border-color: #cdcdcd;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .checkbox-column {

			




	
	
	
		
 
    width: 14px;

			




	
	
	
		
 
    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_pr .compare_view_commits .expand_commit,

			




	
	
	
		
 
#graph_content .container .expand_commit {

			




	
	
	
		
 
    width: 24px;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
    color: #999;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#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;

			




	
	
	
		
 
    margin-top: 8px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container #singlerange,

			




	
	
	
		
 
#graph_content .container .changeset_range {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    margin: 2px 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .author img {

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .author .user {

			




	
	
	
		
 
    color: #444444;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .mid .message,

			




	
	
	
		
 
#graph_content_pr .compare_view_commits .message {

			




	
	
	
		
 
    white-space: pre-wrap;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    height: 1.2em;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content_pr .compare_view_commits .message {

			




	
	
	
		
 
    padding: 0 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .mid .message.expanded,

			




	
	
	
		
 
#graph_content_pr .compare_view_commits .message.expanded {

			




	
	
	
		
 
    height: auto;

			




	
	
	
		
 
    overflow: initial;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .extra-container {

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    position: absolute;

			




	
	
	
		
 
    top: -15px;

			




	
	
	
		
 
    right: 0;

			




	
	
	
		
 
    padding-left: 5px;

			




	
	
	
		
 
    background: #FFFFFF;

			




	
	
	
		
 
    height: 41px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#pull_request_overview .comments-container,

			




	
	
	
		
 
#changeset_compare_view_content .comments-container,

			




	
	
	
		
 
#graph_content .comments-container,

			




	
	
	
		
 
#shortlog_data .comments-container,

			




	
	
	
		
 
#graph_content .logtags {

			




	
	
	
		
 
    display: block;

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -64,151 +64,153 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 

			




	
	
	
		
 
                <div id="graph_nodes">

			




	
	
	
		
 
                    <canvas id="graph_canvas" style="width:0"></canvas>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div id="graph_content" style="${'margin: 0px' if c.changelog_for_path else ''}">

			




	
	
	
		
 

			




	
	
	
		
 
                <table class="table" id="changesets">

			




	
	
	
		
 
                <tbody>

			




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

			




	
	
	
		
 
                    <tr id="chg_${cnt+1}" class="container ${'mergerow' if len(cs.parents) > 1 else ''}">

			




	
	
	
		
 
                        <td class="checkbox-column">

			




	
	
	
		
 
                            %if c.changelog_for_path:

			




	
	
	
		
 
                                ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")}

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                                ${h.checkbox(cs.raw_id,class_="changeset_range")}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        <td class="status">

			




	
	
	
		
 
                          %if c.statuses.get(cs.raw_id):

			




	
	
	
		
 
                            <div class="changeset-status-ico">

			




	
	
	
		
 
                            %if c.statuses.get(cs.raw_id)[2]:

			




	
	
	
		
 
                              <a data-toggle="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

			




	
	
	
		
 
                                <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                              <a data-toggle="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}"

			




	
	
	
		
 
                                 href="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                                  <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                              </a>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="author">

			




	
	
	
		
 
                            ${h.gravatar(h.email_or_none(cs.author), size=16)}

			




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

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="hash">

			




	
	
	
		
 
                            ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), class_='changeset_hash')}

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="date">

			




	
	
	
		
 
                            <div class="date" data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="expand_commit" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
                            <i class="icon-align-left"></i>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="mid">

			




	
	
	
		
 
                            <div class="log-container">

			




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

			




	
	
	
		
 
                                <div class="extra-container">

			




	
	
	
		
 
                                    %if c.comments.get(cs.raw_id):

			




	
	
	
		
 
                                        <div class="comments-container">

			




	
	
	
		
 
                                            <div class="comments-cnt" data-toggle="tooltip" title="${_('Changeset has comments')}">

			




	
	
	
		
 
                                                <a href="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                                                    ${len(c.comments[cs.raw_id])}

			




	
	
	
		
 
                                                    <i class="icon-comment-discussion"></i>

			




	
	
	
		
 
                                                </a>

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.bumped:

			




	
	
	
		
 
                                        <span class="bumpedtag" title="Bumped">

			




	
	
	
		
 
                                            Bumped

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.divergent:

			




	
	
	
		
 
                                        <span class="divergenttag" title="Divergent">

			




	
	
	
		
 
                                            Divergent

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.extinct:

			




	
	
	
		
 
                                        <span class="extincttag" title="Extinct">

			




	
	
	
		
 
                                            Extinct

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.unstable:

			




	
	
	
		
 
                                        <span class="unstabletag" title="Unstable">

			




	
	
	
		
 
                                            Unstable

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if cs.phase:

			




	
	
	
		
 
                                        <span class="phasetag" title="Phase">

			




	
	
	
		
 
                                            ${cs.phase}

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                                        %for book in cs.bookmarks:

			




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

			




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

			




	
	
	
		
 
                                            </span>

			




	
	
	
		
 
                                        %endfor

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                    %for tag in cs.tags:

			




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

			




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

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endfor

			




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

			




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

			




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

			




	
	
	
		
 
                                        </span>

			




	
	
	
		
 
                                    %endif

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </tbody>

			




	
	
	
		
 
                </table>

			




	
	
	
		
 

			




	
	
	
		
 
                <input type="checkbox" id="singlerange" style="display:none"/>

			




	
	
	
		
 

			




	
	
	
		
 
                </div>

			




	
	
	
		
 

			




	
	
	
		
 
                <ul class="pagination">

			




	
	
	
		
 
                    ${c.pagination.pager()}

			




	
	
	
		
 
                </ul>

			




	
	
	
		
 

			




	
	
	
		
 
        <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>

			




	
	
	
		
 
        <script type="text/javascript">

			




	
	
	
		
 
            $(document).ready(function(){

			




	
	
	
		
 
                var $checkboxes = $('.changeset_range');

			




	
	
	
		
 

			




	
	
	
		
 
                pyroutes.register('changeset_home', ${h.js(h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s'))}, ['repo_name', 'revision']);

			




	
	
	
		
 

			




	
	
	
		
 
                var checkbox_checker = function(e) {

			




	
	
	
		
 
                    var $checked_checkboxes = $checkboxes.filter(':checked');

			




	
	
	
		
 
                    var $singlerange = $('#singlerange');

			




	
	
	
		
 

			




	
	
	
		
 
                    $('#rev_range_container').hide();

			




	
	
	
		
 
                    $checkboxes.show();

			




	
	
	
		
 
                    $singlerange.show();

			




	
	
	
		
 

			




	
	
	
		
 
                    if ($checked_checkboxes.length > 0) {

			




	
	
	
		
 
                        $checked_checkboxes.first().parent('td').append($singlerange);

			




	
	
	
		
 
                        var singlerange = $singlerange.prop('checked');

			




	
	
	
		
 
                        var rev_end = $checked_checkboxes.first().prop('name');

			




	
	
	
		
 
                        if ($checked_checkboxes.length > 1 || singlerange) {

			




	
	
	
		
 
                            var rev_start = $checked_checkboxes.last().prop('name');

			




	
	
	
		
 
                            $('#rev_range_container').prop('href',

			




	
	
	
		
 
                                pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},

			




	
	
	
		
 
                                                                'revision': rev_start + '...' + rev_end}));

			




	
	
	
		
 
                            $('#rev_range_container').html(

			




	
	
	
		
 
                                 _TM['Show Selected Changesets {0} &rarr; {1}'].format(rev_start.substr(0, 12), rev_end.substr(0, 12)));

			




	
	
	
		
 
                            $('#rev_range_container').show();

			




	
	
	
		
 
                            $('#open_new_pr').prop('href', pyroutes.url('pullrequest_home',

			




	
	
	
		
 
                                                                        {'repo_name': ${h.js(c.repo_name)},

			




	
	
	
		
 
                                                                         'rev_start': rev_start,

			




	
	
	
		
 
                                                                         'rev_end': rev_end}));

			




	
	
	
		
 
                            $('#open_new_pr').html(_TM['Open New Pull Request for {0} &rarr; {1}'].format(rev_start.substr(0, 12), rev_end.substr(0, 12)));

			




	
	
	
		
 
                        } else {

			




	
	
	
		
 
                            $('#open_new_pr').prop('href', pyroutes.url('pullrequest_home',

			




        

    



    


    



    



      

      





    
    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.