engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

diff-navigation: small improvements on text and display of navigation menu.

Browse source
This commit is contained in:
Marcin Kuzminski 2020-07-14 12:43:23 +02:00
parent aae4c3e227
commit a83fce8367
3 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/templates/changeset/changeset.mako
View file

@ -158,7 +158,7 @@
<div class="cs_files">
<%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
${cbdiffs.render_diffset_menu(c.changes[c.commit.raw_id])}
${cbdiffs.render_diffset_menu(c.changes[c.commit.raw_id], commit=c.commit)}
${cbdiffs.render_diffset(
c.changes[c.commit.raw_id], commit=c.commit, use_comments=True,inline_comments=c.inline_comments )}
</div>

38
rhodecode/templates/codeblocks/diffs.mako
View file

@ -855,7 +855,7 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
</button>
</%def>
<%def name="render_diffset_menu(diffset, range_diff_on=None)">
<%def name="render_diffset_menu(diffset, range_diff_on=None, commit=None, pull_request_menu=None)">
<% diffset_container_id = h.md5(diffset.target_ref) %>
<div id="diff-file-sticky" class="diffset-menu clearinner">
@ -923,13 +923,25 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
</strong>
</div>
<div class="pull-right noselect">
<span id="diff_nav">Loading diff...:</span>
<span class="cursor-pointer" onclick="scrollToPrevChunk(); return false">
<i class="icon-angle-up"></i>
</span>
<span class="cursor-pointer" onclick="scrollToNextChunk(); return false">
<i class="icon-angle-down"></i>
</span>
%if commit:
<span>
<code>${h.show_id(commit)}</code>
</span>
%elif pull_request_menu and pull_request_menu.get('pull_request'):
<span>
<code>!${pull_request_menu['pull_request'].pull_request_id}</code>
</span>
%endif
% if commit or pull_request_menu:
<span id="diff_nav">Loading diff...:</span>
<span class="cursor-pointer" onclick="scrollToPrevChunk(); return false">
<i class="icon-angle-up"></i>
</span>
<span class="cursor-pointer" onclick="scrollToNextChunk(); return false">
<i class="icon-angle-down"></i>
</span>
% endif
</div>
<div class="sidebar_inner_shadow"></div>
</div>
@ -1053,6 +1065,8 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
e.preventDefault();
});
diffNavText = 'diff navigation:'
getCurrentChunk = function () {
var chunksAll = $('.nav-chunk').filter(function () {
@ -1098,15 +1112,15 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
if (curElem === undefined) {
// end or back
$('#diff_nav').html('No next diff element.')
$('#diff_nav').html('no next diff element:')
animateDiffNavText()
return
} else if (newPos < 0) {
$('#diff_nav').html('No previous diff element.')
$('#diff_nav').html('no previous diff element:')
animateDiffNavText()
return
} else {
$('#diff_nav').html('Diff navigation:')
$('#diff_nav').html(diffNavText)
}
curElem = $(curElem)
@ -1347,7 +1361,7 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
lastScrollY = currentScrollY;
});
$('#diff_nav').html('Diff navigation:')
$('#diff_nav').html(diffNavText);
});
</script>

5
rhodecode/templates/pullrequests/pullrequest_show.mako
View file

@ -624,11 +624,12 @@
<%
pr_menu_data = {
'outdated_comm_count_ver': outdated_comm_count_ver
'outdated_comm_count_ver': outdated_comm_count_ver,
'pull_request': c.pull_request
}
%>
${cbdiffs.render_diffset_menu(c.diffset, range_diff_on=c.range_diff_on)}
${cbdiffs.render_diffset_menu(c.diffset, range_diff_on=c.range_diff_on, pull_request_menu=pr_menu_data)}
% if c.range_diff_on:
% for commit in c.commit_ranges: