Changeset - fd5d7b17fa72
[Not reviewed]
default
0 2 0
Marcin Kuzminski - 12 years ago 2013-06-27 22:54:39
marcin@python-works.com
codecleaner
2 files changed with 11 insertions and 11 deletions:
0 comments (0 inline, 0 general)
rhodecode/public/css/mergerly.css
Show inline comments
 

	
 
/* required */
 
.mergely-column textarea { width: 80px; height: 200px; }
 
.mergely-column { float: left; }
 
.mergely-margin { float: left; }
 
.mergely-canvas { float: left; width: 28px; }
 

	
 
/* resizeable */
 
.mergely-resizer { width: 100%; height: 100%; }
 

	
 
/* style configuration */
 
.mergely-column { border: 1px solid #ccc; }
 
.mergely-active { border: 1px solid #a3d1ff; }
 

	
 
.mergely.a.rhs.start { border-top: 1px solid #ddffdd; }
 
.mergely.a.lhs.start.end,
 
.mergely.a.rhs.end { border-bottom: 1px solid #ddffdd; }
 
.mergely.a.rhs { background-color: #ddffdd; }
 
.mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #ddffdd; }
 

	
 
.mergely.d.lhs { background-color: #edc0c0; }
 
.mergely.d.lhs.end,
 
.mergely.d.rhs.start.end { border-bottom: 1px solid #ffdddd; }
 
.mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #ffdddd; }
 
.mergely.d.lhs.start { border-top: 1px solid #ffdddd; }
 

	
 
.mergely.c.lhs,
 
.mergely.c.rhs { background-color: #fafafa; }
 
.mergely.c.lhs.start,
 
.mergely.c.rhs.start { border-top: 1px solid #a3a3a3; }
 
.mergely.c.lhs.end,
 
.mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }
 

	
 
.mergely.ch.a.rhs { background-color: #ddffdd; }
 
.mergely.ch.d.lhs { background-color: #ffdddd; }
 

	
 

	
 
.mergely-margin #compare-lhs-margin,
 
.mergely-margin #compare-rhs-margin{
 
.mergely-margin #compare-rhs-margin {
 
    cursor: pointer
 
}
rhodecode/templates/files/diff_2way.html
Show inline comments
 
@@ -14,67 +14,67 @@
 

	
 
<%def name="title()">
 
    ${_('%s File side-by-side diff') % c.repo_name} &middot; ${c.rhodecode_name}
 
</%def>
 

	
 
<%def name="breadcrumbs_links()">
 
    ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} &rarr; r${c.changeset_2.revision}:${h.short_id(c.changeset_2.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="diff-container" style="overflow-x: hidden">
 
        <div class="diffblock comm" style="margin:3px; padding:1px">
 
            <div class="code-header">
 
                <div class="changeset_header">
 
                    <div class="changeset_file">
 
                        ${h.link_to(h.safe_unicode(c.node1.path),h.url('files_home',repo_name=c.repo_name,
 
                        revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}
 
                    </div>
 
                    <div class="diff-actions">
 
                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a>
 
                      <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}"><img class="icon" src="${h.url('/images/icons/application_double.png')}"/></a>
 
                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
 
                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>
 
                      ##${c.ignorews_url(request.GET, h.FID(c.cs2,path))}
 
                      ##${c.context_url(request.GET, h.FID(c.cs2,path))}
 
                    </div>
 
                </div>
 
            </div>
 
            <div id="compare"></div>
 
        </div>
 
    </div>
 

	
 
<script>
 
var orig1 = '${(c.orig1)|n}';
 
var orig2 = '${(c.orig2)|n}';
 

	
 
$(document).ready(function () {
 
	$('#compare').mergely({
 
    $('#compare').mergely({
 
        width: 'auto',
 
		height: '600',
 
        height: '600',
 
        fgcolor: {a:'#ddffdd',c:'#cccccc',d:'#ffdddd'},
 
        bgcolor: '#fff',
 
        viewport: true,
 
		cmsettings: {mode: 'text/plain', readOnly: true, lineWrapping: false, lineNumbers: true},
 
		lhs: function(setValue) {
 
			setValue(orig1);
 
		},
 
		rhs: function(setValue) {
 
			setValue(orig2);
 
		},
 
	});
 
        cmsettings: {mode: 'text/plain', readOnly: true, lineWrapping: false, lineNumbers: true},
 
        lhs: function(setValue) {
 
            setValue(orig1);
 
        },
 
        rhs: function(setValue) {
 
            setValue(orig2);
 
        },
 
    });
 
});
 
</script>
 

	
 
</div>
 
</%def>
0 comments (0 inline, 0 general)