diff --git a/cms/envs/common.py b/cms/envs/common.py index 0196ddc9e5..896c4515a2 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -132,10 +132,10 @@ IGNORABLE_404_ENDS = ('favicon.ico') # Email EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' -DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu' -DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu' +DEFAULT_FROM_EMAIL = 'registration@edx.org' +DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org' ADMINS = ( - ('MITx Admins', 'admin@mitx.mit.edu'), + ('edX Admins', 'admin@edx.org'), ) MANAGERS = ADMINS diff --git a/common/djangoapps/pipeline_mako/templates/static_content.html b/common/djangoapps/pipeline_mako/templates/static_content.html index 225e3e0542..1737153260 100644 --- a/common/djangoapps/pipeline_mako/templates/static_content.html +++ b/common/djangoapps/pipeline_mako/templates/static_content.html @@ -1,7 +1,6 @@ <%! from staticfiles.storage import staticfiles_storage from pipeline_mako import compressed_css, compressed_js -from static_replace import replace_urls %> <%def name='url(file)'>${staticfiles_storage.url(file)} @@ -24,5 +23,3 @@ from static_replace import replace_urls % endfor %endif - -<%def name='replace_urls(text)'>${replace_urls(text)} diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 449ea1d02d..a556ca7b45 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -266,13 +266,13 @@ def create_account(request, post_override=None): # TODO: Check password is sane for a in ['username', 'email', 'name', 'password', 'terms_of_service', 'honor_code']: if len(post_vars[a]) < 2: - error_str = {'username': 'Username of length 2 or greater', - 'email': 'Properly formatted e-mail', - 'name': 'Your legal name ', - 'password': 'Valid password ', - 'terms_of_service': 'Accepting Terms of Service', - 'honor_code': 'Agreeing to the Honor Code'} - js['value'] = "{field} is required.".format(field=error_str[a]) + error_str = {'username': 'Username must be minimum of two characters long.', + 'email': 'A properly formatted e-mail is required.', + 'name': 'Your legal name must be a minimum of two characters long.', + 'password': 'A valid password is required.', + 'terms_of_service': 'Accepting Terms of Service is required.', + 'honor_code': 'Agreeing to the Honor Code is required.'} + js['value'] = error_str[a] return HttpResponse(json.dumps(js)) try: @@ -408,10 +408,11 @@ def password_reset(request): raise Http404 form = PasswordResetForm(request.POST) if form.is_valid(): - form.save(use_https=request.is_secure(), - from_email=settings.DEFAULT_FROM_EMAIL, - request=request) - return HttpResponse(json.dumps({'success': True, + form.save(use_https = request.is_secure(), + from_email = settings.DEFAULT_FROM_EMAIL, + request = request, + domain_override = settings.SITE_NAME) + return HttpResponse(json.dumps({'success':True, 'value': render_to_string('registration/password_reset_done.html', {})})) else: return HttpResponse(json.dumps({'success': False, diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py index 272cc210ac..878f12e2dd 100644 --- a/lms/djangoapps/courseware/courses.py +++ b/lms/djangoapps/courseware/courses.py @@ -9,6 +9,8 @@ from django.http import Http404 from xmodule.course_module import CourseDescriptor from xmodule.modulestore.django import modulestore from xmodule.modulestore.exceptions import ItemNotFoundError +from static_replace import replace_urls +from staticfiles.storage import staticfiles_storage log = logging.getLogger(__name__) @@ -40,15 +42,8 @@ def check_course(course_id, course_must_be_open=True, course_required=True): return course -### These methods look like they should be on the course_module object itself, but they rely -### on the lms. Maybe they should be added dynamically to the class? - -def course_static_url(course): - return settings.STATIC_URL + "/" + course.metadata['data_dir'] + "/" - - def course_image_url(course): - return course_static_url(course) + "images/course_image.jpg" + return staticfiles_storage.url(course.metadata['data_dir'] + "/images/course_image.jpg") def get_course_about_section(course, section_key): @@ -81,7 +76,7 @@ def get_course_about_section(course, section_key): 'effort', 'end_date', 'prerequisites']: try: with course.system.resources_fs.open(path("about") / section_key + ".html") as htmlFile: - return htmlFile.read().decode('utf-8').format(COURSE_STATIC_URL=course_static_url(course)) + return replace_urls(htmlFile.read().decode('utf-8'), course.metadata['data_dir']) except ResourceNotFoundError: log.warning("Missing about section {key} in course {url}".format(key=section_key, url=course.location.url())) return None @@ -111,11 +106,9 @@ def get_course_info_section(course, section_key): if section_key in ['handouts', 'guest_handouts', 'updates', 'guest_updates']: try: with course.system.resources_fs.open(path("info") / section_key + ".html") as htmlFile: - return htmlFile.read().decode('utf-8') + return replace_urls(htmlFile.read().decode('utf-8'), course.metadata['data_dir']) except ResourceNotFoundError: log.exception("Missing info section {key} in course {url}".format(key=section_key, url=course.location.url())) return "! Info section missing !" raise KeyError("Invalid about key " + str(section_key)) - - diff --git a/lms/envs/common.py b/lms/envs/common.py index f0571d19cf..3b005c5dbe 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -158,17 +158,17 @@ TEMPLATE_DEBUG = False # Site info SITE_ID = 1 -SITE_NAME = "localhost:8000" +SITE_NAME = "edx.org" HTTPS = 'on' ROOT_URLCONF = 'lms.urls' IGNORABLE_404_ENDS = ('favicon.ico') # Email EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' -DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu' -DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu' +DEFAULT_FROM_EMAIL = 'registration@edx.org' +DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org' ADMINS = ( - ('MITx Admins', 'admin@mitx.mit.edu'), + ('edX Admins', 'admin@edx.org'), ) MANAGERS = ADMINS diff --git a/lms/static/images/about_1.jpg b/lms/static/images/about_1.jpg index c21f7ee836..a67cafe344 100644 Binary files a/lms/static/images/about_1.jpg and b/lms/static/images/about_1.jpg differ diff --git a/lms/static/images/amplifier-slider-handle.png b/lms/static/images/amplifier-slider-handle.png index 47e3c8d449..1a00b40255 100644 Binary files a/lms/static/images/amplifier-slider-handle.png and b/lms/static/images/amplifier-slider-handle.png differ diff --git a/lms/static/images/askbot/comment-vote-up.png b/lms/static/images/askbot/comment-vote-up.png index 0ce3dcc9e7..05dc84e12e 100644 Binary files a/lms/static/images/askbot/comment-vote-up.png and b/lms/static/images/askbot/comment-vote-up.png differ diff --git a/lms/static/images/askbot/search-icon.png b/lms/static/images/askbot/search-icon.png index a6d4561b75..b06aa1163d 100644 Binary files a/lms/static/images/askbot/search-icon.png and b/lms/static/images/askbot/search-icon.png differ diff --git a/lms/static/images/askbot/vote-arrow-down-activate.png b/lms/static/images/askbot/vote-arrow-down-activate.png index 8b0ffc44d0..354c49dca6 100644 Binary files a/lms/static/images/askbot/vote-arrow-down-activate.png and b/lms/static/images/askbot/vote-arrow-down-activate.png differ diff --git a/lms/static/images/askbot/vote-arrow-down.png b/lms/static/images/askbot/vote-arrow-down.png index aace02ffb2..e67524077a 100644 Binary files a/lms/static/images/askbot/vote-arrow-down.png and b/lms/static/images/askbot/vote-arrow-down.png differ diff --git a/lms/static/images/askbot/vote-arrow-up-activate.png b/lms/static/images/askbot/vote-arrow-up-activate.png index 66aa8c9772..aa411c70e1 100644 Binary files a/lms/static/images/askbot/vote-arrow-up-activate.png and b/lms/static/images/askbot/vote-arrow-up-activate.png differ diff --git a/lms/static/images/askbot/vote-arrow-up.png b/lms/static/images/askbot/vote-arrow-up.png index e1920c652e..a35946cc51 100644 Binary files a/lms/static/images/askbot/vote-arrow-up.png and b/lms/static/images/askbot/vote-arrow-up.png differ diff --git a/lms/static/images/askbot/wmd-buttons.png b/lms/static/images/askbot/wmd-buttons.png index 3013a4ad02..1092100710 100755 Binary files a/lms/static/images/askbot/wmd-buttons.png and b/lms/static/images/askbot/wmd-buttons.png differ diff --git a/lms/static/images/brazilstory_blog_arthur.jpg b/lms/static/images/brazilstory_blog_arthur.jpg index f207bbbf7e..58efd75542 100644 Binary files a/lms/static/images/brazilstory_blog_arthur.jpg and b/lms/static/images/brazilstory_blog_arthur.jpg differ diff --git a/lms/static/images/bullet-triangle.png b/lms/static/images/bullet-triangle.png index cca2bc2ae1..d9d36f5a74 100644 Binary files a/lms/static/images/bullet-triangle.png and b/lms/static/images/bullet-triangle.png differ diff --git a/lms/static/images/calc-icon.png b/lms/static/images/calc-icon.png index a37423dff1..7be00daff0 100644 Binary files a/lms/static/images/calc-icon.png and b/lms/static/images/calc-icon.png differ diff --git a/lms/static/images/contact-page.jpg b/lms/static/images/contact-page.jpg index 065850c56f..8b9e9a9bfa 100644 Binary files a/lms/static/images/contact-page.jpg and b/lms/static/images/contact-page.jpg differ diff --git a/lms/static/images/courses/edx_hp_video_thumbsmall.jpg b/lms/static/images/courses/edx_hp_video_thumbsmall.jpg index 8d4fcec72d..644fa8e065 100644 Binary files a/lms/static/images/courses/edx_hp_video_thumbsmall.jpg and b/lms/static/images/courses/edx_hp_video_thumbsmall.jpg differ diff --git a/lms/static/images/courses/history.png b/lms/static/images/courses/history.png index a04d242d6a..c9dc8ada49 100644 Binary files a/lms/static/images/courses/history.png and b/lms/static/images/courses/history.png differ diff --git a/lms/static/images/courses/math.png b/lms/static/images/courses/math.png index de3328195a..2652b15473 100644 Binary files a/lms/static/images/courses/math.png and b/lms/static/images/courses/math.png differ diff --git a/lms/static/images/courses/python.png b/lms/static/images/courses/python.png deleted file mode 100644 index 05e7d6006a..0000000000 Binary files a/lms/static/images/courses/python.png and /dev/null differ diff --git a/lms/static/images/courses/space1.jpg b/lms/static/images/courses/space1.jpg deleted file mode 100644 index a7fde7dc4a..0000000000 Binary files a/lms/static/images/courses/space1.jpg and /dev/null differ diff --git a/lms/static/images/courses/space2.jpg.REMOVED.git-id b/lms/static/images/courses/space2.jpg.REMOVED.git-id deleted file mode 100644 index d6ffb516a8..0000000000 --- a/lms/static/images/courses/space2.jpg.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -69017eed8a9ec5b9caf28814cadf01ba69b4b3bc \ No newline at end of file diff --git a/lms/static/images/courses/space3.jpg.REMOVED.git-id b/lms/static/images/courses/space3.jpg.REMOVED.git-id deleted file mode 100644 index e037dd6c43..0000000000 --- a/lms/static/images/courses/space3.jpg.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -74bca798766449c9f2c87244410ca8fa30d5482e \ No newline at end of file diff --git a/lms/static/images/courses/space4.jpg.REMOVED.git-id b/lms/static/images/courses/space4.jpg.REMOVED.git-id deleted file mode 100644 index 78001082eb..0000000000 --- a/lms/static/images/courses/space4.jpg.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -184bae027b6853b575b8de2329f77089bcc87966 \ No newline at end of file diff --git a/lms/static/images/courses/space5.jpg b/lms/static/images/courses/space5.jpg deleted file mode 100644 index 65dad74b01..0000000000 Binary files a/lms/static/images/courses/space5.jpg and /dev/null differ diff --git a/lms/static/images/courses/video-thumb.jpg b/lms/static/images/courses/video-thumb.jpg index b27b8dc750..abda2d5b66 100644 Binary files a/lms/static/images/courses/video-thumb.jpg and b/lms/static/images/courses/video-thumb.jpg differ diff --git a/lms/static/images/document-download.png b/lms/static/images/document-download.png index 9cceef2486..767bf8029e 100644 Binary files a/lms/static/images/document-download.png and b/lms/static/images/document-download.png differ diff --git a/lms/static/images/edx-location.png b/lms/static/images/edx-location.png index 8e12854c10..20f1ec18bc 100644 Binary files a/lms/static/images/edx-location.png and b/lms/static/images/edx-location.png differ diff --git a/lms/static/images/edx-logo-large-bw.png b/lms/static/images/edx-logo-large-bw.png index 48fc90d686..d888e1f4bb 100644 Binary files a/lms/static/images/edx-logo-large-bw.png and b/lms/static/images/edx-logo-large-bw.png differ diff --git a/lms/static/images/edx-logo-large-color.png b/lms/static/images/edx-logo-large-color.png index db8e0fa024..f2cffea7a7 100644 Binary files a/lms/static/images/edx-logo-large-color.png and b/lms/static/images/edx-logo-large-color.png differ diff --git a/lms/static/images/edx.png b/lms/static/images/edx.png index e5bb6e4cc6..22ed9b92c3 100644 Binary files a/lms/static/images/edx.png and b/lms/static/images/edx.png differ diff --git a/lms/static/images/edx_bw.png b/lms/static/images/edx_bw.png index 94a924ea43..25e4725262 100644 Binary files a/lms/static/images/edx_bw.png and b/lms/static/images/edx_bw.png differ diff --git a/lms/static/images/fullscreen.png b/lms/static/images/fullscreen.png index e2f9054fe1..389aa4538d 100644 Binary files a/lms/static/images/fullscreen.png and b/lms/static/images/fullscreen.png differ diff --git a/lms/static/images/header-logo.png b/lms/static/images/header-logo.png index c851a703e7..f1d2357e6b 100644 Binary files a/lms/static/images/header-logo.png and b/lms/static/images/header-logo.png differ diff --git a/lms/static/images/home_bg.jpg b/lms/static/images/home_bg.jpg index 7f86a9d7bd..6df3ab2f81 100644 Binary files a/lms/static/images/home_bg.jpg and b/lms/static/images/home_bg.jpg differ diff --git a/lms/static/images/homepage-bg.jpg b/lms/static/images/homepage-bg.jpg index c2c1e805b5..61da5545c1 100644 Binary files a/lms/static/images/homepage-bg.jpg and b/lms/static/images/homepage-bg.jpg differ diff --git a/lms/static/images/homepage_interns_placeholder_2025x550.jpg b/lms/static/images/homepage_interns_placeholder_2025x550.jpg index 17f387bdc0..d5d9b915da 100644 Binary files a/lms/static/images/homepage_interns_placeholder_2025x550.jpg and b/lms/static/images/homepage_interns_placeholder_2025x550.jpg differ diff --git a/lms/static/images/intro-video.jpg b/lms/static/images/intro-video.jpg index 84933d7fe4..45e309e7a4 100644 Binary files a/lms/static/images/intro-video.jpg and b/lms/static/images/intro-video.jpg differ diff --git a/lms/static/images/jobs.jpeg b/lms/static/images/jobs.jpeg index cff61de5f8..af2424f154 100644 Binary files a/lms/static/images/jobs.jpeg and b/lms/static/images/jobs.jpeg differ diff --git a/lms/static/images/logo.png b/lms/static/images/logo.png index b9e4199c85..0ba6a4e175 100644 Binary files a/lms/static/images/logo.png and b/lms/static/images/logo.png differ diff --git a/lms/static/images/logo_bw.png b/lms/static/images/logo_bw.png index 6ce9c460db..236e3fd0c2 100644 Binary files a/lms/static/images/logo_bw.png and b/lms/static/images/logo_bw.png differ diff --git a/lms/static/images/logo_harvard_v5.png b/lms/static/images/logo_harvard_v5.png index aa1f8604cb..0c8f016798 100644 Binary files a/lms/static/images/logo_harvard_v5.png and b/lms/static/images/logo_harvard_v5.png differ diff --git a/lms/static/images/mongolia_post.jpeg b/lms/static/images/mongolia_post.jpeg index bfccf0c105..48949d14ee 100644 Binary files a/lms/static/images/mongolia_post.jpeg and b/lms/static/images/mongolia_post.jpeg differ diff --git a/lms/static/images/open-arrow.png b/lms/static/images/open-arrow.png index 4bedb61081..52fde51574 100644 Binary files a/lms/static/images/open-arrow.png and b/lms/static/images/open-arrow.png differ diff --git a/lms/static/images/pause-icon.png b/lms/static/images/pause-icon.png index e3eac51947..b24946d5cf 100644 Binary files a/lms/static/images/pause-icon.png and b/lms/static/images/pause-icon.png differ diff --git a/lms/static/images/play-icon.png b/lms/static/images/play-icon.png index 2888b1c271..4927729492 100644 Binary files a/lms/static/images/play-icon.png and b/lms/static/images/play-icon.png differ diff --git a/lms/static/images/portal-icons/calendar-icon.png b/lms/static/images/portal-icons/calendar-icon.png index 4d21e405c8..ec9d4bfc0d 100644 Binary files a/lms/static/images/portal-icons/calendar-icon.png and b/lms/static/images/portal-icons/calendar-icon.png differ diff --git a/lms/static/images/portal-icons/chart-icon.png b/lms/static/images/portal-icons/chart-icon.png index fc6e224f59..c5f364bcb5 100644 Binary files a/lms/static/images/portal-icons/chart-icon.png and b/lms/static/images/portal-icons/chart-icon.png differ diff --git a/lms/static/images/portal-icons/course-info-icon.png b/lms/static/images/portal-icons/course-info-icon.png index 178a582cbd..36fd0c0773 100644 Binary files a/lms/static/images/portal-icons/course-info-icon.png and b/lms/static/images/portal-icons/course-info-icon.png differ diff --git a/lms/static/images/portal-icons/gear-icon.png b/lms/static/images/portal-icons/gear-icon.png index 4e66eb3e3e..039ce282bb 100644 Binary files a/lms/static/images/portal-icons/gear-icon.png and b/lms/static/images/portal-icons/gear-icon.png differ diff --git a/lms/static/images/portal-icons/home-icon.png b/lms/static/images/portal-icons/home-icon.png index 7022487bf4..ec87b671ee 100644 Binary files a/lms/static/images/portal-icons/home-icon.png and b/lms/static/images/portal-icons/home-icon.png differ diff --git a/lms/static/images/portal-icons/language-icon.png b/lms/static/images/portal-icons/language-icon.png index 9ab8a178a6..e83539d0d6 100644 Binary files a/lms/static/images/portal-icons/language-icon.png and b/lms/static/images/portal-icons/language-icon.png differ diff --git a/lms/static/images/portal-icons/pencil-icon.png b/lms/static/images/portal-icons/pencil-icon.png index 30c99c191f..8f8715c255 100644 Binary files a/lms/static/images/portal-icons/pencil-icon.png and b/lms/static/images/portal-icons/pencil-icon.png differ diff --git a/lms/static/images/portal-icons/prerec-icon.png b/lms/static/images/portal-icons/prerec-icon.png index 70f11c2e0b..78f0eb48f1 100644 Binary files a/lms/static/images/portal-icons/prerec-icon.png and b/lms/static/images/portal-icons/prerec-icon.png differ diff --git a/lms/static/images/portal-icons/video-play-icon.png b/lms/static/images/portal-icons/video-play-icon.png index b55612c1a0..6fea9eed9b 100644 Binary files a/lms/static/images/portal-icons/video-play-icon.png and b/lms/static/images/portal-icons/video-play-icon.png differ diff --git a/lms/static/images/press/bbc_logo_178x138.jpeg b/lms/static/images/press/bbc_logo_178x138.jpeg index b047d814fe..e3395e56a9 100644 Binary files a/lms/static/images/press/bbc_logo_178x138.jpeg and b/lms/static/images/press/bbc_logo_178x138.jpeg differ diff --git a/lms/static/images/press/bostonglobe_logo_178x138.jpeg b/lms/static/images/press/bostonglobe_logo_178x138.jpeg index 9d2aa0bb10..0224476b29 100644 Binary files a/lms/static/images/press/bostonglobe_logo_178x138.jpeg and b/lms/static/images/press/bostonglobe_logo_178x138.jpeg differ diff --git a/lms/static/images/press/edx_logo_108x81.jpeg b/lms/static/images/press/edx_logo_108x81.jpeg index a1fb02d8ec..0660d9de08 100644 Binary files a/lms/static/images/press/edx_logo_108x81.jpeg and b/lms/static/images/press/edx_logo_108x81.jpeg differ diff --git a/lms/static/images/press/gigaom_logo_178x138.jpeg b/lms/static/images/press/gigaom_logo_178x138.jpeg index 0e7712add8..cdbda2f5d1 100644 Binary files a/lms/static/images/press/gigaom_logo_178x138.jpeg and b/lms/static/images/press/gigaom_logo_178x138.jpeg differ diff --git a/lms/static/images/press/huffpost_logo_178x138.jpeg b/lms/static/images/press/huffpost_logo_178x138.jpeg index d2b170c3d6..ed30f223f2 100644 Binary files a/lms/static/images/press/huffpost_logo_178x138.jpeg and b/lms/static/images/press/huffpost_logo_178x138.jpeg differ diff --git a/lms/static/images/press/ieee_logo_178x138.jpeg b/lms/static/images/press/ieee_logo_178x138.jpeg index c4482883c4..6f2d5f7bfa 100644 Binary files a/lms/static/images/press/ieee_logo_178x138.jpeg and b/lms/static/images/press/ieee_logo_178x138.jpeg differ diff --git a/lms/static/images/press/mit_logo_178x138.jpeg b/lms/static/images/press/mit_logo_178x138.jpeg index 7914cfefdf..3fb78ac90c 100644 Binary files a/lms/static/images/press/mit_logo_178x138.jpeg and b/lms/static/images/press/mit_logo_178x138.jpeg differ diff --git a/lms/static/images/press/npr_logo_178x138.jpeg b/lms/static/images/press/npr_logo_178x138.jpeg index 9d7b9ac73b..987f57206c 100644 Binary files a/lms/static/images/press/npr_logo_178x138.jpeg and b/lms/static/images/press/npr_logo_178x138.jpeg differ diff --git a/lms/static/images/press/nyt_logo_178x138.jpeg b/lms/static/images/press/nyt_logo_178x138.jpeg index 8a9a75b7f1..b40af3e79f 100644 Binary files a/lms/static/images/press/nyt_logo_178x138.jpeg and b/lms/static/images/press/nyt_logo_178x138.jpeg differ diff --git a/lms/static/images/press/oef_logo_178x138.jpeg b/lms/static/images/press/oef_logo_178x138.jpeg index d39e890d14..b4469e7bb8 100644 Binary files a/lms/static/images/press/oef_logo_178x138.jpeg and b/lms/static/images/press/oef_logo_178x138.jpeg differ diff --git a/lms/static/images/press/tumblr_tumbnail_brazilian_teen.jpg b/lms/static/images/press/tumblr_tumbnail_brazilian_teen.jpg new file mode 100644 index 0000000000..ea88df6230 Binary files /dev/null and b/lms/static/images/press/tumblr_tumbnail_brazilian_teen.jpg differ diff --git a/lms/static/images/press/tumblr_tumbnail_opening_doors_mongolia.jpg b/lms/static/images/press/tumblr_tumbnail_opening_doors_mongolia.jpg new file mode 100644 index 0000000000..e1cd20b9df Binary files /dev/null and b/lms/static/images/press/tumblr_tumbnail_opening_doors_mongolia.jpg differ diff --git a/lms/static/images/press/univworldnews_logo_178x138.jpeg b/lms/static/images/press/univworldnews_logo_178x138.jpeg index 757643de17..038475c4e0 100644 Binary files a/lms/static/images/press/univworldnews_logo_178x138.jpeg and b/lms/static/images/press/univworldnews_logo_178x138.jpeg differ diff --git a/lms/static/images/press/usa_logo_178x138.jpeg b/lms/static/images/press/usa_logo_178x138.jpeg index 3d6024b75f..ed3a1c50e6 100644 Binary files a/lms/static/images/press/usa_logo_178x138.jpeg and b/lms/static/images/press/usa_logo_178x138.jpeg differ diff --git a/lms/static/images/press/usnews_logo_178x138.jpeg b/lms/static/images/press/usnews_logo_178x138.jpeg index 09d4c07280..55c7cb51e3 100644 Binary files a/lms/static/images/press/usnews_logo_178x138.jpeg and b/lms/static/images/press/usnews_logo_178x138.jpeg differ diff --git a/lms/static/images/press/wbur_logo_178x138.jpeg b/lms/static/images/press/wbur_logo_178x138.jpeg index 09b6d5de12..2319d82140 100644 Binary files a/lms/static/images/press/wbur_logo_178x138.jpeg and b/lms/static/images/press/wbur_logo_178x138.jpeg differ diff --git a/lms/static/images/profile.jpg b/lms/static/images/profile.jpg index 79633c5e15..306f80ec25 100644 Binary files a/lms/static/images/profile.jpg and b/lms/static/images/profile.jpg differ diff --git a/lms/static/images/schools.png b/lms/static/images/schools.png index c1c668de60..c41cac6eed 100644 Binary files a/lms/static/images/schools.png and b/lms/static/images/schools.png differ diff --git a/lms/static/images/sequence-nav/document-icon-current.png b/lms/static/images/sequence-nav/document-icon-current.png index 52f9185e93..f82f38ed59 100644 Binary files a/lms/static/images/sequence-nav/document-icon-current.png and b/lms/static/images/sequence-nav/document-icon-current.png differ diff --git a/lms/static/images/sequence-nav/document-icon-normal.png b/lms/static/images/sequence-nav/document-icon-normal.png index 6e76ad0d93..41c7e3af93 100644 Binary files a/lms/static/images/sequence-nav/document-icon-normal.png and b/lms/static/images/sequence-nav/document-icon-normal.png differ diff --git a/lms/static/images/sequence-nav/document-icon-visited.png b/lms/static/images/sequence-nav/document-icon-visited.png index 5fe36cbbee..df8ff0fa7e 100644 Binary files a/lms/static/images/sequence-nav/document-icon-visited.png and b/lms/static/images/sequence-nav/document-icon-visited.png differ diff --git a/lms/static/images/sequence-nav/edit.png b/lms/static/images/sequence-nav/edit.png index 9ad3945c35..6d7f0632c3 100644 Binary files a/lms/static/images/sequence-nav/edit.png and b/lms/static/images/sequence-nav/edit.png differ diff --git a/lms/static/images/sequence-nav/history.png b/lms/static/images/sequence-nav/history.png index fa8a2d8177..a65c4398d9 100644 Binary files a/lms/static/images/sequence-nav/history.png and b/lms/static/images/sequence-nav/history.png differ diff --git a/lms/static/images/sequence-nav/list-icon-current.png b/lms/static/images/sequence-nav/list-icon-current.png index d8ad94d53e..be95f52ac5 100644 Binary files a/lms/static/images/sequence-nav/list-icon-current.png and b/lms/static/images/sequence-nav/list-icon-current.png differ diff --git a/lms/static/images/sequence-nav/list-icon-visited.png b/lms/static/images/sequence-nav/list-icon-visited.png index 2df2935dbe..ab911cfa8b 100644 Binary files a/lms/static/images/sequence-nav/list-icon-visited.png and b/lms/static/images/sequence-nav/list-icon-visited.png differ diff --git a/lms/static/images/sequence-nav/next-icon.png b/lms/static/images/sequence-nav/next-icon.png index 413ce38d1b..135d4fa715 100644 Binary files a/lms/static/images/sequence-nav/next-icon.png and b/lms/static/images/sequence-nav/next-icon.png differ diff --git a/lms/static/images/sequence-nav/previous-icon.png b/lms/static/images/sequence-nav/previous-icon.png index 0b3f369176..004a69ac4a 100644 Binary files a/lms/static/images/sequence-nav/previous-icon.png and b/lms/static/images/sequence-nav/previous-icon.png differ diff --git a/lms/static/images/sequence-nav/status/dash.png b/lms/static/images/sequence-nav/status/dash.png index 79e7fa8f7f..d65b4583a6 100644 Binary files a/lms/static/images/sequence-nav/status/dash.png and b/lms/static/images/sequence-nav/status/dash.png differ diff --git a/lms/static/images/sequence-nav/status/not-started.png b/lms/static/images/sequence-nav/status/not-started.png index 826e28609b..4b5f03c954 100644 Binary files a/lms/static/images/sequence-nav/status/not-started.png and b/lms/static/images/sequence-nav/status/not-started.png differ diff --git a/lms/static/images/sequence-nav/vertical-icon.png b/lms/static/images/sequence-nav/vertical-icon.png index 6100b678c4..be17eab195 100644 Binary files a/lms/static/images/sequence-nav/vertical-icon.png and b/lms/static/images/sequence-nav/vertical-icon.png differ diff --git a/lms/static/images/sequence-nav/video-icon-visited.png b/lms/static/images/sequence-nav/video-icon-visited.png index e09aad8d20..b980c5b73e 100644 Binary files a/lms/static/images/sequence-nav/video-icon-visited.png and b/lms/static/images/sequence-nav/video-icon-visited.png differ diff --git a/lms/static/images/sequence-nav/video-icon.png b/lms/static/images/sequence-nav/video-icon.png index e68ec0f8ae..afb0ad86af 100644 Binary files a/lms/static/images/sequence-nav/video-icon.png and b/lms/static/images/sequence-nav/video-icon.png differ diff --git a/lms/static/images/sequence-nav/view.png b/lms/static/images/sequence-nav/view.png index 62f04aa993..8905b519a2 100644 Binary files a/lms/static/images/sequence-nav/view.png and b/lms/static/images/sequence-nav/view.png differ diff --git a/lms/static/images/slider-bars.png b/lms/static/images/slider-bars.png index f2e014f4b7..e5b005344c 100644 Binary files a/lms/static/images/slider-bars.png and b/lms/static/images/slider-bars.png differ diff --git a/lms/static/images/slider-handle.png b/lms/static/images/slider-handle.png index 94ebe6f0bc..ba5da5d33a 100644 Binary files a/lms/static/images/slider-handle.png and b/lms/static/images/slider-handle.png differ diff --git a/lms/static/images/social/google-plus-sharing.png b/lms/static/images/social/google-plus-sharing.png index 86fb5754d3..04f21d7860 100644 Binary files a/lms/static/images/social/google-plus-sharing.png and b/lms/static/images/social/google-plus-sharing.png differ diff --git a/lms/static/images/social/youtube-sharing.png b/lms/static/images/social/youtube-sharing.png index 49a4c82c61..a26b18121b 100644 Binary files a/lms/static/images/social/youtube-sharing.png and b/lms/static/images/social/youtube-sharing.png differ diff --git a/lms/static/images/ui-bg_flat_0_aaaaaa_40x100.png b/lms/static/images/ui-bg_flat_0_aaaaaa_40x100.png index 5b5dab2ab7..e425e6e46e 100644 Binary files a/lms/static/images/ui-bg_flat_0_aaaaaa_40x100.png and b/lms/static/images/ui-bg_flat_0_aaaaaa_40x100.png differ diff --git a/lms/static/images/ui-bg_flat_0_eeeeee_40x100.png b/lms/static/images/ui-bg_flat_0_eeeeee_40x100.png index e44f861be1..f1cfaa5636 100644 Binary files a/lms/static/images/ui-bg_flat_0_eeeeee_40x100.png and b/lms/static/images/ui-bg_flat_0_eeeeee_40x100.png differ diff --git a/lms/static/images/ui-bg_flat_55_ffffff_40x100.png b/lms/static/images/ui-bg_flat_55_ffffff_40x100.png index ac8b229af9..72d4757363 100644 Binary files a/lms/static/images/ui-bg_flat_55_ffffff_40x100.png and b/lms/static/images/ui-bg_flat_55_ffffff_40x100.png differ diff --git a/lms/static/images/ui-bg_flat_75_ffffff_40x100.png b/lms/static/images/ui-bg_flat_75_ffffff_40x100.png index ac8b229af9..72d4757363 100644 Binary files a/lms/static/images/ui-bg_flat_75_ffffff_40x100.png and b/lms/static/images/ui-bg_flat_75_ffffff_40x100.png differ diff --git a/lms/static/images/ui-bg_glass_65_023063_1x400.png b/lms/static/images/ui-bg_glass_65_023063_1x400.png index 644a1f78e3..cb030d12ee 100644 Binary files a/lms/static/images/ui-bg_glass_65_023063_1x400.png and b/lms/static/images/ui-bg_glass_65_023063_1x400.png differ diff --git a/lms/static/images/ui-bg_glass_65_ffffff_1x400.png b/lms/static/images/ui-bg_glass_65_ffffff_1x400.png index 42ccba269b..e7d01fac6a 100644 Binary files a/lms/static/images/ui-bg_glass_65_ffffff_1x400.png and b/lms/static/images/ui-bg_glass_65_ffffff_1x400.png differ diff --git a/lms/static/images/ui-bg_highlight-soft_100_7fbcdf_1x100.png b/lms/static/images/ui-bg_highlight-soft_100_7fbcdf_1x100.png index 6c372415be..0c1ee5c9cd 100644 Binary files a/lms/static/images/ui-bg_highlight-soft_100_7fbcdf_1x100.png and b/lms/static/images/ui-bg_highlight-soft_100_7fbcdf_1x100.png differ diff --git a/lms/static/images/ui-bg_highlight-soft_100_bddeff_1x100.png b/lms/static/images/ui-bg_highlight-soft_100_bddeff_1x100.png index 2f6196c9b3..41d7a7d7a7 100644 Binary files a/lms/static/images/ui-bg_highlight-soft_100_bddeff_1x100.png and b/lms/static/images/ui-bg_highlight-soft_100_bddeff_1x100.png differ diff --git a/lms/static/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png b/lms/static/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png index 5dcfaa9a01..20bb28e15b 100644 Binary files a/lms/static/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png and b/lms/static/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png differ diff --git a/lms/static/images/ui-bg_highlight-soft_25_7fbcdf_1x100.png b/lms/static/images/ui-bg_highlight-soft_25_7fbcdf_1x100.png index 994b7557c4..903760d875 100644 Binary files a/lms/static/images/ui-bg_highlight-soft_25_7fbcdf_1x100.png and b/lms/static/images/ui-bg_highlight-soft_25_7fbcdf_1x100.png differ diff --git a/lms/static/images/ui-bg_highlight-soft_25_bddeff_1x100.png b/lms/static/images/ui-bg_highlight-soft_25_bddeff_1x100.png index 77f2cf7bc2..a4c65deaef 100644 Binary files a/lms/static/images/ui-bg_highlight-soft_25_bddeff_1x100.png and b/lms/static/images/ui-bg_highlight-soft_25_bddeff_1x100.png differ diff --git a/lms/static/images/ui-bg_highlight-soft_50_7fbcfd_1x100.png b/lms/static/images/ui-bg_highlight-soft_50_7fbcfd_1x100.png index 6f70ca4003..8742d91098 100644 Binary files a/lms/static/images/ui-bg_highlight-soft_50_7fbcfd_1x100.png and b/lms/static/images/ui-bg_highlight-soft_50_7fbcfd_1x100.png differ diff --git a/lms/static/images/ui-icons_031634_256x240.png b/lms/static/images/ui-icons_031634_256x240.png index 09c70d6470..1a38b25a5c 100644 Binary files a/lms/static/images/ui-icons_031634_256x240.png and b/lms/static/images/ui-icons_031634_256x240.png differ diff --git a/lms/static/images/ui-icons_454545_256x240.png b/lms/static/images/ui-icons_454545_256x240.png index 59bd45b907..c7d8883560 100644 Binary files a/lms/static/images/ui-icons_454545_256x240.png and b/lms/static/images/ui-icons_454545_256x240.png differ diff --git a/lms/static/images/ui-icons_adcc80_256x240.png b/lms/static/images/ui-icons_adcc80_256x240.png index 370191a5ea..28e0801ee2 100644 Binary files a/lms/static/images/ui-icons_adcc80_256x240.png and b/lms/static/images/ui-icons_adcc80_256x240.png differ diff --git a/lms/static/images/ui-icons_fa720a_256x240.png b/lms/static/images/ui-icons_fa720a_256x240.png index b70cbd1ab7..ac5171d3ae 100644 Binary files a/lms/static/images/ui-icons_fa720a_256x240.png and b/lms/static/images/ui-icons_fa720a_256x240.png differ diff --git a/lms/static/images/ui-icons_ffffff_256x240.png b/lms/static/images/ui-icons_ffffff_256x240.png index 42f8f992c7..46df091ffb 100644 Binary files a/lms/static/images/ui-icons_ffffff_256x240.png and b/lms/static/images/ui-icons_ffffff_256x240.png differ diff --git a/lms/static/images/unanswered-icon.png b/lms/static/images/unanswered-icon.png index 8ea9669b8c..ff88b00696 100644 Binary files a/lms/static/images/unanswered-icon.png and b/lms/static/images/unanswered-icon.png differ diff --git a/lms/static/images/university/berkeley/berkeley-cover.jpeg b/lms/static/images/university/berkeley/berkeley-cover.jpeg index c228d30965..16c807555d 100644 Binary files a/lms/static/images/university/berkeley/berkeley-cover.jpeg and b/lms/static/images/university/berkeley/berkeley-cover.jpeg differ diff --git a/lms/static/images/university/berkeley/berkeley.png b/lms/static/images/university/berkeley/berkeley.png index 674b34f895..ca85266538 100644 Binary files a/lms/static/images/university/berkeley/berkeley.png and b/lms/static/images/university/berkeley/berkeley.png differ diff --git a/lms/static/images/university/berkeley/berkeley_bw.png b/lms/static/images/university/berkeley/berkeley_bw.png index fdc7bb28cd..9904e61315 100644 Binary files a/lms/static/images/university/berkeley/berkeley_bw.png and b/lms/static/images/university/berkeley/berkeley_bw.png differ diff --git a/lms/static/images/university/berkeley/berkeley_fountain_2025x550.jpg b/lms/static/images/university/berkeley/berkeley_fountain_2025x550.jpg index c228d30965..16c807555d 100644 Binary files a/lms/static/images/university/berkeley/berkeley_fountain_2025x550.jpg and b/lms/static/images/university/berkeley/berkeley_fountain_2025x550.jpg differ diff --git a/lms/static/images/university/harvard/about-harvard.jpg b/lms/static/images/university/harvard/about-harvard.jpg index fa800b3e6c..1e348faaa5 100644 Binary files a/lms/static/images/university/harvard/about-harvard.jpg and b/lms/static/images/university/harvard/about-harvard.jpg differ diff --git a/lms/static/images/university/harvard/about_harvard_page_2025x550.jpg b/lms/static/images/university/harvard/about_harvard_page_2025x550.jpg index f4ca6e369a..342543ef26 100644 Binary files a/lms/static/images/university/harvard/about_harvard_page_2025x550.jpg and b/lms/static/images/university/harvard/about_harvard_page_2025x550.jpg differ diff --git a/lms/static/images/university/harvard/harvard-cover.jpeg b/lms/static/images/university/harvard/harvard-cover.jpeg index 943fa9ade5..2c29dd99ee 100644 Binary files a/lms/static/images/university/harvard/harvard-cover.jpeg and b/lms/static/images/university/harvard/harvard-cover.jpeg differ diff --git a/lms/static/images/university/harvard/harvard.png b/lms/static/images/university/harvard/harvard.png index ecfef5245d..cee03aeeba 100644 Binary files a/lms/static/images/university/harvard/harvard.png and b/lms/static/images/university/harvard/harvard.png differ diff --git a/lms/static/images/university/harvard/harvard_bw.png b/lms/static/images/university/harvard/harvard_bw.png index e65ca2ae55..5d1afefb84 100644 Binary files a/lms/static/images/university/harvard/harvard_bw.png and b/lms/static/images/university/harvard/harvard_bw.png differ diff --git a/lms/static/images/university/harvard/harvard_cropped.png b/lms/static/images/university/harvard/harvard_cropped.png index e72aeb0a20..e76b24fd59 100644 Binary files a/lms/static/images/university/harvard/harvard_cropped.png and b/lms/static/images/university/harvard/harvard_cropped.png differ diff --git a/lms/static/images/university/mit/about-mit.jpg b/lms/static/images/university/mit/about-mit.jpg index e29611a814..f2051eeb9b 100644 Binary files a/lms/static/images/university/mit/about-mit.jpg and b/lms/static/images/university/mit/about-mit.jpg differ diff --git a/lms/static/images/university/mit/mit.png b/lms/static/images/university/mit/mit.png index 0a673cfd11..8be5c5f2b6 100644 Binary files a/lms/static/images/university/mit/mit.png and b/lms/static/images/university/mit/mit.png differ diff --git a/lms/static/images/university/mit/mit_bw.png b/lms/static/images/university/mit/mit_bw.png index 4c50c51b9c..121683acd9 100644 Binary files a/lms/static/images/university/mit/mit_bw.png and b/lms/static/images/university/mit/mit_bw.png differ diff --git a/lms/static/images/university/mit/shot-2-large.jpg b/lms/static/images/university/mit/shot-2-large.jpg index 592c327ec2..09541dc372 100644 Binary files a/lms/static/images/university/mit/shot-2-large.jpg and b/lms/static/images/university/mit/shot-2-large.jpg differ diff --git a/lms/static/images/university/mit/shot-3-large.jpg b/lms/static/images/university/mit/shot-3-large.jpg index 34e5134d9d..327073f937 100644 Binary files a/lms/static/images/university/mit/shot-3-large.jpg and b/lms/static/images/university/mit/shot-3-large.jpg differ diff --git a/lms/static/images/university/mit/shot-4-large.jpg b/lms/static/images/university/mit/shot-4-large.jpg index af9550c702..7c488bfccf 100644 Binary files a/lms/static/images/university/mit/shot-4-large.jpg and b/lms/static/images/university/mit/shot-4-large.jpg differ diff --git a/lms/static/images/vcr.png b/lms/static/images/vcr.png index aa2ac99e47..6db5ff3bbe 100644 Binary files a/lms/static/images/vcr.png and b/lms/static/images/vcr.png differ diff --git a/lms/static/images/video-image.png b/lms/static/images/video-image.png index 379403a4c5..6963d04540 100644 Binary files a/lms/static/images/video-image.png and b/lms/static/images/video-image.png differ diff --git a/lms/static/js/toggle_login_modal.js b/lms/static/js/toggle_login_modal.js index 006a9e88a6..df62a01505 100644 --- a/lms/static/js/toggle_login_modal.js +++ b/lms/static/js/toggle_login_modal.js @@ -23,6 +23,17 @@ $(".modal").hide(); var modal_id = $(this).attr("href"); + + if ($(modal_id).hasClass("video-modal")) { + //Video modals need to be cloned before being presented as a modal + //This is because actions on the video get recorded in the history. + //Deleting the video (clone) prevents the odd back button behavior. + var modal_clone = $(modal_id).clone(true, true); + modal_clone.attr('id', 'modal_clone'); + $(modal_id).after(modal_clone); + modal_id = '#modal_clone'; + } + $("#lean_overlay").click(function() { close_modal(modal_id); @@ -69,6 +80,9 @@ $("#lean_overlay").fadeOut(200); $('iframe', modal_id).attr('src', ''); $(modal_id).css({ 'display' : 'none' }); + if (modal_id == '#modal_clone') { + $(modal_id).remove(); + } } } }); diff --git a/lms/static/sass/application.scss b/lms/static/sass/application.scss index 32e57ebcb1..c16d72e367 100644 --- a/lms/static/sass/application.scss +++ b/lms/static/sass/application.scss @@ -26,3 +26,4 @@ @import 'multicourse/press_release'; @import 'multicourse/password_reset'; @import 'multicourse/error-pages'; +@import 'multicourse/help'; diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss index e7da93c335..35997d95a7 100644 --- a/lms/static/sass/ie.scss +++ b/lms/static/sass/ie.scss @@ -16,7 +16,6 @@ header.global { .home > header .title { &:hover { - height: 120px; > hgroup { h1 { @@ -101,7 +100,6 @@ header.global { } } - // } .info { height: auto; @@ -128,3 +126,10 @@ header.global { } } +#lean_overlay { + background: #000; +} + +.modal .inner-wrapper form label { + display: block; +} diff --git a/lms/static/sass/multicourse/_about_pages.scss b/lms/static/sass/multicourse/_about_pages.scss index 7b527c9a19..a72a77c89f 100644 --- a/lms/static/sass/multicourse/_about_pages.scss +++ b/lms/static/sass/multicourse/_about_pages.scss @@ -146,6 +146,7 @@ } } + .faq { @include clearfix; diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss index 04cb976fb9..f96d12f7a3 100644 --- a/lms/static/sass/multicourse/_course_about.scss +++ b/lms/static/sass/multicourse/_course_about.scss @@ -405,11 +405,6 @@ p { margin-right: 10px; } - - span { - float: none; - font-weight: normal; - } } &:hover { diff --git a/lms/static/sass/multicourse/_help.scss b/lms/static/sass/multicourse/_help.scss new file mode 100644 index 0000000000..ca1011951e --- /dev/null +++ b/lms/static/sass/multicourse/_help.scss @@ -0,0 +1,36 @@ +.static-container.help { + section.questions { + float: left; + width: flex-grid(9); + margin-right: flex-gutter(); + + article { + margin-bottom: 40px; + + h2 { + border-bottom: 1px solid rgb(220,220,220); + margin-bottom: 40px; + padding-bottom: 20px; + } + } + } + + section.emails { + border: 1px solid rgb(220,220,220); + @include box-sizing(border-box); + float: left; + padding: 20px; + width: flex-grid(3); + + ul { + margin-left: 0; + padding-left: 0; + list-style: none; + + li { + margin-bottom: 1em; + } + } + } +} + diff --git a/lms/static/sass/multicourse/_home.scss b/lms/static/sass/multicourse/_home.scss index 89af76abaf..52471b58d2 100644 --- a/lms/static/sass/multicourse/_home.scss +++ b/lms/static/sass/multicourse/_home.scss @@ -425,6 +425,16 @@ font-family: $serif; font-style: italic; margin-left: 10px; + + &.read-more { + float: right; + color: lighten($base-font-color, 50%); + + &:hover { + color: $blue; + text-decoration: underline; + } + } } } } diff --git a/lms/static/sass/multicourse/_press_release.scss b/lms/static/sass/multicourse/_press_release.scss index d135c8b81f..7b3dd36e31 100644 --- a/lms/static/sass/multicourse/_press_release.scss +++ b/lms/static/sass/multicourse/_press_release.scss @@ -18,6 +18,16 @@ margin-bottom: 30px; text-align: center; } + + li { + color: $base-font-color; + font: normal 1em/1.6em $serif; + margin: 0px; + } + + li + li { + margin-top: 20px; + } > article { border: 1px solid rgb(220,220,220); @@ -42,5 +52,42 @@ h2 + p { margin-top: 30px; } + + .contact { + margin-top: 20px; + + p + p { + margin-top: 0px; + } + } + + h3.date { + margin-bottom: 0; + } + + div.social-sharing { + @include clearfix; + + hr.horizontal-divider { + margin-top: 40px !important; + } + + .fb-like { + margin-top: 8px; + margin-left: 10px; + float: left; + } + + p { + float: left; + margin-top: 8px; + margin-right: 10px; + } + + a { + display: block; + float: left; + } + } } } diff --git a/lms/templates/courses.html b/lms/templates/courses.html index a4c0c2480a..25930184a9 100644 --- a/lms/templates/courses.html +++ b/lms/templates/courses.html @@ -11,7 +11,7 @@ -

Explore courses from leading universities.

+

Explore free courses from leading universities.

diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index c0273ef709..b0d4308253 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -95,7 +95,7 @@ - Unenroll + Unregister % endfor % else: @@ -113,7 +113,7 @@