Changeset - 8d1125a40973
Parent rev.
Child rev.
[Not reviewed]
rhodecode-2.2.5-gpl
0 3 0
Mads Kiilerich - 11 years ago 2014-07-03 01:03:24
madski@unity3d.com
old style: make compare header expand to content
3 files changed with 3 insertions and 3 deletions:
rhodecode/public/css/style.css
1
1
rhodecode/templates/changeset/changeset_range.html
1
1
rhodecode/templates/compare/compare_diff.html
1
1
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -4818,97 +4818,97 @@ span.pr-closed-tag {
 
.perm-gravatar-ac {
 
    vertical-align: middle;
 
    padding: 2px;
 
    width: 14px;
 
    height: 14px;
 
}
 

			




	
	
	
		
 
/*****************************************************************************

			




	
	
	
		
 
                                  DIFFS CSS

			




	
	
	
		
 
******************************************************************************/

			




	
	
	
		
 
.diff-collapse {

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    margin-bottom: -15px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.diff-collapse-button {

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
    color: #666;

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.diff-container {

			




	
	
	
		
 

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.diff-container.hidden {

			




	
	
	
		
 
    display: none;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
div.diffblock {

			




	
	
	
		
 
    overflow: auto;

			




	
	
	
		
 
    padding: 0px;

			




	
	
	
		
 
    border: 1px solid #ccc;

			




	
	
	
		
 
    background: #f8f8f8;

			




	
	
	
		
 
    font-size: 100%;

			




	
	
	
		
 
    line-height: 100%;

			




	
	
	
		
 
    /* new */

			




	
	
	
		
 
    line-height: 125%;

			




	
	
	
		
 
    -webkit-border-radius: 6px 6px 0px 0px;

			




	
	
	
		
 
    border-radius: 6px 6px 0px 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock.margined {

			




	
	
	
		
 
    margin: 0px 20px 0px 20px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock .code-header {

			




	
	
	
		
 
    border-bottom: 1px solid #CCCCCC;

			




	
	
	
		
 
    background: #EEEEEE;

			




	
	
	
		
 
    padding: 10px 0 10px 0;

			




	
	
	
		
 
    height: 14px;

			




	
	
	
		
 
    min-height: 14px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.diffblock .code-header.banner {

			




	
	
	
		
 
    border-bottom: 1px solid #CCCCCC;

			




	
	
	
		
 
    background: #EEEEEE;

			




	
	
	
		
 
    height: 14px;

			




	
	
	
		
 
    margin: 0px 95px 0px 95px;

			




	
	
	
		
 
    padding: 3px 3px 11px 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.diffblock .code-header-title {

			




	
	
	
		
 
    padding: 0px 0px 10px 5px !important;

			




	
	
	
		
 
    margin: 0 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock .code-header .hash {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    padding: 2px 0 0 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock .code-header .date {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    text-transform: uppercase;

			




	
	
	
		
 
    padding: 2px 0px 0px 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock .code-header div {

			




	
	
	
		
 
    margin-left: 4px;

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    font-size: 14px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.diffblock .parents {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    height: 26px;

			




	
	
	
		
 
    width: 100px;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
    font-weight: 400;

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
    padding: 0px 2px 2px 2px;

			




	
	
	
		
 
    background-color: #eeeeee;

			




	
	
	
		
 
    border-bottom: 1px solid #CCCCCC;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.diffblock .children {

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    height: 26px;

			




	
	
	
		
 
    width: 100px;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
    font-weight: 400;

			




	
	
	
		
 
    vertical-align: middle;

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} &gt; r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}

			




	
	
	
		
 
    %if c.rhodecode_name:

			




	
	
	
		
 
        &middot; ${c.rhodecode_name}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Changesets')} -

			




	
	
	
		
 
    r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)}

			




	
	
	
		
 
    <i class="icon-arrow-right"></i>

			




	
	
	
		
 
    r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id="body" class="diffblock">

			




	
	
	
		
 
            <div class="code-header" style="height: 26px">

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)}

			




	
	
	
		
 
                    <i class="icon-arrow-right"></i>

			




	
	
	
		
 
                    r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}

			




	
	
	
		
 
                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-loop"></i> Compare Revisions</a>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
            <div class="container">

			




	
	
	
		
 
            <table class="compare_view_commits noborder">

			




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

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>

			




	
	
	
		
 
                <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td>

			




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

			




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

			




	
	
	
		
 
                <td>

			




	
	
	
		
 
                  %if c.statuses:

			




	
	
	
		
 
                    <div title="${h.tooltip(_('Changeset status'))}" class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cnt])}" /></div>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </td>

			




	
	
	
		
 
                <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </table>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>

			




	
	
	
		
 
            <div class="cs_files">

			




	
	
	
		
 
                   %for cs in c.cs_ranges:

			




	
	
	
		
 
                       <div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                      %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems():

			




	
	
	
		
 
                         <div class="cs_${change}">

			




	
	
	
		
 
                               <div class="node">

			




	
	
	
		
 
                                   ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}

			




	
	
	
		
 
                               </div>

			




	
	
	
		
 
                           <div class="changes">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                         </div>

			




	
	
	
		
 
                      %endfor

			




	
	
	
		
 
                   %endfor

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
     %for cs in c.cs_ranges:

			




	
	
	
		
 
          ##${comment.comment_inline_form(cs)}

			




        

    


    
    

    

        

                

                    rhodecode/templates/compare/compare_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    %if c.compare_home:

			




	
	
	
		
 
        ${_('%s Compare') % c.repo_name}

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} &gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    %if c.rhodecode_name:

			




	
	
	
		
 
        &middot; ${c.rhodecode_name}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
  ${_('Compare revisions')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id="body" class="diffblock">

			




	
	
	
		
 
            <div class="code-header" style="height: 26px">

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.hidden('compare_org')} <i class="icon-ellipsis-horizontal" style="color: #999; vertical-align: -12px; padding: 0px 0px 0px 2px"></i> ${h.hidden('compare_other')}

			




	
	
	
		
 
                    %if not c.compare_home:

			




	
	
	
		
 
                        <a class="btn btn-small" href="${c.swap_url}"><i class="icon-refresh"></i> ${_('Swap')}</a>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                    <div id="compare_revs" class="btn btn-small"><i class="icon-loop"></i> ${_('Compare Revisions')}</div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    %if c.compare_home:

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
         <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks or tags.')}</div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
                ##CS

			




	
	
	
		
 
                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>

			




	
	
	
		
 
                <%include file="compare_cs.html" />

			




	
	
	
		
 

			




	
	
	
		
 
                ## FILES

			




	
	
	
		
 
                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 

			




	
	
	
		
 
                % if c.limited_diff:

			




	
	
	
		
 
                    ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

			




	
	
	
		
 
                % else:

			




	
	
	
		
 
                    ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
                %endif

			




	
	
	
		
 

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="cs_files">

			




	
	
	
		
 
                  %if not c.files:

			




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

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                  %for fid, change, f, stat in c.files:

			




	
	
	
		
 
                      <div class="cs_${change}">

			




	
	
	
		
 
                        <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid, **request.GET.mixed()))}</div>

			




	
	
	
		
 
                        <div class="changes">${h.fancy_file_stats(stat)}</div>

			




	
	
	
		
 
                      </div>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                % if c.limited_diff:

			




	
	
	
		
 
                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>

			




	
	
	
		
 
                % endif

			




	
	
	
		
 
         </div>

			




	
	
	
		
 

			




	
	
	
		
 
        ## diff block

			




	
	
	
		
 
        <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




        

    



    


    



    



      

      





    
    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.