kallithea Files · rhodecode/templates/compare/compare

Files @ 531ab818cc3d

Branch filter:

Location: kallithea/rhodecode/templates/compare/compare_cs.html

531ab818cc3d 2.3 KiB text/html Show Annotation Show as Raw Download as Raw

Bradley M. Kuhn

Add javascript for Object Code excanvas (flot) version herein included and use that instead of minified version.

I had a bit of trouble finding the upstream on excanvas, as the version from
Google, which appears to be the original source, seems unmaintained.

However, it appears the version we're carrying in Kallithea is indeed from
the excanvas era of flot.

$ (cd /tmp; \
svn -r 135 checkout http://flot.googlecode.com/svn/trunk/ flot )
$ cp /tmp/flot/excanvas.js rhodecode/public/js/excanvas.js

I also verified the sha256sum of the min file matched ours:

$ sha256sum /tmp/flot/excanvas.min.js rhodecode/public/js/excanvas.min.js
5f94b032a110504b7b261eaf71392fa3e8d82cdc6455c0cba5c9f03cd34ed122 /tmp/flot/excanvas.min.js
5f94b032a110504b7b261eaf71392fa3e8d82cdc6455c0cba5c9f03cd34ed122 rhodecode/public/js/excanvas.min.js

## 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))}
    </div>
    %endif

    <table class="compare_view_commits noborder">
    %for cs in reversed(c.cs_ranges):
        <tr id="row-${cs.raw_id}">
        <td>
          %if cs.raw_id in c.statuses:
            <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">
                <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" />
            </div>
          %endif
        </td>
        <td style="min-width: 120px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>
        <td><div class="gravatar" commit_id="${cs.raw_id}"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
        <td><div class="author">${h.person(cs.author)}</div></td>
        <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=cs.raw_id))}
        %if c.as_form:
          ${h.hidden('revisions',cs.raw_id)}
        %endif
        </td>
        <td>
        %if cs.branch:
        <span class="branchtag">${cs.branch}</span>
        %endif
        </td>
        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
            <i class="icon-resize-vertical" style="color:#DDD"></i>
        </td>
        <td><div id="C-${cs.raw_id}" class="message" style="white-space:normal; height: 10px;width: 250px">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
        </tr>
    %endfor
    </table>
    %if c.as_form:
      ${h.hidden('ancestor_rev',c.ancestor)}
      ${h.hidden('merge_rev',c.cs_ranges[-1].raw_id)}
    %endif
  %endif
</div>

<script>
$('.expand_commit').on('click',function(e){
    $(this).children('i').hide();
    var cid = $(this).attr('commit_id');
    $('#C-'+cid).css({'height': 'auto','width': 'auto', 'white-space': 'pre'})
});
$('.gravatar').on('click',function(e){
    var cid = $(this).attr('commit_id');
    $('#row-'+cid).toggleClass('hl', !$('#row-'+cid).hasClass('hl'));
});
</script>