diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 980a277c38..1318a13155 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,11 +5,14 @@ These are notable changes in edx-platform. This is a rolling list of changes, in roughly chronological order, most recent first. Add your entries at or near the top. Include a label indicating the component affected. -Common: Add skip links for accessibility to CMS and LMS (LMS-1311) +LMS: The wiki markup cheatsheet dialog is now accessible to people with +disabilites. (LMS-1303) -Studio: Change course overview page, checklists, assets, and course staff management -page URLs to a RESTful interface. Also removed "\listing", which duplicated -"\index". +Common: Add skip links for accessibility to CMS and LMS. (LMS-1311) + +Studio: Change course overview page, checklists, assets, and course staff +management page URLs to a RESTful interface. Also removed "\listing", which +duplicated "\index". Blades: When start time and end time are specified for a video, a visual range will be shown on the time slider to highlight the place in the video that will @@ -71,8 +74,8 @@ editing capability for a course's list of tabs. Studio and LMS: add ability to lock assets (cannot be viewed unless registered for class). -Studio: add restful interface for paging assets (no UX yet, but just add /start/45/max/50 to end of url to get -items 45-95, e.g.) +Studio: add restful interface for paging assets (no UX yet, but just add +/start/45/max/50 to end of url to get items 45-95, e.g.) LMS: First round of improvements to New (beta) Instructor Dash: improvements, fixes, and internationalization to the Student Info section. diff --git a/lms/static/js/wiki/cheatsheet.js b/lms/static/js/wiki/cheatsheet.js index e6c8e3cdaf..bbf8377a32 100644 --- a/lms/static/js/wiki/cheatsheet.js +++ b/lms/static/js/wiki/cheatsheet.js @@ -1,9 +1,6 @@ $(document).ready(function () { $('#cheatsheetLink').click(function() { - $('#cheatsheetModal').modal('show'); + $('#cheatsheetModal').leanModal(); }); - - $('#cheatsheetModal .close-btn').click(function(e) { - $('#cheatsheetModal').modal('hide'); - }); -}); \ No newline at end of file + accessible_modal("#cheatsheetLink", "#cheatsheetModal .close-modal", "#cheatsheetModal", ".content-wrapper"); +}); diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss index f79385bc90..76da4ed7a1 100644 --- a/lms/static/sass/course/wiki/_wiki.scss +++ b/lms/static/sass/course/wiki/_wiki.scss @@ -586,9 +586,7 @@ section.wiki { } #cheatsheetModal { - width: 950px; - margin-left: -450px; - margin-top: -100px; + width: 972px; .left-column { margin-right: 10px; @@ -599,23 +597,6 @@ section.wiki { float: left; width: 450px; } - - .close-btn { - display: block; - position: absolute; - top: -8px; - right: -8px; - width: 30px; - height: 30px; - border-radius: 30px; - border: 1px solid #ccc; - @include linear-gradient(top, #eee, #d2d2d2); - font-size: 22px; - line-height: 28px; - color: #333; - text-align: center; - box-shadow: 0 1px 0 #fff inset, 0 1px 2px rgba(0, 0, 0, .2); - } } #cheatsheet-body { diff --git a/lms/templates/wiki/includes/cheatsheet.html b/lms/templates/wiki/includes/cheatsheet.html index 660a83402a..4214a858a8 100644 --- a/lms/templates/wiki/includes/cheatsheet.html +++ b/lms/templates/wiki/includes/cheatsheet.html @@ -1,64 +1,68 @@ {% load i18n %} - + + + diff --git a/lms/templates/wiki/includes/editor_widget.html b/lms/templates/wiki/includes/editor_widget.html index 3745e6ee6d..e306787488 100644 --- a/lms/templates/wiki/includes/editor_widget.html +++ b/lms/templates/wiki/includes/editor_widget.html @@ -4,7 +4,7 @@ {% comment %} Translators: Do not translate 'cheatsheetLink' {% endcomment %} - {% blocktrans with start_link="" end_link="" %} + {% blocktrans with start_link="" end_link="" %} Markdown syntax is allowed. See the {{ start_link }}cheatsheet{{ end_link }} for help. {% endblocktrans %}