Mercurial > kallithea
diff rhodecode/templates/files/file_diff.html @ 1789:17caf4efe15c beta
implements #308 rewrote diffs to enable displaying full diff on each file
- fixed escaping of html special chars in file editor
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 19 Dec 2011 00:11:20 +0200 |
parents | 64cb9612f9aa |
children | f91d3f9b7230 |
line wrap: on
line diff
--- a/rhodecode/templates/files/file_diff.html Sun Dec 18 04:41:52 2011 +0200 +++ b/rhodecode/templates/files/file_diff.html Mon Dec 19 00:11:20 2011 +0200 @@ -21,33 +21,29 @@ <div class="title"> ${self.breadcrumbs()} </div> - <div class="table"> - <div id="body" class="diffblock"> - <div class="code-header"> - <div class="changeset_header"> - <span class="changeset_file">${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name, - revision=c.changeset_2.raw_id,f_path=c.f_path))}</span> - » <span>${h.link_to(_('diff'), - h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='diff'))}</span> - » <span>${h.link_to(_('raw diff'), - h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='raw'))}</span> - » <span>${h.link_to(_('download diff'), - h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='download'))}</span> - </div> - </div> - <div class="code-body"> - %if c.no_changes: - ${_('No changes')} - %elif c.big_diff: - ${_('Diff is to big to display')} ${h.link_to(_('raw diff'), - h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='raw'))} - %else: - ${c.cur_diff|n} - %endif - </div> - </div> + <div> + ## diff block + <%namespace name="diff_block" file="/changeset/diff_block.html"/> + ${diff_block.diff_block(c.changes)} </div> </div> +<script> +YUE.onDOMReady(function(){ + + YUE.on(YUQ('.diff-menu-activate'),'click',function(e){ + var act = e.currentTarget.nextElementSibling; + + if(YUD.hasClass(act,'active')){ + YUD.removeClass(act,'active'); + YUD.setStyle(act,'display','none'); + }else{ + YUD.addClass(act,'active'); + YUD.setStyle(act,'display',''); + } + }); + +}) +</script> </%def> \ No newline at end of file