##// END OF EJS Templates
diffs: small ui fixes
milka -
r4590:e8a65b0c stable
parent child Browse files
Show More
@@ -1540,7 +1540,6 b' table.integrations {'
1540 .reviewer_name {
1540 .reviewer_name {
1541 display: inline-block;
1541 display: inline-block;
1542 max-width: 83%;
1542 max-width: 83%;
1543 padding-right: 20px;
1544 vertical-align: middle;
1543 vertical-align: middle;
1545 line-height: 1;
1544 line-height: 1;
1546
1545
@@ -954,9 +954,37 b' def get_comments_for(diff_type, comments'
954 </div>
954 </div>
955 <div class="btn-group">
955 <div class="btn-group">
956
956
957 <div class="pull-left">
957 <details class="details-reset details-inline-block">
958 ${h.hidden('diff_menu_{}'.format(diffset_container_id))}
958 <summary class="noselect btn">
959 </div>
959 <i class="icon-options cursor-pointer" op="options"></i>
960 </summary>
961
962 <div>
963 <details-menu class="details-dropdown" style="top: 35px;">
964
965 <div class="dropdown-item">
966 <div style="padding: 2px 0px">
967 % if request.GET.get('ignorews', '') == '1':
968 <a href="${h.current_route_path(request, ignorews=0)}">${_('Show whitespace changes')}</a>
969 % else:
970 <a href="${h.current_route_path(request, ignorews=1)}">${_('Hide whitespace changes')}</a>
971 % endif
972 </div>
973 </div>
974
975 <div class="dropdown-item">
976 <div style="padding: 2px 0px">
977 % if request.GET.get('fullcontext', '') == '1':
978 <a href="${h.current_route_path(request, fullcontext=0)}">${_('Hide full context diff')}</a>
979 % else:
980 <a href="${h.current_route_path(request, fullcontext=1)}">${_('Show full context diff')}</a>
981 % endif
982 </div>
983 </div>
984
985 </details-menu>
986 </div>
987 </details>
960
988
961 </div>
989 </div>
962 </div>
990 </div>
@@ -1270,61 +1298,6 b' def get_comments_for(diff_type, comments'
1270 return null;
1298 return null;
1271 };
1299 };
1272
1300
1273 var preloadDiffMenuData = {
1274 results: [
1275
1276 ## Whitespace change
1277 % if request.GET.get('ignorews', '') == '1':
1278 {
1279 id: 2,
1280 text: _gettext('Show whitespace changes'),
1281 action: function () {},
1282 url: "${h.current_route_path(request, ignorews=0)|n}"
1283 },
1284 % else:
1285 {
1286 id: 2,
1287 text: _gettext('Hide whitespace changes'),
1288 action: function () {},
1289 url: "${h.current_route_path(request, ignorews=1)|n}"
1290 },
1291 % endif
1292
1293 ## FULL CONTEXT
1294 % if request.GET.get('fullcontext', '') == '1':
1295 {
1296 id: 3,
1297 text: _gettext('Hide full context diff'),
1298 action: function () {},
1299 url: "${h.current_route_path(request, fullcontext=0)|n}"
1300 },
1301 % else:
1302 {
1303 id: 3,
1304 text: _gettext('Show full context diff'),
1305 action: function () {},
1306 url: "${h.current_route_path(request, fullcontext=1)|n}"
1307 },
1308 % endif
1309
1310 ]
1311 };
1312
1313 var diffMenuId = "#diff_menu_" + "${diffset_container_id}";
1314 $(diffMenuId).select2({
1315 minimumResultsForSearch: -1,
1316 containerCssClass: "drop-menu-no-width",
1317 dropdownCssClass: "drop-menu-dropdown",
1318 dropdownAutoWidth: true,
1319 data: preloadDiffMenuData,
1320 placeholder: "${_('...')}",
1321 });
1322 $(diffMenuId).on('select2-selecting', function (e) {
1323 e.choice.action();
1324 if (e.choice.url !== null) {
1325 window.location = e.choice.url
1326 }
1327 });
1328 toggleExpand = function (el, diffsetEl) {
1301 toggleExpand = function (el, diffsetEl) {
1329 var el = $(el);
1302 var el = $(el);
1330 if (el.hasClass('collapsed')) {
1303 if (el.hasClass('collapsed')) {
@@ -66,7 +66,7 b" var data_hovercard_url = pyroutes.url('h"
66 <tr id="reviewer_<%= member.user_id %>" class="reviewer_entry" tooltip="Review Group" data-reviewer-user-id="<%= member.user_id %>">
66 <tr id="reviewer_<%= member.user_id %>" class="reviewer_entry" tooltip="Review Group" data-reviewer-user-id="<%= member.user_id %>">
67
67
68 <% if (create) { %>
68 <% if (create) { %>
69 <td></td>
69 <td style="width: 1px"></td>
70 <% } else { %>
70 <% } else { %>
71 <td style="width: 20px">
71 <td style="width: 20px">
72 <div class="tooltip presence-state" style="display: none; position: absolute; left: 2px" title="This users is currently at this page">
72 <div class="tooltip presence-state" style="display: none; position: absolute; left: 2px" title="This users is currently at this page">
General Comments 0
You need to be logged in to leave comments. Login now