diff --git a/rhodecode/public/css/buttons.less b/rhodecode/public/css/buttons.less --- a/rhodecode/public/css/buttons.less +++ b/rhodecode/public/css/buttons.less @@ -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; diff --git a/rhodecode/public/css/rcicons.less b/rhodecode/public/css/rcicons.less --- a/rhodecode/public/css/rcicons.less +++ b/rhodecode/public/css/rcicons.less @@ -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 -- // diff --git a/rhodecode/public/js/src/rhodecode.js b/rhodecode/public/js/src/rhodecode.js --- a/rhodecode/public/js/src/rhodecode.js +++ b/rhodecode/public/js/src/rhodecode.js @@ -714,3 +714,11 @@ var getUserSessionAttr = function(key) { } return null } + +window.scrollDown = function () { + $(document).scrollTop($(document).height()); +} + +window.scrollUp = function scrollUp() { + $(window).scrollTop(0); +} diff --git a/rhodecode/public/js/src/rhodecode/pullrequests.js b/rhodecode/public/js/src/rhodecode/pullrequests.js --- a/rhodecode/public/js/src/rhodecode/pullrequests.js +++ b/rhodecode/public/js/src/rhodecode/pullrequests.js @@ -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) diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako --- a/rhodecode/templates/codeblocks/diffs.mako +++ b/rhodecode/templates/codeblocks/diffs.mako @@ -916,6 +916,16 @@ def get_comments_for(diff_type, comments