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

diffs: small ui fixes

Browse source
This commit is contained in:
Milka Kuzminski 2020-12-03 12:30:02 +01:00
parent c4c67f9ecd
commit fe438d39fd
3 changed files with 32 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rhodecode/public/css/main.less
View file

@ -1540,7 +1540,6 @@ table.integrations {
.reviewer_name {
display: inline-block;
max-width: 83%;
padding-right: 20px;
vertical-align: middle;
line-height: 1;

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

@ -954,9 +954,37 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
</div>
<div class="btn-group">
<div class="pull-left">
${h.hidden('diff_menu_{}'.format(diffset_container_id))}
</div>
<details class="details-reset details-inline-block">
<summary class="noselect btn">
<i class="icon-options cursor-pointer" op="options"></i>
</summary>
<div>
<details-menu class="details-dropdown" style="top: 35px;">
<div class="dropdown-item">
<div style="padding: 2px 0px">
% if request.GET.get('ignorews', '') == '1':
<a href="${h.current_route_path(request, ignorews=0)}">${_('Show whitespace changes')}</a>
% else:
<a href="${h.current_route_path(request, ignorews=1)}">${_('Hide whitespace changes')}</a>
% endif
</div>
</div>
<div class="dropdown-item">
<div style="padding: 2px 0px">
% if request.GET.get('fullcontext', '') == '1':
<a href="${h.current_route_path(request, fullcontext=0)}">${_('Hide full context diff')}</a>
% else:
<a href="${h.current_route_path(request, fullcontext=1)}">${_('Show full context diff')}</a>
% endif
</div>
</div>
</details-menu>
</div>
</details>
</div>
</div>
@ -1270,61 +1298,6 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
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')) {

2
rhodecode/templates/ejs_templates/templates.html
View file

@ -66,7 +66,7 @@ var data_hovercard_url = pyroutes.url('hovercard_user', {"user_id": user_id})
<tr id="reviewer_<%= member.user_id %>" class="reviewer_entry" tooltip="Review Group" data-reviewer-user-id="<%= member.user_id %>">
<% if (create) { %>
<td></td>
<td style="width: 1px"></td>
<% } else { %>
<td style="width: 20px">
<div class="tooltip presence-state" style="display: none; position: absolute; left: 2px" title="This users is currently at this page">