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

diffs: added scroll down/scroll up helper. Fixes #5643

Browse source
This commit is contained in:
Marcin Kuzminski 2020-12-06 19:13:28 +01:00
parent 444efb13b3
commit 118e90552e
6 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rhodecode/public/css/buttons.less
View file

@ -263,6 +263,10 @@ input[type="button"] {
border-radius: @border-radius 0 0 @border-radius;
}
// 2nd, if only 2 elements are there
&:nth-of-type(2) {
border-left-width: 0;
}
// middle elements
&:not(:first-of-type):not(:last-of-type) {
border-radius: 0;

4
rhodecode/public/css/rcicons.less
View file

@ -194,6 +194,7 @@
.icon-comment-toggle:before { content: '\e830'; } /* '' */
.icon-rhodecode:before { content: '\e831'; } /* '' */
.icon-up:before { content: '\e832'; } /* '' */
.icon-down:before { content: '\e832'; } /* '' */
.icon-merge:before { content: '\e833'; } /* '' */
.icon-spin-alt:before { content: '\e834'; } /* '' */
.icon-spin:before { content: '\e838'; } /* '' */
@ -235,6 +236,7 @@
.icon-rss-sign:before { &:extend(.icon-feed:before); }
.icon-code-fork:before { &:extend(.icon-fork:before); }
.icon-arrow_up:before { &:extend(.icon-up:before); }
.icon-arrow_down:before { &:extend(.icon-down:before); }
.icon-file:before { &:extend(.icon-file-code:before); }
.icon-file-text:before { &:extend(.icon-file-code:before); }
.icon-directory:before { &:extend(.icon-folder:before); }
@ -253,6 +255,8 @@
.icon-merge:before {transform: rotate(180deg);}
.icon-wide-mode:before {transform: rotate(90deg);}
.icon-options:before {transform: rotate(90deg);}
.icon-down:before {transform: rotate(180deg);}
// -- END ICON CLASSES -- //

8
rhodecode/public/js/src/rhodecode.js
View file

@ -714,3 +714,11 @@ var getUserSessionAttr = function(key) {
}
return null
}
window.scrollDown = function () {
$(document).scrollTop($(document).height());
}
window.scrollUp = function scrollUp() {
$(window).scrollTop(0);
}

7
rhodecode/public/js/src/rhodecode/pullrequests.js
View file

@ -397,6 +397,7 @@ window.ReviewersController = function () {
'user_group': reviewer_obj.user_group,
'create': true,
'rule_show': true,
'rhodecode_user': templateContext.rhodecode_user
})
if (role === self.ROLE_REVIEWER) {
@ -820,7 +821,8 @@ window.ReviewersPanel = {
'review_status': member.review_status,
'review_status_label': member.review_status_label,
'user_group': member.user_group,
'create': false
'create': false,
'rhodecode_user': templateContext.rhodecode_user
});
$(self.controller.$reviewMembers.selector).append(entry)
@ -915,7 +917,8 @@ window.ObserversPanel = {
'review_status': member.review_status,
'review_status_label': member.review_status_label,
'user_group': member.user_group,
'create': false
'create': false,
'rhodecode_user': templateContext.rhodecode_user
});
$(self.controller.$observerMembers.selector).append(entry)

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

@ -916,6 +916,16 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
<div class="sidebar__inner">
<div class="sidebar__bar">
<div class="pull-right">
<div class="btn-group" style="margin-right: 5px;">
<a class="tooltip btn" onclick="scrollDown();return false" title="${_('Scroll to page bottom')}">
<i class="icon-arrow_down"></i>
</a>
<a class="tooltip btn" onclick="scrollUp();return false" title="${_('Scroll to page top')}">
<i class="icon-arrow_up"></i>
</a>
</div>
<div class="btn-group">
<a class="btn tooltip toggle-wide-diff" href="#toggle-wide-diff" onclick="toggleWideDiff(this); return false" title="${h.tooltip(_('Toggle wide diff'))}">
<i class="icon-wide-mode"></i>
@ -1004,7 +1014,6 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
</strong>
</div>
<div class="pull-right noselect">
%if commit:
<span>
<code>${h.show_id(commit)}</code>

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

@ -604,6 +604,7 @@
<i class="icon-circle review-status-${c.pull_request_review_status}"></i>
${_('Reviewers')}
</span>
%if c.allowed_to_update:
<span id="open_edit_reviewers" class="block-right action_button last-item">${_('Edit')}</span>
<span id="close_edit_reviewers" class="block-right action_button last-item" style="display: none;">${_('Close')}</span>
@ -644,7 +645,7 @@
</div>
% endif
<div class="pull-right" style="margin-bottom: 15px">
<button data-role="reviewer" id="update_reviewers" class="btn btn-small no-margin">${_('Save Changes')}</button>
<button data-role="reviewer" id="update_reviewers" class="btn btn-sm no-margin">${_('Save Changes')}</button>
</div>
%endif
</div>
@ -697,7 +698,7 @@
</div>
% endif
<div class="pull-right" style="margin-bottom: 15px">
<button data-role="observer" id="update_observers" class="btn btn-small no-margin">${_('Save Changes')}</button>
<button data-role="observer" id="update_observers" class="btn btn-sm no-margin">${_('Save Changes')}</button>
</div>
%endif
</div>