Changeset - 9a523af15c9f
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Mads Kiilerich - 9 years ago 2016-09-12 17:41:19
madski@unity3d.com
changelog: show merges as semi opaque in more places

Follow up to 8c5d1e94f9ee.

PRs available for updates (those that have a radio button) are not greyed out -
that would make it look too much like they were disabled.

These merges should perhaps be shown in a different way - perhaps not greying
the whole line. But for now, this makes it more consistent.
4 files changed with 7 insertions and 4 deletions:
kallithea/public/css/style.css
4
1
kallithea/templates/changelog/changelog_summary_data.html
1
1
kallithea/templates/compare/compare_cs.html
1
1
kallithea/templates/pullrequests/pullrequest_show.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -2075,99 +2075,102 @@ BIN_FILENODE = 6
 
}
 

			




	
	
	
		
 
.table {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#updaterevs-table tr.mergerow,

			




	
	
	
		
 
#graph_content_pr tr.mergerow,

			




	
	
	
		
 
#shortlog_data tr.mergerow,

			




	
	
	
		
 
#graph_content #changesets tr.out-of-range,

			




	
	
	
		
 
#graph_content #changesets tr.mergerow {

			




	
	
	
		
 
    opacity: 0.5;

			




	
	
	
		
 
    opacity: 0.6;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #changesets .container .right {

			




	
	
	
		
 
    width: 120px;

			




	
	
	
		
 
    padding-right: 0px;

			




	
	
	
		
 
    overflow: visible;

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog_summary_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
%if c.repo_changesets:

			




	
	
	
		
 
<table>

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <th class="left"></th>

			




	
	
	
		
 
        <th class="left"></th>

			




	
	
	
		
 
        <th class="left">${_('Revision')}</th>

			




	
	
	
		
 
        <th class="left">${_('Commit Message')}</th>

			




	
	
	
		
 
        <th class="left">${_('Age')}</th>

			




	
	
	
		
 
        <th class="left">${_('Author')}</th>

			




	
	
	
		
 
        <th class="left">${_('Refs')}</th>

			




	
	
	
		
 
    </tr>

			




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

			




	
	
	
		
 
    <tr class="parity${cnt%2}">

			




	
	
	
		
 
    <tr class="parity${cnt%2} ${'mergerow' if len(cs.parents) > 1 else ''}">

			




	
	
	
		
 
        <td class="compact">

			




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

			




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

			




	
	
	
		
 
                <span class="changeset-status-ico shortlog">

			




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

			




	
	
	
		
 
                  <a class="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 class="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

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="compact">

			




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

			




	
	
	
		
 
               <div class="comments-container">

			




	
	
	
		
 
                   <div title="${('comments')}">

			




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

			




	
	
	
		
 
                          <i class="icon-comment"></i>${len(c.comments[cs.raw_id])}

			




	
	
	
		
 
                       </a>

			




	
	
	
		
 
                   </div>

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




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

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            ${h.urlify_text(h.chop_at(cs.message,'\n'),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td><span class="tooltip" title="${h.fmt_date(cs.date)}">

			




	
	
	
		
 
                      ${h.age(cs.date)}</span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td title="${cs.author}">${h.person(cs.author)}</td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                %for book in cs.bookmarks:

			




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

			




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

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            %for tag in cs.tags:

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## Changesets table !

			




	
	
	
		
 
<div class="container">

			




	
	
	
		
 
  %if not c.cs_ranges:

			




	
	
	
		
 
    <span class="empty_data">${_('No changesets')}</span>

			




	
	
	
		
 
  %else:

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.ancestor:

			




	
	
	
		
 
    <div class="ancestor">${_('Ancestor')}:

			




	
	
	
		
 
      ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor), class_="changeset_hash")}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 

			




	
	
	
		
 
    <div id="graph_nodes">

			




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

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div id="graph_content_pr" style="margin-left: 100px;">

			




	
	
	
		
 

			




	
	
	
		
 
    <table class="compare_view_commits noborder">

			




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

			




	
	
	
		
 
        <tr id="chg_${cnt+1}">

			




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

			




	
	
	
		
 
        <td style="width:50px">

			




	
	
	
		
 
          %if cs.raw_id in c.statuses:

			




	
	
	
		
 
            <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">

			




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

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          %endif

			




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

			




	
	
	
		
 
              <div class="comments-container">

			




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

			




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

			




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

			




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

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="changeset-logical-index">

			




	
	
	
		
 
          <%

			




	
	
	
		
 
              num_cs = len(c.cs_ranges)

			




	
	
	
		
 
              index = num_cs - cnt

			




	
	
	
		
 
              if index == 1:

			




	
	
	
		
 
                  title = _('First (oldest) changeset in this list')

			




	
	
	
		
 
              elif index == num_cs:

			




	
	
	
		
 
                  title = _('Last (most recent) changeset in this list')

			




	
	
	
		
 
              else:

			




	
	
	
		
 
                  title = _('Position in this list of changesets')

			




	
	
	
		
 
          %>

			




	
	
	
		
 
          <span class="tooltip" title="${title}">

			




	
	
	
		
 
            ${index}

			




	
	
	
		
 
          </span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td style="width: 140px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




	
	
	
		
 
        %if c.visual.use_gravatar:

			




	
	
	
		
 
        <td>${h.gravatar_div(h.email_or_none(cs.author), size=14, div_commit_id="${cs.raw_id}")}</td>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        <td><div class="author">${h.person(cs.author)}</div></td>

			




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

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
        %if cs.branch:

			




	
	
	
		
 
        <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        </td>

			




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

			




	
	
	
		
 
            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <div style="float: right; margin-top: -4px;">

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -136,97 +136,97 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
            %if c.cs_ranges:

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
               ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?

			




	
	
	
		
 
               %if h.is_hg(c.pull_request.org_repo):

			




	
	
	
		
 
                 <span style="font-family: monospace">hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>

			




	
	
	
		
 
               %elif h.is_git(c.pull_request.org_repo):

			




	
	
	
		
 
                 <span style="font-family: monospace">git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Created on')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>${h.fmt_date(c.pull_request.created_on)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Owner')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input pr-not-edit">

			




	
	
	
		
 
                  ${h.gravatar_div(c.pull_request.owner.email, size=20)}

			




	
	
	
		
 
                  <span>${c.pull_request.owner.full_name_and_username}</span><br/>

			




	
	
	
		
 
                  <span><a href="mailto:${c.pull_request.owner.email}">${c.pull_request.owner.email}</a></span><br/>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input pr-do-edit ac" style="display:none">

			




	
	
	
		
 
               ${h.text('owner', class_="large", value=c.pull_request.owner.username, placeholder=_('Username'))}

			




	
	
	
		
 
               <div id="owner_completion_container"></div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
            <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Next iteration')}:</label>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="input">

			




	
	
	
		
 
              <div class="msg-div">${c.update_msg}</div>

			




	
	
	
		
 
              %if c.avail_revs:

			




	
	
	
		
 
              <div id="updaterevs" style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px; padding: 1px 0">

			




	
	
	
		
 
                <div style="height:0">

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <table id="updaterevs-table" class="noborder" style="padding-left:50px">

			




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

			




	
	
	
		
 
                    <tr id="chg_available_${cnt+1}">

			




	
	
	
		
 
                    <tr id="chg_available_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 and not (editable and cs.revision in c.avail_revs) else ''}">

			




	
	
	
		
 
                      %if c.cs_ranges and cs.revision == c.cs_ranges[-1].revision:

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if editable:

			




	
	
	
		
 
                            ${h.radio(name='updaterev', value='', checked=True)}

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td colspan="4">${_("Current revision - no change")}</td>

			




	
	
	
		
 
                      %else:

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          %if editable and cs.revision in c.avail_revs:

			




	
	
	
		
 
                            ${h.radio(name='updaterev', value=cs.raw_id)}

			




	
	
	
		
 
                          %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td style="width: 120px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




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

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                          <div style="float: right; margin-top: -4px;">

			




	
	
	
		
 
                            %for tag in cs.tags:

			




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

			




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

			




	
	
	
		
 
                              </div>

			




	
	
	
		
 
                            %endfor

			




	
	
	
		
 
                          </div>

			




	
	
	
		
 
                          <div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_text(cs.message, c.repo_name)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                      %endif

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                </table>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="msg-div">(${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")})</div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <div class="msg-div">${c.update_msg_other}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ## REVIEWERS

			




	
	
	
		
 
    <div style="float:left; border-left:1px dashed #eee">

			




	
	
	
		
 
        <div class="pr-details-title">${_('Pull Request Reviewers')}</div>

			




	
	
	
		
 
        <div id="reviewers" style="padding:0px 0px 5px 10px">

			




	
	
	
		
 
          ## members goes here !

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            <ul id="review_members">

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




	
	
	
		
 
              ## WARNING: the HTML below is duplicate with

			




	
	
	
		
 
              ## kallithea/public/js/base.js

			




	
	
	
		
 
              ## If you change something here it should be reflected in the template too.

			




        

    



    


    



    



      

      





    
    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.