Skip to content

E
edx-platform
Commit f643f2dc by estute Committed by GitHub
Options

Merge pull request #12733 from edx/rc/2016-06-14 

Release Candidate rc/2016-06-14
parents 7d4a8a20 dfd5bd3e
Showing with 234 additions and 326 deletions
.jshintrc
...@@ -109,10 +109,10 @@ ...@@ -109,10 +109,10 @@
// The parameter "predef" should remain empty for this configuration file // The parameter "predef" should remain empty for this configuration file
// to remain as general as possible. // to remain as general as possible.
"predef": [ "predef": [
// jQuery globals // JavaScript global libraries
"jQuery", "$", "Backbone",
"jQuery",
// Underscore.js globals "$",
"_", "_",
// RequireJS globals // RequireJS globals
......
AUTHORS
...@@ -271,3 +271,5 @@ Dmitry Viskov <dmitry.viskov@webenterprise.ru> ...@@ -271,3 +271,5 @@ Dmitry Viskov <dmitry.viskov@webenterprise.ru>
Brian Jacobel <bjacobel@edx.org> Brian Jacobel <bjacobel@edx.org>
Sigberto Alarcon <salarcon@stanford.edu> Sigberto Alarcon <salarcon@stanford.edu>
Sofiya Semenova <ssemenova@edx.org> Sofiya Semenova <ssemenova@edx.org>
Alisan Tang <atang@edx.org>
cms/djangoapps/contentstore/tests/test_i18n.py
...@@ -66,7 +66,7 @@ class TestModuleI18nService(ModuleStoreTestCase): ...@@ -66,7 +66,7 @@ class TestModuleI18nService(ModuleStoreTestCase):
self.descriptor, self.descriptor,
self.field_data, self.field_data,
) )
self.addCleanup(translation.activate, settings.LANGUAGE_CODE) self.addCleanup(translation.deactivate)
def get_module_i18n_service(self, descriptor): def get_module_i18n_service(self, descriptor):
""" """
......
cms/djangoapps/contentstore/views/error.py
...@@ -39,9 +39,9 @@ def server_error(request): ...@@ -39,9 +39,9 @@ def server_error(request):
@jsonable_error(404, "Resource not found") @jsonable_error(404, "Resource not found")
def render_404(request): def render_404(request):
return HttpResponseNotFound(render_to_string('404.html', {})) return HttpResponseNotFound(render_to_string('404.html', {}, request=request))
@jsonable_error(500, "The Studio servers encountered an error") @jsonable_error(500, "The Studio servers encountered an error")
def render_500(request): def render_500(request):
return HttpResponseServerError(render_to_string('500.html', {})) return HttpResponseServerError(render_to_string('500.html', {}, request=request))
cms/djangoapps/contentstore/views/helpers.py
...@@ -24,7 +24,7 @@ from contentstore.utils import reverse_course_url, reverse_library_url, reverse_ ...@@ -24,7 +24,7 @@ from contentstore.utils import reverse_course_url, reverse_library_url, reverse_
from models.settings.course_grading import CourseGradingModel from models.settings.course_grading import CourseGradingModel
from util.milestones_helpers import is_entrance_exams_enabled from util.milestones_helpers import is_entrance_exams_enabled
__all__ = ['edge', 'event', 'landing'] __all__ = ['event']
# Note: Grader types are used throughout the platform but most usages are simply in-line # Note: Grader types are used throughout the platform but most usages are simply in-line
# strings. In addition, new grader types can be defined on the fly anytime one is needed # strings. In addition, new grader types can be defined on the fly anytime one is needed
...@@ -38,16 +38,6 @@ GRADER_TYPES = { ...@@ -38,16 +38,6 @@ GRADER_TYPES = {
} }
# points to the temporary course landing page with log in and sign up
def landing(request, org, course, coursename):
return render_to_response('temp-course-landing.html', {})
# points to the temporary edge page
def edge(request):
return redirect('/')
def event(request): def event(request):
''' '''
A noop to swallow the analytics call so that cms methods don't spook and poor developers looking at A noop to swallow the analytics call so that cms methods don't spook and poor developers looking at
......
cms/djangoapps/course_creators/tests/test_views.py
...@@ -5,13 +5,13 @@ Tests course_creators.views.py. ...@@ -5,13 +5,13 @@ Tests course_creators.views.py.
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.test import TestCase, RequestFactory from django.test import TestCase, RequestFactory
from django.core.urlresolvers import reverse
from course_creators.views import add_user_with_status_unrequested, add_user_with_status_granted from course_creators.views import add_user_with_status_unrequested, add_user_with_status_granted
from course_creators.views import get_course_creator_status, update_course_creator_group, user_requested_access from course_creators.views import get_course_creator_status, update_course_creator_group, user_requested_access
import mock import mock
from student.roles import CourseCreatorRole from student.roles import CourseCreatorRole
from student import auth from student import auth
from edxmako.tests import mako_middleware_process_request
class CourseCreatorView(TestCase): class CourseCreatorView(TestCase):
...@@ -73,11 +73,12 @@ class CourseCreatorView(TestCase): ...@@ -73,11 +73,12 @@ class CourseCreatorView(TestCase):
add_user_with_status_unrequested(self.user) add_user_with_status_unrequested(self.user)
self.assertEqual('unrequested', get_course_creator_status(self.user)) self.assertEqual('unrequested', get_course_creator_status(self.user))
request = RequestFactory().get('/') self.client.login(username=self.user.username, password='foo')
request.user = self.user
mako_middleware_process_request(request) # The user_requested_access function renders a template that requires
user_requested_access(self.user) # request-specific information. Use the django TestClient to supply
# the appropriate request context.
self.client.post(reverse('request_course_creator'))
self.assertEqual('pending', get_course_creator_status(self.user)) self.assertEqual('pending', get_course_creator_status(self.user))
def test_user_requested_already_granted(self): def test_user_requested_already_granted(self):
......
cms/envs/common.py
...@@ -312,6 +312,7 @@ simplefilter('ignore') ...@@ -312,6 +312,7 @@ simplefilter('ignore')
################################# Middleware ################################### ################################# Middleware ###################################
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'crum.CurrentRequestUserMiddleware',
'request_cache.middleware.RequestCache', 'request_cache.middleware.RequestCache',
'header_control.middleware.HeaderControlMiddleware', 'header_control.middleware.HeaderControlMiddleware',
'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.cache.UpdateCacheMiddleware',
...@@ -332,7 +333,6 @@ MIDDLEWARE_CLASSES = ( ...@@ -332,7 +333,6 @@ MIDDLEWARE_CLASSES = (
'student.middleware.UserStandingMiddleware', 'student.middleware.UserStandingMiddleware',
'contentserver.middleware.StaticContentServer', 'contentserver.middleware.StaticContentServer',
'crum.CurrentRequestUserMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'track.middleware.TrackMiddleware', 'track.middleware.TrackMiddleware',
...@@ -350,9 +350,6 @@ MIDDLEWARE_CLASSES = ( ...@@ -350,9 +350,6 @@ MIDDLEWARE_CLASSES = (
'codejail.django_integration.ConfigureCodeJailMiddleware', 'codejail.django_integration.ConfigureCodeJailMiddleware',
# needs to run after locale middleware (or anything that modifies the request context)
'edxmako.middleware.MakoMiddleware',
# catches any uncaught RateLimitExceptions and returns a 403 instead of a 500 # catches any uncaught RateLimitExceptions and returns a 403 instead of a 500
'ratelimitbackend.middleware.RateLimitMiddleware', 'ratelimitbackend.middleware.RateLimitMiddleware',
......
cms/static/js/i18n/hi/djangojs.js
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
"%(numResponses)s \u092a\u094d\u0930\u0924\u093f\u0915\u094d\u0930\u093f\u092f\u093e", "%(numResponses)s \u092a\u094d\u0930\u0924\u093f\u0915\u094d\u0930\u093f\u092f\u093e",
"%(numResponses)s \u091c\u0935\u093e\u092c" "%(numResponses)s \u091c\u0935\u093e\u092c"
], ],
"%(total_items)s total": "%(total_items)s \u0915\u0941\u0932 \u092f\u094b\u0917",
"%(unread_count)s new comment": [ "%(unread_count)s new comment": [
"%(unread_count)s \u0928\u0908 \u091f\u093f\u092a\u094d\u092a\u0923\u0940", "%(unread_count)s \u0928\u0908 \u091f\u093f\u092a\u094d\u092a\u0923\u0940",
"%(unread_count)s \u0928\u0908 \u091f\u093f\u092a\u094d\u092a\u0923\u0940" "%(unread_count)s \u0928\u0908 \u091f\u093f\u092a\u094d\u092a\u0923\u0940"
...@@ -114,6 +115,7 @@ ...@@ -114,6 +115,7 @@
"Files must be in JPEG or PNG format.": "\u092b\u093e\u0907\u0932\u0947\u0902 JPEG \u092f\u093e PNG \u092b\u0949\u0930\u094d\u092e\u0947\u091f \u092e\u0947\u0902 \u0939\u094b\u0928\u0940 \u091a\u093e\u0939\u093f\u092f\u0947\u0902.", "Files must be in JPEG or PNG format.": "\u092b\u093e\u0907\u0932\u0947\u0902 JPEG \u092f\u093e PNG \u092b\u0949\u0930\u094d\u092e\u0947\u091f \u092e\u0947\u0902 \u0939\u094b\u0928\u0940 \u091a\u093e\u0939\u093f\u092f\u0947\u0902.",
"Fill browser": "\u092c\u094d\u0930\u093e\u0909\u091c\u093c\u0930 \u0938\u0915\u094d\u0930\u0940\u0928 \u0915\u094b \u092a\u0942\u0930\u093e \u0916\u094b\u0932\u0947\u0902 (open full browser)", "Fill browser": "\u092c\u094d\u0930\u093e\u0909\u091c\u093c\u0930 \u0938\u0915\u094d\u0930\u0940\u0928 \u0915\u094b \u092a\u0942\u0930\u093e \u0916\u094b\u0932\u0947\u0902 (open full browser)",
"Find discussions": "\u091a\u0930\u094d\u091a\u093e\u0913\u0902 \u0915\u094b \u0922\u0942\u0902\u0922\u0947\u0902", "Find discussions": "\u091a\u0930\u094d\u091a\u093e\u0913\u0902 \u0915\u094b \u0922\u0942\u0902\u0922\u0947\u0902",
"Fullscreen": "\u092a\u0942\u0930\u094d\u0923 \u0938\u094d\u0915\u094d\u0930\u0940\u0928",
"Grace period must be specified in HH:MM format.": "\u092e\u0941\u0939\u0932\u0924 \u0915\u0940 \u0905\u0935\u0927\u093f \u0915\u093e \u092a\u094d\u0930\u093e\u0930\u0942\u092a HH:MM \u0939\u094b\u0928\u093e \u091a\u093e\u0939\u093f\u090f.", "Grace period must be specified in HH:MM format.": "\u092e\u0941\u0939\u0932\u0924 \u0915\u0940 \u0905\u0935\u0927\u093f \u0915\u093e \u092a\u094d\u0930\u093e\u0930\u0942\u092a HH:MM \u0939\u094b\u0928\u093e \u091a\u093e\u0939\u093f\u090f.",
"Group name is required": "\u0938\u092e\u0942\u0939 \u0915\u0947 \u0928\u093e\u092e \u0915\u0940 \u0906\u0935\u0936\u094d\u200d\u092f\u0915\u0924\u093e \u0939\u0948", "Group name is required": "\u0938\u092e\u0942\u0939 \u0915\u0947 \u0928\u093e\u092e \u0915\u0940 \u0906\u0935\u0936\u094d\u200d\u092f\u0915\u0924\u093e \u0939\u0948",
"Heading": "\u0936\u0940\u0930\u094d\u0937\u0915", "Heading": "\u0936\u0940\u0930\u094d\u0937\u0915",
...@@ -165,6 +167,7 @@ ...@@ -165,6 +167,7 @@
"Previous": "\u092a\u093f\u091b\u0932\u093e", "Previous": "\u092a\u093f\u091b\u0932\u093e",
"Redo (Ctrl+Shift+Z)": "\u092b\u093f\u0930 \u0938\u0947 \u0915\u0930\u0947\u0902 (Ctrl+Shift+Z)", "Redo (Ctrl+Shift+Z)": "\u092b\u093f\u0930 \u0938\u0947 \u0915\u0930\u0947\u0902 (Ctrl+Shift+Z)",
"Redo (Ctrl+Y)": "\u092b\u093f\u0930 \u0938\u0947 \u0915\u0930\u0947\u0902 (Ctrl+Y)", "Redo (Ctrl+Y)": "\u092b\u093f\u0930 \u0938\u0947 \u0915\u0930\u0947\u0902 (Ctrl+Y)",
"Remove": "\u0939\u091f\u093e\u090f\u0902",
"Reply to Annotation": "\u090f\u0928\u094b\u091f\u0947\u0936\u0928 \u0915\u093e \u091c\u0935\u093e\u092c \u0926\u0947\u0902", "Reply to Annotation": "\u090f\u0928\u094b\u091f\u0947\u0936\u0928 \u0915\u093e \u091c\u0935\u093e\u092c \u0926\u0947\u0902",
"Requester": "\u0928\u093f\u0935\u0947\u0926\u0915", "Requester": "\u0928\u093f\u0935\u0947\u0926\u0915",
"Rescore problem '<%= problem_id %>' for all students?": "\u0938\u092e\u0938\u094d\u092f\u093e '<%= problem_id %>' \u0915\u094b \u0938\u092c \u091b\u093e\u0924\u094d\u0930\u094b\u0902 \u0915\u0947 \u0932\u093f\u090f \u0930\u0940\u0938\u094d\u0915\u094b\u0930 \u0915\u0930\u0947\u0902?", "Rescore problem '<%= problem_id %>' for all students?": "\u0938\u092e\u0938\u094d\u092f\u093e '<%= problem_id %>' \u0915\u094b \u0938\u092c \u091b\u093e\u0924\u094d\u0930\u094b\u0902 \u0915\u0947 \u0932\u093f\u090f \u0930\u0940\u0938\u094d\u0915\u094b\u0930 \u0915\u0930\u0947\u0902?",
...@@ -176,6 +179,7 @@ ...@@ -176,6 +179,7 @@
"Show Annotations": "\u091f\u093f\u092a\u094d\u092a\u0923\u093f\u092f\u093e\u0902 \u0926\u093f\u0916\u093e\u090f\u0902", "Show Annotations": "\u091f\u093f\u092a\u094d\u092a\u0923\u093f\u092f\u093e\u0902 \u0926\u093f\u0916\u093e\u090f\u0902",
"Show Answer": "\u091c\u0935\u093e\u092c \u0926\u0947\u0916\u0947\u0902", "Show Answer": "\u091c\u0935\u093e\u092c \u0926\u0947\u0916\u0947\u0902",
"Show Discussion": " \u091a\u0930\u094d\u091a\u093e \u0926\u093f\u0916\u093e\u090f\u0902", "Show Discussion": " \u091a\u0930\u094d\u091a\u093e \u0926\u093f\u0916\u093e\u090f\u0902",
"Showing %(current_item_range)s out of %(total_items_count)s, sorted by %(sort_name)s ascending": "\u092a\u094d\u0930\u0926\u0930\u094d\u0936\u093f\u0924 \u0939\u0948 %(current_item_range)s \u092e\u0947\u0902 \u0938\u0947 %(total_items_count)s, \u0915\u0947 \u0905\u0928\u0941\u0938\u093e\u0930 \u0915\u094d\u0930\u092e\u092c\u0926\u094d\u0927 %(sort_name)s \u0906\u0930\u094b\u0939\u0940 \u0915\u094d\u0930\u092e \u092e\u0947\u0902",
"Showing all responses": "\u0938\u092d\u0940 \u091c\u0935\u093e\u092c \u0926\u093f\u0916\u093e\u090f \u091c\u093e \u0930\u0939\u0947 \u0939\u0948\u0902", "Showing all responses": "\u0938\u092d\u0940 \u091c\u0935\u093e\u092c \u0926\u093f\u0916\u093e\u090f \u091c\u093e \u0930\u0939\u0947 \u0939\u0948\u0902",
"Showing first response": [ "Showing first response": [
"\u092a\u0939\u0932\u0940 %(numResponses)s \u092a\u094d\u0930\u0924\u093f\u0915\u094d\u0930\u093f\u092f\u093e\u090f\u0902 ", "\u092a\u0939\u0932\u0940 %(numResponses)s \u092a\u094d\u0930\u0924\u093f\u0915\u094d\u0930\u093f\u092f\u093e\u090f\u0902 ",
...@@ -215,6 +219,7 @@ ...@@ -215,6 +219,7 @@
"These users will be enrolled once they register:": "\u0930\u091c\u093f\u0938\u094d\u091f\u0930 \u0939\u094b\u0928\u0947 \u0915\u0947 \u092c\u093e\u0926 \u0907\u0928 \u091b\u093e\u0924\u094d\u0930\u094b\u0902 \u0915\u093e \u0928\u093e\u092e\u093e\u0902\u0915\u0928 \u0915\u0930 \u0926\u093f\u092f\u093e \u091c\u093e\u090f\u0917\u093e:", "These users will be enrolled once they register:": "\u0930\u091c\u093f\u0938\u094d\u091f\u0930 \u0939\u094b\u0928\u0947 \u0915\u0947 \u092c\u093e\u0926 \u0907\u0928 \u091b\u093e\u0924\u094d\u0930\u094b\u0902 \u0915\u093e \u0928\u093e\u092e\u093e\u0902\u0915\u0928 \u0915\u0930 \u0926\u093f\u092f\u093e \u091c\u093e\u090f\u0917\u093e:",
"This action cannot be undone.": "\u0907\u0938 \u0915\u094d\u0930\u093f\u092f\u093e \u0915\u094b \u092a\u0942\u0930\u094d\u0935\u0935\u0924 \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948.", "This action cannot be undone.": "\u0907\u0938 \u0915\u094d\u0930\u093f\u092f\u093e \u0915\u094b \u092a\u0942\u0930\u094d\u0935\u0935\u0924 \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u091c\u093e \u0938\u0915\u0924\u093e \u0939\u0948.",
"This link will open in a modal window": "\u092f\u0939 \u0932\u093f\u0902\u0915 \u090f\u0915 \u092e\u0949\u0921\u0932 \u0935\u093f\u0902\u0921\u094b \u091f\u0948\u092c \u092e\u0947\u0902 \u0916\u0941\u0932\u0947\u0917\u0940", "This link will open in a modal window": "\u092f\u0939 \u0932\u093f\u0902\u0915 \u090f\u0915 \u092e\u0949\u0921\u0932 \u0935\u093f\u0902\u0921\u094b \u091f\u0948\u092c \u092e\u0947\u0902 \u0916\u0941\u0932\u0947\u0917\u0940",
"This link will open in a new browser window/tab": "\u092f\u0939 \u0932\u093f\u0902\u0915 \u090f\u0915 \u0928\u090f \u092c\u094d\u0930\u093e\u0909\u095b\u0930 \u0935\u093f\u0902\u0921\u094b / \u091f\u0948\u092c \u092e\u0947\u0902 \u0916\u0941\u0932\u0947\u0917\u0940",
"This may be happening because of an error with our server or your internet connection. Try refreshing the page or making sure you are online.": "\u0939\u092e\u093e\u0930\u0947 \u0938\u0930\u094d\u0935\u0930 \u092a\u0930 \u0924\u094d\u0930\u0941\u091f\u093f \u0915\u0947 \u0935\u091c\u0939 \u0938\u0947 \u092f\u093e \u0906\u092a\u0915\u0947 \u0907\u0902\u091f\u0930\u0928\u0947\u091f \u0915\u0928\u0947\u0915\u094d\u0936\u0928 \u0915\u0947 \u0938\u093e\u0925 \u0915\u093f\u0938\u0940 \u0924\u094d\u0930\u0941\u091f\u093f \u0915\u0947 \u0915\u093e\u0930\u0923 \u092f\u0939 \u0939\u094b \u0938\u0915\u0924\u093e \u0939\u0948| \u092a\u0943\u0937\u094d\u0920 \u092b\u093f\u0930 \u0938\u0947 \u0916\u094b\u0932\u0947 \u092f\u093e \u0938\u0941\u0928\u093f\u0936\u094d\u091a\u093f\u0924 \u0915\u0930\u0947\u0902 \u0915\u093f \u0906\u092a \u0911\u0928\u0932\u093e\u0907\u0928 \u0939\u0948\u0902|", "This may be happening because of an error with our server or your internet connection. Try refreshing the page or making sure you are online.": "\u0939\u092e\u093e\u0930\u0947 \u0938\u0930\u094d\u0935\u0930 \u092a\u0930 \u0924\u094d\u0930\u0941\u091f\u093f \u0915\u0947 \u0935\u091c\u0939 \u0938\u0947 \u092f\u093e \u0906\u092a\u0915\u0947 \u0907\u0902\u091f\u0930\u0928\u0947\u091f \u0915\u0928\u0947\u0915\u094d\u0936\u0928 \u0915\u0947 \u0938\u093e\u0925 \u0915\u093f\u0938\u0940 \u0924\u094d\u0930\u0941\u091f\u093f \u0915\u0947 \u0915\u093e\u0930\u0923 \u092f\u0939 \u0939\u094b \u0938\u0915\u0924\u093e \u0939\u0948| \u092a\u0943\u0937\u094d\u0920 \u092b\u093f\u0930 \u0938\u0947 \u0916\u094b\u0932\u0947 \u092f\u093e \u0938\u0941\u0928\u093f\u0936\u094d\u091a\u093f\u0924 \u0915\u0930\u0947\u0902 \u0915\u093f \u0906\u092a \u0911\u0928\u0932\u093e\u0907\u0928 \u0939\u0948\u0902|",
"Unable to retrieve data, please try again later.": "\u0921\u0947\u091f\u093e \u092a\u0941\u0928\u0903 \u092a\u094d\u0930\u093e\u092a\u094d\u0924 \u0915\u0930\u0928\u0947 \u092e\u0947\u0902 \u0905\u0938\u092e\u0930\u094d\u0925 \u0939\u0948, \u0915\u0943\u092a\u092f\u093e \u092b\u093f\u0930 \u0938\u0947 \u0915\u094b\u0936\u093f\u0936 \u0915\u0930\u0947\u0902", "Unable to retrieve data, please try again later.": "\u0921\u0947\u091f\u093e \u092a\u0941\u0928\u0903 \u092a\u094d\u0930\u093e\u092a\u094d\u0924 \u0915\u0930\u0928\u0947 \u092e\u0947\u0902 \u0905\u0938\u092e\u0930\u094d\u0925 \u0939\u0948, \u0915\u0943\u092a\u092f\u093e \u092b\u093f\u0930 \u0938\u0947 \u0915\u094b\u0936\u093f\u0936 \u0915\u0930\u0947\u0902",
"Undo (Ctrl+Z)": "\u092b\u093f\u0930 \u0938\u0947 \u0915\u0930\u0947\u0902 (Ctrl+Z)", "Undo (Ctrl+Z)": "\u092b\u093f\u0930 \u0938\u0947 \u0915\u0930\u0947\u0902 (Ctrl+Z)",
......
cms/static/js/spec/views/group_configuration_spec.js
...@@ -34,10 +34,10 @@ define([ ...@@ -34,10 +34,10 @@ define([
usageUnit: '.group-configuration-usage-unit', usageUnit: '.group-configuration-usage-unit',
usageUnitAnchor: '.group-configuration-usage-unit a', usageUnitAnchor: '.group-configuration-usage-unit a',
usageUnitMessage: '.group-configuration-validation-message', usageUnitMessage: '.group-configuration-validation-message',
usageUnitWarningIcon: '.group-configuration-usage-unit i.fa-warning', usageUnitWarningIcon: '.group-configuration-usage-unit .fa-warning',
usageUnitErrorIcon: '.group-configuration-usage-unit i.fa-exclamation-circle', usageUnitErrorIcon: '.group-configuration-usage-unit .fa-exclamation-circle',
warningMessage: '.group-configuration-validation-text', warningMessage: '.group-configuration-validation-text',
warningIcon: '.wrapper-group-configuration-validation > i', warningIcon: '.wrapper-group-configuration-validation > .fa-warning',
note: '.wrapper-delete-button' note: '.wrapper-delete-button'
}; };
......
cms/static/js/spec/views/pages/container_spec.js
...@@ -519,7 +519,7 @@ define(["jquery", "underscore", "underscore.string", "common/js/spec_helpers/aja ...@@ -519,7 +519,7 @@ define(["jquery", "underscore", "underscore.string", "common/js/spec_helpers/aja
var getButtonIcon, getButtonText; var getButtonIcon, getButtonText;
getButtonIcon = function (containerPage) { getButtonIcon = function (containerPage) {
return containerPage.$('.action-toggle-preview i'); return containerPage.$('.action-toggle-preview .fa');
}; };
getButtonText = function (containerPage) { getButtonText = function (containerPage) {
......
cms/static/js/spec/views/pages/container_subviews_spec.js
...@@ -443,9 +443,9 @@ define(["jquery", "underscore", "underscore.string", "common/js/spec_helpers/aja ...@@ -443,9 +443,9 @@ define(["jquery", "underscore", "underscore.string", "common/js/spec_helpers/aja
verifyExplicitStaffOnly = function(isStaffOnly) { verifyExplicitStaffOnly = function(isStaffOnly) {
if (isStaffOnly) { if (isStaffOnly) {
expect(containerPage.$('.action-staff-lock i')).toHaveClass('fa-check-square-o'); expect(containerPage.$('.action-staff-lock .fa')).toHaveClass('fa-check-square-o');
} else { } else {
expect(containerPage.$('.action-staff-lock i')).toHaveClass('fa-square-o'); expect(containerPage.$('.action-staff-lock .fa')).toHaveClass('fa-square-o');
} }
}; };
......
cms/static/js/views/course_rerun.js
...@@ -50,7 +50,7 @@ define(["domReady", "jquery", "underscore", "js/views/utils/create_course_utils" ...@@ -50,7 +50,7 @@ define(["domReady", "jquery", "underscore", "js/views/utils/create_course_utils"
// Go into creating re-run state // Go into creating re-run state
$('.rerun-course-save').addClass('is-disabled').attr('aria-disabled', true).addClass('is-processing').html( $('.rerun-course-save').addClass('is-disabled').attr('aria-disabled', true).addClass('is-processing').html(
'<i class="icon fa fa-refresh fa-spin"></i>' + gettext('Processing Re-run Request') '<span class="icon fa fa-refresh fa-spin" aria-hidden="true"></span>' + gettext('Processing Re-run Request') //jshint ignore:line
); );
$('.action-cancel').addClass('is-hidden'); $('.action-cancel').addClass('is-hidden');
}; };
......
cms/static/js/views/metadata.js
...@@ -287,8 +287,8 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog, ...@@ -287,8 +287,8 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog,
_.each(value, function(ele, index) { _.each(value, function(ele, index) {
var template = _.template( var template = _.template(
'<li class="list-settings-item">' + '<li class="list-settings-item">' +
'<input type="text" class="input" value="<%= ele %>">' + '<input type="text" class="input" value="<%- ele %>">' +
'<a href="#" class="remove-action remove-setting" data-index="<%= index %>"><i class="icon fa fa-times-circle" aria-hidden="true"></i><span class="sr">Remove</span></a>' + '<a href="#" class="remove-action remove-setting" data-index="<%- index %>"><span class="icon fa fa-times-circle" aria-hidden="true"></span><span class="sr">' + gettext('Remove') + '</span></a>' + //jshint ignore:line
'</li>' '</li>'
); );
list.append($(template({'ele': ele, 'index': index}))); list.append($(template({'ele': ele, 'index': index})));
...@@ -455,7 +455,7 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog, ...@@ -455,7 +455,7 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog,
'<li class="list-settings-item">' + '<li class="list-settings-item">' +
'<input type="text" class="input input-key" value="<%= key %>">' + '<input type="text" class="input input-key" value="<%= key %>">' +
'<input type="text" class="input input-value" value="<%= value %>">' + '<input type="text" class="input input-value" value="<%= value %>">' +
'<a href="#" class="remove-action remove-setting" data-value="<%= value %>"><i class="icon fa fa-times-circle" aria-hidden="true"></i><span class="sr">Remove</span></a>' + '<a href="#" class="remove-action remove-setting" data-value="<%= value %>"><span class="icon fa fa-times-circle" aria-hidden="true"></span><span class="sr">Remove</span></a>' + //jshint ignore:line
'</li>' '</li>'
); );
......
cms/static/js/views/overview_assignment_grader.js deleted 100644 → 0
define(["js/views/baseview", "underscore", "gettext", "js/models/assignment_grade", "common/js/components/views/feedback_notification"],
function(BaseView, _, gettext, AssignmentGrade, NotificationView) {
var l10nNotGraded = gettext('Not Graded');
var OverviewAssignmentGrader = BaseView.extend({
// instantiate w/ { graders : CourseGraderCollection, el : <the gradable-status div> }
events : {
"click .menu-toggle" : "showGradeMenu",
"click .menu li" : "selectGradeType"
},
initialize : function() {
// call template w/ {assignmentType : formatname, graders : CourseGraderCollection instance }
this.template = _.template(
// TODO move to a template file
'<h4 class="status-label"><%= assignmentType %></h4>' +
'<a data-tooltip="Mark/unmark this subsection as graded" class="menu-toggle" href="#">' +
'<% if (!hideSymbol) {%><i class="icon fa fa-check"></i><%};%>' +
'</a>' +
'<ul class="menu">' +
'<% graders.each(function(option) { %>' +
'<li><a <% if (option.get("type") == assignmentType) {%>class="is-selected" <%}%> href="#"><%= option.get("type") %></a></li>' +
'<% }) %>' +
'<li><a class="gradable-status-notgraded" href="#">' +
l10nNotGraded +
'</a></li>' +
'</ul>');
this.assignmentGrade = new AssignmentGrade({
locator : this.$el.closest('.id-holder').data('locator'),
graderType : this.$el.data('initial-status')});
// TODO throw exception if graders is null
this.graders = this.options['graders'];
var cachethis = this;
// defining here to get closure around this
this.removeMenu = function(e) {
e.preventDefault();
cachethis.$el.removeClass('is-active');
$(document).off('click', cachethis.removeMenu);
};
this.hideSymbol = this.options['hideSymbol'];
this.render();
},
render : function() {
var graderType = this.assignmentGrade.get('graderType');
this.$el.html(this.template(
{
assignmentType : (graderType == 'notgraded') ? l10nNotGraded : graderType,
graders : this.graders,
hideSymbol : this.hideSymbol
}
));
if (this.assignmentGrade.has('graderType') && this.assignmentGrade.get('graderType') != "notgraded") {
this.$el.addClass('is-set');
}
else {
this.$el.removeClass('is-set');
}
},
showGradeMenu : function(e) {
e.preventDefault();
// I sure hope this doesn't break anything but it's needed to keep the removeMenu from activating
e.stopPropagation();
// nasty global event trap :-(
$(document).on('click', this.removeMenu);
this.$el.addClass('is-active');
},
selectGradeType : function(e) {
e.preventDefault();
this.removeMenu(e);
var saving = new NotificationView.Mini({
title: gettext('Saving')
});
saving.show();
// TODO I'm not happy with this string fetch via the html for what should be an id. I'd rather use the id attr
// of the CourseGradingPolicy model or null for notgraded (NOTE, change template's if check for is-selected accordingly)
this.assignmentGrade.save(
'graderType',
($(e.target).hasClass('gradable-status-notgraded')) ? 'notgraded' : $(e.target).text(),
{success: function () { saving.hide(); }}
);
this.render();
}
});
return OverviewAssignmentGrader;
});
cms/templates/asset_index.html
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<h3 class="sr">${_("Page Actions")}</h3> <h3 class="sr">${_("Page Actions")}</h3>
<ul> <ul>
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button upload-button new-button"><i class="icon fa fa-plus"></i> ${_("Upload New File")}</a> <a href="#" class="button upload-button new-button"><span class="icon fa fa-plus" aria-hidden="true"></span> ${_("Upload New File")}</a>
</li> </li>
</ul> </ul>
</nav> </nav>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<article class="content-primary" role="main"> <article class="content-primary" role="main">
<div class="wrapper-assets" /> <div class="wrapper-assets" />
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
</div> </div>
</article> </article>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</div> </div>
<div class="upload-modal modal"> <div class="upload-modal modal">
<a href="#" class="close-button"><i class="icon fa fa-times-circle"></i> <span class="sr">${_('close')}</span></a> <a href="#" class="close-button"><span class="icon fa fa-times-circle" aria-hidden="true"></span> <span class="sr">${_('close')}</span></a>
<div class="modal-body"> <div class="modal-body">
<h1 class="title">${_("Upload New File")}</h1> <h1 class="title">${_("Upload New File")}</h1>
<h2>${_("Max per-file size: {max_filesize}MB").format(max_filesize=max_file_size_in_mbs)}</h2> <h2>${_("Max per-file size: {max_filesize}MB").format(max_filesize=max_file_size_in_mbs)}</h2>
...@@ -115,14 +115,14 @@ ...@@ -115,14 +115,14 @@
<!-- alert: save confirmed with close --> <!-- alert: save confirmed with close -->
<div class="wrapper wrapper-alert wrapper-alert-confirmation" role="status"> <div class="wrapper wrapper-alert wrapper-alert-confirmation" role="status">
<div class="alert confirmation"> <div class="alert confirmation">
<i class="icon fa fa-check"></i> <span class="icon fa fa-check" aria-hidden="true"></span>
<div class="copy"> <div class="copy">
<h2 class="title title-3">${_('Your file has been deleted.')}</h2> <h2 class="title title-3">${_('Your file has been deleted.')}</h2>
</div> </div>
<a href="" rel="view" class="action action-alert-close"> <a href="" rel="view" class="action action-alert-close">
<i class="icon fa fa-times-circle"></i> <span class="icon fa fa-times-circle" aria-hidden="true"></span>
<span class="label">${_('close alert')}</span> <span class="label">${_('close alert')}</span>
</a> </a>
</div> </div>
......
cms/templates/certificates.html
...@@ -76,7 +76,7 @@ CMS.User.isGlobalStaff = '${is_global_staff}'=='True' ? true : false; ...@@ -76,7 +76,7 @@ CMS.User.isGlobalStaff = '${is_global_staff}'=='True' ? true : false;
</div> </div>
% else: % else:
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh" aria-hidden="true"></i></span> <span class="copy">${_("Loading")}</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
</div> </div>
% endif % endif
</div> </div>
......
cms/templates/component.html
...@@ -9,19 +9,19 @@ ...@@ -9,19 +9,19 @@
<ul class="component-actions"> <ul class="component-actions">
<li class="action-item action-edit"> <li class="action-item action-edit">
<a href="#" class="edit-button action-button"> <a href="#" class="edit-button action-button">
<i class="icon fa fa-pencil"></i> <span class="icon fa fa-pencil" aria-hidden="true"></span>
<span class="action-button-text">${_("Edit")}</span> <span class="action-button-text">${_("Edit")}</span>
</a> </a>
</li> </li>
<li class="action-item action-duplicate"> <li class="action-item action-duplicate">
<a href="#" data-tooltip="${_("Duplicate")}" class="duplicate-button action-button"> <a href="#" data-tooltip="${_("Duplicate")}" class="duplicate-button action-button">
<i class="icon fa fa-copy"></i> <span class="icon fa fa-copy" aria-hidden="true"></span>
<span class="sr">${_("Duplicate this component")}</span> <span class="sr">${_("Duplicate this component")}</span>
</a> </a>
</li> </li>
<li class="action-item action-delete"> <li class="action-item action-delete">
<a href="#" data-tooltip="${_("Delete")}" class="delete-button action-button"> <a href="#" data-tooltip="${_("Delete")}" class="delete-button action-button">
<i class="icon fa fa-trash-o"></i> <span class="icon fa fa-trash-o" aria-hidden="true"></span>
<span class="sr">${_("Delete this component")}</span> <span class="sr">${_("Delete this component")}</span>
</a> </a>
</li> </li>
......
cms/templates/container.html
...@@ -90,7 +90,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -90,7 +90,7 @@ from openedx.core.djangolib.markup import HTML, Text
% else: % else:
<li class="action-item action-edit nav-item"> <li class="action-item action-edit nav-item">
<a href="#" class="button button-edit action-button edit-button"> <a href="#" class="button button-edit action-button edit-button">
<i class="icon fa fa-pencil"></i> <span class="icon fa fa-pencil" aria-hidden="true"></span>
<span class="action-button-text">${_("Edit")}</span> <span class="action-button-text">${_("Edit")}</span>
</a> </a>
</li> </li>
...@@ -109,7 +109,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -109,7 +109,7 @@ from openedx.core.djangolib.markup import HTML, Text
<section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" data-locator="${xblock_locator}" data-course-key="${xblock_locator.course_key}"> <section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" data-locator="${xblock_locator}" data-course-key="${xblock_locator.course_key}">
</section> </section>
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
</div> </div>
</article> </article>
<aside class="content-supplementary" role="complementary"> <aside class="content-supplementary" role="complementary">
......
cms/templates/course_info.html
...@@ -45,7 +45,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -45,7 +45,7 @@ from openedx.core.djangolib.js_utils import (
<h3 class="sr">${_('Page Actions')}</h3> <h3 class="sr">${_('Page Actions')}</h3>
<ul> <ul>
<li class="nav-item"> <li class="nav-item">
<a href="#" class=" button new-button new-update-button"><i class="icon fa fa-plus"></i> ${_('New Update')}</a> <a href="#" class=" button new-button new-update-button"><span class="icon fa fa-plus" aria-hidden="true"></span> ${_('New Update')}</a>
</li> </li>
</ul> </ul>
</nav> </nav>
......
cms/templates/course_outline.html
...@@ -37,7 +37,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -37,7 +37,7 @@ from openedx.core.djangolib.markup import HTML, Text
%if notification_dismiss_url is not None: %if notification_dismiss_url is not None:
<div class="wrapper wrapper-alert wrapper-alert-announcement is-shown"> <div class="wrapper wrapper-alert wrapper-alert-announcement is-shown">
<div class="alert announcement has-actions"> <div class="alert announcement has-actions">
<i class="feedback-symbol fa fa-bullhorn"></i> <span class="feedback-symbol fa fa-bullhorn" aria-hidden="true"></span>
<div class="copy"> <div class="copy">
<h2 class="title title-3">${_("This course was created as a re-run. Some manual configuration is needed.")}</h2> <h2 class="title title-3">${_("This course was created as a re-run. Some manual configuration is needed.")}</h2>
...@@ -48,7 +48,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -48,7 +48,7 @@ from openedx.core.djangolib.markup import HTML, Text
<ul class="nav-actions"> <ul class="nav-actions">
<li class="action action-dismiss"> <li class="action action-dismiss">
<a href="#" class="button dismiss-button" data-dismiss-link='${notification_dismiss_url}'> <a href="#" class="button dismiss-button" data-dismiss-link='${notification_dismiss_url}'>
<i class="icon fa fa-times-circle"></i> <span class="icon fa fa-times-circle" aria-hidden="true"></span>
<span class="button-copy">${_("Dismiss")}</span> <span class="button-copy">${_("Dismiss")}</span>
</a> </a>
</li> </li>
...@@ -60,7 +60,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -60,7 +60,7 @@ from openedx.core.djangolib.markup import HTML, Text
%if deprecated_blocks_info.get('blocks') or deprecated_blocks_info.get('block_types_enabled'): %if deprecated_blocks_info.get('blocks') or deprecated_blocks_info.get('block_types_enabled'):
<div class="wrapper wrapper-alert wrapper-alert-error is-shown"> <div class="wrapper wrapper-alert wrapper-alert-error is-shown">
<div class="alert announcement"> <div class="alert announcement">
<i class="feedback-symbol fa fa-warning" aria-hidden="true"></i><span class="sr">${_("Warning")}</span> <span class="feedback-symbol fa fa-warning" aria-hidden="true"></span><span class="sr">${_("Warning")}</span>
<div class="copy"> <div class="copy">
<h2 class="title title-3 warning-heading-text">${_("This course uses features that are no longer supported.")}</h2> <h2 class="title title-3 warning-heading-text">${_("This course uses features that are no longer supported.")}</h2>
...@@ -122,20 +122,20 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -122,20 +122,20 @@ from openedx.core.djangolib.markup import HTML, Text
<ul> <ul>
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button button-new" data-category="chapter" data-parent="${context_course.location}" data-default-name="${_('Section')}" title="${_('Click to add a new section')}"> <a href="#" class="button button-new" data-category="chapter" data-parent="${context_course.location}" data-default-name="${_('Section')}" title="${_('Click to add a new section')}">
<i class="icon fa fa-plus"></i>${_('New Section')} <span class="icon fa fa-plus" aria-hidden="true"></span>${_('New Section')}
</a> </a>
</li> </li>
%if reindex_link: %if reindex_link:
<li class="nav-item"> <li class="nav-item">
<a href="${reindex_link}" class="button button-reindex" data-category="reindex" title="${_('Reindex current course')}"> <a href="${reindex_link}" class="button button-reindex" data-category="reindex" title="${_('Reindex current course')}">
<i class="icon-arrow-right"></i>${_('Reindex')} <span class="icon-arrow-right" aria-hidden="true"></span>${_('Reindex')}
</a> </a>
</li> </li>
%endif %endif
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button button-toggle button-toggle-expand-collapse collapse-all is-hidden"> <a href="#" class="button button-toggle button-toggle-expand-collapse collapse-all is-hidden">
<span class="collapse-all"><i class="icon fa fa-arrow-up"></i> <span class="label">${_("Collapse All Sections")}</span></span> <span class="collapse-all"><span class="icon fa fa-arrow-up" aria-hidden="true"></span> <span class="label">${_("Collapse All Sections")}</span></span>
<span class="expand-all"><i class="icon fa fa-arrow-down"></i> <span class="label">${_("Expand All Sections")}</span></span> <span class="expand-all"><span class="icon fa fa-arrow-down" aria-hidden="true"></span> <span class="label">${_("Expand All Sections")}</span></span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
...@@ -158,7 +158,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -158,7 +158,7 @@ from openedx.core.djangolib.markup import HTML, Text
<ul class="status-actions"> <ul class="status-actions">
<li class="action-item action-edit"> <li class="action-item action-edit">
<a href="${settings_url}" class="edit-button action-button" data-tooltip="${_("Edit Start Date")}"> <a href="${settings_url}" class="edit-button action-button" data-tooltip="${_("Edit Start Date")}">
<i class="icon fa fa-pencil"></i> <span class="icon fa fa-pencil" aria-hidden="true"></span>
<span class="action-button-text sr">${_("Edit Start Date")}</span> <span class="action-button-text sr">${_("Edit Start Date")}</span>
</a> </a>
</li> </li>
...@@ -185,7 +185,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -185,7 +185,7 @@ from openedx.core.djangolib.markup import HTML, Text
</article> </article>
</div> </div>
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
</div> </div>
</article> </article>
<aside class="content-supplementary" role="complementary"> <aside class="content-supplementary" role="complementary">
......
cms/templates/edit-tabs.html
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<h3 class="sr">${_("Page Actions")}</h3> <h3 class="sr">${_("Page Actions")}</h3>
<ul> <ul>
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button new-button new-tab"><i class="icon fa fa-plus"></i> ${_("New Page")}</a> <a href="#" class="button new-button new-tab"><span class="icon fa fa-plus" aria-hidden="true"></span> ${_("New Page")}</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="${lms_link}" rel="external" class="button view-button view-live-button">${_("View Live")}</a> <a href="${lms_link}" rel="external" class="button view-button view-live-button">${_("View Live")}</a>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
% else: % else:
<input type="checkbox" class="toggle-checkbox" data-tooltip="${_('Show/hide page')}" /> <input type="checkbox" class="toggle-checkbox" data-tooltip="${_('Show/hide page')}" />
% endif % endif
<div class="action-button"><i class="icon fa fa-eye"></i><i class="icon fa fa-eye-slash"></i></div> <div class="action-button"><span class="icon fa fa-eye" aria-hidden="true"></span><span class="icon fa fa-eye-slash"></span></div>
</li> </li>
% endif % endif
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
</div> </div>
<div class="add-pages"> <div class="add-pages">
<p>${_("You can add additional custom pages to your course.")} <a href="#" class="button new-button new-tab"><i class="icon fa fa-plus"></i>${_("Add a New Page")}</a></p> <p>${_("You can add additional custom pages to your course.")} <a href="#" class="button new-button new-tab"><span class="icon fa fa-plus" aria-hidden="true"></span>${_("Add a New Page")}</a></p>
</div> </div>
</article> </article>
</div> </div>
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
</figure> </figure>
<a href="#" rel="view" class="action action-modal-close"> <a href="#" rel="view" class="action action-modal-close">
<i class="icon fa fa-times-circle"></i> <span class="icon fa fa-times-circle" aria-hidden="true"></span>
<span class="label">${_("close modal")}</span> <span class="label">${_("close modal")}</span>
</a> </a>
</div> </div>
......
cms/templates/export.html
...@@ -94,7 +94,7 @@ else: ...@@ -94,7 +94,7 @@ else:
<ul class="list-actions"> <ul class="list-actions">
<li class="item-action"> <li class="item-action">
<a class="action action-export action-primary" href="${export_url}"> <a class="action action-export action-primary" href="${export_url}">
<i class="icon fa fa-arrow-circle-o-down"></i> <span class="icon fa fa-arrow-circle-o-down" aria-hidden="true"></span>
<span class="copy"> <span class="copy">
%if library: %if library:
${_("Export Library Content")} ${_("Export Library Content")}
......
cms/templates/export_git.html
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<ul class="list-actions"> <ul class="list-actions">
<li class="item-action"> <li class="item-action">
<a class="action action-export-git action-primary" href="${reverse('export_git', kwargs=dict(course_key_string=unicode(context_course.id)))}?action=push"> <a class="action action-export-git action-primary" href="${reverse('export_git', kwargs=dict(course_key_string=unicode(context_course.id)))}?action=push">
<i class="icon fa fa-arrow-circle-o-down"></i> <span class="icon fa fa-arrow-circle-o-down" aria-hidden="true"></span>
<span class="copy">${_("Export to Git")}</span> <span class="copy">${_("Export to Git")}</span>
</a> </a>
</li> </li>
......
cms/templates/group_configurations.html
...@@ -51,7 +51,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -51,7 +51,7 @@ from openedx.core.djangolib.markup import HTML, Text
<div class="wrapper-groups content-groups"> <div class="wrapper-groups content-groups">
<h3 class="title">${_("Content Groups")}</h3> <h3 class="title">${_("Content Groups")}</h3>
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
</div> </div>
</div> </div>
...@@ -66,7 +66,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -66,7 +66,7 @@ from openedx.core.djangolib.markup import HTML, Text
</div> </div>
% else: % else:
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
</div> </div>
% endif % endif
</div> </div>
......
cms/templates/howitworks.html
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<img src="${static.url("images/thumb-hiw-feature1.png")}" alt="${_('{studio_name} Helps You Keep Your Courses Organized').format(studio_name=settings.STUDIO_SHORT_NAME)}" /> <img src="${static.url("images/thumb-hiw-feature1.png")}" alt="${_('{studio_name} Helps You Keep Your Courses Organized').format(studio_name=settings.STUDIO_SHORT_NAME)}" />
<figcaption class="sr">${_("{studio_name} Helps You Keep Your Courses Organized").format(studio_name=settings.STUDIO_NAME)}</figcaption> <figcaption class="sr">${_("{studio_name} Helps You Keep Your Courses Organized").format(studio_name=settings.STUDIO_NAME)}</figcaption>
<span class="action-zoom"> <span class="action-zoom">
<i class="icon fa fa-search-plus"></i> <span class="icon fa fa-search-plus" aria-hidden="true"></span><span class="sr">${_("Enlarge image")}</span>
</span> </span>
</a> </a>
</figure> </figure>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<img src="${static.url("images/thumb-hiw-feature2.png")}" alt="${_('Learning is More than Just Lectures')}" /> <img src="${static.url("images/thumb-hiw-feature2.png")}" alt="${_('Learning is More than Just Lectures')}" />
<figcaption class="sr">${_("Learning is More than Just Lectures")}</figcaption> <figcaption class="sr">${_("Learning is More than Just Lectures")}</figcaption>
<span class="action-zoom"> <span class="action-zoom">
<i class="icon fa fa-search-plus"></i> <span class="icon fa fa-search-plus" aria-hidden="true"></span><span class="sr">${_("Enlarge image")}</span>
</span> </span>
</a> </a>
</figure> </figure>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<img src="${static.url("images/thumb-hiw-feature3.png")}" alt="${_('{studio_name} Gives You Simple, Fast, and Incremental Publishing. With Friends.').format(studio_name=settings.STUDIO_SHORT_NAME)}" /> <img src="${static.url("images/thumb-hiw-feature3.png")}" alt="${_('{studio_name} Gives You Simple, Fast, and Incremental Publishing. With Friends.').format(studio_name=settings.STUDIO_SHORT_NAME)}" />
<figcaption class="sr">${_("{studio_name} Gives You Simple, Fast, and Incremental Publishing. With Friends.").format(studio_name=settings.STUDIO_SHORT_NAME)}</figcaption> <figcaption class="sr">${_("{studio_name} Gives You Simple, Fast, and Incremental Publishing. With Friends.").format(studio_name=settings.STUDIO_SHORT_NAME)}</figcaption>
<span class="action-zoom"> <span class="action-zoom">
<i class="icon fa fa-search-plus"></i> <span class="icon fa fa-search-plus" aria-hidden="true"></span><span class="sr">${_("Enlarge image")}</span>
</span> </span>
</a> </a>
</figure> </figure>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
</figure> </figure>
<a href="" rel="view" class="action action-modal-close"> <a href="" rel="view" class="action action-modal-close">
<i class="icon fa fa-times-circle"></i> <span class="icon fa fa-times-circle" aria-hidden="true"></span>
<span class="label">${_("close modal")}</span> <span class="label">${_("close modal")}</span>
</a> </a>
</div> </div>
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
</figure> </figure>
<a href="" rel="view" class="action action-modal-close"> <a href="" rel="view" class="action action-modal-close">
<i class="icon fa fa-times-circle"></i> <span class="icon fa fa-times-circle" aria-hidden="true"></span>
<span class="label">${_("close modal")}</span> <span class="label">${_("close modal")}</span>
</a> </a>
</div> </div>
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
</figure> </figure>
<a href="" rel="view" class="action action-modal-close"> <a href="" rel="view" class="action action-modal-close">
<i class="icon fa fa-times-circle"></i> <span class="icon fa fa-times-circle" aria-hidden="true"></span>
<span class="label">${_("close modal")}</span> <span class="label">${_("close modal")}</span>
</a> </a>
</div> </div>
......
cms/templates/html_error.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="copy"> <div class="copy">
<h2 class="title"> <h2 class="title">
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
${_("We're having trouble rendering your component")} ${_("We're having trouble rendering your component")}
</h2> </h2>
......
cms/templates/import.html
...@@ -69,7 +69,7 @@ else: ...@@ -69,7 +69,7 @@ else:
<p class="error-block"></p> <p class="error-block"></p>
<a href="#" class="action action-choose-file choose-file-button"> <a href="#" class="action action-choose-file choose-file-button">
<i class="icon fa fa-upload"></i> <span class="icon fa fa-upload" aria-hidden="true"></span>
<span class="copy">${_("Choose a File to Import")}</span> <span class="copy">${_("Choose a File to Import")}</span>
</a> </a>
...@@ -102,8 +102,8 @@ else: ...@@ -102,8 +102,8 @@ else:
<ol class="status-progress list-progress"> <ol class="status-progress list-progress">
<li class="item-progresspoint item-progresspoint-upload is-complete"> <li class="item-progresspoint item-progresspoint-upload is-complete">
<span class="deco status-visual"> <span class="deco status-visual">
<i class="icon fa fa-cog"></i> <span class="icon fa fa-cog" aria-hidden="true"></span>
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
</span> </span>
<div class="status-detail"> <div class="status-detail">
...@@ -117,8 +117,8 @@ else: ...@@ -117,8 +117,8 @@ else:
<li class="item-progresspoint item-progresspoint-unpack is-started"> <li class="item-progresspoint item-progresspoint-unpack is-started">
<span class="deco status-visual"> <span class="deco status-visual">
<i class="icon fa fa-cog"></i> <span class="icon fa fa-cog" aria-hidden="true"></span>
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"v></span>
</span> </span>
<div class="status-detail"> <div class="status-detail">
...@@ -130,8 +130,8 @@ else: ...@@ -130,8 +130,8 @@ else:
<li class="item-progresspoint item-progresspoint-verify is-not-started"> <li class="item-progresspoint item-progresspoint-verify is-not-started">
<span class="deco status-visual"> <span class="deco status-visual">
<i class="icon fa fa-cog"></i> <span class="icon fa fa-cog" aria-hidden="true"></span>
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
</span> </span>
<div class="status-detail"> <div class="status-detail">
...@@ -142,8 +142,8 @@ else: ...@@ -142,8 +142,8 @@ else:
<li class="item-progresspoint item-progresspoint-import is-not-started"> <li class="item-progresspoint item-progresspoint-import is-not-started">
<span class="deco status-visual"> <span class="deco status-visual">
<i class="icon fa fa-cog"></i> <span class="icon fa fa-cog" aria-hidden="true"></span>
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
</span> </span>
<div class="status-detail"> <div class="status-detail">
...@@ -165,7 +165,7 @@ else: ...@@ -165,7 +165,7 @@ else:
</li> </li>
<li class="item-progresspoint item-progresspoint-success has-actions is-not-started"> <li class="item-progresspoint item-progresspoint-success has-actions is-not-started">
<span class="deco status-visual"> <span class="deco status-visual">
<i class="icon fa fa-square-o"></i> <span class="icon fa fa-square-o" aria-hidden="true"></span>
</span> </span>
<div class="status-detail"> <div class="status-detail">
......
cms/templates/index.html
...@@ -28,19 +28,19 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -28,19 +28,19 @@ from openedx.core.djangolib.markup import HTML, Text
<ul> <ul>
<li class="nav-item"> <li class="nav-item">
% if course_creator_status=='granted': % if course_creator_status=='granted':
<a href="#" class="button new-button new-course-button"><i class="icon fa fa-plus icon-inline"></i> <a href="#" class="button new-button new-course-button"><span class="icon fa fa-plus icon-inline" aria-hidden="true"></span>
${_("New Course")}</a> ${_("New Course")}</a>
% elif course_creator_status=='disallowed_for_this_site' and settings.FEATURES.get('STUDIO_REQUEST_EMAIL',''): % elif course_creator_status=='disallowed_for_this_site' and settings.FEATURES.get('STUDIO_REQUEST_EMAIL',''):
<a href="mailto:${settings.FEATURES.get('STUDIO_REQUEST_EMAIL','')}">${_("Email staff to create course")}</a> <a href="mailto:${settings.FEATURES.get('STUDIO_REQUEST_EMAIL','')}">${_("Email staff to create course")}</a>
% endif % endif
% if show_new_library_button: % if show_new_library_button:
<a href="#" class="button new-button new-library-button"><i class="icon fa fa-plus icon-inline"></i> <a href="#" class="button new-button new-library-button"><span class="icon fa fa-plus icon-inline" aria-hidden="true"></span>
${_("New Library")}</a> ${_("New Library")}</a>
% endif % endif
% if is_programs_enabled: % if is_programs_enabled:
<a href=${program_authoring_url + 'new'} class="button new-button new-program-button"><i class="icon fa fa-plus icon-inline"></i> <a href=${program_authoring_url + 'new'} class="button new-button new-program-button"><span class="icon fa fa-plus icon-inline" aria-hidden="true"></span>
${_("New Program")}</a> ${_("New Program")}</a>
% endif % endif
</li> </li>
...@@ -220,7 +220,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -220,7 +220,7 @@ from openedx.core.djangolib.markup import HTML, Text
<dl class="course-status"> <dl class="course-status">
<dt class="label sr">${_("This course run is currently being created.")}</dt> <dt class="label sr">${_("This course run is currently being created.")}</dt>
<dd class="value"> <dd class="value">
<i class="icon fa fa-refresh fa-spin"></i> <span class="icon fa fa-refresh fa-spin" aria-hidden="true"></span>
## Translators: This is a status message, used to inform the user of ## Translators: This is a status message, used to inform the user of
## what the system is doing. This status means that the user has ## what the system is doing. This status means that the user has
## requested to re-run an existing course, and the system is currently ## requested to re-run an existing course, and the system is currently
...@@ -270,7 +270,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -270,7 +270,7 @@ from openedx.core.djangolib.markup import HTML, Text
## the process will follow this text. ## the process will follow this text.
<dt class="label sr">${_("This re-run processing status:")}</dt> <dt class="label sr">${_("This re-run processing status:")}</dt>
<dd class="value"> <dd class="value">
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
<span class="copy">${_("Configuration Error")}</span> <span class="copy">${_("Configuration Error")}</span>
</dd> </dd>
</dl> </dl>
...@@ -282,7 +282,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -282,7 +282,7 @@ from openedx.core.djangolib.markup import HTML, Text
<ul class="status-actions"> <ul class="status-actions">
<li class="action action-dismiss"> <li class="action action-dismiss">
<a href="#" class="button dismiss-button" data-dismiss-link="${course_info['dismiss_link']}"> <a href="#" class="button dismiss-button" data-dismiss-link="${course_info['dismiss_link']}">
<i class="icon fa fa-times-circle"></i> <span class="icon fa fa-times-circle" aria-hidden="true"></span>
<span class="button-copy">${_("Dismiss")}</span> <span class="button-copy">${_("Dismiss")}</span>
</a> </a>
</li> </li>
...@@ -368,7 +368,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -368,7 +368,7 @@ from openedx.core.djangolib.markup import HTML, Text
<ul class="list-actions"> <ul class="list-actions">
<li class="action-item"> <li class="action-item">
<a href="#" class="action-primary action-create action-create-course new-course-button"><i class="icon fa fa-plus icon-inline"></i> ${_('Create Your First Course')}</a> <a href="#" class="action-primary action-create action-create-course new-course-button"><span class="icon fa fa-plus icon-inline" aria-hidden="true"></span> ${_('Create Your First Course')}</a>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -381,7 +381,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -381,7 +381,7 @@ from openedx.core.djangolib.markup import HTML, Text
%if course_creator_status == "unrequested": %if course_creator_status == "unrequested":
<div class="wrapper wrapper-creationrights"> <div class="wrapper wrapper-creationrights">
<h3 class="title"> <h3 class="title">
<a href="#instruction-creationrights" class="ui-toggle-control show-creationrights"><span class="label">${_('Becoming a Course Creator in {studio_name}').format(studio_name=settings.STUDIO_SHORT_NAME)}</span> <i class="icon fa fa-times-circle"></i></a> <a href="#instruction-creationrights" class="ui-toggle-control show-creationrights"><span class="label">${_('Becoming a Course Creator in {studio_name}').format(studio_name=settings.STUDIO_SHORT_NAME)}</span> <span class="icon fa fa-times-circle" aria-hidden="true"></span></a>
</h3> </h3>
<div class="notice notice-incontext notice-instruction notice-instruction-creationrights ui-toggle-target" id="instruction-creationrights"> <div class="notice notice-incontext notice-instruction notice-instruction-creationrights ui-toggle-target" id="instruction-creationrights">
...@@ -395,7 +395,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -395,7 +395,7 @@ from openedx.core.djangolib.markup import HTML, Text
<form id="request-coursecreator" action="${request_course_creator_url}" method="post" enctype="multipart/form-data"> <form id="request-coursecreator" action="${request_course_creator_url}" method="post" enctype="multipart/form-data">
<div class="form-actions"> <div class="form-actions">
<button type="submit" id="request-coursecreator-submit" name="request-coursecreator-submit" class="action-primary action-request"><i class="icon fa fa-cog icon-inline fa fa-spin"></i> <span class="label">${_('Request the Ability to Create Courses')}</span></button> <button type="submit" id="request-coursecreator-submit" name="request-coursecreator-submit" class="action-primary action-request"><span class="icon fa fa-cog icon-inline fa fa-spin" aria-hidden="true"></span> <span class="label">${_('Request the Ability to Create Courses')}</span></button>
</div> </div>
</form> </form>
</div> </div>
...@@ -405,7 +405,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -405,7 +405,7 @@ from openedx.core.djangolib.markup import HTML, Text
%elif course_creator_status == "denied": %elif course_creator_status == "denied":
<div class="wrapper wrapper-creationrights is-shown"> <div class="wrapper wrapper-creationrights is-shown">
<h3 class="title"> <h3 class="title">
<a href="#instruction-creationrights" class="ui-toggle-control current show-creationrights"><span class="label">${_('Your Course Creator Request Status')}</span> <i class="icon fa fa-times-circle"></i></a> <a href="#instruction-creationrights" class="ui-toggle-control current show-creationrights"><span class="label">${_('Your Course Creator Request Status')}</span> <span class="icon fa fa-times-circle" aria-hidden="true"></span></a>
</h3> </h3>
<div class="notice notice-incontext notice-instruction notice-instruction-creationrights ui-toggle-target" id="instruction-creationrights"> <div class="notice notice-incontext notice-instruction notice-instruction-creationrights ui-toggle-target" id="instruction-creationrights">
...@@ -433,7 +433,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -433,7 +433,7 @@ from openedx.core.djangolib.markup import HTML, Text
%elif course_creator_status == "pending": %elif course_creator_status == "pending":
<div class="wrapper wrapper-creationrights is-shown"> <div class="wrapper wrapper-creationrights is-shown">
<h3 class="title"> <h3 class="title">
<a href="#instruction-creationrights" class="ui-toggle-control current show-creationrights"><span class="label">${_('Your Course Creator Request Status')}</span> <i class="icon fa fa-times-circle"></i></a> <a href="#instruction-creationrights" class="ui-toggle-control current show-creationrights"><span class="label">${_('Your Course Creator Request Status')}</span> <span class="icon fa fa-times-circle" aria-hidden="true"></span></a>
</h3> </h3>
<div class="notice notice-incontext notice-instruction notice-instruction-creationrights ui-toggle-target" id="instruction-creationrights"> <div class="notice notice-incontext notice-instruction notice-instruction-creationrights ui-toggle-target" id="instruction-creationrights">
...@@ -508,7 +508,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -508,7 +508,7 @@ from openedx.core.djangolib.markup import HTML, Text
<ul class="list-actions"> <ul class="list-actions">
<li class="action-item"> <li class="action-item">
<a href="#" class="action-primary action-create new-button action-create-library new-library-button"><i class="icon fa fa-plus icon-inline"></i> ${_('Create Your First Library')}</a> <a href="#" class="action-primary action-create new-button action-create-library new-library-button"><span class="icon fa fa-plus icon-inline" aria-hidden="true"></span> ${_('Create Your First Library')}</a>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -553,7 +553,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -553,7 +553,7 @@ from openedx.core.djangolib.markup import HTML, Text
<ul class="list-actions"> <ul class="list-actions">
<li class="action-item"> <li class="action-item">
<a href=${program_authoring_url + 'new'} class="action-primary action-create new-button action-create-program new-program-button"><i class="icon fa fa-plus icon-inline"></i> ${_('Create Your First Program')}</a> <a href=${program_authoring_url + 'new'} class="action-primary action-create new-button action-create-program new-program-button"><span class="icon fa fa-plus icon-inline" aria-hidden="true"></span> ${_('Create Your First Program')}</a>
</li> </li>
</ul> </ul>
......
cms/templates/js/access-editor.underscore
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
<li class="field field-checkbox checkbox-cosmetic"> <li class="field field-checkbox checkbox-cosmetic">
<input type="checkbox" id="is_prereq" name="is_prereq" class="input input-checkbox" /> <input type="checkbox" id="is_prereq" name="is_prereq" class="input input-checkbox" />
<label for="is_prereq" class="label"> <label for="is_prereq" class="label">
<i class="icon fa fa-check-square-o input-checkbox-checked"></i> <span class="icon fa fa-check-square-o input-checkbox-checked" aria-hidden="true"></span>
<i class="icon fa fa-square-o input-checkbox-unchecked"></i> <span class="icon fa fa-square-o input-checkbox-unchecked" aria-hidden="true"></span>
<%- gettext('Make this subsection available as a prerequisite to other content') %> <%- gettext('Make this subsection available as a prerequisite to other content') %>
</label> </label>
</li> </li>
......
cms/templates/js/asset-library.underscore
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<span class="type-filter" data-alllabel='<%- gettext("Type") %>'><%- gettext("Type") %></span> <span class="type-filter" data-alllabel='<%- gettext("Type") %>'><%- gettext("Type") %></span>
<span class="label-prefix sr">Filter</span> <span class="label-prefix sr">Filter</span>
<span class="filter-link"></span> <span class="filter-link"></span>
<i class="fa fa-caret-down ui-toggle-dd" aria-hidden="true"></i> <span class="fa fa-caret-down ui-toggle-dd" aria-hidden="true"></span>
</span> </span>
<div class="wrapper-nav-sub"> <div class="wrapper-nav-sub">
<div class="nav-sub"> <div class="nav-sub">
...@@ -64,5 +64,5 @@ ...@@ -64,5 +64,5 @@
</div> </div>
<div class="no-asset-content"> <div class="no-asset-content">
<p><%- gettext("You haven't added any assets to this course yet.") %> <a href="#" class="button new-button upload-button"><i class="icon fa fa-plus" aria-hidden="true"></i><%- gettext("Upload your first asset") %></a></p> <p><%- gettext("You haven't added any assets to this course yet.") %> <a href="#" class="button new-button upload-button"><span class="icon fa fa-plus" aria-hidden="true"></span><%- gettext("Upload your first asset") %></a></p>
</div> </div>
cms/templates/js/asset-upload-modal.underscore
<div class="upload-modal modal" style="display: none;"> <div class="upload-modal modal" style="display: none;">
<a href="#" class="close-button"><i class="icon fa fa-times-circle" aria-hidden="true"></i> <span class="sr"><%= gettext('close') %></span></a> <a href="#" class="close-button"><span class="icon fa fa-times-circle" aria-hidden="true"></span> <span class="sr"><%= gettext('close') %></span></a>
<div class="modal-body"> <div class="modal-body">
<h1 class="title"><%= gettext("Upload New File") %></h1> <h1 class="title"><%= gettext("Upload New File") %></h1>
<p class="file-name"> <p class="file-name">
......
cms/templates/js/asset.underscore
...@@ -36,12 +36,12 @@ ...@@ -36,12 +36,12 @@
<td class="actions-col"> <td class="actions-col">
<ul class="actions-list"> <ul class="actions-list">
<li class="action-item action-delete"> <li class="action-item action-delete">
<a href="#" data-tooltip="<%- gettext('Delete this asset') %>" class="remove-asset-button action-button"><i class="icon fa fa-times-circle" aria-hidden="true"></i> <span class="sr"><%- gettext('Delete this asset') %></span></a> <a href="#" data-tooltip="<%- gettext('Delete this asset') %>" class="remove-asset-button action-button"><span class="icon fa fa-times-circle" aria-hidden="true"></span> <span class="sr"><%- gettext('Delete this asset') %></span></a>
</li> </li>
<li class="action-item action-lock"> <li class="action-item action-lock">
<label for="<%- uniqueId %>"><span class="sr"><%- gettext('Lock this asset') %></span></label> <label for="<%- uniqueId %>"><span class="sr"><%- gettext('Lock this asset') %></span></label>
<input type="checkbox" id="<%- uniqueId %>" class="lock-checkbox" data-tooltip="<%- gettext('Lock/unlock file') %>" /> <input type="checkbox" id="<%- uniqueId %>" class="lock-checkbox" data-tooltip="<%- gettext('Lock/unlock file') %>" />
<div class="action-button"><i class="icon fa fa-lock"></i><i class="icon fa fa-unlock-alt" aria-hidden="true"></i></div> <div class="action-button"><span class="icon fa fa-lock" aria-hidden="true"></span><span class="icon fa fa-unlock-alt" aria-hidden="true"></span></div>
</li> </li>
</ul> </ul>
</td> </td>
cms/templates/js/certificate-details.underscore
...@@ -61,10 +61,10 @@ ...@@ -61,10 +61,10 @@
<ul class="actions certificate-actions"> <ul class="actions certificate-actions">
<% if (CMS.User.isGlobalStaff || !is_active) { %> <% if (CMS.User.isGlobalStaff || !is_active) { %>
<li class="action action-edit"> <li class="action action-edit">
<button class="edit"><i class="icon fa fa-pencil" aria-hidden="true"></i> <%- gettext("Edit") %></button> <button class="edit"><span class="icon fa fa-pencil" aria-hidden="true"></span> <%- gettext("Edit") %></button>
</li> </li>
<li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Delete') %>"> <li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Delete') %>">
<button class="delete action-icon"><i class="icon fa fa-trash-o" aria-hidden="true"></i><span><%- gettext("Delete") %></span></button> <button class="delete action-icon" title="<%- gettext('Delete') %>"><span class="icon fa fa-trash-o" aria-hidden="true"></span></button>
</li> </li>
<% } %> <% } %>
</ul> </ul>
......
cms/templates/js/container-message.underscore
<% if (currentlyVisibleToStudents) { %> <% if (currentlyVisibleToStudents) { %>
<div class="message has-warnings"> <div class="message has-warnings">
<p class="warning"> <p class="warning">
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
<%= gettext("Caution: The last published version of this unit is live. By publishing changes you will change the student experience.") %> <%- gettext("Caution: The last published version of this unit is live. By publishing changes you will change the student experience.") %>
</p> </p>
</div> </div>
<% } %> <% } %>
cms/templates/js/content-group-details.underscore
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<header class="collection-header"> <header class="collection-header">
<h3 class="title"> <h3 class="title">
<a href="#" class="toggle group-toggle <% if (showContentGroupUsages){ print('hide'); } else { print('show'); } %>-groups"> <a href="#" class="toggle group-toggle <% if (showContentGroupUsages){ print('hide'); } else { print('show'); } %>-groups">
<i class="ui-toggle-expansion icon fa fa-caret-<% if (showContentGroupUsages){ print('down'); } else { print('right'); } %>"></i> <span class="ui-toggle-expansion icon fa fa-caret-<% if (showContentGroupUsages){ print('down'); } else { print('right'); } %>" aria-hidden="true"></span>
<%- name %> <%- name %>
</a> </a>
</h3> </h3>
...@@ -24,15 +24,15 @@ ...@@ -24,15 +24,15 @@
<ul class="actions group-configuration-actions"> <ul class="actions group-configuration-actions">
<li class="action action-edit"> <li class="action action-edit">
<button class="edit"><i class="icon fa fa-pencil"></i> <%- gettext("Edit") %></button> <button class="edit"><span class="icon fa fa-pencil" aria-hidden="true"></span> <%- gettext("Edit") %></button>
</li> </li>
<% if (_.isEmpty(usage)) { %> <% if (_.isEmpty(usage)) { %>
<li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Delete') %>"> <li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Delete') %>">
<button class="delete action-icon"><i class="icon fa fa-trash-o"></i><span><%- gettext("Delete") %></span></button> <button class="delete action-icon" title="<%- gettext('Delete') %>"><span class="icon fa fa-trash-o" aria-hidden="true"></span></button>
</li> </li>
<% } else { %> <% } else { %>
<li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Cannot delete when in use by a unit') %>"> <li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Cannot delete when in use by a unit') %>">
<button class="delete action-icon is-disabled" aria-disabled="true" disabled="disabled"><i class="icon fa fa-trash-o"></i><span><%- gettext("Delete") %></span></button> <button class="delete action-icon is-disabled" aria-disabled="true" disabled="disabled" title="<%- gettext('Delete') %>"><span class="icon fa fa-trash-o" aria-hidden="true"></span></button>
</li> </li>
<% } %> <% } %>
</ul> </ul>
......
cms/templates/js/content-group-editor.underscore
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</fieldset> </fieldset>
<% if (!_.isEmpty(usage)) { %> <% if (!_.isEmpty(usage)) { %>
<div class="wrapper-group-configuration-validation usage-validation"> <div class="wrapper-group-configuration-validation usage-validation">
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
<p class="group-configuration-validation-text"> <p class="group-configuration-validation-text">
<%- gettext('This content group is used in one or more units.') %> <%- gettext('This content group is used in one or more units.') %>
</p> </p>
......
cms/templates/js/course-outline.underscore
...@@ -70,7 +70,7 @@ if (is_proctored_exam) { ...@@ -70,7 +70,7 @@ if (is_proctored_exam) {
<li class="outline-item outline-<%- xblockType %> <%- visibilityClass %> is-draggable <%- includesChildren ? 'is-collapsible' : '' %> <%- isCollapsed ? 'is-collapsed' : '' %>" <li class="outline-item outline-<%- xblockType %> <%- visibilityClass %> is-draggable <%- includesChildren ? 'is-collapsible' : '' %> <%- isCollapsed ? 'is-collapsed' : '' %>"
data-parent="<%- parentInfo.get('id') %>" data-locator="<%- xblockInfo.get('id') %>"> data-parent="<%- parentInfo.get('id') %>" data-locator="<%- xblockInfo.get('id') %>">
<span class="draggable-drop-indicator draggable-drop-indicator-before"><i class="icon fa fa-caret-right"></i></span> <span class="draggable-drop-indicator draggable-drop-indicator-before"><span class="icon fa fa-caret-right" aria-hidden="true"></span></span>
<% if (xblockInfo.isHeaderVisible()) { %> <% if (xblockInfo.isHeaderVisible()) { %>
<div class="<%- xblockType %>-header"> <div class="<%- xblockType %>-header">
<% if (includesChildren) { %> <% if (includesChildren) { %>
...@@ -79,7 +79,7 @@ if (is_proctored_exam) { ...@@ -79,7 +79,7 @@ if (is_proctored_exam) {
gettext('Collapse/Expand this %(xblock_type)s'), { xblock_type: xblockTypeDisplayName }, true gettext('Collapse/Expand this %(xblock_type)s'), { xblock_type: xblockTypeDisplayName }, true
) %>" ) %>"
> >
<i class="icon fa fa-caret-down"></i> <span class="icon fa fa-caret-down" aria-hidden="true"></span>
<% } else { %> <% } else { %>
<h3 class="<%- xblockType %>-header-details"> <h3 class="<%- xblockType %>-header-details">
<% } %> <% } %>
...@@ -99,7 +99,7 @@ if (is_proctored_exam) { ...@@ -99,7 +99,7 @@ if (is_proctored_exam) {
<% if (xblockInfo.isPublishable()) { %> <% if (xblockInfo.isPublishable()) { %>
<li class="action-item action-publish"> <li class="action-item action-publish">
<a href="#" data-tooltip="<%- gettext('Publish') %>" class="publish-button action-button"> <a href="#" data-tooltip="<%- gettext('Publish') %>" class="publish-button action-button">
<i class="icon fa fa-upload"></i> <span class="icon fa fa-upload" aria-hidden="true"></span>
<span class="sr action-button-text"><%- gettext('Publish') %></span> <span class="sr action-button-text"><%- gettext('Publish') %></span>
</a> </a>
</li> </li>
...@@ -107,7 +107,7 @@ if (is_proctored_exam) { ...@@ -107,7 +107,7 @@ if (is_proctored_exam) {
<% if (xblockInfo.isEditableOnCourseOutline()) { %> <% if (xblockInfo.isEditableOnCourseOutline()) { %>
<li class="action-item action-configure"> <li class="action-item action-configure">
<a href="#" data-tooltip="<%- gettext('Configure') %>" class="configure-button action-button"> <a href="#" data-tooltip="<%- gettext('Configure') %>" class="configure-button action-button">
<i class="icon fa fa-gear"></i> <span class="icon fa fa-gear" aria-hidden="true"></span>
<span class="sr action-button-text"><%- gettext('Configure') %></span> <span class="sr action-button-text"><%- gettext('Configure') %></span>
</a> </a>
</li> </li>
...@@ -115,7 +115,7 @@ if (is_proctored_exam) { ...@@ -115,7 +115,7 @@ if (is_proctored_exam) {
<% if (xblockInfo.isDeletable()) { %> <% if (xblockInfo.isDeletable()) { %>
<li class="action-item action-delete"> <li class="action-item action-delete">
<a href="#" data-tooltip="<%- gettext('Delete') %>" class="delete-button action-button"> <a href="#" data-tooltip="<%- gettext('Delete') %>" class="delete-button action-button">
<i class="icon fa fa-trash-o" aria-hidden="true"></i> <span class="icon fa fa-trash-o" aria-hidden="true"></span>
<span class="sr action-button-text"><%- gettext('Delete') %></span> <span class="sr action-button-text"><%- gettext('Delete') %></span>
</a> </a>
</li> </li>
...@@ -146,13 +146,13 @@ if (is_proctored_exam) { ...@@ -146,13 +146,13 @@ if (is_proctored_exam) {
<span class="status-release-value"> <span class="status-release-value">
<% if (!course.get('self_paced')) { %> <% if (!course.get('self_paced')) { %>
<% if (xblockInfo.get('released_to_students')) { %> <% if (xblockInfo.get('released_to_students')) { %>
<i class="icon fa fa-check"></i> <span class="icon fa fa-check" aria-hidden="true"></span>
<%- gettext('Released:') %> <%- gettext('Released:') %>
<% } else if (xblockInfo.get('release_date')) { %> <% } else if (xblockInfo.get('release_date')) { %>
<i class="icon fa fa-clock-o"></i> <span class="icon fa fa-clock-o" aria-hidden="true"></span>
<%- gettext('Scheduled:') %> <%- gettext('Scheduled:') %>
<% } else { %> <% } else { %>
<i class="icon fa fa-clock-o"></i> <span class="icon fa fa-clock-o" aria-hidden="true"></span>
<%- gettext('Unscheduled') %> <%- gettext('Unscheduled') %>
<% } %> <% } %>
<% if (xblockInfo.get('release_date')) { %> <% if (xblockInfo.get('release_date')) { %>
...@@ -167,7 +167,7 @@ if (is_proctored_exam) { ...@@ -167,7 +167,7 @@ if (is_proctored_exam) {
<div class="status-timed-proctored-exam"> <div class="status-timed-proctored-exam">
<p> <p>
<span class="sr status-grading-label"> <%- gettext('Graded as:') %> </span> <span class="sr status-grading-label"> <%- gettext('Graded as:') %> </span>
<i class="icon fa fa-check"></i> <span class="icon fa fa-check" aria-hidden="true"></span>
<span class="status-grading-value"> <%- gradingType %> </span> <span class="status-grading-value"> <%- gradingType %> </span>
- -
<span class="sr status-proctored-exam-label"> <%- exam_value %> </span> <span class="sr status-proctored-exam-label"> <%- exam_value %> </span>
...@@ -180,10 +180,10 @@ if (is_proctored_exam) { ...@@ -180,10 +180,10 @@ if (is_proctored_exam) {
<div class="status-hide-after-due"> <div class="status-hide-after-due">
<p> <p>
<% if (!is_proctored_exam && xblockInfo.get('hide_after_due')) { %> <% if (!is_proctored_exam && xblockInfo.get('hide_after_due')) { %>
<i class="icon fa fa-eye-slash"></i> <span class="icon fa fa-eye-slash" aria-hidden="true"></span>
<span class="status-hide-after-due-value"> <%- gettext("Exam will remain hidden after due date") %> </span> <span class="status-hide-after-due-value"> <%- gettext("Exam will remain hidden after due date") %> </span>
<% } else { %> <% } else { %>
<i class="icon fa fa-eye"></i> <span class="icon fa fa-eye" aria-hidden="true"></span>
<span class="status-hide-after-due-value"> <%- gettext("Exam will be visible after due date") %> </span> <span class="status-hide-after-due-value"> <%- gettext("Exam will be visible after due date") %> </span>
<% } %> <% } %>
</p> </p>
...@@ -192,7 +192,7 @@ if (is_proctored_exam) { ...@@ -192,7 +192,7 @@ if (is_proctored_exam) {
<div class="status-grading"> <div class="status-grading">
<p> <p>
<span class="sr status-grading-label"> <%- gettext('Graded as:') %> </span> <span class="sr status-grading-label"> <%- gettext('Graded as:') %> </span>
<i class="icon fa fa-check"></i> <span class="icon fa fa-check" aria-hidden="true"></span>
<span class="status-grading-value"> <%- gradingType %> </span> <span class="status-grading-value"> <%- gradingType %> </span>
<% if (xblockInfo.get('due_date') && !course.get('self_paced')) { %> <% if (xblockInfo.get('due_date') && !course.get('self_paced')) { %>
<span class="status-grading-date"> <%- gettext('Due:') %> <%- xblockInfo.get('due_date') %> </span> <span class="status-grading-date"> <%- gettext('Due:') %> <%- xblockInfo.get('due_date') %> </span>
...@@ -203,7 +203,7 @@ if (is_proctored_exam) { ...@@ -203,7 +203,7 @@ if (is_proctored_exam) {
<% } %> <% } %>
<% if (statusMessage) { %> <% if (statusMessage) { %>
<div class="status-message"> <div class="status-message">
<i class="icon fa <%- statusIconClass %>"></i> <span class="icon fa <%- statusIconClass %>" aria-hidden="true"></span>
<p class="status-message-copy"><%- statusMessage %></p> <p class="status-message-copy"><%- statusMessage %></p>
</div> </div>
<% } %> <% } %>
...@@ -220,7 +220,7 @@ if (is_proctored_exam) { ...@@ -220,7 +220,7 @@ if (is_proctored_exam) {
gettext('Click to add a new %(xblock_type)s'), { xblock_type: defaultNewChildName }, true gettext('Click to add a new %(xblock_type)s'), { xblock_type: defaultNewChildName }, true
) %>" ) %>"
> >
<i class="icon fa fa-plus"></i><%- addChildLabel %> <span class="icon fa fa-plus" aria-hidden="true"></span><%- addChildLabel %>
</a> </a>
</p> </p>
</div> </div>
...@@ -228,7 +228,7 @@ if (is_proctored_exam) { ...@@ -228,7 +228,7 @@ if (is_proctored_exam) {
<div class="outline-content <%- xblockType %>-content"> <div class="outline-content <%- xblockType %>-content">
<ol class="<%- typeListClass %> is-sortable"> <ol class="<%- typeListClass %> is-sortable">
<li class="ui-splint ui-splint-indicator"> <li class="ui-splint ui-splint-indicator">
<span class="draggable-drop-indicator draggable-drop-indicator-initial"><i class="icon fa fa-caret-right"></i></span> <span class="draggable-drop-indicator draggable-drop-indicator-initial"><span class="icon fa fa-caret-right" aria-hidden="true"></span></span>
</li> </li>
</ol> </ol>
...@@ -241,7 +241,7 @@ if (is_proctored_exam) { ...@@ -241,7 +241,7 @@ if (is_proctored_exam) {
gettext('Click to add a new %(xblock_type)s'), { xblock_type: defaultNewChildName }, true gettext('Click to add a new %(xblock_type)s'), { xblock_type: defaultNewChildName }, true
) %>" ) %>"
> >
<i class="icon fa fa-plus"></i><%- addChildLabel %> <span class="icon fa fa-plus" aria-hidden="true"></span><%- addChildLabel %>
</a> </a>
</div> </div>
<% } %> <% } %>
...@@ -250,6 +250,6 @@ if (is_proctored_exam) { ...@@ -250,6 +250,6 @@ if (is_proctored_exam) {
<% } %> <% } %>
<% if (parentInfo) { %> <% if (parentInfo) { %>
<span class="draggable-drop-indicator draggable-drop-indicator-after"><i class="icon fa fa-caret-right"></i></span> <span class="draggable-drop-indicator draggable-drop-indicator-after"><span class="icon fa fa-caret-right" aria-hidden="true"></span></span>
</li> </li>
<% } %> <% } %>
cms/templates/js/due-date-editor.underscore
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<ul class="list-actions"> <ul class="list-actions">
<li class="action-item"> <li class="action-item">
<a href="#" data-tooltip="<%= gettext('Clear Grading Due Date') %>" class="clear-date action-button action-clear"> <a href="#" data-tooltip="<%= gettext('Clear Grading Due Date') %>" class="clear-date action-button action-clear">
<i class="icon fa fa-undo"></i> <span class="icon fa fa-undo" aria-hidden="true"></span>
<span class="sr"><%= gettext('Clear Grading Due Date') %></span> <span class="sr"><%= gettext('Clear Grading Due Date') %></span>
</a> </a>
</li> </li>
......
cms/templates/js/edit-chapter.underscore
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
<span class="tip tip-stacked"><%- gettext("upload a PDF file or provide the path to a Studio asset file") %></span> <span class="tip tip-stacked"><%- gettext("upload a PDF file or provide the path to a Studio asset file") %></span>
<button class="action action-upload"><%- gettext("Upload PDF") %></button> <button class="action action-upload"><%- gettext("Upload PDF") %></button>
</div> </div>
<a href="" class="action action-close"><i class="icon fa fa-times-circle"></i> <span class="sr"><%- gettext("delete chapter") %></span></a> <a href="" class="action action-close"><span class="icon fa fa-times-circle" aria-hidden="true"></span> <span class="sr"><%- gettext("delete chapter") %></span></a>
cms/templates/js/edit-textbook.underscore
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<legend class="sr"><%- gettext("Chapter information") %></legend> <legend class="sr"><%- gettext("Chapter information") %></legend>
<ol class="chapters list-input enum"></ol> <ol class="chapters list-input enum"></ol>
<button class="action action-add-chapter"><i class="icon fa fa-plus"></i> <%- gettext("Add a Chapter") %></button> <button class="action action-add-chapter"><span class="icon fa fa-plus" aria-hidden="true"></span> <%- gettext("Add a Chapter") %></button>
</fieldset> </fieldset>
</div> </div>
<div class="actions"> <div class="actions">
......
cms/templates/js/group-configuration-details.underscore
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<header class="collection-header group-configuration-header"> <header class="collection-header group-configuration-header">
<h3 class="title group-configuration-title"> <h3 class="title group-configuration-title">
<a href="#" class="toggle group-toggle <% if(showGroups){ print('hide'); } else { print('show'); } %>-groups"> <a href="#" class="toggle group-toggle <% if(showGroups){ print('hide'); } else { print('show'); } %>-groups">
<i class="ui-toggle-expansion icon fa fa-caret-<% if(showGroups){ print('down'); } else { print('right'); } %>"></i> <span class="ui-toggle-expansion icon fa fa-caret-<% if(showGroups){ print('down'); } else { print('right'); } %>"></span>
<%- name %> <%- name %>
</a> </a>
</h3> </h3>
...@@ -42,15 +42,15 @@ ...@@ -42,15 +42,15 @@
<% } %> <% } %>
<ul class="actions group-configuration-actions"> <ul class="actions group-configuration-actions">
<li class="action action-edit"> <li class="action action-edit">
<button class="edit"><i class="icon fa fa-pencil"></i> <%- gettext("Edit") %></button> <button class="edit"><span class="icon fa fa-pencil" aria-hidden="true"></span> <%- gettext("Edit") %></button>
</li> </li>
<% if (_.isEmpty(usage)) { %> <% if (_.isEmpty(usage)) { %>
<li class="action action-delete wrapper-delete-button"> <li class="action action-delete wrapper-delete-button">
<button class="delete action-icon"><i class="icon fa fa-trash-o"></i><span><%- gettext("Delete") %></span></button> <button class="delete action-icon" title="<%- gettext('Delete') %>"><span class="icon fa fa-trash-o" aria-hidden="true"></span></button>
</li> </li>
<% } else { %> <% } else { %>
<li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Cannot delete when in use by an experiment') %>"> <li class="action action-delete wrapper-delete-button" data-tooltip="<%- gettext('Cannot delete when in use by an experiment') %>">
<button class="delete action-icon is-disabled" aria-disabled="true"><i class="icon fa fa-trash-o"></i><span><%- gettext("Delete") %></span></button> <button class="delete action-icon is-disabled" aria-disabled="true" aria-hidden="true" title="<%- gettext('Delete') %>"><span class="icon fa fa-trash-o"></span></button>
</li> </li>
<% } %> <% } %>
</ul> </ul>
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
<% if (unit.validation) { %> <% if (unit.validation) { %>
<p> <p>
<% if (unit.validation.type === 'warning') { %> <% if (unit.validation.type === 'warning') { %>
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
<% } else if (unit.validation.type === 'error') { %> <% } else if (unit.validation.type === 'error') { %>
<i class="icon fa fa-exclamation-circle"></i> <span class="icon fa fa-exclamation-circle" aria-hidden="true"></span>
<% } %> <% } %>
<span class="usage-validation-message group-configuration-validation-message"> <span class="usage-validation-message group-configuration-validation-message">
<%- unit.validation.text %> <%- unit.validation.text %>
......
cms/templates/js/group-configuration-editor.underscore
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
<label class="groups-fields-label required"><%- gettext("Groups") %></label> <label class="groups-fields-label required"><%- gettext("Groups") %></label>
<span class="tip tip-stacked"><%- gettext("Name of the groups that students will be assigned to, for example, Control, Video, Problems. You must have two or more groups.") %></span> <span class="tip tip-stacked"><%- gettext("Name of the groups that students will be assigned to, for example, Control, Video, Problems. You must have two or more groups.") %></span>
<ol class="groups list-input enum"></ol> <ol class="groups list-input enum"></ol>
<button class="action action-add-group action-add-item"><i class="icon fa fa-plus"></i> <%- gettext("Add another group") %></button> <button class="action action-add-group action-add-item"><span class="icon fa fa-plus" aria-hidden="true"></span> <%- gettext("Add another group") %></button>
</fieldset> </fieldset>
<% if (!_.isEmpty(usage)) { %> <% if (!_.isEmpty(usage)) { %>
<div class="wrapper-group-configuration-validation usage-validation"> <div class="wrapper-group-configuration-validation usage-validation">
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
<p class="group-configuration-validation-text"> <p class="group-configuration-validation-text">
<%- gettext('This configuration is currently used in content experiments. If you make changes to the groups, you may need to edit those experiments.') %> <%- gettext('This configuration is currently used in content experiments. If you make changes to the groups, you may need to edit those experiments.') %>
</p> </p>
......
cms/templates/js/group-edit.underscore
<div class="input-wrap field long text required field-add-group-name group-<%- index %>-name <div class="input-wrap field long text required field-add-group-name group-<%- index %>-name
<% if (error && error.attributes && error.attributes.name) { print('error'); } %>"><input name="group-<%- index %>-name" class="group-name long" value="<%- name %>" type="text"> <% if (error && error.attributes && error.attributes.name) { print('error'); } %>"><input name="group-<%- index %>-name" class="group-name long" value="<%- name %>" type="text">
</div><div class="group-allocation"><%- allocation %>%</div> </div><div class="group-allocation"><%- allocation %>%</div>
<a href="" class="action action-close"><i class="icon fa fa-times-circle"></i> <span class="sr"><%- gettext("delete group") %></span></a> <a href="" class="action action-close"><span class="icon fa fa-times-circle" aria-hidden="true"></span> <span class="sr"><%- gettext("delete group") %></span></a>
cms/templates/js/license-selector.underscore
...@@ -98,9 +98,9 @@ ...@@ -98,9 +98,9 @@
/> />
<% } else { %> <% } else { %>
<% //<span> must come before <i> icon or else spacing gets messed up %> <% //<span> must come before <i> icon or else spacing gets messed up %>
<span class="sr">gettext("Creative Commons licensed content, with terms as follow:")&nbsp;</span><i aria-hidden="true" class="icon-cc"></i> <span class="sr">gettext("Creative Commons licensed content, with terms as follow:")&nbsp;</span><span aria-hidden="true" class="icon-cc"></span>
<% _.each(enabled, function(option) { %> <% _.each(enabled, function(option) { %>
<span class="sr"><%- license.options[option.toUpperCase()].name %>&nbsp;</span><i aria-hidden="true" class="icon-cc-<%- option %>"></i> <span class="sr"><%- license.options[option.toUpperCase()].name %>&nbsp;</span><span aria-hidden="true" class="icon-cc-<%- option %>"></span>
<% }); %> <% }); %>
<span class="license-text"><%= gettext("Some Rights Reserved") %></span> <span class="license-text"><%= gettext("Some Rights Reserved") %></span>
<% } %> <% } %>
......
cms/templates/js/list.underscore
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="no-content"> <div class="no-content">
<p> <p>
<%- emptyMessage %> <%- emptyMessage %>
<a href="#" class="button new-button"><i class="icon fa fa-plus"></i> <a href="#" class="button new-button"><span class="icon fa fa-plus" aria-hidden="true"></span>
<%- interpolate( <%- interpolate(
gettext("%(new_item_message)s"), {new_item_message: newItemMessage}, true gettext("%(new_item_message)s"), {new_item_message: newItemMessage}, true
) %></a> ) %></a>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="list-items"></div> <div class="list-items"></div>
<% if (!isEditing) { %> <% if (!isEditing) { %>
<button class="action action-add <% if(!canCreateNewItem) {%> action-add-hidden <% }%>" > <button class="action action-add <% if(!canCreateNewItem) {%> action-add-hidden <% }%>" >
<i class="icon fa fa-plus"></i> <span class="icon fa fa-plus" aria-hidden="true"></span>
<%- interpolate( <%- interpolate(
gettext('New %(item_type)s'), {item_type: itemCategoryDisplayName}, true gettext('New %(item_type)s'), {item_type: itemCategoryDisplayName}, true
) %> ) %>
......
cms/templates/js/metadata-dict-entry.underscore
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<div id="<%= uniqueId %>" class="wrapper-dict-settings"> <div id="<%= uniqueId %>" class="wrapper-dict-settings">
<ol class="list-settings"></ol> <ol class="list-settings"></ol>
<a href="#" class="create-action create-setting"> <a href="#" class="create-action create-setting">
<i class="icon fa fa-plus"></i><%= gettext("Add") %> <span class="sr"><%= model.get('display_name')%></span> <span class="icon fa fa-plus" aria-hidden="true"></span><%= gettext("Add") %> <span class="sr"><%= model.get('display_name')%></span>
</a> </a>
</div> </div>
<button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>"> <button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>">
<i class="icon fa fa-undo"></i> <span class="icon fa fa-undo" aria-hidden="true"></span>
<span class="sr">"<%= gettext("Clear Value") %>"</span> <span class="sr">"<%= gettext("Clear Value") %>"</span>
</button> </button>
</div> </div>
......
cms/templates/js/metadata-file-uploader-entry.underscore
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<input type="hidden" id="<%= uniqueId %>" class="input setting-input" value="<%= model.get("value") %>"> <input type="hidden" id="<%= uniqueId %>" class="input setting-input" value="<%= model.get("value") %>">
<div class="wrapper-uploader-actions"></div> <div class="wrapper-uploader-actions"></div>
<button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>"> <button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>">
<i class="icon fa fa-undo"></i><span class="sr">"<%= gettext("Clear Value") %>"</span> <span class="icon fa fa-undo" aria-hidden="true"></span><span class="sr">"<%= gettext("Clear Value") %>"</span>
</button> </button>
</div> </div>
<span class="tip setting-help"><%= model.get('help') %></span> <span class="tip setting-help"><%= model.get('help') %></span>
cms/templates/js/metadata-list-entry.underscore
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
</ol> </ol>
<a href="#" class="create-action create-setting"> <a href="#" class="create-action create-setting">
<i class="icon fa fa-plus"></i><%= gettext("Add") %> <span class="sr"><%= model.get('display_name')%></span> <span class="icon fa fa-plus" aria-hidden="true"></span><%= gettext("Add") %> <span class="sr"><%= model.get('display_name')%></span>
</a> </a>
</div> </div>
<button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>"> <button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>">
<i class="icon fa fa-undo"></i> <span class="icon fa fa-undo" aria-hidden="true"></span>
<span class="sr">"<%= gettext("Clear Value") %>"</span> <span class="sr">"<%= gettext("Clear Value") %>"</span>
</button> </button>
</div> </div>
......
cms/templates/js/metadata-number-entry.underscore
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label> <label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label>
<input class="input setting-input setting-input-number" type="number" id="<%= uniqueId %>" value='<%= model.get("value") %>'/> <input class="input setting-input setting-input-number" type="number" id="<%= uniqueId %>" value='<%= model.get("value") %>'/>
<button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>"> <button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>">
<i class="icon fa fa-undo"></i><span class="sr">"<%= gettext("Clear Value") %>"</span> <span class="icon fa fa-undo" aria-hidden="true"></span><span class="sr">"<%= gettext("Clear Value") %>"</span>
</button> </button>
</div> </div>
<span class="tip setting-help"><%= model.get('help') %></span> <span class="tip setting-help"><%= model.get('help') %></span>
cms/templates/js/metadata-option-entry.underscore
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<% }) %> <% }) %>
</select> </select>
<button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>"> <button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>">
<i class="icon fa fa-undo"></i><span class="sr">"<%= gettext("Clear Value") %>"</span> <span class="icon fa fa-undo" aria-hidden="true"></span><span class="sr">"<%= gettext("Clear Value") %>"</span>
</button> </button>
</div> </div>
<span class="tip setting-help"><%= model.get('help') %></span> <span class="tip setting-help"><%= model.get('help') %></span>
cms/templates/js/metadata-string-entry.underscore
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label> <label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label>
<input class="input setting-input" type="text" id="<%= uniqueId %>" value='<%= model.get("value") %>'/> <input class="input setting-input" type="text" id="<%= uniqueId %>" value='<%= model.get("value") %>'/>
<button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>"> <button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>">
<i class="icon fa fa-undo"></i><span class="sr">"<%= gettext("Clear Value") %>"</span> <span class="icon fa fa-undo" aria-hidden="true"></span><span class="sr">"<%= gettext("Clear Value") %>"</span>
</button> </button>
</div> </div>
<span class="tip setting-help"><%= model.get('help') %></span> <span class="tip setting-help"><%= model.get('help') %></span>
cms/templates/js/mock/mock-collapsible-view.underscore
<div class="is-collapsible"> <div class="is-collapsible">
<a href="#" class="expand-collapse collapse"><i class="ui-toggle-expansion">Expand/Collapse</i></a> <a href="#" class="expand-collapse collapse"><span class="ui-toggle-expansion" aria-hidden="true"></span>Expand/Collapse</a>
<div class="content">Mock Content</div> <div class="content">Mock Content</div>
</div> </div>
cms/templates/js/mock/mock-container-page.underscore
...@@ -28,20 +28,20 @@ ...@@ -28,20 +28,20 @@
% else: % else:
<li class="action-item action-edit nav-item"> <li class="action-item action-edit nav-item">
<a href="#" class="button edit-button action-button"> <a href="#" class="button edit-button action-button">
<i class="icon fa fa-pencil"></i> <span class="icon fa fa-pencil" aria-hidden="true"></span>
<span class="action-button-text">Edit</span> <span class="action-button-text">Edit</span>
</a> </a>
</li> </li>
% endif % endif
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button new-button new-component-button"> <a href="#" class="button new-button new-component-button">
<i class="icon fa fa-plus icon-inline"></i> <span class="icon fa fa-plus icon-inline" aria-hidden="true"></span>
<span class="action-button-text">Add Component</span> <span class="action-button-text">Add Component</span>
</a> </a>
</li> </li>
<li class="action-item action-toggle-preview nav-item"> <li class="action-item action-toggle-preview nav-item">
<a href="#" class="button button-toggle-preview action-button toggle-preview-button is-hidden"> <a href="#" class="button button-toggle-preview action-button toggle-preview-button is-hidden">
<i class="icon fa fa-refresh"></i> <span class="icon fa fa-refresh" aria-hidden="true"></span>
<span class="action-button-text preview-text"></span> <span class="action-button-text preview-text"></span>
</a> </a>
</li> </li>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<section class="wrapper-xblock level-page studio-xblock-wrapper" data-locator="locator-container"> <section class="wrapper-xblock level-page studio-xblock-wrapper" data-locator="locator-container">
</section> </section>
<div class="ui-loading is-hidden"> <div class="ui-loading is-hidden">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading...</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">Loading...</span></p>
</div> </div>
</article> </article>
<aside class="content-supplementary" role="complementary"> <aside class="content-supplementary" role="complementary">
......
cms/templates/js/mock/mock-container-paged-xblock.underscore
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="xblock-header-primary"> <div class="xblock-header-primary">
<div class="header-details"> <div class="header-details">
<a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand"> <a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand">
<i class="icon fa fa-caret-down ui-toggle-expansion"></i> <span class="icon fa fa-caret-down ui-toggle-expansion" aria-hidden="true"></span>
<span class="sr">Expand or Collapse</span> <span class="sr">Expand or Collapse</span>
</a> </a>
<span class="xblock-display-name">Group A</span> <span class="xblock-display-name">Group A</span>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<div class="xblock-header-primary"> <div class="xblock-header-primary">
<div class="header-details"> <div class="header-details">
<a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand"> <a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand">
<i class="icon fa fa-caret-down ui-toggle-expansion"></i> <span class="icon fa fa-caret-down ui-toggle-expansion" aria-hidden="true"></span>
<span class="sr">Expand or Collapse</span> <span class="sr">Expand or Collapse</span>
</a> </a>
<span class="xblock-display-name">Group B</span> <span class="xblock-display-name">Group B</span>
......
cms/templates/js/mock/mock-container-xblock.underscore
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="xblock-header-primary"> <div class="xblock-header-primary">
<div class="header-details"> <div class="header-details">
<a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand"> <a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand">
<i class="icon fa fa-caret-down ui-toggle-expansion"></i> <span class="icon fa fa-caret-down ui-toggle-expansion" aria-hidden="true"></span>
<span class="sr">Expand or Collapse</span> <span class="sr">Expand or Collapse</span>
</a> </a>
<span class="xblock-display-name">Group A</span> <span class="xblock-display-name">Group A</span>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<div class="xblock-header-primary"> <div class="xblock-header-primary">
<div class="header-details"> <div class="header-details">
<a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand"> <a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand">
<i class="icon fa fa-caret-down ui-toggle-expansion"></i> <span class="icon fa fa-caret-down ui-toggle-expansion" aria-hidden="true"></span>
<span class="sr">Expand or Collapse</span> <span class="sr">Expand or Collapse</span>
</a> </a>
<span class="xblock-display-name">Group B</span> <span class="xblock-display-name">Group B</span>
......
cms/templates/js/mock/mock-course-outline-page.underscore
...@@ -12,18 +12,18 @@ ...@@ -12,18 +12,18 @@
<ul> <ul>
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button button-toggle button-toggle-expand-collapse collapse-all is-hidden"> <a href="#" class="button button-toggle button-toggle-expand-collapse collapse-all is-hidden">
<span class="collapse-all"><i class="icon fa fa-arrow-up"></i> <span class="label">Collapse All Sections</span></span> <span class="collapse-all"><span class="icon fa fa-arrow-up" aria-hidden="true"></span> <span class="label">Collapse All Sections</span></span>
<span class="expand-all"><i class="icon fa fa-arrow-down"></i> <span class="label">Expand All Sections</span></span> <span class="expand-all"><span class="icon fa fa-arrow-down" aria-hidden="true"></span> <span class="label">Expand All Sections</span></span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button button-new" data-category="chapter" data-parent="mock-course" data-default-name="Section" title="Click to add a new section"> <a href="#" class="button button-new" data-category="chapter" data-parent="mock-course" data-default-name="Section" title="Click to add a new section">
<i class="icon fa fa-plus"></i>New Section <span class="icon fa fa-plus" aria-hidden="true"></span>New Section
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a title="Reindex current course" data-category="reindex" class="button button-reindex" href="#"> <a title="Reindex current course" data-category="reindex" class="button button-reindex" href="#">
<i class="icon-arrow-right"></i>Reindex <span class="icon-arrow-right" aria-hidden="true"></span>Reindex
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,14 @@
<div class="no-content add-xblock-component"> <div class="no-content add-xblock-component">
<p>You haven't added any content to this course yet. <p>You haven't added any content to this course yet.
<a href="#" class="button button-new" data-category="chapter" data-parent="mock-course" data-default-name="Section" title="Click to add a new section"> <a href="#" class="button button-new" data-category="chapter" data-parent="mock-course" data-default-name="Section" title="Click to add a new section">
<i class="icon fa fa-plus"></i>Add Section <span class="icon fa fa-plus" aria-hidden="true"></span>Add Section
</a> </a>
</p> </p>
</div> </div>
</article> </article>
</div> </div>
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">Loading</span></p>
</div> </div>
</article> </article>
<aside class="content-supplementary" role="complementary"> <aside class="content-supplementary" role="complementary">
......
cms/templates/js/mock/mock-course-rerun-notification.underscore
<div id="page-alert"> <div id="page-alert">
<div class="wrapper wrapper-alert wrapper-alert-announcement is-shown"> <div class="wrapper wrapper-alert wrapper-alert-announcement is-shown">
<div class="alert announcement has-actions"> <div class="alert announcement has-actions">
<i class="feedback-symbol icon fa fa-bullhorn"></i> <span class="feedback-symbol icon fa fa-bullhorn" aria-hidden="true"></span>
<div class="copy"> <div class="copy">
<h2 class="title title-3">This course was created as a re-run. Some manual configuration is needed.</h2> <h2 class="title title-3">This course was created as a re-run. Some manual configuration is needed.</h2>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<ul class="nav-actions"> <ul class="nav-actions">
<li class="action action-dismiss"> <li class="action action-dismiss">
<a href="#" class="button dismiss-button" data-dismiss-link="dummy_dismiss_url"> <a href="#" class="button dismiss-button" data-dismiss-link="dummy_dismiss_url">
<i class="icon icon fa fa-times-circle"></i> <span class="icon icon fa fa-times-circle" aria-hidden="true"></span>
<span class="button-copy">Dismiss</span> <span class="button-copy">Dismiss</span>
</a> </a>
</li> </li>
......
cms/templates/js/mock/mock-empty-container-xblock.underscore
<header class="xblock-header"> <header class="xblock-header">
<div class="header-details"> <div class="header-details">
<a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse collapse"> <a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse collapse">
<i class="icon fa fa-caret-down ui-toggle-expansion"></i> <span class="icon fa fa-caret-down ui-toggle-expansion" aria-hidden="true"></span>
<span class="sr">Expand or Collapse</span> <span class="sr">Expand or Collapse</span>
</a> </a>
<span class="xblock-display-name">Empty Vertical Test</span> <span class="xblock-display-name">Empty Vertical Test</span>
......
cms/templates/js/mock/mock-group-configuration-page.underscore
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
<article class="content-primary" role="main"> <article class="content-primary" role="main">
<div class="wrapper-groups content-groups"> <div class="wrapper-groups content-groups">
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">Loading</span></p>
</div> </div>
</div> </div>
<div class="wrapper-groups experiment-groups"> <div class="wrapper-groups experiment-groups">
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">Loading</span></p>
</div> </div>
</div> </div>
</article> </article>
......
cms/templates/js/mock/mock-index-page.underscore
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
<h3 class="sr">Page Actions</h3> <h3 class="sr">Page Actions</h3>
<ul> <ul>
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button new-button new-course-button"><i class="icon fa fa-plus icon-inline"></i> <a href="#" class="button new-button new-course-button"><span class="icon fa fa-plus icon-inline" aria-hidden="true"></span>
New Course</a> New Course</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button new-button new-library-button"><i class="icon fa fa-plus icon-inline"></i> <a href="#" class="button new-button new-library-button"><span class="icon fa fa-plus icon-inline" aria-hidden="true"></span>
New Library</a> New Library</a>
</li> </li>
</ul> </ul>
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<dl class="course-status"> <dl class="course-status">
<dt class="label sr">This re-run processing status:</dt> <dt class="label sr">This re-run processing status:</dt>
<dd class="value"> <dd class="value">
<i class="icon fa fa-refresh fa-spin"></i> <span class="icon fa fa-refresh fa-spin" aria-hidden="true"></span>
<span class="copy">Configuring as re-run</span> <span class="copy">Configuring as re-run</span>
</dd> </dd>
</dl> </dl>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<dl class="course-status"> <dl class="course-status">
<dt class="label sr">This re-run processing status:</dt> <dt class="label sr">This re-run processing status:</dt>
<dd class="value"> <dd class="value">
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
<span class="copy">Configuration Error</span> <span class="copy">Configuration Error</span>
</dd> </dd>
</dl> </dl>
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
<ul class="status-actions"> <ul class="status-actions">
<li class="action action-dismiss"> <li class="action action-dismiss">
<a href="#" class="button dismiss-button" data-dismiss-link="dummy_dismiss_url"> <a href="#" class="button dismiss-button" data-dismiss-link="dummy_dismiss_url">
<i class="icon fa fa-times-circle"></i> <span class="icon fa fa-times-circle" aria-hidden="true"></span>
<span class="button-copy">Dismiss</span> <span class="button-copy">Dismiss</span>
</a> </a>
</li> </li>
......
cms/templates/js/mock/mock-manage-users-lib-ro.underscore
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<article class="content-primary" role="main"> <article class="content-primary" role="main">
<ol id="user-list" class="user-list"> <ol id="user-list" class="user-list">
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">Loading</span></p>
</div> </div>
</ol> </ol>
</article> </article>
......
cms/templates/js/mock/mock-manage-users-lib.underscore
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<h3 class="sr">Page Actions</h3> <h3 class="sr">Page Actions</h3>
<ul> <ul>
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button new-button create-user-button"><i class="icon fa fa-plus"></i> Add Instructor</a> <a href="#" class="button new-button create-user-button"><span class="icon fa fa-plus" aria-hidden="true"></span> Add Instructor</a>
</li> </li>
</ul> </ul>
</nav> </nav>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<ol id="user-list" class="user-list"> <ol id="user-list" class="user-list">
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">Loading</span></p>
</div> </div>
</ol> </ol>
......
cms/templates/js/mock/mock-paged-container-xblock.underscore
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="xblock-header-primary"> <div class="xblock-header-primary">
<div class="header-details"> <div class="header-details">
<a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand"> <a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand">
<i class="icon fa fa-caret-down ui-toggle-expansion"></i> <span class="icon fa fa-caret-down ui-toggle-expansion" aria-hidden="true"></span>
<span class="sr">Expand or Collapse</span> <span class="sr">Expand or Collapse</span>
</a> </a>
<span class="xblock-display-name">Group A</span> <span class="xblock-display-name">Group A</span>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<div class="xblock-header-primary"> <div class="xblock-header-primary">
<div class="header-details"> <div class="header-details">
<a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand"> <a href="#" data-tooltip="Expand or Collapse" class="action expand-collapse expand">
<i class="icon fa fa-caret-down ui-toggle-expansion"></i> <span class="icon fa fa-caret-down ui-toggle-expansion" aria-hidden="true"></span>
<span class="sr">Expand or Collapse</span> <span class="sr">Expand or Collapse</span>
</a> </a>
<span class="xblock-display-name">Group B</span> <span class="xblock-display-name">Group B</span>
......
cms/templates/js/mock/mock-settings-page.underscore
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
</ol> </ol>
<div class="actions"> <div class="actions">
<button type="button" class="action action-primary button new-button add-course-learning-info"> <button type="button" class="action action-primary button new-button add-course-learning-info">
<i class="icon fa fa-plus icon-inline"></i>Add Learning Outcome <span class="icon fa fa-plus icon-inline" aria-hidden="true"></span>Add Learning Outcome
</button> </button>
</div> </div>
</section> </section>
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
</ol> </ol>
<div class="actions"> <div class="actions">
<button type="button" class="action action-primary button new-button add-course-instructor-info"> <button type="button" class="action action-primary button new-button add-course-instructor-info">
<i class="icon fa fa-plus icon-inline"></i>Add Instructor <span class="icon fa fa-plus icon-inline" aria-hidden="true"></span>Add Instructor
</button> </button>
</div> </div>
</section> </section>
......
cms/templates/js/mock/mock-xmodule-editor.underscore
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
\t<label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label> \t<label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label>
\t<input class="input setting-input" type="text" id="<%= uniqueId %>" value='<%= model.get("value") %>'/> \t<input class="input setting-input" type="text" id="<%= uniqueId %>" value='<%= model.get("value") %>'/>
\t<button class="action setting-clear inactive" type="button" name="setting-clear" value="Clear" data-tooltip="Clear"> \t<button class="action setting-clear inactive" type="button" name="setting-clear" value="Clear" data-tooltip="Clear">
<i class="icon fa fa-undo"></i><span class="sr">"Clear Value"</span> <span class="icon fa fa-undo" aria-hidden="true"></span><span class="sr">"Clear Value"</span>
</button> </button>
</div> </div>
<span class="tip setting-help"><%= model.get('help') %></span> <span class="tip setting-help"><%= model.get('help') %></span>
......
cms/templates/js/mock/mock-xmodule-settings-only-editor.underscore
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
\t<label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label> \t<label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label>
\t<input class="input setting-input" type="text" id="<%= uniqueId %>" value='<%= model.get("value") %>'/> \t<input class="input setting-input" type="text" id="<%= uniqueId %>" value='<%= model.get("value") %>'/>
\t<button class="action setting-clear inactive" type="button" name="setting-clear" value="Clear" data-tooltip="Clear"> \t<button class="action setting-clear inactive" type="button" name="setting-clear" value="Clear" data-tooltip="Clear">
<i class="icon fa fa-undo"></i><span class="sr">"Clear Value"</span> <span class="icon fa fa-undo" aria-hidden="true"></span><span class="sr">"Clear Value"</span>
</button> </button>
</div> </div>
<span class="tip setting-help"><%= model.get('help') %></span> <span class="tip setting-help"><%= model.get('help') %></span>
......
cms/templates/js/no-textbooks.underscore
<div class="no-textbook-content"> <div class="no-textbook-content">
<p><%= gettext("You haven't added any textbooks to this course yet.") %><a href="#" class="button new-button"><i class="icon fa fa-plus"></i><%= gettext("Add your first textbook") %></a></p> <p><%- gettext("You haven't added any textbooks to this course yet.") %><a href="#" class="button new-button"><span class="icon fa fa-plus" aria-hidden="true"></span><%- gettext("Add your first textbook") %></a></p>
</div> </div>
cms/templates/js/paging-header.underscore
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
</div> </div>
<nav class="pagination pagination-compact top" aria-label="Compact Pagination"> <nav class="pagination pagination-compact top" aria-label="Compact Pagination">
<ol> <ol>
<li class="nav-item previous"><a class="nav-link previous-page-link" href="#"><i class="icon fa fa-angle-left"></i> <span class="nav-label"><%- gettext("Previous") %></span></a></li> <li class="nav-item previous"><a class="nav-link previous-page-link" href="#"><span class="icon fa fa-angle-left" aria-hidden="true"></span> <span class="nav-label"><%- gettext("Previous") %></span></a></li>
<li class="nav-item next"><a class="nav-link next-page-link" href="#"><span class="nav-label"><%- gettext("Next") %></span> <i class="icon fa fa-angle-right"></i></a></li> <li class="nav-item next"><a class="nav-link next-page-link" href="#"><span class="nav-label"><%- gettext("Next") %></span> <span class="icon fa fa-angle-right" aria-hidden="true"></span></a></li>
</ol> </ol>
</nav> </nav>
</div> </div>
cms/templates/js/publish-xblock.underscore
...@@ -85,7 +85,7 @@ var visibleToStaffOnly = visibilityState === 'staff_only'; ...@@ -85,7 +85,7 @@ var visibleToStaffOnly = visibilityState === 'staff_only';
<% } %> <% } %>
<% if (hasContentGroupComponents) { %> <% if (hasContentGroupComponents) { %>
<p class="note-visibility"> <p class="note-visibility">
<i class="icon fa fa-eye" aria-hidden="true"></i> <span class="icon fa fa-eye" aria-hidden="true"></span>
<span class="note-copy"><%- gettext("Some content in this unit is visible only to particular content groups") %></span> <span class="note-copy"><%- gettext("Some content in this unit is visible only to particular content groups") %></span>
</p> </p>
<% } %> <% } %>
...@@ -93,9 +93,9 @@ var visibleToStaffOnly = visibilityState === 'staff_only'; ...@@ -93,9 +93,9 @@ var visibleToStaffOnly = visibilityState === 'staff_only';
<li class="action-inline"> <li class="action-inline">
<a href="" class="action-staff-lock" role="button" aria-pressed="<%- hasExplicitStaffLock %>"> <a href="" class="action-staff-lock" role="button" aria-pressed="<%- hasExplicitStaffLock %>">
<% if (hasExplicitStaffLock) { %> <% if (hasExplicitStaffLock) { %>
<i class="icon fa fa-check-square-o" aria-hidden="true"></i> <span class="icon fa fa-check-square-o" aria-hidden="true"></span>
<% } else { %> <% } else { %>
<i class="icon fa fa-square-o" aria-hidden="true"></i> <span class="icon fa fa-square-o" aria-hidden="true"></span>
<% } %> <% } %>
<%- gettext('Hide from students') %> <%- gettext('Hide from students') %>
</a> </a>
......
cms/templates/js/release-date-editor.underscore
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<ul class="list-actions"> <ul class="list-actions">
<li class="action-item"> <li class="action-item">
<a href="#" data-tooltip="<%= gettext('Clear Release Date/Time') %>" class="clear-date action-button action-clear"> <a href="#" data-tooltip="<%= gettext('Clear Release Date/Time') %>" class="clear-date action-button action-clear">
<i class="icon fa fa-undo"></i> <span class="icon fa fa-undo" aria-hidden="true"></span>
<span class="sr"><%= gettext('Clear Release Date/Time') %></span> <span class="sr"><%= gettext('Clear Release Date/Time') %></span>
</a> </a>
</li> </li>
......
cms/templates/js/show-textbook.underscore
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<% if(chapters.length > 1) {%> <% if(chapters.length > 1) {%>
<p><a href="#" class="chapter-toggle <p><a href="#" class="chapter-toggle
<% if(showChapters){ print('hide'); } else { print('show'); } %>-chapters"> <% if(showChapters){ print('hide'); } else { print('show'); } %>-chapters">
<i class="ui-toggle-expansion icon fa fa-caret-<% if(showChapters){ print('down'); } else { print('right'); } %>"></i> <span class="ui-toggle-expansion icon fa fa-caret-<% if(showChapters){ print('down'); } else { print('right'); } %>" aria-hidden="true"></span>
<%- chapters.length %> PDF Chapters <%- chapters.length %> PDF Chapters
</a></p> </a></p>
<% } else if(chapters.length === 1) { %> <% } else if(chapters.length === 1) { %>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<button class="edit"><%- gettext("Edit") %></button> <button class="edit"><%- gettext("Edit") %></button>
</li> </li>
<li class="action action-delete"> <li class="action action-delete">
<button class="delete action-icon"><i class="icon fa fa-trash-o"></i><span><%- gettext("Delete") %></span></button> <button class="delete action-icon" title="<%- gettext('Delete') %>"><span class="icon fa fa-trash-o" aria-hidden="true" ></span></button>
</li> </li>
</ul> </ul>
......
cms/templates/js/signatory-details.underscore
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<% if (CMS.User.isGlobalStaff || !certificate.get('is_active')) { %> <% if (CMS.User.isGlobalStaff || !certificate.get('is_active')) { %>
<div class="actions certificate-actions signatory-panel-edit"> <div class="actions certificate-actions signatory-panel-edit">
<span class="action action-edit-signatory"> <span class="action action-edit-signatory">
<a href="javascript:void(0);" class="edit-signatory"><i class="icon fa fa-pencil" aria-hidden="true"></i> <%- gettext("Edit") %></a> <a href="javascript:void(0);" class="edit-signatory"><span class="icon fa fa-pencil" aria-hidden="true"></span> <%- gettext("Edit") %></a>
</span> </span>
</div> </div>
<% } %> <% } %>
......
cms/templates/js/signatory-editor.underscore
<div class="signatory-panel-default"> <div class="signatory-panel-default">
<% if (is_editing_all_collections && signatories_count > 1 && (total_saved_signatories > 1 || isNew) ) { %> <% if (is_editing_all_collections && signatories_count > 1 && (total_saved_signatories > 1 || isNew) ) { %>
<a class="signatory-panel-delete" href="#" data-tooltip="Delete"> <a class="signatory-panel-delete" href="#" data-tooltip="Delete">
<i class="icon fa fa-trash-o" aria-hidden="true"></i> <span class="icon fa fa-trash-o" aria-hidden="true"></span>
<span class="sr action-button-text"><%- gettext("Delete") %></span> <span class="sr action-button-text"><%- gettext("Delete") %></span>
</a> </a>
<% } %> <% } %>
......
cms/templates/js/staff-lock-editor.underscore
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<li class="field field-checkbox checkbox-cosmetic"> <li class="field field-checkbox checkbox-cosmetic">
<input type="checkbox" id="staff_lock" name="staff_lock" class="input input-checkbox" /> <input type="checkbox" id="staff_lock" name="staff_lock" class="input input-checkbox" />
<label for="staff_lock" class="label"> <label for="staff_lock" class="label">
<i class="icon fa fa-check-square-o input-checkbox-checked"></i> <span class="icon fa fa-check-square-o input-checkbox-checked" aria-hidden="true"></span>
<i class="icon fa fa-square-o input-checkbox-unchecked"></i> <span class="icon fa fa-square-o input-checkbox-unchecked" aria-hidden="true"></span>
<%= gettext('Hide from students') %> <%= gettext('Hide from students') %>
</label> </label>
......
cms/templates/js/team-member.underscore
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</li> </li>
<li class="action action-delete <%=!allow_delete ? "is-disabled" : "" %> aria-disabled="<%=!allow_delete%>"> <li class="action action-delete <%=!allow_delete ? "is-disabled" : "" %> aria-disabled="<%=!allow_delete%>">
<a href="#" class="delete remove-user action-icon" data-id="<%= user.email %>"> <a href="#" class="delete remove-user action-icon" data-id="<%= user.email %>">
<i class="icon fa fa-trash-o"></i> <span class="icon fa fa-trash-o" aria-hidden="true"></span>
<span class="sr"><%= viewHelpers.format(gettext("Delete the user, {username}"), {username:user.username}) %></span> <span class="sr"><%= viewHelpers.format(gettext("Delete the user, {username}"), {username:user.username}) %></span>
</a> </a>
</li> </li>
......
cms/templates/js/unit-outline.underscore
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div class="add-<%= childType %> add-item"> <div class="add-<%= childType %> add-item">
<a href="#" class="button button-new" data-category="<%= childCategory %>" <a href="#" class="button button-new" data-category="<%= childCategory %>"
data-parent="<%= xblockInfo.get('id') %>" data-default-name="<%= defaultNewChildName %>"> data-parent="<%= xblockInfo.get('id') %>" data-default-name="<%= defaultNewChildName %>">
<i class="icon fa fa-plus"></i><%= addChildLabel %> <span class="icon fa fa-plus" aria-hidden="true"></span><%= addChildLabel %>
</a> </a>
</div> </div>
<% } %> <% } %>
......
cms/templates/js/validation-error-modal.underscore
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<li class = "error-item"> <li class = "error-item">
<span class='error-item-title'> <span class='error-item-title'>
<i class="icon fa fa-warning"></i> <span class="icon fa fa-warning" aria-hidden="true"></span>
<strong><%= value.model.display_name %></strong>: <strong><%= value.model.display_name %></strong>:
</span> </span>
<textarea class = "error-item-message" disabled='disabled'><%=value.message%></textarea> <textarea class = "error-item-message" disabled='disabled'><%=value.message%></textarea>
......
cms/templates/js/verification-access-editor.underscore
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
aria-describedby="verification-help-text" aria-describedby="verification-help-text"
> >
<label class="label" for="verification-access-checkbox"> <label class="label" for="verification-access-checkbox">
<i class="icon fa fa-check-square-o input-checkbox-checked" aria-hidden="true"></i> <span class="icon fa fa-check-square-o input-checkbox-checked" aria-hidden="true"></span>
<i class="icon fa fa-square-o input-checkbox-unchecked" aria-hidden="true"></i> <span class="icon fa fa-square-o input-checkbox-unchecked" aria-hidden="true"></span>
<span class="sr"><%- gettext("Must complete verification checkpoint") %></span> <span class="sr"><%- gettext("Must complete verification checkpoint") %></span>
</label> </label>
......
cms/templates/js/video/metadata-translations-entry.underscore
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<div class="wrapper-translations-settings"> <div class="wrapper-translations-settings">
<ol class="list-settings"></ol> <ol class="list-settings"></ol>
<a href="#" class="create-action create-setting"> <a href="#" class="create-action create-setting">
<i class="icon fa fa-plus"></i><%= gettext("Add") %> <span class="sr"><%= model.get('display_name')%></span> <span class="icon fa fa-plus" aria-hidden="true"></span><%= gettext("Add") %> <span class="sr"><%= model.get('display_name')%></span>
</a> </a>
</div> </div>
<button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>"> <button class="action setting-clear inactive" type="button" name="setting-clear" value="<%= gettext("Clear") %>" data-tooltip="<%= gettext("Clear") %>">
<i class="icon fa fa-undo"></i> <span class="icon fa fa-undo" aria-hidden="true"></span>
<span class="sr">"<%= gettext("Clear Value") %>"</span> <span class="sr">"<%= gettext("Clear Value") %>"</span>
</button> </button>
</div> </div>
......
cms/templates/js/video/metadata-translations-item.underscore
<li class="list-settings-item" <li class="list-settings-item">
><a href="#" class="remove-action remove-setting" data-lang="<%= lang %>" data-value="<%= value %>"><i class="icon fa fa-times-circle"></i><span class="sr"><%= gettext("Remove") %></span></a> <a href="#" class="remove-action remove-setting" data-lang="<%= lang %>" data-value="<%= value %>"><span class="icon fa fa-times-circle" aria-hidden="true"></span><span class="sr"><%= gettext("Remove") %></span></a>
<input type="hidden" class="input" value="<%= value %>"> <input type="hidden" class="input" value="<%= value %>">
<div class="list-settings-buttons"><% if (lang) { <div class="list-settings-buttons"><% if (lang) {
%><a href="#" class="upload-action upload-setting" data-lang="<%= lang %>" data-value="<%= value %>"><%= value ? gettext("Replace") : gettext("Upload") %> %><a href="#" class="upload-action upload-setting" data-lang="<%= lang %>" data-value="<%= value %>"><%= value ? gettext("Replace") : gettext("Upload") %>
......
cms/templates/js/video/transcripts/messages/transcripts-choose.underscore
<div class="transcripts-message-status status-error"> <div class="transcripts-message-status status-error">
<i class="icon fa fa-remove"></i> <span class="icon fa fa-remove" aria-hidden="true"></span>
<%= gettext("Timed Transcript Conflict") %> <%= gettext("Timed Transcript Conflict") %>
</div> </div>
......
cms/templates/js/video/transcripts/messages/transcripts-found.underscore
<div class="transcripts-message-status"><i class="icon fa fa-check"></i><%= gettext("Timed Transcript Found") %></div> <div class="transcripts-message-status"><span class="icon fa fa-check" aria-hidden="true"></span><%= gettext("Timed Transcript Found") %></div>
<p class="transcripts-message"> <p class="transcripts-message">
<%= gettext("EdX has a timed transcript for this video. If you want to edit this transcript, you can download, edit, and re-upload the existing transcript. If you want to replace this transcript, upload a new .srt transcript file.") %> <%= gettext("EdX has a timed transcript for this video. If you want to edit this transcript, you can download, edit, and re-upload the existing transcript. If you want to replace this transcript, upload a new .srt transcript file.") %>
</p> </p>
......
cms/templates/js/video/transcripts/messages/transcripts-import.underscore
<div class="transcripts-message-status status-error"><i class="icon fa fa-remove"></i><%= gettext("No EdX Timed Transcript") %></div> <div class="transcripts-message-status status-error"><span class="icon fa fa-remove" aria-hidden="true"></span><%= gettext("No EdX Timed Transcript") %></div>
<p class="transcripts-message"> <p class="transcripts-message">
<%= gettext("EdX doesn't have a timed transcript for this video in Studio, but we found a transcript on YouTube. You can import the YouTube transcript or upload your own .srt transcript file.") %> <%= gettext("EdX doesn't have a timed transcript for this video in Studio, but we found a transcript on YouTube. You can import the YouTube transcript or upload your own .srt transcript file.") %>
</p> </p>
......
cms/templates/js/video/transcripts/messages/transcripts-not-found.underscore
<div class="transcripts-message-status status-error"><i class="icon fa fa-remove"></i><%= gettext("No Timed Transcript") %></div> <div class="transcripts-message-status status-error"><span class="icon fa fa-remove" aria-hidden="true"></span><%= gettext("No Timed Transcript") %></div>
<p class="transcripts-message"> <p class="transcripts-message">
<%= gettext("EdX doesn\'t have a timed transcript for this video. Please upload an .srt file.") %> <%= gettext("EdX doesn\'t have a timed transcript for this video. Please upload an .srt file.") %>
</p> </p>
......
cms/templates/js/video/transcripts/messages/transcripts-replace.underscore
<div class="transcripts-message-status status-error"> <div class="transcripts-message-status status-error">
<i class="icon fa fa-remove"></i> <span class="icon fa fa-remove" aria-hidden="true"></span>
<%= gettext("Timed Transcript Conflict") %> <%= gettext("Timed Transcript Conflict") %>
</div> </div>
......
cms/templates/js/video/transcripts/messages/transcripts-uploaded.underscore
<div class="transcripts-message-status"><i class="icon fa fa-check"></i><%= gettext("Timed Transcript Uploaded Successfully") %></div> <div class="transcripts-message-status"><span class="icon fa fa-check" aria-hidden="true"></span><%= gettext("Timed Transcript Uploaded Successfully") %></div>
<p class="transcripts-message"> <p class="transcripts-message">
<%= gettext("EdX has a timed transcript for this video. If you want to replace this transcript, upload a new .srt transcript file. If you want to edit this transcript, you can download, edit, and re-upload the existing transcript.") %> <%= gettext("EdX has a timed transcript for this video. If you want to replace this transcript, upload a new .srt transcript file. If you want to edit this transcript, you can download, edit, and re-upload the existing transcript.") %>
</p> </p>
......
cms/templates/js/video/transcripts/messages/transcripts-use-existing.underscore
<div class="transcripts-message-status status-error"> <div class="transcripts-message-status status-error">
<i class="icon fa fa-remove"></i> <span class="icon fa fa-remove" aria-hidden="true"></span>
<%= gettext("Confirm Timed Transcript") %> <%= gettext("Confirm Timed Transcript") %>
</div> </div>
......
cms/templates/js/video/transcripts/metadata-videolist-entry.underscore
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="tip videolist-url-tip setting-help"><%= model.get('help') %></div> <div class="tip videolist-url-tip setting-help"><%= model.get('help') %></div>
<div class="wrapper-videolist-urls"> <div class="wrapper-videolist-urls">
<a href="#" class="collapse-action collapse-setting"> <a href="#" class="collapse-action collapse-setting">
<i class="icon fa fa-plus"></i><%= gettext("Add URLs for additional versions") %> <span class="sr"><%= model.get('display_name')%></span> <span class="icon fa fa-plus" aria-hidden="true"></span><%= gettext("Add URLs for additional versions") %> <span class="sr"><%= model.get('display_name')%></span>
</a> </a>
<div class="videolist-extra-videos"> <div class="videolist-extra-videos">
<span class="tip videolist-extra-videos-tip setting-help"><%= gettext("To be sure all students can access the video, we recommend providing both an .mp4 and a .webm version of your video. Click below to add a URL for another version. These URLs cannot be YouTube URLs. The first listed video that's compatible with the student's computer will play.") %></span> <span class="tip videolist-extra-videos-tip setting-help"><%= gettext("To be sure all students can access the video, we recommend providing both an .mp4 and a .webm version of your video. Click below to add a URL for another version. These URLs cannot be YouTube URLs. The first listed video that's compatible with the student's computer will play.") %></span>
......
cms/templates/js/xblock-outline.underscore
<% if (parentInfo) { %> <% if (parentInfo) { %>
<li class="outline-item outline-item-<%= xblockType %> <%= includesChildren ? 'is-collapsible' : '' %> is-draggable <%= isCollapsed ? 'is-collapsed' : '' %>" <li class="outline-item outline-item-<%= xblockType %> <%= includesChildren ? 'is-collapsible' : '' %> is-draggable <%= isCollapsed ? 'is-collapsed' : '' %>"
data-parent="<%= parentInfo.get('id') %>" data-locator="<%= xblockInfo.get('id') %>"> data-parent="<%= parentInfo.get('id') %>" data-locator="<%= xblockInfo.get('id') %>">
<span class="draggable-drop-indicator draggable-drop-indicator-before"><i class="icon fa fa-caret-right"></i></span> <span class="draggable-drop-indicator draggable-drop-indicator-before"><span class="icon fa fa-caret-right" aria-hidden="true"></span></span>
<div class="wrapper-xblock-header"> <div class="wrapper-xblock-header">
<div class="wrapper-xblock-header-primary"> <div class="wrapper-xblock-header-primary">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
gettext('Collapse/Expand this %(xblock_type)s'), { xblock_type: xblockTypeDisplayName }, true gettext('Collapse/Expand this %(xblock_type)s'), { xblock_type: xblockTypeDisplayName }, true
) %>" ) %>"
> >
<i class="icon fa fa-caret-down ui-toggle-expansion"></i> <span class="icon fa fa-caret-down ui-toggle-expansion" aria-hidden="true"></span>
<% } else { %> <% } else { %>
<h3 class="xblock-title"> <h3 class="xblock-title">
<% } %> <% } %>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<ul class="actions-list"> <ul class="actions-list">
<li class="action-item action-delete"> <li class="action-item action-delete">
<a href="#" data-tooltip="<%= gettext('Delete') %>" class="delete-button action-button"> <a href="#" data-tooltip="<%= gettext('Delete') %>" class="delete-button action-button">
<i class="icon fa fa-remove"></i> <span class="icon fa fa-remove" aria-hidden="true"></span>
<span class="sr"><%= gettext('Delete') %></span> <span class="sr"><%= gettext('Delete') %></span>
</a> </a>
</li> </li>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="wrapper-xblock-header-secondary"> <div class="wrapper-xblock-header-secondary">
<% if (xblockInfo.get('release_date')) { %> <% if (xblockInfo.get('release_date')) { %>
<div class="meta-info"> <div class="meta-info">
<i class="icon fa fa-clock-o"></i> <span class="icon fa fa-clock-o" aria-hidden="true"></span>
<%= gettext('Released:') %> <%= xblockInfo.get('release_date') %> <%= gettext('Released:') %> <%= xblockInfo.get('release_date') %>
</div> </div>
<% } %> <% } %>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
gettext('Click to add a new %(xblock_type)s'), { xblock_type: defaultNewChildName }, true gettext('Click to add a new %(xblock_type)s'), { xblock_type: defaultNewChildName }, true
) %>" ) %>"
> >
<i class="icon fa fa-plus"></i><%= addChildLabel %> <span class="icon fa fa-plus" aria-hidden="true"></span><%= addChildLabel %>
</a> </a>
</p> </p>
</div> </div>
...@@ -77,13 +77,13 @@ ...@@ -77,13 +77,13 @@
gettext('Click to add a new %(xblock_type)s'), { xblock_type: defaultNewChildName }, true gettext('Click to add a new %(xblock_type)s'), { xblock_type: defaultNewChildName }, true
) %>" ) %>"
> >
<i class="icon fa fa-plus"></i><%= addChildLabel %> <span class="icon fa fa-plus" aria-hidden="true"></span><%= addChildLabel %>
</a> </a>
</div> </div>
<% } %> <% } %>
<% } %> <% } %>
<% if (parentInfo) { %> <% if (parentInfo) { %>
<span class="draggable-drop-indicator draggable-drop-indicator-after"><i class="icon fa fa-caret-right"></i></span> <span class="draggable-drop-indicator draggable-drop-indicator-after"><span class="icon fa fa-caret-right" aria-hidden="true"></span></span>
</li> </li>
<% } %> <% } %>
cms/templates/js/xblock-string-field-editor.underscore
<div class="incontext-editor-action-wrapper"> <div class="incontext-editor-action-wrapper">
<a href="" class="action-edit action-inline xblock-field-value-edit incontext-editor-open-action" title="<%= gettext('Edit the name') %>"> <a href="" class="action-edit action-inline xblock-field-value-edit incontext-editor-open-action" title="<%- gettext('Edit the name') %>">
<i class="icon fa fa-pencil"></i><span class="sr"> <%= gettext("Edit") %></span> <span class="icon fa fa-pencil" aria-hidden="true"></span><span class="sr"> <%- gettext("Edit") %></span>
</a> </a>
</div> </div>
......
cms/templates/js/xblock-validation-messages.underscore
...@@ -4,7 +4,7 @@ var aggregateMessageType = summaryMessage.type; ...@@ -4,7 +4,7 @@ var aggregateMessageType = summaryMessage.type;
var aggregateValidationClass = aggregateMessageType === "error"? "has-errors" : "has-warnings"; var aggregateValidationClass = aggregateMessageType === "error"? "has-errors" : "has-warnings";
%> %>
<div class="xblock-message validation <%= aggregateValidationClass %> <%= additionalClasses %>"> <div class="xblock-message validation <%= aggregateValidationClass %> <%= additionalClasses %>">
<p class="<%= aggregateMessageType %>"><i class="icon fa <%= getIcon(aggregateMessageType) %>"></i> <p class="<%- aggregateMessageType %>"><span class="icon fa <%- getIcon(aggregateMessageType) %>" aria-hidden="true"></span>
<%- summaryMessage.text %> <%- summaryMessage.text %>
<% if (summaryMessage.action_class) { %> <% if (summaryMessage.action_class) { %>
<a href="#" class="button action-button <%- summaryMessage.action_class %>"> <a href="#" class="button action-button <%- summaryMessage.action_class %>">
......
cms/templates/library.html
...@@ -58,12 +58,12 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -58,12 +58,12 @@ from openedx.core.djangolib.markup import HTML, Text
<ul> <ul>
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button new-button new-component-button"> <a href="#" class="button new-button new-component-button">
<i class="icon fa fa-plus icon-inline"></i> <span class="action-button-text">${_("Add Component")}</span> <span class="icon fa fa-plus icon-inline" aria-hidden="true"></span> <span class="action-button-text">${_("Add Component")}</span>
</a> </a>
</li> </li>
<li class="action-item action-toggle-preview nav-item"> <li class="action-item action-toggle-preview nav-item">
<a href="#" class="button button-toggle-preview action-button toggle-preview-button is-hidden"> <a href="#" class="button button-toggle-preview action-button toggle-preview-button is-hidden">
<i class="icon fa fa-refresh"></i> <span class="icon fa fa-refresh" aria-hidden="true"></span>
<span class="action-button-text preview-text"></span> <span class="action-button-text preview-text"></span>
</a> </a>
</li> </li>
...@@ -81,7 +81,7 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -81,7 +81,7 @@ from openedx.core.djangolib.markup import HTML, Text
<section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" data-locator="${context_library.location}" data-course-key="${context_library.location.library_key}"> <section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" data-locator="${context_library.location}" data-course-key="${context_library.location.library_key}">
</section> </section>
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span><span class="copy">${_("Loading")}</span></p>
</div> </div>
</article> </article>
<aside class="content-supplementary" role="complementary"> <aside class="content-supplementary" role="complementary">
......
cms/templates/manage_users.html
...@@ -32,7 +32,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -32,7 +32,7 @@ from openedx.core.djangolib.js_utils import (
<ul> <ul>
%if allow_actions: %if allow_actions:
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button new-button create-user-button"><i class="icon fa fa-plus"></i> ${_("New Team Member")}</a> <a href="#" class="button new-button create-user-button"><span class="icon fa fa-plus" aria-hidden="true"></span> ${_("New Team Member")}</a>
</li> </li>
%endif %endif
</ul> </ul>
...@@ -72,7 +72,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -72,7 +72,7 @@ from openedx.core.djangolib.js_utils import (
<ol class="user-list" id="user-list"> <ol class="user-list" id="user-list">
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_('Loading')}</span></p>
</div> </div>
</ol> </ol>
...@@ -87,7 +87,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -87,7 +87,7 @@ from openedx.core.djangolib.js_utils import (
<ul class="list-actions"> <ul class="list-actions">
<li class="action-item"> <li class="action-item">
<a href="#" class="action action-primary button new-button create-user-button"><i class="icon fa fa-plus icon-inline"></i> ${_('Add a New Team Member')}</a> <a href="#" class="action action-primary button new-button create-user-button"><span class="icon fa fa-plus icon-inline" aria-hidden="true"></span> ${_('Add a New Team Member')}</a>
</li> </li>
</ul> </ul>
</div> </div>
......
cms/templates/manage_users_lib.html
...@@ -32,7 +32,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -32,7 +32,7 @@ from openedx.core.djangolib.js_utils import (
<ul> <ul>
%if allow_actions: %if allow_actions:
<li class="nav-item"> <li class="nav-item">
<a href="#" class="button new-button create-user-button"><i class="icon fa fa-plus"></i> ${_("New Team Member")}</a> <a href="#" class="button new-button create-user-button"><span class="icon fa fa-plus" aria-hidden="true"></span> ${_("New Team Member")}</a>
</li> </li>
%endif %endif
</ul> </ul>
...@@ -72,7 +72,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -72,7 +72,7 @@ from openedx.core.djangolib.js_utils import (
<ol class="user-list" id="user-list"> <ol class="user-list" id="user-list">
<div class="ui-loading"> <div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p> <p><span class="spin"><span class="icon fa fa-refresh" aria-hidden="true"></span></span> <span class="copy">${_("Loading")}</span></p>
</div> </div>
</ol> </ol>
...@@ -87,7 +87,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -87,7 +87,7 @@ from openedx.core.djangolib.js_utils import (
<ul class="list-actions"> <ul class="list-actions">
<li class="action-item"> <li class="action-item">
<a href="#" class="action action-primary button new-button create-user-button"><i class="icon fa fa-plus icon-inline"></i> ${_('Add a New User')}</a> <a href="#" class="action action-primary button new-button create-user-button"><span class="icon fa fa-plus icon-inline" aria-hidden="true"></span> ${_('Add a New User')}</a>
</li> </li>
</ul> </ul>
</div> </div>
......
cms/templates/settings.html
...@@ -106,7 +106,7 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url | n, js_escaped_string}' ...@@ -106,7 +106,7 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url | n, js_escaped_string}'
%> %>
<a title="${_('Send a note to students via email')}" <a title="${_('Send a note to students via email')}"
href="mailto:someone@domain.com?Subject=${email_subject}&body=${email_body}" class="action action-primary"> href="mailto:someone@domain.com?Subject=${email_subject}&body=${email_body}" class="action action-primary">
<i class="icon fa fa-envelope-o icon-inline"></i>${_("Invite your students")}</a> <span class="icon fa fa-envelope-o icon-inline" aria-hidden="true"></span>${_("Invite your students")}</a>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -476,7 +476,7 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url | n, js_escaped_string}' ...@@ -476,7 +476,7 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url | n, js_escaped_string}'
</ol> </ol>
<div class="actions"> <div class="actions">
<button type="button" class="action action-primary button new-button add-course-learning-info"> <button type="button" class="action action-primary button new-button add-course-learning-info">
<i class="icon fa fa-plus icon-inline"></i>${_("Add Learning Outcome")} <span class="icon fa fa-plus icon-inline" aria-hidden="true"></span>${_("Add Learning Outcome")}
</button> </button>
</div> </div>
</section> </section>
...@@ -492,7 +492,7 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url | n, js_escaped_string}' ...@@ -492,7 +492,7 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url | n, js_escaped_string}'
</ol> </ol>
<div class="actions"> <div class="actions">
<button type="button" class="action action-primary button new-button add-course-instructor-info"> <button type="button" class="action action-primary button new-button add-course-instructor-info">
<i class="icon fa fa-plus icon-inline"></i>${_("Add Instructor")} <span class="icon fa fa-plus icon-inline" aria-hidden="true"></span>${_("Add Instructor")}
</button> </button>
</div> </div>
</section> </section>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment