Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #216 from edx/IM/security-fixes-7

Browse Source 
Incident Management Security Fixes 7
This commit is contained in:
Ali Akbar
2021-01-19 19:26:45 +05:00
committed by GitHub
parent 7ef4471c2c ea227a18a9
commit 38e2a5242e
10 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/static/common/templates/components/paging-footer.underscore
View File

@@ -1,20 +1,20 @@
<nav class="pagination pagination-full bottom" aria-label="<%= paginationLabel %>">
<div class="nav-item previous"><button class="nav-link previous-page-link"><span class="icon fa fa-angle-left" aria-hidden="true"></span> <span class="nav-label"><%= gettext("Previous") %></span></button></div>
<nav class="pagination pagination-full bottom" aria-label="<%- paginationLabel %>">
<div class="nav-item previous"><button class="nav-link previous-page-link"><span class="icon fa fa-angle-left" aria-hidden="true"></span> <span class="nav-label"><%- gettext("Previous") %></span></button></div>
<div class="nav-item page">
<div class="pagination-form">
<label class="page-number-label" for="page-number-input"><%= interpolate(
<label class="page-number-label" for="page-number-input"><%- interpolate(
gettext("Page number out of %(total_pages)s"),
{total_pages: total_pages},
true
)%></label>
<input id="page-number-input" class="page-number-input" name="page-number" type="text" size="4" autocomplete="off" aria-describedby="page-number-input-helper"/>
<span class="sr field-helper" id="page-number-input-helper"><%= gettext("Enter the page number you'd like to quickly navigate to.") %></span>
<span class="sr field-helper" id="page-number-input-helper"><%- gettext("Enter the page number you'd like to quickly navigate to.") %></span>
</div>
<span class="current-page"><%= current_page %></span>
<span class="current-page"><%- current_page %></span>
<span class="sr">&nbsp;out of&nbsp;</span>
<span class="page-divider" aria-hidden="true">/</span>
<span class="total-pages"><%= total_pages %></span>
<span class="total-pages"><%- total_pages %></span>
</div>
<div class="nav-item next"><button class="nav-link next-page-link"><span class="nav-label"><%= gettext("Next") %></span> <span class="icon fa fa-angle-right" aria-hidden="true"></span></button></div>
<div class="nav-item next"><button class="nav-link next-page-link"><span class="nav-label"><%- gettext("Next") %></span> <span class="icon fa fa-angle-right" aria-hidden="true"></span></button></div>
</nav>

4
common/static/common/templates/image-modal.underscore
View File

@@ -1,6 +1,6 @@
<div class="wrapper-modal wrapper-modal-image">
<section class="image-link">
<%= smallHTML%>
<%= smallHTML%> <% // xss-lint: disable=underscore-not-escaped %>
<a href="#" class="modal-ui-icon action-fullscreen" role="button">
<span class="label">
<span class="icon fa fa-arrows-alt fa-large" aria-hidden="true"></span> <%- gettext("Fullscreen") %>
@@ -11,7 +11,7 @@
<section class="image-modal">
<section class="image-content">
<div class="image-wrapper">
<img alt="<%= largeALT %>, <%- gettext('Large') %>" src="<%= largeSRC %>" />
<img alt="<%- largeALT %>, <%- gettext('Large') %>" src="<%- largeSRC %>" />
</div>
<a href="#" class="modal-ui-icon action-close" role="button">

15
common/static/js/capa/drag_and_drop/container.js
View File

@@ -1,20 +1,13 @@
(function(requirejs, require, define) {
define([], function() {
define(['edx-ui-toolkit/js/utils/html-utils'], function(HtmlUtils) {
return Container;
function Container(state) {
state.containerEl = $(
'<div ' +
'style=" ' +
'clear: both; ' +
'width: 665px; ' +
'margin-left: auto; ' +
'margin-right: auto; ' +
'" ' +
'></div>'
);
'<div style=" clear: both; width: 665px; margin-left: auto; margin-right: auto; " ></div>'
);
$('#inputtype_' + state.problemId).before(state.containerEl);
$('#inputtype_' + state.problemId).before(HtmlUtils.HTML(state.containerEl).toString());
}
}); // End-of: define([], function () {
}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define) {

4
common/static/js/src/tooltip_manager.js
View File

@@ -8,7 +8,7 @@
if (!this.tooltip.length) {
this.tooltip = $('<div />', {
class: this.className
}).appendTo(this.element);
}).appendTo(this.element); // xss-lint: disable=javascript-jquery-insert-into-target
}
this.hide();
@@ -58,7 +58,7 @@
pageY = typeof pageY !== 'undefined' ? pageY : element.offset().top + element.height() / 2;
var tooltipText = $(element).attr('data-tooltip');
this.tooltip
.html(tooltipText)
.text(tooltipText)
.css(this.getCoords(pageX, pageY));
},