# HG changeset patch # User Milka Kuzminski # Date 2020-12-03 11:30:02 # Node ID e8a65b0c94c8821720906ab058d969f2258b46ea # Parent 8da3a1fad73fd2bc92469f1807f82eb420312aef diffs: small ui fixes diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less --- a/rhodecode/public/css/main.less +++ b/rhodecode/public/css/main.less @@ -1540,7 +1540,6 @@ table.integrations { .reviewer_name { display: inline-block; max-width: 83%; - padding-right: 20px; vertical-align: middle; line-height: 1; 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 @@ -954,9 +954,37 @@ def get_comments_for(diff_type, comments
-
- ${h.hidden('diff_menu_{}'.format(diffset_container_id))} -
+
+ + + + +
+ + + + + + + +
+
@@ -1270,61 +1298,6 @@ def get_comments_for(diff_type, comments return null; }; - var preloadDiffMenuData = { - results: [ - - ## Whitespace change - % if request.GET.get('ignorews', '') == '1': - { - id: 2, - text: _gettext('Show whitespace changes'), - action: function () {}, - url: "${h.current_route_path(request, ignorews=0)|n}" - }, - % else: - { - id: 2, - text: _gettext('Hide whitespace changes'), - action: function () {}, - url: "${h.current_route_path(request, ignorews=1)|n}" - }, - % endif - - ## FULL CONTEXT - % if request.GET.get('fullcontext', '') == '1': - { - id: 3, - text: _gettext('Hide full context diff'), - action: function () {}, - url: "${h.current_route_path(request, fullcontext=0)|n}" - }, - % else: - { - id: 3, - text: _gettext('Show full context diff'), - action: function () {}, - url: "${h.current_route_path(request, fullcontext=1)|n}" - }, - % endif - - ] - }; - - var diffMenuId = "#diff_menu_" + "${diffset_container_id}"; - $(diffMenuId).select2({ - minimumResultsForSearch: -1, - containerCssClass: "drop-menu-no-width", - dropdownCssClass: "drop-menu-dropdown", - dropdownAutoWidth: true, - data: preloadDiffMenuData, - placeholder: "${_('...')}", - }); - $(diffMenuId).on('select2-selecting', function (e) { - e.choice.action(); - if (e.choice.url !== null) { - window.location = e.choice.url - } - }); toggleExpand = function (el, diffsetEl) { var el = $(el); if (el.hasClass('collapsed')) { diff --git a/rhodecode/templates/ejs_templates/templates.html b/rhodecode/templates/ejs_templates/templates.html --- a/rhodecode/templates/ejs_templates/templates.html +++ b/rhodecode/templates/ejs_templates/templates.html @@ -66,7 +66,7 @@ var data_hovercard_url = pyroutes.url('h <% if (create) { %> - + <% } else { %>