diff --git a/AUTHORS b/AUTHORS index 1a67c65d05..4b57d723d2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -53,7 +53,7 @@ Christina Roberts Robert Chirwa Ed Zarecor Deena Wang -Jean Manuel-Nater +Jean Manuel Náter Emily Zhang <1800.ehz.hang@gmail.com> Jennifer Akana Peter Baratta diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 15310ebb9e..897ea3ae3a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,14 @@ These are notable changes in edx-platform. This is a rolling list of changes, in roughly chronological order, most recent first. Add your entries at or near the top. Include a label indicating the component affected. +Studio: Email will be sent to admin address when a user requests course creator +privileges for Studio (edge only). + +Studio: Studio course authors (both instructors and staff) will be auto-enrolled +for their courses so that "View Live" works. + +Common: Added ratelimiting to our authentication backend. + Common: Add additional logging to cover login attempts and logouts. Studio: Send e-mails to new Studio users (on edge only) when their course creator @@ -40,6 +48,9 @@ Common: Add a manage.py that knows about edx-platform specific settings and proj Common: Added *experimental* support for jsinput type. +Studio: Remove XML from HTML5 video component editor. All settings are +moved to be edited as metadata. + Common: Added setting to specify Celery Broker vhost Common: Utilize new XBlock bulk save API in LMS and CMS. diff --git a/cms/djangoapps/contentstore/features/advanced-settings.feature b/cms/djangoapps/contentstore/features/advanced-settings.feature index 514eb8898e..a11a6cb869 100644 --- a/cms/djangoapps/contentstore/features/advanced-settings.feature +++ b/cms/djangoapps/contentstore/features/advanced-settings.feature @@ -40,6 +40,7 @@ Feature: Advanced (manual) course policy And I reload the page Then the policy key value is unchanged + # This feature will work in Firefox only when Firefox is the active window Scenario: Test automatic quoting of non-JSON values Given I am on the Advanced Course Settings page in Studio When I create a non-JSON value not in quotes diff --git a/cms/djangoapps/contentstore/features/checklists.feature b/cms/djangoapps/contentstore/features/checklists.feature index 10db23c4fa..f13ce53fc2 100644 --- a/cms/djangoapps/contentstore/features/checklists.feature +++ b/cms/djangoapps/contentstore/features/checklists.feature @@ -10,6 +10,7 @@ Feature: Course checklists Then I can check and uncheck tasks in a checklist And They are correctly selected after reloading the page + # CHROME ONLY, due to issues getting link to be active in firefox Scenario: A task can link to a location within Studio Given I have opened Checklists When I select a link to the course outline @@ -17,6 +18,7 @@ Feature: Course checklists And I press the browser back button Then I am brought back to the course outline in the correct state + # CHROME ONLY, due to issues getting link to be active in firefox Scenario: A task can link to a location outside Studio Given I have opened Checklists When I select a link to help page diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py index 8b23bc3635..8d13a39bb3 100644 --- a/cms/djangoapps/contentstore/features/common.py +++ b/cms/djangoapps/contentstore/features/common.py @@ -56,10 +56,8 @@ def i_have_opened_a_new_course(_step): @step('(I select|s?he selects) the new course') def select_new_course(_step, whom): - course_link_xpath = '//div[contains(@class, "courses")]//a[contains(@class, "class-link")]//span[contains(., "{name}")]/..'.format( - name="Robot Super Course") - element = world.browser.find_by_xpath(course_link_xpath) - element.click() + course_link_css = 'a.course-link' + world.css_click(course_link_css) @step(u'I press the "([^"]*)" notification button$') @@ -72,8 +70,12 @@ def press_the_notification_button(_step, name): confirmation_dismissed = world.is_css_not_present('.is-shown.wrapper-notification-warning') error_showing = world.is_css_present('.is-shown.wrapper-notification-error') return confirmation_dismissed or error_showing - - world.css_click(css, success_condition=button_clicked), '%s button not clicked after 5 attempts.' % name + if world.is_firefox(): + # This is done to explicitly make the changes save on firefox. It will remove focus from the previously focused element + world.trigger_event(css, event='focus') + world.browser.execute_script("$('{}').click()".format(css)) + else: + world.css_click(css, success_condition=button_clicked), '%s button not clicked after 5 attempts.' % name @step('I change the "(.*)" field to "(.*)"$') @@ -144,24 +146,13 @@ def fill_in_course_info( def log_into_studio( uname='robot', email='robot+studio@edx.org', - password='test'): + password='test', + name='Robot Studio'): - world.browser.cookies.delete() + world.log_in(username=uname, password=password, email=email, name=name) + # Navigate to the studio dashboard world.visit('/') - - signin_css = 'a.action-signin' - world.is_css_present(signin_css) - world.css_click(signin_css) - - def fill_login_form(): - login_form = world.browser.find_by_css('form#login_form') - login_form.find_by_name('email').fill(email) - login_form.find_by_name('password').fill(password) - login_form.find_by_name('submit').click() - world.retry_on_exception(fill_login_form) - assert_true(world.is_css_present('.new-course-button')) - world.scenario_dict['USER'] = get_user_by_email(email) - + world.wait_for(lambda _driver: uname in world.css_find('h2.title')[0].text) def create_a_course(): course = world.CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') @@ -178,9 +169,10 @@ def create_a_course(): group, __ = Group.objects.get_or_create(name=groupname) user.groups.add(group) user.save() - world.browser.reload() - course_link_css = 'span.class-name' + # Navigate to the studio dashboard + world.visit('/') + course_link_css = 'a.course-link' world.css_click(course_link_css) course_title_css = 'span.course-title' assert_true(world.is_css_present(course_title_css)) @@ -228,6 +220,26 @@ def i_created_a_video_component(step): ) +@step('I have created a Video Alpha component$') +def i_created_video_alpha(step): + step.given('I have enabled the videoalpha advanced module') + world.css_click('a.course-link') + step.given('I have added a new subsection') + step.given('I expand the first section') + world.css_click('a.new-unit-item') + world.css_click('.large-advanced-icon') + world.click_component_from_menu('videoalpha', None, '.xmodule_VideoAlphaModule') + + +@step('I have enabled the (.*) advanced module$') +def i_enabled_the_advanced_module(step, module): + step.given('I have opened a new course section in Studio') + world.css_click('.nav-course-settings') + world.css_click('.nav-course-settings-advanced a') + type_in_codemirror(0, '["%s"]' % module) + press_the_notification_button(step, 'Save') + + @step('I have clicked the new unit button') def open_new_unit(step): step.given('I have opened a new course section in Studio') @@ -236,14 +248,14 @@ def open_new_unit(step): world.css_click('a.new-unit-item') -@step('when I view the video it (.*) show the captions') -def shows_captions(step, show_captions): +@step('when I view the (video.*) it (.*) show the captions') +def shows_captions(_step, video_type, show_captions): # Prevent cookies from overriding course settings world.browser.cookies.delete('hide_captions') if show_captions == 'does not': - assert world.css_has_class('.video', 'closed') + assert world.css_has_class('.%s' % video_type, 'closed') else: - assert world.is_css_not_present('.video.closed') + assert world.is_css_not_present('.%s.closed' % video_type) @step('the save button is disabled$') @@ -265,7 +277,7 @@ def i_am_shown_a_notification(step, notification_type): def type_in_codemirror(index, text): - world.css_click(".CodeMirror", index=index) + world.css_click("div.CodeMirror-lines", index=index) world.browser.execute_script("$('div.CodeMirror.CodeMirror-focused > div').css('overflow', '')") g = world.css_find("div.CodeMirror.CodeMirror-focused > div > textarea") if world.is_mac(): @@ -274,3 +286,5 @@ def type_in_codemirror(index, text): g._element.send_keys(Keys.CONTROL + 'a') g._element.send_keys(Keys.DELETE) g._element.send_keys(text) + if world.is_firefox(): + world.trigger_event('div.CodeMirror', index=index, event='blur') diff --git a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py index 513eb699e9..606e3dcee8 100644 --- a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py +++ b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py @@ -56,13 +56,24 @@ def click_component_from_menu(category, boilerplate, expected_css): def edit_component_and_select_settings(): world.wait_for(lambda _driver: world.css_visible('a.edit-button')) world.css_click('a.edit-button') - world.css_click('#settings-mode') + world.css_click('#settings-mode a') + + +@world.absorb +def edit_component(): + world.wait_for(lambda _driver: world.css_visible('a.edit-button')) + world.css_click('a.edit-button') @world.absorb def verify_setting_entry(setting, display_name, value, explicitly_set): assert_equal(display_name, setting.find_by_css('.setting-label')[0].value) - assert_equal(value, setting.find_by_css('.setting-input')[0].value) + # Check specifically for the list type; it has a different structure + if setting.has_class('metadata-list-enum'): + list_value = ', '.join(ele.value for ele in setting.find_by_css('.list-settings-item')) + assert_equal(value, list_value) + else: + assert_equal(value, setting.find_by_css('.setting-input')[0].value) settingClearButton = setting.find_by_css('.setting-clear')[0] assert_equal(explicitly_set, settingClearButton.has_class('active')) assert_equal(not explicitly_set, settingClearButton.has_class('inactive')) @@ -103,8 +114,20 @@ def revert_setting_entry(label): @world.absorb def get_setting_entry(label): - settings = world.browser.find_by_css('.wrapper-comp-setting') - for setting in settings: - if setting.find_by_css('.setting-label')[0].value == label: - return setting - return None + def get_setting(): + settings = world.css_find('.wrapper-comp-setting') + for setting in settings: + if setting.find_by_css('.setting-label')[0].value == label: + return setting + return None + return world.retry_on_exception(get_setting) + +@world.absorb +def get_setting_entry_index(label): + def get_index(): + settings = world.css_find('.wrapper-comp-setting') + for index, setting in enumerate(settings): + if setting.find_by_css('.setting-label')[0].value == label: + return index + return None + return world.retry_on_exception(get_index) diff --git a/cms/djangoapps/contentstore/features/course-overview.py b/cms/djangoapps/contentstore/features/course-overview.py index 8baad68fdf..3fcb134f5b 100644 --- a/cms/djangoapps/contentstore/features/course-overview.py +++ b/cms/djangoapps/contentstore/features/course-overview.py @@ -52,7 +52,7 @@ def have_a_course_with_two_sections(step): def navigate_to_the_course_overview_page(step): create_studio_user(is_staff=True) log_into_studio() - course_locator = '.class-name' + course_locator = 'a.course-link' world.css_click(course_locator) diff --git a/cms/djangoapps/contentstore/features/course-team.feature b/cms/djangoapps/contentstore/features/course-team.feature index 20171eeae5..de5bb6556a 100644 --- a/cms/djangoapps/contentstore/features/course-team.feature +++ b/cms/djangoapps/contentstore/features/course-team.feature @@ -15,6 +15,8 @@ Feature: Course Team And I am viewing the course team settings When I add "bob" to the course team And "bob" logs in + And he selects the new course + And he views the course team settings Then he cannot delete users And he cannot add users @@ -69,7 +71,7 @@ Feature: Course Team And she selects the new course And she views the course team settings And she deletes me from the course team - And I log in + And I am logged into studio Then I do not see the course on my page Scenario: Admins should be able to remove their own admin rights diff --git a/cms/djangoapps/contentstore/features/course-team.py b/cms/djangoapps/contentstore/features/course-team.py index 57545060c1..db7b4d81f9 100644 --- a/cms/djangoapps/contentstore/features/course-team.py +++ b/cms/djangoapps/contentstore/features/course-team.py @@ -2,9 +2,10 @@ #pylint: disable=W0621 from lettuce import world, step -from common import create_studio_user, log_into_studio +from common import create_studio_user from django.contrib.auth.models import Group -from auth.authz import get_course_groupname_for_role +from auth.authz import get_course_groupname_for_role, get_user_by_email +from nose.tools import assert_true PASSWORD = 'test' EMAIL_EXTENSION = '@edx.org' @@ -42,9 +43,9 @@ def add_other_user(_step, name): world.wait(0.5) email_css = 'input#user-email-input' - f = world.css_find(email_css) - f._element.send_keys(name, EMAIL_EXTENSION) - + world.css_fill(email_css, name + EMAIL_EXTENSION) + if world.is_firefox(): + world.trigger_event(email_css) confirm_css = 'form.create-user button.action-primary' world.css_click(confirm_css) @@ -55,6 +56,8 @@ def delete_other_user(_step, name): email="{0}{1}".format(name, EMAIL_EXTENSION)) world.css_click(to_delete_css) # confirm prompt + # need to wait for the animation to be done, there isn't a good success condition that won't work both on latest chrome and jenkins + world.wait(.5) world.css_click(".wrapper-prompt-warning .action-primary") @@ -64,6 +67,7 @@ def other_delete_self(_step): email="robot+studio@edx.org") world.css_click(to_delete_css) # confirm prompt + world.wait(.5) world.css_click(".wrapper-prompt-warning .action-primary") @@ -87,13 +91,27 @@ def remove_course_team_admin(_step, outer_capture, name): @step(u'"([^"]*)" logs in$') def other_user_login(_step, name): - log_into_studio(uname=name, password=PASSWORD, email=name + EMAIL_EXTENSION) + world.browser.cookies.delete() + world.visit('/') + + signin_css = 'a.action-signin' + world.is_css_present(signin_css) + world.css_click(signin_css) + + def fill_login_form(): + login_form = world.browser.find_by_css('form#login_form') + login_form.find_by_name('email').fill(name + EMAIL_EXTENSION) + login_form.find_by_name('password').fill(PASSWORD) + login_form.find_by_name('submit').click() + world.retry_on_exception(fill_login_form) + assert_true(world.is_css_present('.new-course-button')) + world.scenario_dict['USER'] = get_user_by_email(name + EMAIL_EXTENSION) @step(u'I( do not)? see the course on my page') @step(u's?he does( not)? see the course on (his|her) page') def see_course(_step, inverted, gender='self'): - class_css = 'span.class-name' + class_css = 'h3.course-title' all_courses = world.css_find(class_css, wait_time=1) all_names = [item.html for item in all_courses] if inverted: diff --git a/cms/djangoapps/contentstore/features/course-updates.py b/cms/djangoapps/contentstore/features/course-updates.py index 9506191a76..f431af9cf5 100644 --- a/cms/djangoapps/contentstore/features/course-updates.py +++ b/cms/djangoapps/contentstore/features/course-updates.py @@ -9,7 +9,7 @@ from common import type_in_codemirror @step(u'I go to the course updates page') def go_to_updates(_step): menu_css = 'li.nav-course-courseware' - updates_css = 'li.nav-course-courseware-updates' + updates_css = 'li.nav-course-courseware-updates a' world.css_click(menu_css) world.css_click(updates_css) diff --git a/cms/djangoapps/contentstore/features/courses.py b/cms/djangoapps/contentstore/features/courses.py index 2feafce361..f18b06ec64 100644 --- a/cms/djangoapps/contentstore/features/courses.py +++ b/cms/djangoapps/contentstore/features/courses.py @@ -30,7 +30,7 @@ def i_create_a_course(step): @step('I click the course link in My Courses$') def i_click_the_course_link_in_my_courses(step): - course_css = 'span.class-name' + course_css = 'a.course-link' world.css_click(course_css) ############ ASSERTIONS ################### @@ -44,7 +44,7 @@ def courseware_page_has_loaded_in_studio(step): @step('I see the course listed in My Courses$') def i_see_the_course_in_my_courses(step): - course_css = 'span.class-name' + course_css = 'h3.class-title' assert world.css_has_text(course_css, world.scenario_dict['COURSE'].display_name) diff --git a/cms/djangoapps/contentstore/features/problem-editor.feature b/cms/djangoapps/contentstore/features/problem-editor.feature index cc1d766d2e..50c49a1896 100644 --- a/cms/djangoapps/contentstore/features/problem-editor.feature +++ b/cms/djangoapps/contentstore/features/problem-editor.feature @@ -47,12 +47,12 @@ Feature: Problem Editor Scenario: User cannot type decimal values integer number field Given I have created a Blank Common Problem When I edit and select Settings - Then if I set the max attempts to "2.34", it displays initially as "234", and is persisted as "234" + Then if I set the max attempts to "2.34", it will persist as a valid integer Scenario: User cannot type out of range values in an integer number field Given I have created a Blank Common Problem When I edit and select Settings - Then if I set the max attempts to "-3", it displays initially as "-3", and is persisted as "0" + Then if I set the max attempts to "-3", it will persist as a valid integer Scenario: Settings changes are not saved on Cancel Given I have created a Blank Common Problem @@ -66,6 +66,7 @@ Feature: Problem Editor When I edit and select Settings Then Edit High Level Source is visible + # This feature will work in Firefox only when Firefox is the active window Scenario: High Level source is persisted for LaTeX problem (bug STUD-280) Given I have created a LaTeX Problem When I edit and compile the High Level Source diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py index d7ccb557ba..d891789e4a 100644 --- a/cms/djangoapps/contentstore/features/problem-editor.py +++ b/cms/djangoapps/contentstore/features/problem-editor.py @@ -45,7 +45,10 @@ def i_see_five_settings_with_values(step): def i_can_modify_the_display_name(step): # Verifying that the display name can be a string containing a floating point value # (to confirm that we don't throw an error because it is of the wrong type). - world.get_setting_entry(DISPLAY_NAME).find_by_css('.setting-input')[0].fill('3.4') + index = world.get_setting_entry_index(DISPLAY_NAME) + world.css_fill('.wrapper-comp-setting .setting-input', '3.4', index=index) + if world.is_firefox(): + world.trigger_event('.wrapper-comp-setting .setting-input', index=index) verify_modified_display_name() @@ -57,7 +60,10 @@ def my_display_name_change_is_persisted_on_save(step): @step('I can specify special characters in the display name') def i_can_modify_the_display_name_with_special_chars(step): - world.get_setting_entry(DISPLAY_NAME).find_by_css('.setting-input')[0].fill("updated ' \" &") + index = world.get_setting_entry_index(DISPLAY_NAME) + world.css_fill('.wrapper-comp-setting .setting-input', "updated ' \" &", index=index) + if world.is_firefox(): + world.trigger_event('.wrapper-comp-setting .setting-input', index=index) verify_modified_display_name_with_special_chars() @@ -127,12 +133,16 @@ def set_the_weight_to_abc(step, bad_weight): world.verify_setting_entry(world.get_setting_entry(PROBLEM_WEIGHT), PROBLEM_WEIGHT, "", False) -@step('if I set the max attempts to "(.*)", it displays initially as "(.*)", and is persisted as "(.*)"') -def set_the_max_attempts(step, max_attempts_set, max_attempts_displayed, max_attempts_persisted): - world.get_setting_entry(MAXIMUM_ATTEMPTS).find_by_css('.setting-input')[0].fill(max_attempts_set) - world.verify_setting_entry(world.get_setting_entry(MAXIMUM_ATTEMPTS), MAXIMUM_ATTEMPTS, max_attempts_displayed, True) +@step('if I set the max attempts to "(.*)", it will persist as a valid integer$') +def set_the_max_attempts(step, max_attempts_set): + # on firefox with selenium, the behaviour is different. eg 2.34 displays as 2.34 and is persisted as 2 + index = world.get_setting_entry_index(MAXIMUM_ATTEMPTS) + world.css_fill('.wrapper-comp-setting .setting-input', max_attempts_set, index=index) + if world.is_firefox(): + world.trigger_event('.wrapper-comp-setting .setting-input', index=index) world.save_component_and_reopen(step) - world.verify_setting_entry(world.get_setting_entry(MAXIMUM_ATTEMPTS), MAXIMUM_ATTEMPTS, max_attempts_persisted, True) + value = int(world.css_value('input.setting-input', index=index)) + assert value >= 0 @step('Edit High Level Source is not visible') @@ -213,7 +223,11 @@ def verify_unset_display_name(): def set_weight(weight): - world.get_setting_entry(PROBLEM_WEIGHT).find_by_css('.setting-input')[0].fill(weight) + index = world.get_setting_entry_index(PROBLEM_WEIGHT) + world.css_fill('.wrapper-comp-setting .setting-input', weight, index=index) + if world.is_firefox(): + world.trigger_event('.wrapper-comp-setting .setting-input', index=index, event='blur') + world.trigger_event('a.save-button', event='focus') def open_high_level_source(): diff --git a/cms/djangoapps/contentstore/features/section.feature b/cms/djangoapps/contentstore/features/section.feature index a08b490c6d..6402db1bcb 100644 --- a/cms/djangoapps/contentstore/features/section.feature +++ b/cms/djangoapps/contentstore/features/section.feature @@ -3,7 +3,6 @@ Feature: Create Section As a course author I want to create and edit sections - @skip Scenario: Add a new section to a course Given I have opened a new course in Studio When I click the New Section link @@ -24,7 +23,7 @@ Feature: Create Section Given I have opened a new course in Studio And I have added a new section When I click the Edit link for the release date - And I save a new section release date + And I set the section release date to 12/25/2013 Then the section release date is updated And I see a "saving" notification diff --git a/cms/djangoapps/contentstore/features/section.py b/cms/djangoapps/contentstore/features/section.py index 955c6a8f4e..3ca8e1676d 100644 --- a/cms/djangoapps/contentstore/features/section.py +++ b/cms/djangoapps/contentstore/features/section.py @@ -35,10 +35,15 @@ def i_click_the_edit_link_for_the_release_date(_step): world.css_click(button_css) -@step('I save a new section release date$') -def i_save_a_new_section_release_date(_step): - set_date_and_time('input.start-date.date.hasDatepicker', '12/25/2013', - 'input.start-time.time.ui-timepicker-input', '00:00') +@step('I set the section release date to ([0-9/-]+)( [0-9:]+)?') +def set_section_release_date(_step, datestring, timestring): + if hasattr(timestring, "strip"): + timestring = timestring.strip() + if not timestring: + timestring = "00:00" + set_date_and_time( + 'input.start-date.date.hasDatepicker', datestring, + 'input.start-time.time.ui-timepicker-input', timestring) world.browser.click_link_by_text('Save') diff --git a/cms/djangoapps/contentstore/features/static-pages.py b/cms/djangoapps/contentstore/features/static-pages.py index 3c9226f874..d3244955e1 100644 --- a/cms/djangoapps/contentstore/features/static-pages.py +++ b/cms/djangoapps/contentstore/features/static-pages.py @@ -8,7 +8,7 @@ from selenium.webdriver.common.keys import Keys @step(u'I go to the static pages page') def go_to_static(_step): menu_css = 'li.nav-course-courseware' - static_css = 'li.nav-course-courseware-pages' + static_css = 'li.nav-course-courseware-pages a' world.css_click(menu_css) world.css_click(static_css) @@ -38,14 +38,12 @@ def click_edit_delete(_step, edit_delete, page): @step(u'I change the name to "([^"]*)"$') def change_name(_step, new_name): - settings_css = '#settings-mode' + settings_css = '#settings-mode a' world.css_click(settings_css) input_css = 'input.setting-input' - name_input = world.css_find(input_css) - old_name = name_input.value - for count in range(len(old_name)): - name_input._element.send_keys(Keys.END, Keys.BACK_SPACE) - name_input._element.send_keys(new_name) + world.css_fill(input_css, new_name) + if world.is_firefox(): + world.trigger_event(input_css) save_button = 'a.save-button' world.css_click(save_button) diff --git a/cms/djangoapps/contentstore/features/subsection.feature b/cms/djangoapps/contentstore/features/subsection.feature index 9f5793dbe7..84755b3644 100644 --- a/cms/djangoapps/contentstore/features/subsection.feature +++ b/cms/djangoapps/contentstore/features/subsection.feature @@ -14,7 +14,7 @@ Feature: Create Subsection When I click the New Subsection link And I enter a subsection name with a quote and click save Then I see my subsection name with a quote on the Courseware page - And I click to edit the subsection name + And I click on the subsection Then I see the complete subsection name with a quote in the editor Scenario: Assign grading type to a subsection and verify it is still shown after refresh (bug #258) @@ -27,10 +27,13 @@ Feature: Create Subsection Scenario: Set a due date in a different year (bug #256) Given I have opened a new subsection in Studio - And I have set a release date and due date in different years - Then I see the correct dates + And I set the subsection release date to 12/25/2011 03:00 + And I set the subsection due date to 01/02/2012 04:00 + Then I see the subsection release date is 12/25/2011 03:00 + And I see the subsection due date is 01/02/2012 04:00 And I reload the page - Then I see the correct dates + Then I see the subsection release date is 12/25/2011 03:00 + And I see the subsection due date is 01/02/2012 04:00 Scenario: Delete a subsection Given I have opened a new course section in Studio @@ -40,3 +43,16 @@ Feature: Create Subsection And I press the "subsection" delete icon And I confirm the prompt Then the subsection does not exist + + Scenario: Sync to Section + Given I have opened a new course section in Studio + And I click the Edit link for the release date + And I set the section release date to 01/02/2103 + And I have added a new subsection + And I click on the subsection + And I set the subsection release date to 01/20/2103 + And I reload the page + And I click the link to sync release date to section + And I wait for "1" second + And I reload the page + Then I see the subsection release date is 01/02/2103 diff --git a/cms/djangoapps/contentstore/features/subsection.py b/cms/djangoapps/contentstore/features/subsection.py index e280ec615d..60a325f550 100644 --- a/cms/djangoapps/contentstore/features/subsection.py +++ b/cms/djangoapps/contentstore/features/subsection.py @@ -41,8 +41,8 @@ def i_save_subsection_name_with_quote(step): save_subsection_name('Subsection With "Quote"') -@step('I click to edit the subsection name$') -def i_click_to_edit_subsection_name(step): +@step('I click on the subsection$') +def click_on_subsection(step): world.css_click('span.subsection-name-value') @@ -53,12 +53,28 @@ def i_see_complete_subsection_name_with_quote_in_editor(step): assert_equal(world.css_value(css), 'Subsection With "Quote"') -@step('I have set a release date and due date in different years$') -def test_have_set_dates_in_different_years(step): - set_date_and_time('input#start_date', '12/25/2011', 'input#start_time', '03:00') - world.css_click('.set-date') - # Use a year in the past so that current year will always be different. - set_date_and_time('input#due_date', '01/02/2012', 'input#due_time', '04:00') +@step('I set the subsection release date to ([0-9/-]+)( [0-9:]+)?') +def set_subsection_release_date(_step, datestring, timestring): + if hasattr(timestring, "strip"): + timestring = timestring.strip() + if not timestring: + timestring = "00:00" + set_date_and_time( + 'input#start_date', datestring, + 'input#start_time', timestring) + + +@step('I set the subsection due date to ([0-9/-]+)( [0-9:]+)?') +def set_subsection_due_date(_step, datestring, timestring): + if hasattr(timestring, "strip"): + timestring = timestring.strip() + if not timestring: + timestring = "00:00" + if not world.css_visible('input#due_date'): + world.css_click('.due-date-input .set-date') + set_date_and_time( + 'input#due_date', datestring, + 'input#due_time', timestring) @step('I mark it as Homework$') @@ -72,6 +88,11 @@ def i_see_it_marked__as_homework(step): assert_equal(world.css_value(".status-label"), 'Homework') +@step('I click the link to sync release date to section') +def click_sync_release_date(step): + world.css_click('.sync-date') + + ############ ASSERTIONS ################### @@ -91,16 +112,25 @@ def the_subsection_does_not_exist(step): assert world.browser.is_element_not_present_by_css(css) -@step('I see the correct dates$') -def i_see_the_correct_dates(step): - assert_equal('12/25/2011', get_date('input#start_date')) - assert_equal('03:00', get_date('input#start_time')) - assert_equal('01/02/2012', get_date('input#due_date')) - assert_equal('04:00', get_date('input#due_time')) +@step('I see the subsection release date is ([0-9/-]+)( [0-9:]+)?') +def i_see_subsection_release(_step, datestring, timestring): + if hasattr(timestring, "strip"): + timestring = timestring.strip() + assert_equal(datestring, get_date('input#start_date')) + if timestring: + assert_equal(timestring, get_date('input#start_time')) + + +@step('I see the subsection due date is ([0-9/-]+)( [0-9:]+)?') +def i_see_subsection_due(_step, datestring, timestring): + if hasattr(timestring, "strip"): + timestring = timestring.strip() + assert_equal(datestring, get_date('input#due_date')) + if timestring: + assert_equal(timestring, get_date('input#due_time')) ############ HELPER METHODS ################### - def get_date(css): return world.css_find(css).first.value.strip() diff --git a/cms/djangoapps/contentstore/features/textbooks.py b/cms/djangoapps/contentstore/features/textbooks.py index ca135d9725..d9c08ec6eb 100644 --- a/cms/djangoapps/contentstore/features/textbooks.py +++ b/cms/djangoapps/contentstore/features/textbooks.py @@ -11,8 +11,8 @@ TEST_ROOT = settings.COMMON_TEST_DATA_ROOT @step(u'I go to the textbooks page') def go_to_uploads(_step): world.click_course_content() - menu_css = 'li.nav-course-courseware-textbooks' - world.css_find(menu_css).click() + menu_css = 'li.nav-course-courseware-textbooks a' + world.css_click(menu_css) @step(u'I should see a message telling me to create a new textbook') @@ -45,6 +45,8 @@ def click_new_textbook(_step, on): def name_textbook(_step, name): input_css = ".textbook input[name=textbook-name]" world.css_fill(input_css, name) + if world.is_firefox(): + world.trigger_event(input_css) @step(u'I name the (first|second|third) chapter "([^"]*)"') @@ -52,6 +54,8 @@ def name_chapter(_step, ordinal, name): index = ["first", "second", "third"].index(ordinal) input_css = ".textbook .chapter{i} input.chapter-name".format(i=index+1) world.css_fill(input_css, name) + if world.is_firefox(): + world.trigger_event(input_css) @step(u'I type in "([^"]*)" for the (first|second|third) chapter asset') @@ -59,6 +63,8 @@ def asset_chapter(_step, name, ordinal): index = ["first", "second", "third"].index(ordinal) input_css = ".textbook .chapter{i} input.chapter-asset-path".format(i=index+1) world.css_fill(input_css, name) + if world.is_firefox(): + world.trigger_event(input_css) @step(u'I click the Upload Asset link for the (first|second|third) chapter') diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py index df63b26b3b..a989d6c07f 100644 --- a/cms/djangoapps/contentstore/features/upload.py +++ b/cms/djangoapps/contentstore/features/upload.py @@ -9,13 +9,11 @@ import random import os TEST_ROOT = settings.COMMON_TEST_DATA_ROOT -HTTP_PREFIX = "http://localhost:%s" % settings.LETTUCE_SERVER_PORT - @step(u'I go to the files and uploads page') def go_to_uploads(_step): menu_css = 'li.nav-course-courseware' - uploads_css = 'li.nav-course-courseware-uploads' + uploads_css = 'li.nav-course-courseware-uploads a' world.css_click(menu_css) world.css_click(uploads_css) @@ -24,13 +22,10 @@ def go_to_uploads(_step): def upload_file(_step, file_name): upload_css = 'a.upload-button' world.css_click(upload_css) - - file_css = 'input.file-input' - upload = world.css_find(file_css) #uploading the file itself path = os.path.join(TEST_ROOT, 'uploads/', file_name) - upload._element.send_keys(os.path.abspath(path)) - + world.browser.execute_script("$('input.file-input').css('display', 'block')") + world.browser.attach_file('file', os.path.abspath(path)) close_css = 'a.close-button' world.css_click(close_css) @@ -80,6 +75,9 @@ def check_download(_step, file_name): r = get_file(file_name) downloaded_text = r.text assert cur_text == downloaded_text + #resetting the file back to its original state + with open(os.path.abspath(path), 'w') as cur_file: + cur_file.write("This is an arbitrary file for testing uploads") @step(u'I modify "([^"]*)"$') @@ -109,6 +107,8 @@ def get_file(file_name): index = get_index(file_name) assert index != -1 - url_css = 'input.embeddable-xml-input' - url = world.css_find(url_css)[index].value - return requests.get(HTTP_PREFIX + url) + url_css = 'a.filename' + def get_url(): + return world.css_find(url_css)[index]._element.get_attribute('href') + url = world.retry_on_exception(get_url) + return requests.get(url) diff --git a/cms/djangoapps/contentstore/features/video-editor.py b/cms/djangoapps/contentstore/features/video-editor.py index 6113f42c91..ad3229ab53 100644 --- a/cms/djangoapps/contentstore/features/video-editor.py +++ b/cms/djangoapps/contentstore/features/video-editor.py @@ -22,3 +22,19 @@ def set_show_captions(step, setting): world.wait_for(lambda _driver: world.css_visible('a.save-button')) world.browser.select('Show Captions', setting) world.css_click('a.save-button') + + +@step('I see the correct videoalpha settings and default values$') +def correct_videoalpha_settings(_step): + world.verify_all_setting_entries([['Display Name', 'Video Alpha', False], + ['Download Track', '', False], + ['Download Video', '', False], + ['End Time', '0', False], + ['HTML5 Subtitles', '', False], + ['Show Captions', 'True', False], + ['Start Time', '0', False], + ['Video Sources', '', False], + ['Youtube ID', 'OEoXaMPEzfM', False], + ['Youtube ID for .75x speed', '', False], + ['Youtube ID for 1.25x speed', '', False], + ['Youtube ID for 1.5x speed', '', False]]) diff --git a/cms/djangoapps/contentstore/features/video.feature b/cms/djangoapps/contentstore/features/video.feature index e4caa70ef6..634bb8a17f 100644 --- a/cms/djangoapps/contentstore/features/video.feature +++ b/cms/djangoapps/contentstore/features/video.feature @@ -22,3 +22,33 @@ Feature: Video Component Given I have created a Video component And I have toggled captions Then when I view the video it does show the captions + + # Video Alpha Features will work in Firefox only when Firefox is the active window + Scenario: Autoplay is disabled in Studio for Video Alpha + Given I have created a Video Alpha component + Then when I view the videoalpha it does not have autoplay enabled + + Scenario: User can view Video Alpha metadata + Given I have created a Video Alpha component + And I edit the component + Then I see the correct videoalpha settings and default values + + Scenario: User can modify Video Alpha display name + Given I have created a Video Alpha component + And I edit the component + Then I can modify the display name + And my videoalpha display name change is persisted on save + + Scenario: Video Alpha captions are hidden when "show captions" is false + Given I have created a Video Alpha component + And I have set "show captions" to False + Then when I view the videoalpha it does not show the captions + + Scenario: Video Alpha captions are shown when "show captions" is true + Given I have created a Video Alpha component + And I have set "show captions" to True + Then when I view the videoalpha it does show the captions + + Scenario: Video data is shown correctly + Given I have created a video with only XML data + Then the correct Youtube video is shown diff --git a/cms/djangoapps/contentstore/features/video.py b/cms/djangoapps/contentstore/features/video.py index a6a362befc..e27ca28eb7 100644 --- a/cms/djangoapps/contentstore/features/video.py +++ b/cms/djangoapps/contentstore/features/video.py @@ -1,13 +1,17 @@ #pylint: disable=C0111 from lettuce import world, step +from terrain.steps import reload_the_page +from xmodule.modulestore import Location +from contentstore.utils import get_modulestore + ############### ACTIONS #################### -@step('when I view the video it does not have autoplay enabled') -def does_not_autoplay(_step): - assert world.css_find('.video')[0]['data-autoplay'] == 'False' +@step('when I view the (.*) it does not have autoplay enabled') +def does_not_autoplay(_step, video_type): + assert world.css_find('.%s' % video_type)[0]['data-autoplay'] == 'False' assert world.css_has_class('.video_control', 'play') @@ -29,5 +33,55 @@ def hide_or_show_captions(step, shown): # click the button rather than the tooltip, so move the mouse # away to make it disappear. button = world.css_find(button_css) - button.mouse_out() + # mouse_out is not implemented on firefox with selenium + if not world.is_firefox: + button.mouse_out() world.css_click(button_css) + +@step('I edit the component') +def i_edit_the_component(_step): + world.edit_component() + + +@step('my videoalpha display name change is persisted on save') +def videoalpha_name_persisted(step): + world.css_click('a.save-button') + reload_the_page(step) + world.edit_component() + world.verify_setting_entry(world.get_setting_entry('Display Name'), 'Display Name', '3.4', True) + + +@step('I have created a video with only XML data') +def xml_only_video(step): + # Create a new video *without* metadata. This requires a certain + # amount of rummaging to make sure all the correct data is present + step.given('I have clicked the new unit button') + + # Wait for the new unit to be created and to load the page + world.wait(1) + + location = world.scenario_dict['COURSE'].location + store = get_modulestore(location) + + parent_location = store.get_items(Location(category='vertical', revision='draft'))[0].location + + youtube_id = 'ABCDEFG' + world.scenario_dict['YOUTUBE_ID'] = youtube_id + + # Create a new Video component, but ensure that it doesn't have + # metadata. This allows us to test that we are correctly parsing + # out XML + video = world.ItemFactory.create( + parent_location=parent_location, + category='video', + data='' % youtube_id + ) + + # Refresh to see the new video + reload_the_page(step) + + +@step('The correct Youtube video is shown') +def the_youtube_video_is_shown(_step): + ele = world.css_find('.video').first + assert ele['data-youtube-id-1-0'] == world.scenario_dict['YOUTUBE_ID'] diff --git a/cms/djangoapps/contentstore/management/commands/clone.py b/cms/djangoapps/contentstore/management/commands/clone_course.py similarity index 54% rename from cms/djangoapps/contentstore/management/commands/clone.py rename to cms/djangoapps/contentstore/management/commands/clone_course.py index f20625d7f2..5fffe29543 100644 --- a/cms/djangoapps/contentstore/management/commands/clone.py +++ b/cms/djangoapps/contentstore/management/commands/clone_course.py @@ -12,7 +12,14 @@ from auth.authz import _copy_course_group # # To run from command line: rake cms:clone SOURCE_LOC=MITx/111/Foo1 DEST_LOC=MITx/135/Foo3 # +from request_cache.middleware import RequestCache +from django.core.cache import get_cache +# +# To run from command line: rake cms:delete_course LOC=MITx/111/Foo1 +# + +CACHE = get_cache('mongo_metadata_inheritance') class Command(BaseCommand): """Clone a MongoDB-backed course to another location""" @@ -21,19 +28,27 @@ class Command(BaseCommand): def handle(self, *args, **options): "Execute the command" if len(args) != 2: - raise CommandError("clone requires two arguments: ") + raise CommandError("clone requires two arguments: ") - source_location_str = args[0] - dest_location_str = args[1] + source_course_id = args[0] + dest_course_id = args[1] mstore = modulestore('direct') cstore = contentstore() - print("Cloning course {0} to {1}".format(source_location_str, dest_location_str)) + mstore.metadata_inheritance_cache_subsystem = CACHE + mstore.request_cache = RequestCache.get_request_cache() + org, course_num, run = dest_course_id.split("/") + mstore.ignore_write_events_on_courses.append('{0}/{1}'.format(org, course_num)) - source_location = CourseDescriptor.id_to_location(source_location_str) - dest_location = CourseDescriptor.id_to_location(dest_location_str) + print("Cloning course {0} to {1}".format(source_course_id, dest_course_id)) + + source_location = CourseDescriptor.id_to_location(source_course_id) + dest_location = CourseDescriptor.id_to_location(dest_course_id) if clone_course(mstore, cstore, source_location, dest_location): + # be sure to recompute metadata inheritance after all those updates + mstore.refresh_cached_metadata_inheritance_tree(dest_location) + print("copying User permissions...") _copy_course_group(source_location, dest_location) diff --git a/cms/djangoapps/contentstore/management/commands/delete_course.py b/cms/djangoapps/contentstore/management/commands/delete_course.py index 5aafe9f8a6..4d8c4eda55 100644 --- a/cms/djangoapps/contentstore/management/commands/delete_course.py +++ b/cms/djangoapps/contentstore/management/commands/delete_course.py @@ -9,12 +9,14 @@ from xmodule.course_module import CourseDescriptor from .prompt import query_yes_no from auth.authz import _delete_course_group +from request_cache.middleware import RequestCache +from django.core.cache import get_cache # # To run from command line: rake cms:delete_course LOC=MITx/111/Foo1 # - +CACHE = get_cache('mongo_metadata_inheritance') class Command(BaseCommand): help = '''Delete a MongoDB backed course''' @@ -22,7 +24,7 @@ class Command(BaseCommand): if len(args) != 1 and len(args) != 2: raise CommandError("delete_course requires one or more arguments: |commit|") - loc_str = args[0] + course_id = args[0] commit = False if len(args) == 2: @@ -34,9 +36,14 @@ class Command(BaseCommand): ms = modulestore('direct') cs = contentstore() - if query_yes_no("Deleting course {0}. Confirm?".format(loc_str), default="no"): + ms.metadata_inheritance_cache_subsystem = CACHE + ms.request_cache = RequestCache.get_request_cache() + org, course_num, run = course_id.split("/") + ms.ignore_write_events_on_courses.append('{0}/{1}'.format(org, course_num)) + + if query_yes_no("Deleting course {0}. Confirm?".format(course_id), default="no"): if query_yes_no("Are you sure. This action cannot be undone!", default="no"): - loc = CourseDescriptor.id_to_location(loc_str) + loc = CourseDescriptor.id_to_location(course_id) if delete_course(ms, cs, loc, commit): print 'removing User permissions from course....' # in the django layer, we need to remove all the user permissions groups associated with this course diff --git a/cms/djangoapps/contentstore/tests/test_assets.py b/cms/djangoapps/contentstore/tests/test_assets.py index cde40d502e..b627237729 100644 --- a/cms/djangoapps/contentstore/tests/test_assets.py +++ b/cms/djangoapps/contentstore/tests/test_assets.py @@ -10,6 +10,8 @@ from unittest import TestCase, skip from .utils import CourseTestCase from django.core.urlresolvers import reverse from contentstore.views import assets +from xmodule.contentstore.content import StaticContent +from xmodule.modulestore import Location class AssetsTestCase(CourseTestCase): @@ -35,6 +37,11 @@ class AssetsTestCase(CourseTestCase): content = json.loads(resp.content) self.assertIsInstance(content, list) + def test_static_url_generation(self): + location = Location(['i4x', 'foo', 'bar', 'asset', 'my_file_name.jpg']) + path = StaticContent.get_static_path_from_location(location) + self.assertEquals(path, '/static/my_file_name.jpg') + class UploadTestCase(CourseTestCase): """ diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py index 4c9fcf7f81..09413be7b7 100644 --- a/cms/djangoapps/contentstore/tests/test_contentstore.py +++ b/cms/djangoapps/contentstore/tests/test_contentstore.py @@ -49,7 +49,7 @@ import datetime from pytz import UTC from uuid import uuid4 from pymongo import MongoClient - +from student.views import is_enrolled_in_course TEST_DATA_CONTENTSTORE = copy.deepcopy(settings.CONTENTSTORE) TEST_DATA_CONTENTSTORE['OPTIONS']['db'] = 'test_xcontent_%s' % uuid4().hex @@ -303,6 +303,16 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): num_drafts = self._get_draft_counts(course) self.assertEqual(num_drafts, 1) + def test_no_static_link_rewrites_on_import(self): + module_store = modulestore('direct') + import_from_xml(module_store, 'common/test/data/', ['toy']) + + handouts = module_store.get_item(Location(['i4x', 'edX', 'toy', 'course_info', 'handouts', None])) + self.assertIn('/static/', handouts.data) + + handouts = module_store.get_item(Location(['i4x', 'edX', 'toy', 'html', 'toyhtml', None])) + self.assertIn('/static/', handouts.data) + def test_import_textbook_as_content_element(self): module_store = modulestore('direct') import_from_xml(module_store, 'common/test/data/', ['toy']) @@ -607,8 +617,26 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): } module_store = modulestore('direct') + draft_store = modulestore('draft') import_from_xml(module_store, 'common/test/data/', ['toy']) + source_course_id = 'edX/toy/2012_Fall' + dest_course_id = 'MITx/999/2013_Spring' + source_location = CourseDescriptor.id_to_location(source_course_id) + dest_location = CourseDescriptor.id_to_location(dest_course_id) + + # get a vertical (and components in it) to put into 'draft' + # this is to assert that draft content is also cloned over + vertical = module_store.get_instance(source_course_id, Location([ + source_location.tag, source_location.org, source_location.course, 'vertical', 'vertical_test', None]), depth=1) + + draft_store.convert_to_draft(vertical.location) + for child in vertical.get_children(): + draft_store.convert_to_draft(child.location) + + items = module_store.get_items(Location([source_location.tag, source_location.org, source_location.course, None, None, 'draft'])) + self.assertGreater(len(items), 0) + resp = self.client.post(reverse('create_new_course'), course_data) self.assertEqual(resp.status_code, 200) data = parse_json(resp) @@ -616,22 +644,105 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): content_store = contentstore() - source_location = CourseDescriptor.id_to_location('edX/toy/2012_Fall') - dest_location = CourseDescriptor.id_to_location('MITx/999/2013_Spring') - + # now do the actual cloning clone_course(module_store, content_store, source_location, dest_location) + # first assert that all draft content got cloned as well + items = module_store.get_items(Location([source_location.tag, source_location.org, source_location.course, None, None, 'draft'])) + self.assertGreater(len(items), 0) + clone_items = module_store.get_items(Location([dest_location.tag, dest_location.org, dest_location.course, None, None, 'draft'])) + self.assertGreater(len(clone_items), 0) + self.assertEqual(len(items), len(clone_items)) + # now loop through all the units in the course and verify that the clone can render them, which # means the objects are at least present - items = module_store.get_items(Location(['i4x', 'edX', 'toy', 'poll_question', None])) + items = module_store.get_items(Location([source_location.tag, source_location.org, source_location.course, None, None])) self.assertGreater(len(items), 0) - clone_items = module_store.get_items(Location(['i4x', 'MITx', '999', 'poll_question', None])) + clone_items = module_store.get_items(Location([dest_location.tag, dest_location.org, dest_location.course, None, None])) self.assertGreater(len(clone_items), 0) + for descriptor in items: - new_loc = descriptor.location.replace(org='MITx', course='999') + source_item = module_store.get_instance(source_course_id, descriptor.location) + if descriptor.location.category == 'course': + new_loc = descriptor.location.replace(org=dest_location.org, course=dest_location.course, name='2013_Spring') + else: + new_loc = descriptor.location.replace(org=dest_location.org, course=dest_location.course) print "Checking {0} should now also be at {1}".format(descriptor.location.url(), new_loc.url()) - resp = self.client.get(reverse('edit_unit', kwargs={'location': new_loc.url()})) - self.assertEqual(resp.status_code, 200) + lookup_item = module_store.get_item(new_loc) + + # we want to assert equality between the objects, but we know the locations + # differ, so just make them equal for testing purposes + source_item.location = new_loc + if hasattr(source_item, 'data') and hasattr(lookup_item, 'data'): + self.assertEqual(source_item.data, lookup_item.data) + + # also make sure that metadata was cloned over and filtered with own_metadata, i.e. inherited + # values were not explicitly set + self.assertEqual(own_metadata(source_item), own_metadata(lookup_item)) + + # check that the children are as expected + self.assertEqual(source_item.has_children, lookup_item.has_children) + if source_item.has_children: + expected_children = [] + for child_loc_url in source_item.children: + child_loc = Location(child_loc_url) + child_loc = child_loc._replace( + tag=dest_location.tag, + org=dest_location.org, + course=dest_location.course + ) + expected_children.append(child_loc.url()) + self.assertEqual(expected_children, lookup_item.children) + + def test_portable_link_rewrites_during_clone_course(self): + course_data = { + 'org': 'MITx', + 'number': '999', + 'display_name': 'Robot Super Course', + 'run': '2013_Spring' + } + + module_store = modulestore('direct') + draft_store = modulestore('draft') + content_store = contentstore() + + import_from_xml(module_store, 'common/test/data/', ['toy']) + + source_course_id = 'edX/toy/2012_Fall' + dest_course_id = 'MITx/999/2013_Spring' + source_location = CourseDescriptor.id_to_location(source_course_id) + dest_location = CourseDescriptor.id_to_location(dest_course_id) + + # let's force a non-portable link in the clone source + # as a final check, make sure that any non-portable links are rewritten during cloning + html_module_location = Location([ + source_location.tag, source_location.org, source_location.course, 'html', 'nonportable']) + html_module = module_store.get_instance(source_location.course_id, html_module_location) + + self.assertTrue(isinstance(html_module.data, basestring)) + new_data = html_module.data.replace('/static/', '/c4x/{0}/{1}/asset/'.format( + source_location.org, source_location.course)) + module_store.update_item(html_module_location, new_data) + + html_module = module_store.get_instance(source_location.course_id, html_module_location) + self.assertEqual(new_data, html_module.data) + + # create the destination course + + resp = self.client.post(reverse('create_new_course'), course_data) + self.assertEqual(resp.status_code, 200) + data = parse_json(resp) + self.assertEqual(data['id'], 'i4x://MITx/999/course/2013_Spring') + + # do the actual cloning + clone_course(module_store, content_store, source_location, dest_location) + + # make sure that any non-portable links are rewritten during cloning + html_module_location = Location([ + dest_location.tag, dest_location.org, dest_location.course, 'html', 'nonportable']) + html_module = module_store.get_instance(dest_location.course_id, html_module_location) + + self.assertIn('/static/foo.jpg', html_module.data) def test_illegal_draft_crud_ops(self): draft_store = modulestore('draft') @@ -660,6 +771,22 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): resp = self.client.get('http://localhost:8001/c4x/CDX/123123/asset/&images_circuits_Lab7Solution2.png') self.assertEqual(resp.status_code, 400) + def test_rewrite_nonportable_links_on_import(self): + module_store = modulestore('direct') + content_store = contentstore() + + import_from_xml(module_store, 'common/test/data/', ['toy'], static_content_store=content_store) + + # first check a static asset link + html_module_location = Location(['i4x', 'edX', 'toy', 'html', 'nonportable']) + html_module = module_store.get_instance('edX/toy/2012_Fall', html_module_location) + self.assertIn('/static/foo.jpg', html_module.data) + + # then check a intra courseware link + html_module_location = Location(['i4x', 'edX', 'toy', 'html', 'nonportable_link']) + html_module = module_store.get_instance('edX/toy/2012_Fall', html_module_location) + self.assertIn('/jump_to_id/nonportable_link', html_module.data) + def test_delete_course(self): """ This test will import a course, make a draft item, and delete it. This will also assert that the @@ -1041,12 +1168,18 @@ class ContentStoreTest(ModuleStoreTestCase): data = parse_json(resp) self.assertNotIn('ErrMsg', data) self.assertEqual(data['id'], 'i4x://MITx/{0}/course/2013_Spring'.format(test_course_data['number'])) + # Verify that the creator is now registered in the course. + self.assertTrue(is_enrolled_in_course(self.user, self._get_course_id(test_course_data))) return test_course_data def test_create_course_check_forum_seeding(self): """Test new course creation and verify forum seeding """ test_course_data = self.assert_created_course(number_suffix=uuid4().hex) - self.assertTrue(are_permissions_roles_seeded('MITx/{0}/2013_Spring'.format(test_course_data['number']))) + self.assertTrue(are_permissions_roles_seeded(self._get_course_id(test_course_data))) + + def _get_course_id(self, test_course_data): + """Returns the course ID (org/number/run).""" + return "{org}/{number}/{run}".format(**test_course_data) def test_create_course_duplicate_course(self): """Test new course creation - error path""" @@ -1057,10 +1190,15 @@ class ContentStoreTest(ModuleStoreTestCase): """ Checks that the course did not get created """ + course_id = self._get_course_id(self.course_data) + initially_enrolled = is_enrolled_in_course(self.user, course_id) resp = self.client.post(reverse('create_new_course'), self.course_data) self.assertEqual(resp.status_code, 200) data = parse_json(resp) self.assertEqual(data['ErrMsg'], error_message) + # One test case involves trying to create the same course twice. Hence for that course, + # the user will be enrolled. In the other cases, initially_enrolled will be False. + self.assertEqual(initially_enrolled, is_enrolled_in_course(self.user, course_id)) def test_create_course_duplicate_number(self): """Test new course creation - error path""" @@ -1141,7 +1279,7 @@ class ContentStoreTest(ModuleStoreTestCase): resp = self.client.get(reverse('index')) self.assertContains( resp, - 'Robot Super Educational Course', + '

Robot Super Educational Course

', status_code=200, html=True ) @@ -1313,6 +1451,31 @@ class ContentStoreTest(ModuleStoreTestCase): json.dumps({'id': del_loc.url()}), "application/json") self.assertEqual(200, resp.status_code) + def test_import_into_new_course_id(self): + module_store = modulestore('direct') + target_location = Location(['i4x', 'MITx', '999', 'course', '2013_Spring']) + + course_data = { + 'org': target_location.org, + 'number': target_location.course, + 'display_name': 'Robot Super Course', + 'run': target_location.name + } + + resp = self.client.post(reverse('create_new_course'), course_data) + self.assertEqual(resp.status_code, 200) + data = parse_json(resp) + self.assertEqual(data['id'], target_location.url()) + + import_from_xml(module_store, 'common/test/data/', ['simple'], target_location_namespace=target_location) + + modules = module_store.get_items(Location([ + target_location.tag, target_location.org, target_location.course, None, None, None])) + + # we should have a number of modules in there + # we can't specify an exact number since it'll always be changing + self.assertGreater(len(modules), 10) + def test_import_metadata_with_attempts_empty_string(self): module_store = modulestore('direct') import_from_xml(module_store, 'common/test/data/', ['simple']) diff --git a/cms/djangoapps/contentstore/tests/test_users.py b/cms/djangoapps/contentstore/tests/test_users.py index 4b9dcf487f..a9216da612 100644 --- a/cms/djangoapps/contentstore/tests/test_users.py +++ b/cms/djangoapps/contentstore/tests/test_users.py @@ -1,8 +1,12 @@ +""" +Tests for contentstore/views/user.py. +""" import json from .utils import CourseTestCase from django.contrib.auth.models import User, Group from django.core.urlresolvers import reverse from auth.authz import get_course_groupname_for_role +from student.views import is_enrolled_in_course class UsersTestCase(CourseTestCase): @@ -90,6 +94,7 @@ class UsersTestCase(CourseTestCase): # no content: should not be in any roles self.assertNotIn(self.staff_groupname, groups) self.assertNotIn(self.inst_groupname, groups) + self.assert_not_enrolled() def test_detail_post_staff(self): resp = self.client.post( @@ -104,6 +109,7 @@ class UsersTestCase(CourseTestCase): groups = [g.name for g in ext_user.groups.all()] self.assertIn(self.staff_groupname, groups) self.assertNotIn(self.inst_groupname, groups) + self.assert_enrolled() def test_detail_post_staff_other_inst(self): inst_group, _ = Group.objects.get_or_create(name=self.inst_groupname) @@ -122,6 +128,7 @@ class UsersTestCase(CourseTestCase): groups = [g.name for g in ext_user.groups.all()] self.assertIn(self.staff_groupname, groups) self.assertNotIn(self.inst_groupname, groups) + self.assert_enrolled() # check that other user is unchanged user = User.objects.get(email=self.user.email) groups = [g.name for g in user.groups.all()] @@ -141,6 +148,7 @@ class UsersTestCase(CourseTestCase): groups = [g.name for g in ext_user.groups.all()] self.assertNotIn(self.staff_groupname, groups) self.assertIn(self.inst_groupname, groups) + self.assert_enrolled() def test_detail_post_missing_role(self): resp = self.client.post( @@ -152,6 +160,7 @@ class UsersTestCase(CourseTestCase): self.assert4XX(resp.status_code) result = json.loads(resp.content) self.assertIn("error", result) + self.assert_not_enrolled() def test_detail_post_bad_json(self): resp = self.client.post( @@ -163,6 +172,7 @@ class UsersTestCase(CourseTestCase): self.assert4XX(resp.status_code) result = json.loads(resp.content) self.assertIn("error", result) + self.assert_not_enrolled() def test_detail_post_no_json(self): resp = self.client.post( @@ -176,6 +186,7 @@ class UsersTestCase(CourseTestCase): groups = [g.name for g in ext_user.groups.all()] self.assertIn(self.staff_groupname, groups) self.assertNotIn(self.inst_groupname, groups) + self.assert_enrolled() def test_detail_delete_staff(self): group, _ = Group.objects.get_or_create(name=self.staff_groupname) @@ -317,3 +328,57 @@ class UsersTestCase(CourseTestCase): ext_user = User.objects.get(email=self.ext_user.email) groups = [g.name for g in ext_user.groups.all()] self.assertIn(self.staff_groupname, groups) + + def test_user_not_initially_enrolled(self): + # Verify that ext_user is not enrolled in the new course before being added as a staff member. + self.assert_not_enrolled() + + def test_remove_staff_does_not_unenroll(self): + # Add user with staff permissions. + self.client.post( + self.detail_url, + data=json.dumps({"role": "staff"}), + content_type="application/json", + HTTP_ACCEPT="application/json", + ) + self.assert_enrolled() + # Remove user from staff on course. Will not un-enroll them from the course. + resp = self.client.delete( + self.detail_url, + HTTP_ACCEPT="application/json", + ) + self.assert2XX(resp.status_code) + self.assert_enrolled() + + def test_staff_to_instructor_still_enrolled(self): + # Add user with staff permission. + self.client.post( + self.detail_url, + data=json.dumps({"role": "staff"}), + content_type="application/json", + HTTP_ACCEPT="application/json", + ) + self.assert_enrolled() + # Now add with instructor permission. Verify still enrolled. + resp = self.client.post( + self.detail_url, + data=json.dumps({"role": "instructor"}), + content_type="application/json", + HTTP_ACCEPT="application/json", + ) + self.assert2XX(resp.status_code) + self.assert_enrolled() + + def assert_not_enrolled(self): + """ Asserts that self.ext_user is not enrolled in self.course. """ + self.assertFalse( + is_enrolled_in_course(self.ext_user, self.course.location.course_id), + 'Did not expect ext_user to be enrolled in course' + ) + + def assert_enrolled(self): + """ Asserts that self.ext_user is enrolled in self.course. """ + self.assertTrue( + is_enrolled_in_course(self.ext_user, self.course.location.course_id), + 'User ext_user should have been enrolled in the course' + ) diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py index 1f2a4185a3..0cbc82cbf1 100644 --- a/cms/djangoapps/contentstore/tests/tests.py +++ b/cms/djangoapps/contentstore/tests/tests.py @@ -1,4 +1,5 @@ from django.test.client import Client +from django.core.cache import cache from django.core.urlresolvers import reverse from .utils import parse_json, user, registration @@ -79,6 +80,8 @@ class AuthTestCase(ContentStoreTestCase): self.pw = 'xyz' self.username = 'testuser' self.client = Client() + # clear the cache so ratelimiting won't affect these tests + cache.clear() def check_page_get(self, url, expected): resp = self.client.get(url) @@ -119,6 +122,18 @@ class AuthTestCase(ContentStoreTestCase): # Now login should work self.login(self.email, self.pw) + def test_login_ratelimited(self): + # try logging in 30 times, the default limit in the number of failed + # login attempts in one 5 minute period before the rate gets limited + for i in xrange(30): + resp = self._login(self.email, 'wrong_password{0}'.format(i)) + self.assertEqual(resp.status_code, 200) + resp = self._login(self.email, 'wrong_password') + self.assertEqual(resp.status_code, 200) + data = parse_json(resp) + self.assertFalse(data['success']) + self.assertIn('Too many failed login attempts.', data['value']) + def test_login_link_on_activation_age(self): self.create_account(self.username, self.email, self.pw) # we want to test the rendering of the activation page when the user isn't logged in diff --git a/cms/djangoapps/contentstore/views/assets.py b/cms/djangoapps/contentstore/views/assets.py index e4201cddd7..94bfa55b58 100644 --- a/cms/djangoapps/contentstore/views/assets.py +++ b/cms/djangoapps/contentstore/views/assets.py @@ -3,6 +3,7 @@ import json import os import tarfile import shutil +import cgi from tempfile import mkdtemp from path import path @@ -27,7 +28,7 @@ from xmodule.modulestore import Location from xmodule.contentstore.content import StaticContent from xmodule.util.date_utils import get_default_time_display from xmodule.modulestore import InvalidLocationError -from xmodule.exceptions import NotFoundError +from xmodule.exceptions import NotFoundError, SerializationError from .access import get_location_and_verify_access from util.json_request import JsonResponse @@ -105,6 +106,7 @@ def asset_index(request, org, course, name): asset_location = StaticContent.compute_location(asset_id['org'], asset_id['course'], asset_id['name']) display_info['url'] = StaticContent.get_url_path_from_location(asset_location) + display_info['portable_url'] = StaticContent.get_static_path_from_location(asset_location) # note, due to the schema change we may not have a 'thumbnail_location' in the result set _thumbnail_location = asset.get('thumbnail_location', None) @@ -187,12 +189,12 @@ def upload_asset(request, org, course, coursename): response_payload = {'displayname': content.name, 'uploadDate': get_default_time_display(readback.last_modified_at), 'url': StaticContent.get_url_path_from_location(content.location), + 'portable_url': StaticContent.get_static_path_from_location(content.location), 'thumb_url': StaticContent.get_url_path_from_location(thumbnail_location) if thumbnail_content is not None else None, 'msg': 'Upload completed' } response = JsonResponse(response_payload) - response['asset_url'] = StaticContent.get_url_path_from_location(content.location) return response @@ -313,6 +315,8 @@ def import_course(request, org, course, name): create_all_course_groups(request.user, course_items[0].location) + logging.debug('created all course groups at {0}'.format(course_items[0].location)) + return HttpResponse(json.dumps({'Status': 'OK'})) else: course_module = modulestore().get_item(location) @@ -335,16 +339,59 @@ def generate_export_course(request, org, course, name): the course """ location = get_location_and_verify_access(request, org, course, name) - + course_module = modulestore().get_instance(location.course_id, location) loc = Location(location) export_file = NamedTemporaryFile(prefix=name + '.', suffix=".tar.gz") root_dir = path(mkdtemp()) - # export out to a tempdir - logging.debug('root = {0}'.format(root_dir)) + try: + export_to_xml(modulestore('direct'), contentstore(), loc, root_dir, name, modulestore()) + except SerializationError, e: + unit = None + failed_item = None + parent = None + try: + failed_item = modulestore().get_instance(course_module.location.course_id, e.location) + parent_locs = modulestore().get_parent_locations(failed_item.location, course_module.location.course_id) - export_to_xml(modulestore('direct'), contentstore(), loc, root_dir, name, modulestore()) + if len(parent_locs) > 0: + parent = modulestore().get_item(parent_locs[0]) + if parent.location.category == 'vertical': + unit = parent + except: + # if we have a nested exception, then we'll show the more generic error message + pass + + return render_to_response('export.html', { + 'context_course': course_module, + 'successful_import_redirect_url': '', + 'in_err': True, + 'raw_err_msg': str(e), + 'failed_module': failed_item, + 'unit': unit, + 'edit_unit_url': reverse('edit_unit', kwargs={ + 'location': parent.location + }) if parent else '', + 'course_home_url': reverse('course_index', kwargs={ + 'org': org, + 'course': course, + 'name': name + }) + }) + except Exception, e: + return render_to_response('export.html', { + 'context_course': course_module, + 'successful_import_redirect_url': '', + 'in_err': True, + 'unit': None, + 'raw_err_msg': str(e), + 'course_home_url': reverse('course_index', kwargs={ + 'org': org, + 'course': course, + 'name': name + }) + }) logging.debug('tar file being generated at {0}'.format(export_file.name)) tar_file = tarfile.open(name=export_file.name, mode='w:gz') diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py index e68210dea4..8ac1d223cb 100644 --- a/cms/djangoapps/contentstore/views/course.py +++ b/cms/djangoapps/contentstore/views/course.py @@ -44,6 +44,8 @@ from .component import ( from django_comment_common.utils import seed_permissions_roles +from student.views import enroll_in_course + from xmodule.html_module import AboutDescriptor __all__ = ['course_index', 'create_new_course', 'course_info', 'course_info_updates', 'get_course_settings', @@ -162,6 +164,9 @@ def create_new_course(request): # seed the forums seed_permissions_roles(new_course.location.course_id) + # auto-enroll the course creator in the course so that "View Live" will work. + enroll_in_course(request.user, new_course.location.course_id) + return JsonResponse({'id': new_course.location.url()}) diff --git a/cms/djangoapps/contentstore/views/user.py b/cms/djangoapps/contentstore/views/user.py index e1c75bad0f..8b92107e88 100644 --- a/cms/djangoapps/contentstore/views/user.py +++ b/cms/djangoapps/contentstore/views/user.py @@ -13,6 +13,7 @@ from django.core.context_processors import csrf from xmodule.modulestore.django import modulestore from xmodule.modulestore import Location +from xmodule.error_module import ErrorDescriptor from contentstore.utils import get_lms_link_for_item from util.json_request import JsonResponse from auth.authz import ( @@ -23,6 +24,8 @@ from course_creators.views import ( from .access import has_access +from student.views import enroll_in_course + @login_required @ensure_csrf_cookie @@ -54,10 +57,13 @@ def index(request): course.location, course_id=course.location.course_id, ), + course.display_org_with_default, + course.display_number_with_default, + course.location.name ) return render_to_response('index.html', { - 'courses': [format_course_for_view(c) for c in courses], + 'courses': [format_course_for_view(c) for c in courses if not isinstance(c, ErrorDescriptor)], 'user': request.user, 'request_course_creator_url': reverse('request_course_creator'), 'course_creator_status': _get_course_creator_status(request.user), @@ -179,7 +185,7 @@ def course_team_user(request, org, course, name, email): return JsonResponse() # all other operations require the requesting user to specify a role - if request.META.get("CONTENT_TYPE", "") == "application/json" and request.body: + if request.META.get("CONTENT_TYPE", "").startswith("application/json") and request.body: try: payload = json.loads(request.body) except: @@ -201,6 +207,8 @@ def course_team_user(request, org, course, name, email): return JsonResponse(msg, 400) user.groups.add(groups["instructor"]) user.save() + # auto-enroll the course creator in the course so that "View Live" will work. + enroll_in_course(user, location.course_id) elif role == "staff": # if we're trying to downgrade a user from "instructor" to "staff", # make sure we have at least one other instructor in the course team. @@ -214,6 +222,9 @@ def course_team_user(request, org, course, name, email): user.groups.remove(groups["instructor"]) user.groups.add(groups["staff"]) user.save() + # auto-enroll the course creator in the course so that "View Live" will work. + enroll_in_course(user, location.course_id) + return JsonResponse() diff --git a/cms/djangoapps/course_creators/admin.py b/cms/djangoapps/course_creators/admin.py index 65473d8bde..df2baa1aa2 100644 --- a/cms/djangoapps/course_creators/admin.py +++ b/cms/djangoapps/course_creators/admin.py @@ -2,13 +2,15 @@ django admin page for the course creators table """ -from course_creators.models import CourseCreator, update_creator_state +from course_creators.models import CourseCreator, update_creator_state, send_user_notification, send_admin_notification from course_creators.views import update_course_creator_group -from django.contrib import admin +from ratelimitbackend import admin from django.conf import settings from django.dispatch import receiver from mitxmako.shortcuts import render_to_string +from django.core.mail import send_mail +from smtplib import SMTPException import logging @@ -28,12 +30,12 @@ class CourseCreatorAdmin(admin.ModelAdmin): """ # Fields to display on the overview page. - list_display = ['user', get_email, 'state', 'state_changed', 'note'] - readonly_fields = ['user', 'state_changed'] + list_display = ['username', get_email, 'state', 'state_changed', 'note'] + readonly_fields = ['username', 'state_changed'] # Controls the order on the edit form (without this, read-only fields appear at the end). fieldsets = ( (None, { - 'fields': ['user', 'state', 'state_changed', 'note'] + 'fields': ['username', 'state', 'state_changed', 'note'] }), ) # Fields that filtering support @@ -43,6 +45,16 @@ class CourseCreatorAdmin(admin.ModelAdmin): # Turn off the action bar (we have no bulk actions) actions = None + def username(self, inst): + """ + Returns the username for a given user. + + Implemented to make sorting by username instead of by user object. + """ + return inst.user.username + + username.admin_order_field = 'user__username' + def has_add_permission(self, request): return False @@ -70,7 +82,16 @@ def update_creator_group_callback(sender, **kwargs): updated_state = kwargs['state'] update_course_creator_group(kwargs['caller'], user, updated_state == CourseCreator.GRANTED) - studio_request_email = settings.MITX_FEATURES.get('STUDIO_REQUEST_EMAIL','') + +@receiver(send_user_notification, sender=CourseCreator) +def send_user_notification_callback(sender, **kwargs): + """ + Callback for notifying user about course creator status change. + """ + user = kwargs['user'] + updated_state = kwargs['state'] + + studio_request_email = settings.MITX_FEATURES.get('STUDIO_REQUEST_EMAIL', '') context = {'studio_request_email': studio_request_email} subject = render_to_string('emails/course_creator_subject.txt', context) @@ -88,3 +109,29 @@ def update_creator_group_callback(sender, **kwargs): user.email_user(subject, message, studio_request_email) except: log.warning("Unable to send course creator status e-mail to %s", user.email) + + +@receiver(send_admin_notification, sender=CourseCreator) +def send_admin_notification_callback(sender, **kwargs): + """ + Callback for notifying admin of a user in the 'pending' state. + """ + user = kwargs['user'] + + studio_request_email = settings.MITX_FEATURES.get('STUDIO_REQUEST_EMAIL', '') + context = {'user_name': user.username, 'user_email': user.email} + + subject = render_to_string('emails/course_creator_admin_subject.txt', context) + subject = ''.join(subject.splitlines()) + message = render_to_string('emails/course_creator_admin_user_pending.txt', context) + + try: + send_mail( + subject, + message, + studio_request_email, + [studio_request_email], + fail_silently=False + ) + except SMTPException: + log.warning("Failure sending 'pending state' e-mail for %s to %s", user.email, studio_request_email) diff --git a/cms/djangoapps/course_creators/models.py b/cms/djangoapps/course_creators/models.py index ba434c9140..5138916c88 100644 --- a/cms/djangoapps/course_creators/models.py +++ b/cms/djangoapps/course_creators/models.py @@ -10,7 +10,13 @@ from django.utils import timezone from django.utils.translation import ugettext as _ # A signal that will be sent when users should be added or removed from the creator group -update_creator_state = Signal(providing_args=["caller", "user", "add"]) +update_creator_state = Signal(providing_args=["caller", "user", "state"]) + +# A signal that will be sent when admin should be notified of a pending user request +send_admin_notification = Signal(providing_args=["user"]) + +# A signal that will be sent when user should be notified of change in course creator privileges +send_user_notification = Signal(providing_args=["user", "state"]) class CourseCreator(models.Model): @@ -60,9 +66,10 @@ def post_save_callback(sender, **kwargs): # We only wish to modify the state_changed time if the state has been modified. We don't wish to # modify it for changes to the notes field. if instance.state != instance.orig_state: + granted_state_change = instance.state == CourseCreator.GRANTED or instance.orig_state == CourseCreator.GRANTED # If either old or new state is 'granted', we must manipulate the course creator # group maintained by authz. That requires staff permissions (stored admin). - if instance.state == CourseCreator.GRANTED or instance.orig_state == CourseCreator.GRANTED: + if granted_state_change: assert hasattr(instance, 'admin'), 'Must have stored staff user to change course creator group' update_creator_state.send( sender=sender, @@ -71,6 +78,22 @@ def post_save_callback(sender, **kwargs): state=instance.state ) + # If user has been denied access, granted access, or previously granted access has been + # revoked, send a notification message to the user. + if instance.state == CourseCreator.DENIED or granted_state_change: + send_user_notification.send( + sender=sender, + user=instance.user, + state=instance.state + ) + + # If the user has gone into the 'pending' state, send a notification to interested admin. + if instance.state == CourseCreator.PENDING: + send_admin_notification.send( + sender=sender, + user=instance.user + ) + instance.state_changed = timezone.now() instance.orig_state = instance.state instance.save() diff --git a/cms/djangoapps/course_creators/tests/test_admin.py b/cms/djangoapps/course_creators/tests/test_admin.py index 91a28d77ae..aa293e008e 100644 --- a/cms/djangoapps/course_creators/tests/test_admin.py +++ b/cms/djangoapps/course_creators/tests/test_admin.py @@ -11,6 +11,7 @@ import mock from course_creators.admin import CourseCreatorAdmin from course_creators.models import CourseCreator from auth.authz import is_user_in_creator_group +from django.core import mail def mock_render_to_string(template_name, context): @@ -37,21 +38,25 @@ class CourseCreatorAdminTest(TestCase): self.creator_admin = CourseCreatorAdmin(self.table_entry, AdminSite()) + self.studio_request_email = 'mark@marky.mark' + self.enable_creator_group_patch = { + "ENABLE_CREATOR_GROUP": True, + "STUDIO_REQUEST_EMAIL": self.studio_request_email + } + @mock.patch('course_creators.admin.render_to_string', mock.Mock(side_effect=mock_render_to_string, autospec=True)) @mock.patch('django.contrib.auth.models.User.email_user') def test_change_status(self, email_user): """ Tests that updates to state impact the creator group maintained in authz.py and that e-mails are sent. """ - STUDIO_REQUEST_EMAIL = 'mark@marky.mark' - - def change_state(state, is_creator): - """ Helper method for changing state """ - self.table_entry.state = state - self.creator_admin.save_model(self.request, self.table_entry, None, True) + + def change_state_and_verify_email(state, is_creator): + """ Changes user state, verifies creator status, and verifies e-mail is sent based on transition """ + self._change_state(state) self.assertEqual(is_creator, is_user_in_creator_group(self.user)) - - context = {'studio_request_email': STUDIO_REQUEST_EMAIL} + + context = {'studio_request_email': self.studio_request_email} if state == CourseCreator.GRANTED: template = 'emails/course_creator_granted.txt' elif state == CourseCreator.DENIED: @@ -61,30 +66,76 @@ class CourseCreatorAdminTest(TestCase): email_user.assert_called_with( mock_render_to_string('emails/course_creator_subject.txt', context), mock_render_to_string(template, context), - STUDIO_REQUEST_EMAIL + self.studio_request_email ) - with mock.patch.dict( - 'django.conf.settings.MITX_FEATURES', - { - "ENABLE_CREATOR_GROUP": True, - "STUDIO_REQUEST_EMAIL": STUDIO_REQUEST_EMAIL - }): + with mock.patch.dict('django.conf.settings.MITX_FEATURES', self.enable_creator_group_patch): # User is initially unrequested. self.assertFalse(is_user_in_creator_group(self.user)) - change_state(CourseCreator.GRANTED, True) + change_state_and_verify_email(CourseCreator.GRANTED, True) - change_state(CourseCreator.DENIED, False) + change_state_and_verify_email(CourseCreator.DENIED, False) - change_state(CourseCreator.GRANTED, True) + change_state_and_verify_email(CourseCreator.GRANTED, True) - change_state(CourseCreator.PENDING, False) + change_state_and_verify_email(CourseCreator.PENDING, False) - change_state(CourseCreator.GRANTED, True) + change_state_and_verify_email(CourseCreator.GRANTED, True) - change_state(CourseCreator.UNREQUESTED, False) + change_state_and_verify_email(CourseCreator.UNREQUESTED, False) + + change_state_and_verify_email(CourseCreator.DENIED, False) + + @mock.patch('course_creators.admin.render_to_string', mock.Mock(side_effect=mock_render_to_string, autospec=True)) + def test_mail_admin_on_pending(self): + """ + Tests that the admin account is notified when a user is in the 'pending' state. + """ + + def check_admin_message_state(state, expect_sent_to_admin, expect_sent_to_user): + """ Changes user state and verifies e-mail sent to admin address only when pending. """ + mail.outbox = [] + self._change_state(state) + + # If a message is sent to the user about course creator status change, it will be the first + # message sent. Admin message will follow. + base_num_emails = 1 if expect_sent_to_user else 0 + if expect_sent_to_admin: + context = {'user_name': "test_user", 'user_email': 'test_user+courses@edx.org'} + self.assertEquals(base_num_emails + 1, len(mail.outbox), 'Expected admin message to be sent') + sent_mail = mail.outbox[base_num_emails] + self.assertEquals( + mock_render_to_string('emails/course_creator_admin_subject.txt', context), + sent_mail.subject + ) + self.assertEquals( + mock_render_to_string('emails/course_creator_admin_user_pending.txt', context), + sent_mail.body + ) + self.assertEquals(self.studio_request_email, sent_mail.from_email) + self.assertEqual([self.studio_request_email], sent_mail.to) + else: + self.assertEquals(base_num_emails, len(mail.outbox)) + + with mock.patch.dict('django.conf.settings.MITX_FEATURES', self.enable_creator_group_patch): + # E-mail message should be sent to admin only when new state is PENDING, regardless of what + # previous state was (unless previous state was already PENDING). + # E-mail message sent to user only on transition into and out of GRANTED state. + check_admin_message_state(CourseCreator.UNREQUESTED, expect_sent_to_admin=False, expect_sent_to_user=False) + check_admin_message_state(CourseCreator.PENDING, expect_sent_to_admin=True, expect_sent_to_user=False) + check_admin_message_state(CourseCreator.GRANTED, expect_sent_to_admin=False, expect_sent_to_user=True) + check_admin_message_state(CourseCreator.DENIED, expect_sent_to_admin=False, expect_sent_to_user=True) + check_admin_message_state(CourseCreator.GRANTED, expect_sent_to_admin=False, expect_sent_to_user=True) + check_admin_message_state(CourseCreator.PENDING, expect_sent_to_admin=True, expect_sent_to_user=True) + check_admin_message_state(CourseCreator.PENDING, expect_sent_to_admin=False, expect_sent_to_user=False) + check_admin_message_state(CourseCreator.DENIED, expect_sent_to_admin=False, expect_sent_to_user=True) + + def _change_state(self, state): + """ Helper method for changing state """ + self.table_entry.state = state + self.creator_admin.save_model(self.request, self.table_entry, None, True) def test_add_permission(self): """ @@ -106,3 +157,18 @@ class CourseCreatorAdminTest(TestCase): self.request.user = self.user self.assertFalse(self.creator_admin.has_change_permission(self.request)) + + def test_rate_limit_login(self): + with mock.patch.dict('django.conf.settings.MITX_FEATURES', {'ENABLE_CREATOR_GROUP': True}): + post_params = {'username': self.user.username, 'password': 'wrong_password'} + # try logging in 30 times, the default limit in the number of failed + # login attempts in one 5 minute period before the rate gets limited + for _ in xrange(30): + response = self.client.post('/admin/', post_params) + self.assertEquals(response.status_code, 200) + + response = self.client.post('/admin/', post_params) + # Since we are using the default rate limit behavior, we are + # expecting this to return a 403 error to indicate that there have + # been too many attempts + self.assertEquals(response.status_code, 403) diff --git a/cms/djangoapps/models/settings/course_details.py b/cms/djangoapps/models/settings/course_details.py index 7c3b883283..78c5dcff33 100644 --- a/cms/djangoapps/models/settings/course_details.py +++ b/cms/djangoapps/models/settings/course_details.py @@ -173,7 +173,7 @@ class CourseDetails(object): # the right thing result = None if video_key: - result = '' return result diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index ecd22ed769..a1f5edb153 100644 --- a/cms/envs/acceptance.py +++ b/cms/envs/acceptance.py @@ -72,6 +72,9 @@ DATABASES = { } } +# Use the auto_auth workflow for creating users and logging them in +MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] = True + # Include the lettuce app for acceptance testing, including the 'harvest' django-admin command INSTALLED_APPS += ('lettuce.django',) LETTUCE_APPS = ('contentstore',) diff --git a/cms/envs/common.py b/cms/envs/common.py index 155c4d46d8..40084c20ae 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -108,6 +108,11 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.csrf' ) +# use the ratelimit backend to prevent brute force attacks +AUTHENTICATION_BACKENDS = ( + 'ratelimitbackend.backends.RateLimitModelBackend', +) + LMS_BASE = None #################### CAPA External Code Evaluation ############################# @@ -152,7 +157,10 @@ MIDDLEWARE_CLASSES = ( # Detects user-requested locale from 'accept-language' header in http request 'django.middleware.locale.LocaleMiddleware', - 'django.middleware.transaction.TransactionMiddleware' + 'django.middleware.transaction.TransactionMiddleware', + + # catches any uncaught RateLimitExceptions and returns a 403 instead of a 500 + 'ratelimitbackend.middleware.RateLimitMiddleware', ) ############################ SIGNAL HANDLERS ################################ @@ -188,8 +196,8 @@ STATICFILES_DIRS = [ COMMON_ROOT / "static", PROJECT_ROOT / "static", -# This is how you would use the textbook images locally -# ("book", ENV_ROOT / "book_images") + # This is how you would use the textbook images locally + # ("book", ENV_ROOT / "book_images") ] # Locale/Internationalization diff --git a/cms/envs/dev.py b/cms/envs/dev.py index 0b0a62f05d..42a6f706b6 100644 --- a/cms/envs/dev.py +++ b/cms/envs/dev.py @@ -150,14 +150,13 @@ DEBUG_TOOLBAR_PANELS = ( 'debug_toolbar.panels.sql.SQLDebugPanel', 'debug_toolbar.panels.signals.SignalDebugPanel', 'debug_toolbar.panels.logger.LoggingPanel', - 'debug_toolbar_mongo.panel.MongoDebugPanel', # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and # Django=1.3.1/1.4 where requests to views get duplicated (your method gets # hit twice). So you can uncomment when you need to diagnose performance # problems, but you shouldn't leave it on. # 'debug_toolbar.panels.profiling.ProfilingDebugPanel', - ) +) DEBUG_TOOLBAR_CONFIG = { 'INTERCEPT_REDIRECTS': False @@ -165,7 +164,7 @@ DEBUG_TOOLBAR_CONFIG = { # To see stacktraces for MongoDB queries, set this to True. # Stacktraces slow down page loads drastically (for pages with lots of queries). -DEBUG_TOOLBAR_MONGO_STACKTRACES = True +DEBUG_TOOLBAR_MONGO_STACKTRACES = False # disable NPS survey in dev mode MITX_FEATURES['STUDIO_NPS_SURVEY'] = False diff --git a/cms/envs/dev_dbperf.py b/cms/envs/dev_dbperf.py new file mode 100644 index 0000000000..2ea131b69e --- /dev/null +++ b/cms/envs/dev_dbperf.py @@ -0,0 +1,31 @@ +""" +This configuration is to turn on the Django Toolbar stats for DB access stats, for performance analysis +""" + +# We intentionally define lots of variables that aren't used, and +# want to import all variables from base settings files +# pylint: disable=W0401, W0614 + +from .dev import * + +DEBUG_TOOLBAR_PANELS = ( + 'debug_toolbar.panels.version.VersionDebugPanel', + 'debug_toolbar.panels.timer.TimerDebugPanel', + 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel', + 'debug_toolbar.panels.headers.HeaderDebugPanel', + 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', + 'debug_toolbar.panels.sql.SQLDebugPanel', + 'debug_toolbar.panels.signals.SignalDebugPanel', + 'debug_toolbar.panels.logger.LoggingPanel', + 'debug_toolbar_mongo.panel.MongoDebugPanel' + + # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and + # Django=1.3.1/1.4 where requests to views get duplicated (your method gets + # hit twice). So you can uncomment when you need to diagnose performance + # problems, but you shouldn't leave it on. + # 'debug_toolbar.panels.profiling.ProfilingDebugPanel', +) + +# To see stacktraces for MongoDB queries, set this to True. +# Stacktraces slow down page loads drastically (for pages with lots of queries). +DEBUG_TOOLBAR_MONGO_STACKTRACES = True diff --git a/cms/envs/test.py b/cms/envs/test.py index efc7c5a7ef..4f3b0caee0 100644 --- a/cms/envs/test.py +++ b/cms/envs/test.py @@ -15,6 +15,7 @@ sessions. Assumes structure: from .common import * import os from path import path +from warnings import filterwarnings # Nose Test Runner INSTALLED_APPS += ('django_nose',) @@ -124,6 +125,9 @@ CACHES = { } } +# hide ratelimit warnings while running tests +filterwarnings('ignore', message='No request passed to the backend, unable to rate-limit') + ################################# CELERY ###################################### CELERY_ALWAYS_EAGER = True diff --git a/cms/static/coffee/fixtures/metadata-list-entry.underscore b/cms/static/coffee/fixtures/metadata-list-entry.underscore new file mode 120000 index 0000000000..78fa4e2000 --- /dev/null +++ b/cms/static/coffee/fixtures/metadata-list-entry.underscore @@ -0,0 +1 @@ +../../../templates/js/metadata-list-entry.underscore \ No newline at end of file diff --git a/cms/static/coffee/fixtures/tabs-edit.html b/cms/static/coffee/fixtures/tabs-edit.html new file mode 100644 index 0000000000..c83a145622 --- /dev/null +++ b/cms/static/coffee/fixtures/tabs-edit.html @@ -0,0 +1,33 @@ +
+
+
+
+ +
+
+
+ +
+
+ Transcripts +
+
+ Subtitles +
+
+
+ +
+
+
+ +
+
+ diff --git a/cms/static/coffee/spec/tabs/edit.coffee b/cms/static/coffee/spec/tabs/edit.coffee new file mode 100644 index 0000000000..734e398c74 --- /dev/null +++ b/cms/static/coffee/spec/tabs/edit.coffee @@ -0,0 +1,95 @@ +describe "TabsEditingDescriptor", -> + beforeEach -> + @isInactiveClass = "is-inactive" + @isCurrent = "current" + loadFixtures 'tabs-edit.html' + @descriptor = new TabsEditingDescriptor($('.base_wrapper')) + @html_id = 'test_id' + @tab_0_switch = jasmine.createSpy('tab_0_switch'); + @tab_0_modelUpdate = jasmine.createSpy('tab_0_modelUpdate'); + @tab_1_switch = jasmine.createSpy('tab_1_switch'); + @tab_1_modelUpdate = jasmine.createSpy('tab_1_modelUpdate'); + TabsEditingDescriptor.Model.addModelUpdate(@html_id, 'Tab 0 Editor', @tab_0_modelUpdate) + TabsEditingDescriptor.Model.addOnSwitch(@html_id, 'Tab 0 Editor', @tab_0_switch) + TabsEditingDescriptor.Model.addModelUpdate(@html_id, 'Tab 1 Transcripts', @tab_1_modelUpdate) + TabsEditingDescriptor.Model.addOnSwitch(@html_id, 'Tab 1 Transcripts', @tab_1_switch) + + spyOn($.fn, 'hide').andCallThrough() + spyOn($.fn, 'show').andCallThrough() + spyOn(TabsEditingDescriptor.Model, 'initialize') + spyOn(TabsEditingDescriptor.Model, 'updateValue') + + afterEach -> + TabsEditingDescriptor.Model.modules= {} + + describe "constructor", -> + it "first tab should be visible", -> + expect(@descriptor.$tabs.first()).toHaveClass(@isCurrent) + expect(@descriptor.$content.first()).not.toHaveClass(@isInactiveClass) + + describe "onSwitchEditor", -> + it "switching tabs changes styles", -> + @descriptor.$tabs.eq(1).trigger("click") + expect(@descriptor.$tabs.eq(0)).not.toHaveClass(@isCurrent) + expect(@descriptor.$content.eq(0)).toHaveClass(@isInactiveClass) + expect(@descriptor.$tabs.eq(1)).toHaveClass(@isCurrent) + expect(@descriptor.$content.eq(1)).not.toHaveClass(@isInactiveClass) + expect(@tab_1_switch).toHaveBeenCalled() + + it "if click on current tab, nothing should happen", -> + spyOn($.fn, 'trigger').andCallThrough() + currentTab = @descriptor.$tabs.filter('.' + @isCurrent) + @descriptor.$tabs.eq(0).trigger("click") + expect(@descriptor.$tabs.filter('.' + @isCurrent)).toEqual(currentTab) + expect($.fn.trigger.calls.length).toEqual(1) + + it "onSwitch function call", -> + @descriptor.$tabs.eq(1).trigger("click") + expect(TabsEditingDescriptor.Model.updateValue).toHaveBeenCalled() + expect(@tab_1_switch).toHaveBeenCalled() + + describe "save", -> + it "function for current tab should be called", -> + @descriptor.$tabs.eq(1).trigger("click") + data = @descriptor.save().data + expect(@tab_1_modelUpdate).toHaveBeenCalled() + + it "detach click event", -> + spyOn($.fn, "off") + @descriptor.save() + expect($.fn.off).toHaveBeenCalledWith( + 'click', + '.editor-tabs .tab', + @descriptor.onSwitchEditor + ) + + describe "editor/settings header", -> + it "is hidden", -> + expect(@descriptor.element.find(".component-edit-header").css('display')).toEqual('none') + +describe "TabsEditingDescriptor special save cases", -> + beforeEach -> + @isInactiveClass = "is-inactive" + @isCurrent = "current" + loadFixtures 'tabs-edit.html' + @descriptor = new window.TabsEditingDescriptor($('.base_wrapper')) + @html_id = 'test_id' + + describe "save", -> + it "case: no init", -> + data = @descriptor.save().data + expect(data).toEqual(null) + + it "case: no function in model update", -> + TabsEditingDescriptor.Model.initialize(@html_id) + data = @descriptor.save().data + expect(data).toEqual(null) + + it "case: no function in model update, but value presented", -> + @tab_0_modelUpdate = jasmine.createSpy('tab_0_modelUpdate').andReturn(1) + TabsEditingDescriptor.Model.addModelUpdate(@html_id, 'Tab 0 Editor', @tab_0_modelUpdate) + @descriptor.$tabs.eq(1).trigger("click") + expect(@tab_0_modelUpdate).toHaveBeenCalled() + data = @descriptor.save().data + expect(data).toEqual(1) + diff --git a/cms/static/coffee/spec/views/metadata_edit_spec.coffee b/cms/static/coffee/spec/views/metadata_edit_spec.coffee index 0c2069cf00..926e5be315 100644 --- a/cms/static/coffee/spec/views/metadata_edit_spec.coffee +++ b/cms/static/coffee/spec/views/metadata_edit_spec.coffee @@ -3,12 +3,14 @@ describe "Test Metadata Editor", -> numberEntryTemplate = readFixtures('metadata-number-entry.underscore') stringEntryTemplate = readFixtures('metadata-string-entry.underscore') optionEntryTemplate = readFixtures('metadata-option-entry.underscore') + listEntryTemplate = readFixtures('metadata-list-entry.underscore') beforeEach -> setFixtures($(" - """ - - appendSetFixtures """ - - """ + _.each ["/static/js/vendor/date.js", "/static/js/vendor/timepicker/jquery.timepicker.js", "/jsi18n/"], (path) -> + appendSetFixtures """ + + """ appendSetFixtures """
Will Release: 06/12/2013 at 04:00 UTC - Edit + Edit
- """#" + """ appendSetFixtures """
@@ -38,7 +35,7 @@ describe "Course Overview", -> SaveCancel
- """#" + """ appendSetFixtures """
@@ -46,12 +43,13 @@ describe "Course Overview", ->
- """#" + """ spyOn(window, 'saveSetSectionScheduleDate').andCallThrough() # Have to do this here, as it normally gets bound in document.ready() $('a.save-button').click(saveSetSectionScheduleDate) $('a.delete-section-button').click(deleteSection) + $(".edit-subsection-publish-settings .start-date").datepicker() @notificationSpy = spyOn(CMS.Views.Notification.Mini.prototype, 'show').andCallThrough() window.analytics = jasmine.createSpyObj('analytics', ['track']) diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index fd679c289b..0154b4f51a 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -120,6 +120,7 @@ class CMS.Views.UnitEdit extends Backbone.View @model.save() deleteComponent: (event) => + event.preventDefault() msg = new CMS.Views.Prompt.Warning( title: gettext('Delete this component?'), message: gettext('Deleting this component is permanent and cannot be undone.'), diff --git a/cms/static/js/base.js b/cms/static/js/base.js index de0fd955dc..80b24776da 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -253,21 +253,20 @@ function syncReleaseDate(e) { $("#start_time").val(""); } -function getEdxTimeFromDateTimeVals(date_val, time_val) { - if (date_val != '') { - if (time_val == '') time_val = '00:00'; - - return new Date(date_val + " " + time_val + "Z"); +function getDatetime(datepickerInput, timepickerInput) { + // given a pair of inputs (datepicker and timepicker), return a JS Date + // object that corresponds to the datetime that they represent. Assume + // UTC timezone, NOT the timezone of the user's browser. + var date = $(datepickerInput).datepicker("getDate"); + var time = $(timepickerInput).timepicker("getTime"); + if(date && time) { + return new Date(Date.UTC( + date.getFullYear(), date.getMonth(), date.getDate(), + time.getHours(), time.getMinutes() + )); + } else { + return null; } - - else return null; -} - -function getEdxTimeFromDateTimeInputs(date_id, time_id) { - var input_date = $('#' + date_id).val(); - var input_time = $('#' + time_id).val(); - - return getEdxTimeFromDateTimeVals(input_date, input_time); } function autosaveInput(e) { @@ -307,9 +306,17 @@ function saveSubsection() { metadata[$(el).data("metadata-name")] = el.value; } - // Piece back together the date/time UI elements into one date/time string - metadata['start'] = getEdxTimeFromDateTimeInputs('start_date', 'start_time'); - metadata['due'] = getEdxTimeFromDateTimeInputs('due_date', 'due_time'); + // get datetimes for start and due, stick into metadata + _(["start", "due"]).each(function(name) { + + var datetime = getDatetime( + document.getElementById(name+"_date"), + document.getElementById(name+"_time") + ); + // if datetime is null, we want to set that in metadata anyway; + // its an indication to the server to clear the datetime in the DB + metadata[name] = datetime; + }); $.ajax({ url: "/save_item", @@ -772,21 +779,21 @@ function cancelSetSectionScheduleDate(e) { function saveSetSectionScheduleDate(e) { e.preventDefault(); - var input_date = $('.edit-subsection-publish-settings .start-date').val(); - var input_time = $('.edit-subsection-publish-settings .start-time').val(); - - var start = getEdxTimeFromDateTimeVals(input_date, input_time); + var datetime = getDatetime( + $('.edit-subsection-publish-settings .start-date'), + $('.edit-subsection-publish-settings .start-time') + ); var id = $modal.attr('data-id'); analytics.track('Edited Section Release Date', { 'course': course_location_analytics, 'id': id, - 'start': start + 'start': datetime }); var saving = new CMS.Views.Notification.Mini({ - title: gettext("Saving") + "…", + title: gettext("Saving") + "…" }); saving.show(); // call into server to commit the new order @@ -798,20 +805,29 @@ function saveSetSectionScheduleDate(e) { data: JSON.stringify({ 'id': id, 'metadata': { - 'start': start + 'start': datetime } }) }).success(function() { + var pad2 = function(number) { + // pad a number to two places: useful for formatting months, days, hours, etc + // when displaying a date/time + return (number < 10 ? '0' : '') + number; + }; + var $thisSection = $('.courseware-section[data-id="' + id + '"]'); var html = _.template( '' + '' + gettext("Will Release:") + ' ' + - gettext("<%= date %> at <%= time %> UTC") + + gettext("{month}/{day}/{year} at {hour}:{minute} UTC") + '' + - '' + + '' + gettext("Edit") + '', - {date: input_date, time: input_time, id: id}); + {year: datetime.getUTCFullYear(), month: pad2(datetime.getUTCMonth() + 1), day: pad2(datetime.getUTCDate()), + hour: pad2(datetime.getUTCHours()), minute: pad2(datetime.getUTCMinutes()), + id: id}, + {interpolate: /\{(.+?)\}/g}); $thisSection.find('.section-published-date').html(html); hideModal(); saving.hide(); diff --git a/cms/static/js/models/metadata_model.js b/cms/static/js/models/metadata_model.js index 2aff78b295..c1c69939cc 100644 --- a/cms/static/js/models/metadata_model.js +++ b/cms/static/js/models/metadata_model.js @@ -111,3 +111,4 @@ CMS.Models.Metadata.SELECT_TYPE = "Select"; CMS.Models.Metadata.INTEGER_TYPE = "Integer"; CMS.Models.Metadata.FLOAT_TYPE = "Float"; CMS.Models.Metadata.GENERIC_TYPE = "Generic"; +CMS.Models.Metadata.LIST_TYPE = "List"; diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js index d7e11d5689..4d048bab81 100644 --- a/cms/static/js/models/settings/course_details.js +++ b/cms/static/js/models/settings/course_details.js @@ -75,7 +75,7 @@ CMS.Models.Settings.CourseDetails = Backbone.Model.extend({ return this.videosourceSample(); }, videosourceSample : function() { - if (this.has('intro_video')) return "http://www.youtube.com/embed/" + this.get('intro_video'); + if (this.has('intro_video')) return "//www.youtube.com/embed/" + this.get('intro_video'); else return ""; } }); diff --git a/cms/static/js/views/assets.js b/cms/static/js/views/assets.js index 282aeab69c..4b0b97180a 100644 --- a/cms/static/js/views/assets.js +++ b/cms/static/js/views/assets.js @@ -96,7 +96,7 @@ function displayFinishedUpload(xhr) { } var resp = JSON.parse(xhr.responseText); - $('.upload-modal .embeddable-xml-input').val(xhr.getResponseHeader('asset_url')); + $('.upload-modal .embeddable-xml-input').val(resp.portable_url); $('.upload-modal .embeddable').show(); $('.upload-modal .file-name').hide(); $('.upload-modal .progress-fill').html(resp.msg); diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index 564e77cb8a..f8c093e62a 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -27,6 +27,9 @@ CMS.Views.Metadata.Editor = Backbone.View.extend({ model.getType() === CMS.Models.Metadata.FLOAT_TYPE) { new CMS.Views.Metadata.Number(data); } + else if(model.getType() === CMS.Models.Metadata.LIST_TYPE) { + new CMS.Views.Metadata.List(data); + } else { // Everything else is treated as GENERIC_TYPE, which uses String editor. new CMS.Views.Metadata.String(data); @@ -310,3 +313,59 @@ CMS.Views.Metadata.Option = CMS.Views.Metadata.AbstractEditor.extend({ }).prop('selected', true); } }); + +CMS.Views.Metadata.List = CMS.Views.Metadata.AbstractEditor.extend({ + + events : { + "click .setting-clear" : "clear", + "keypress .setting-input" : "showClearButton", + "change input" : "updateModel", + "input input" : "enableAdd", + "click .create-setting" : "addEntry", + "click .remove-setting" : "removeEntry" + }, + + templateName: "metadata-list-entry", + + getValueFromEditor: function () { + return _.map( + this.$el.find('li input'), + function (ele) { return ele.value.trim(); } + ).filter(_.identity); + }, + + setValueInEditor: function (value) { + var list = this.$el.find('ol'); + list.empty(); + _.each(value, function(ele, index) { + var template = _.template( + '
  • ' + + '' + + 'Remove' + + '
    • ' + ); + list.append($(template({'ele': ele, 'index': index}))); + }); + }, + + addEntry: function(event) { + event.preventDefault(); + // We don't call updateModel here since it's bound to the + // change event + var list = this.model.get('value') || []; + this.setValueInEditor(list.concat([''])) + this.$el.find('.create-setting').addClass('is-disabled'); + }, + + removeEntry: function(event) { + event.preventDefault(); + var entry = $(event.currentTarget).siblings().val(); + this.setValueInEditor(_.without(this.model.get('value'), entry)); + this.updateModel(); + this.$el.find('.create-setting').removeClass('is-disabled'); + }, + + enableAdd: function() { + this.$el.find('.create-setting').removeClass('is-disabled'); + } +}); diff --git a/cms/static/js/views/overview.js b/cms/static/js/views/overview.js index e41a6971a6..4ce0d3688e 100644 --- a/cms/static/js/views/overview.js +++ b/cms/static/js/views/overview.js @@ -148,7 +148,7 @@ function generateCheckHoverState(selectorsToOpen, selectorsToShove) { } }); - } + }; } function removeHesitate(event, ui) { diff --git a/cms/static/sass/elements/_navigation.scss b/cms/static/sass/elements/_navigation.scss index 739d091b8e..a9e2f45533 100644 --- a/cms/static/sass/elements/_navigation.scss +++ b/cms/static/sass/elements/_navigation.scss @@ -65,6 +65,7 @@ nav { pointer-events: none; width: ($baseline*8); overflow: hidden; + height: 0; // dropped down state @@ -72,6 +73,7 @@ nav { opacity: 1.0; pointer-events: auto; overflow: visible; + height: auto; } } diff --git a/cms/static/sass/views/_dashboard.scss b/cms/static/sass/views/_dashboard.scss index ab3ad6f810..817fc726c0 100644 --- a/cms/static/sass/views/_dashboard.scss +++ b/cms/static/sass/views/_dashboard.scss @@ -291,7 +291,7 @@ body.dashboard { // ==================== - // course listings + // ELEM: course listings .courses { margin: $baseline 0; } @@ -304,61 +304,110 @@ body.dashboard { box-shadow: 0 1px 2px $shadow-l1; .course-item { + @include box-sizing(border-box); + width: flex-grid(9, 9); position: relative; border-bottom: 1px solid $gray-l1; + padding: $baseline; - &:last-child { - border-bottom: none; - } + // STATE: hover/focus + &:hover { + background: $paleYellow; - .class-link { - z-index: 100; - display: block; - padding: 20px 25px; - line-height: 1.3; + .course-actions .view-live-button { + opacity: 1.0; + pointer-events: auto; + } - &:hover { - background: $paleYellow; + .course-title { + color: $orange-d1; + } - + .view-live-button { - opacity: 1.0; - pointer-events: auto; - } - } - } - } + .course-metadata { + opacity: 1.0; + } + } - .class-name { - display: block; - font-size: 19px; - font-weight: 300; - } + .course-link, .course-actions { + @include box-sizing(border-box); + display: inline-block; + vertical-align: middle; + } - .detail { - font-size: 14px; - font-weight: 400; - margin-right: 20px; - color: #3c3c3c; - } + // encompassing course link + .course-link { + @extend .ui-depth2; + width: flex-grid(7, 9); + margin-right: flex-gutter(); + } - // view live button - .view-live-button { - z-index: 10000; - position: absolute; - top: ($baseline*0.75); - right: $baseline; - padding: ($baseline/4) ($baseline/2); - opacity: 0.0; - pointer-events: none; + // course title + .course-title { + @extend .t-title4; + margin: 0 ($baseline*2) ($baseline/4) 0; + font-weight: 300; + } - &:hover { - opacity: 1.0; - pointer-events: auto; - } + // course metadata + .course-metadata { + @extend .t-copy-sub1; + @include transition(opacity $tmg-f1 ease-in-out 0); + color: $gray; + opacity: 0.75; + + .metadata-item { + display: inline-block; + + &:after { + content: "/"; + margin-left: ($baseline/10); + margin-right: ($baseline/10); + color: $gray-l4; + } + + &:last-child { + + &:after { + content: ""; + margin-left: 0; + margin-right: 0; + } + } + + .label { + @extend .cont-text-sr; + } + } + } + + .course-actions { + @extend .ui-depth3; + position: static; + width: flex-grid(2, 9); + text-align: right; + + // view live button + .view-live-button { + @extend .ui-depth3; + @include transition(opacity $tmg-f2 ease-in-out 0); + @include box-sizing(border-box); + padding: ($baseline/2); + opacity: 0.0; + pointer-events: none; + + &:hover { + opacity: 1.0; + pointer-events: auto; + } + } + + &:last-child { + border-bottom: none; + } + } } } - // ELEM: new user form .wrapper-create-course { diff --git a/cms/static/sass/views/_textbooks.scss b/cms/static/sass/views/_textbooks.scss index 8058673b2b..b83d22414b 100644 --- a/cms/static/sass/views/_textbooks.scss +++ b/cms/static/sass/views/_textbooks.scss @@ -148,6 +148,14 @@ body.course.textbooks { padding: ($baseline*0.75) $baseline; background: $gray-l6; + .action { + margin-right: ($baseline/4); + + &:last-child { + margin-right: 0; + } + } + // add a chapter is below with chapters styling .action-primary { diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 06685ad96b..6e893fece3 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -449,12 +449,39 @@ body.course.unit { // Module Actions, also used for Static Pages .module-actions { - box-shadow: inset 0 1px 1px $shadow; - padding: 0 0 $baseline $baseline; - background-color: $gray-l6; + box-shadow: inset 0 1px 2px $shadow; + border-top: 1px solid $gray-l1; + padding: ($baseline*0.75) $baseline; + background: $gray-l6; - .save-button { - margin: ($baseline/2) 8px 0 0; + .action { + display: inline-block; + vertical-align: middle; + margin-right: ($baseline/4); + + &:last-child { + margin-right: 0; + } + } + + .action-primary { + @include blue-button; + @extend .t-action2; + @include transition(all .15s); + display: inline-block; + padding: ($baseline/5) $baseline; + font-weight: 600; + text-transform: uppercase; + } + + .action-secondary { + @include grey-button; + @extend .t-action2; + @include transition(all .15s); + display: inline-block; + padding: ($baseline/5) $baseline; + font-weight: 600; + text-transform: uppercase; } } } @@ -599,26 +626,27 @@ body.course.unit { } } - .wrapper-comp-setting{ + .wrapper-comp-setting { display: inline-block; min-width: 300px; - width: 45%; + width: 55%; top: 0; vertical-align: top; margin-bottom:5px; position: relative; } - label.setting-label { + .setting-label { @extend .t-copy-sub1; @include transition(color $tmg-f2 ease-in-out 0s); - font-weight: 400; vertical-align: middle; display: inline-block; position: relative; left: 0; + width: 33%; min-width: 100px; - width: 35%; + margin-right: ($baseline/2); + font-weight: 600; &.is-focused { color: $blue; @@ -708,14 +736,98 @@ body.course.unit { } } - .tip.setting-help { + .setting-help { @include font-size(12); display: inline-block; font-color: $gray-l6; - min-width: 260px; - width: 50%; + min-width: ($baseline*10); + width: 35%; vertical-align: top; } + + + + // TYPE: enumerated lists of metadata sets + .metadata-list-enum { + + * { + @include box-sizing(border-box); + } + + // label + .setting-label { + vertical-align: top; + margin-top: ($baseline/2); + } + + // inputs and labels + .wrapper-list-settings { + @include size(45%,100%); + display: inline-block; + min-width: ($baseline*5); + + // enumerated fields + .list-settings { + margin: 0; + + .list-settings-item { + margin-bottom: ($baseline/2); + } + + // inputs + .input { + width: 80%; + margin-right: ($baseline/2); + vertical-align: middle; + } + } + } + + // actions + .create-action, .remove-action, .setting-clear { + + } + + .setting-clear { + vertical-align: top; + margin-top: ($baseline/4); + } + + .create-setting { + @extend .ui-btn-flat-outline; + @extend .t-action3; + display: block; + width: 100%; + padding: ($baseline/2); + font-weight: 600; + + *[class^="icon-"] { + margin-right: ($baseline/4); + } + + // STATE: disabled + &.is-disabled { + + } + } + + .remove-setting { + @include transition(color 0.25s ease-in-out); + @include font-size(20); + display: inline-block; + background: transparent; + color: $blue-l3; + + &:hover { + color: $blue; + } + + // STATE: disabled + &.is-disabled { + + } + } + } } } } diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 6c92994a6f..c681cf5058 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -29,7 +29,7 @@ {{uploadDate}} - + @@ -89,7 +89,7 @@ ${asset['uploadDate']} - + diff --git a/cms/templates/component.html b/cms/templates/component.html index 512847aa3d..2412cd74d4 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -26,8 +26,8 @@
    - ${_("Save")} - ${_("Cancel")} + ${_("Save")} + ${_("Cancel")}
    diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index bdcaf18015..5b03643f3b 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -1,11 +1,10 @@ -<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%! - import logging - from xmodule.util.date_utils import get_default_time_display, almost_same_datetime + import logging + from xmodule.util.date_utils import get_default_time_display, almost_same_datetime + from django.utils.translation import ugettext as _ + from django.core.urlresolvers import reverse %> - -<%! from django.core.urlresolvers import reverse %> <%block name="title">${_("CMS Subsection")} <%block name="bodyclass">is-signedin course subsection diff --git a/cms/templates/emails/course_creator_admin_subject.txt b/cms/templates/emails/course_creator_admin_subject.txt new file mode 100644 index 0000000000..13c7c3094d --- /dev/null +++ b/cms/templates/emails/course_creator_admin_subject.txt @@ -0,0 +1,2 @@ +<%! from django.utils.translation import ugettext as _ %> +${_("{email} has requested Studio course creator privileges on edge".format(email=user_email))} \ No newline at end of file diff --git a/cms/templates/emails/course_creator_admin_user_pending.txt b/cms/templates/emails/course_creator_admin_user_pending.txt new file mode 100644 index 0000000000..37464d3e9c --- /dev/null +++ b/cms/templates/emails/course_creator_admin_user_pending.txt @@ -0,0 +1,9 @@ +<%! from django.utils.translation import ugettext as _ %> +${_("User '{user}' with e-mail {email} has requested Studio course creator privileges on edge.".format(user=user_name, email=user_email))} +${_("To grant or deny this request, use the course creator admin table.")} + +% if is_secure: + https://${ site }/admin/course_creators/coursecreator/ +% else: + http://${ site }/admin/course_creators/coursecreator/ +% endif diff --git a/cms/templates/export.html b/cms/templates/export.html index 593cf3dd6e..3356bea42b 100644 --- a/cms/templates/export.html +++ b/cms/templates/export.html @@ -6,6 +6,62 @@ <%block name="title">${_("Course Export")} <%block name="bodyclass">is-signedin course tools export +<%block name="jsextra"> + % if in_err: + + %endif + + <%block name="content">
    @@ -18,6 +74,7 @@
    +

    ${_("About Exporting Courses")}

    diff --git a/cms/templates/index.html b/cms/templates/index.html index 9c845ccb5a..9702eedada 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -133,12 +133,30 @@ %if len(courses) > 0:
    diff --git a/cms/templates/js/metadata-editor.underscore b/cms/templates/js/metadata-editor.underscore index 03fdd28996..67898a77b6 100644 --- a/cms/templates/js/metadata-editor.underscore +++ b/cms/templates/js/metadata-editor.underscore @@ -1,6 +1,6 @@
      <% _.each(_.range(numEntries), function() { %> -
    • +
      • <% }) %>
    diff --git a/cms/templates/js/metadata-list-entry.underscore b/cms/templates/js/metadata-list-entry.underscore new file mode 100644 index 0000000000..8b3d99c507 --- /dev/null +++ b/cms/templates/js/metadata-list-entry.underscore @@ -0,0 +1,17 @@ +
    + + + +
    +<%= model.get('help') %> diff --git a/cms/templates/overview.html b/cms/templates/overview.html index 3795e9d09b..2c42df187a 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -1,10 +1,10 @@ -<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%! - import logging - from xmodule.util import date_utils + import logging + from xmodule.util import date_utils + from django.utils.translation import ugettext as _ + from django.core.urlresolvers import reverse %> -<%! from django.core.urlresolvers import reverse %> <%block name="title">${_("Course Outline")} <%block name="bodyclass">is-signedin course outline diff --git a/cms/templates/textbooks.html b/cms/templates/textbooks.html index 3ee1bc5b74..28349b5436 100644 --- a/cms/templates/textbooks.html +++ b/cms/templates/textbooks.html @@ -76,7 +76,7 @@ $(function() {

    ${_("What if my book isn't divided into chapters?")}

    -

    ${_("If you haven't broken your textbook into chapters, you can upload the entire text as Chapter 1.")}

    +

    ${_("If you haven't broken your text into chapters, you can upload the entire text as a single chapter and enter a name of your choice in the Chapter Name field.")}

    diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 6178058689..a0d4d0fd41 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -13,7 +13,7 @@

    ${_("Current Course:")} - ${ctx_loc.org}${ctx_loc.course} + ${context_course.display_org_with_default | h}${context_course.display_number_with_default | h} ${context_course.display_name_with_default}

    diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html index 879ae43e07..34866321c4 100644 --- a/cms/templates/widgets/html-edit.html +++ b/cms/templates/widgets/html-edit.html @@ -1,6 +1,6 @@ <%! from django.utils.translation import ugettext as _ %> -
    +
    • ${_("Visual")}
      • diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html index db50a1d877..70a2df3400 100644 --- a/cms/templates/widgets/metadata-edit.html +++ b/cms/templates/widgets/metadata-edit.html @@ -25,6 +25,10 @@ <%static:include path="js/metadata-option-entry.underscore" /> + + <% showHighLevelSource='source_code' in editable_metadata_fields and editable_metadata_fields['source_code']['explicitly_set'] %> <% metadata_field_copy = copy.copy(editable_metadata_fields) %> ## Delete 'source_code' field (if it exists) so metadata editor view does not attempt to render it. @@ -40,4 +44,4 @@ <%include file="source-edit.html" /> % endif -
      \ No newline at end of file +
      diff --git a/cms/templates/widgets/tabs-aggregator.html b/cms/templates/widgets/tabs-aggregator.html new file mode 100644 index 0000000000..02c34d4dc1 --- /dev/null +++ b/cms/templates/widgets/tabs-aggregator.html @@ -0,0 +1,21 @@ +<%! from django.utils.translation import ugettext as _ %> +
      +
      +
      + + +
      +
      + % for tab in tabs: +
      + <%include file="${tab['template']}" args="tabName=tab['name']"/> +
      + % endfor +
      +
      +
      + diff --git a/cms/templates/widgets/tabs/metadata-edit-tab.html b/cms/templates/widgets/tabs/metadata-edit-tab.html new file mode 100644 index 0000000000..0caf9d2078 --- /dev/null +++ b/cms/templates/widgets/tabs/metadata-edit-tab.html @@ -0,0 +1,28 @@ +<%namespace name='static' file='../../static_content.html'/> +<% + import json +%> + +## js templates + + + + + + + + + + +
      + diff --git a/cms/templates/widgets/videoalpha/codemirror-edit.html b/cms/templates/widgets/videoalpha/codemirror-edit.html new file mode 100644 index 0000000000..10c28d829c --- /dev/null +++ b/cms/templates/widgets/videoalpha/codemirror-edit.html @@ -0,0 +1,33 @@ +<%! from django.utils.translation import ugettext as _ %> +<%page args="tabName"/> +
      + +
      + + + diff --git a/cms/templates/widgets/videoalpha/subtitles.html b/cms/templates/widgets/videoalpha/subtitles.html new file mode 100644 index 0000000000..e69de29bb2 diff --git a/cms/urls.py b/cms/urls.py index 5945394f55..8f396d3742 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -6,7 +6,7 @@ from django.conf.urls import patterns, include, url from . import one_time_startup # There is a course creators admin table. -from django.contrib import admin +from ratelimitbackend import admin admin.autodiscover() urlpatterns = ('', # nopep8 @@ -147,7 +147,7 @@ if settings.MITX_FEATURES.get('ENABLE_SERVICE_STATUS'): urlpatterns += (url(r'^admin/', include(admin.site.urls)),) # enable automatic login -if settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_LOAD_TESTING'): +if settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING'): urlpatterns += ( url(r'^auto_auth$', 'student.views.auto_auth'), ) diff --git a/common/djangoapps/external_auth/admin.py b/common/djangoapps/external_auth/admin.py index 1ee18dadc1..fad0917604 100644 --- a/common/djangoapps/external_auth/admin.py +++ b/common/djangoapps/external_auth/admin.py @@ -3,7 +3,7 @@ django admin pages for courseware model ''' from external_auth.models import * -from django.contrib import admin +from ratelimitbackend import admin class ExternalAuthMapAdmin(admin.ModelAdmin): diff --git a/common/djangoapps/external_auth/tests/test_openid_provider.py b/common/djangoapps/external_auth/tests/test_openid_provider.py index 1f7f201087..2024da469f 100644 --- a/common/djangoapps/external_auth/tests/test_openid_provider.py +++ b/common/djangoapps/external_auth/tests/test_openid_provider.py @@ -9,12 +9,15 @@ from urlparse import parse_qs from django.conf import settings from django.test import TestCase, LiveServerTestCase +from django.core.cache import cache from django.test.utils import override_settings -# from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.test.client import RequestFactory from unittest import skipUnless +from student.tests.factories import UserFactory +from external_auth.views import provider_login + class MyFetcher(HTTPFetcher): """A fetcher that uses server-internal calls for performing HTTP @@ -199,6 +202,49 @@ class OpenIdProviderTest(TestCase): """ Test for 403 error code when the url""" self.attempt_login(403, return_to="http://apps.cs50.edx.or") + def _send_bad_redirection_login(self): + """ + Attempt to log in to the provider with setup parameters + + Intentionally fail the login to force a redirect + """ + user = UserFactory() + + factory = RequestFactory() + post_params = {'email': user.email, 'password': 'password'} + fake_url = 'fake url' + request = factory.post(reverse('openid-provider-login'), post_params) + openid_setup = { + 'request': factory.request(), + 'url': fake_url + } + request.session = { + 'openid_setup': openid_setup + } + response = provider_login(request) + return response + + @skipUnless(settings.MITX_FEATURES.get('AUTH_USE_OPENID') or + settings.MITX_FEATURES.get('AUTH_USE_OPENID_PROVIDER'), True) + def test_login_openid_handle_redirection(self): + """ Test to see that we can handle login redirection properly""" + response = self._send_bad_redirection_login() + self.assertEquals(response.status_code, 302) + + @skipUnless(settings.MITX_FEATURES.get('AUTH_USE_OPENID') or + settings.MITX_FEATURES.get('AUTH_USE_OPENID_PROVIDER'), True) + def test_login_openid_handle_redirection_ratelimited(self): + # try logging in 30 times, the default limit in the number of failed + # log in attempts before the rate gets limited + for _ in xrange(30): + self._send_bad_redirection_login() + + response = self._send_bad_redirection_login() + # verify that we are not returning the default 403 + self.assertEquals(response.status_code, 302) + # clear the ratelimit cache so that we don't fail other logins + cache.clear() + class OpenIdProviderLiveServerTest(LiveServerTestCase): """ diff --git a/common/djangoapps/external_auth/views.py b/common/djangoapps/external_auth/views.py index 9065ea78d6..37dcd5313a 100644 --- a/common/djangoapps/external_auth/views.py +++ b/common/djangoapps/external_auth/views.py @@ -39,6 +39,7 @@ from openid.consumer.consumer import SUCCESS from openid.server.server import Server, ProtocolError, UntrustedReturnURL from openid.server.trustroot import TrustRoot from openid.extensions import ax, sreg +from ratelimitbackend.exceptions import RateLimitException import student.views as student_views # Required for Pearson @@ -191,7 +192,7 @@ def _external_login_or_signup(request, user.backend = auth_backend AUDIT_LOG.info('Linked user "%s" logged in via Shibboleth', user.email) else: - user = authenticate(username=uname, password=eamap.internal_password) + user = authenticate(username=uname, password=eamap.internal_password, request=request) if user is None: # we want to log the failure, but don't want to log the password attempted: AUDIT_LOG.warning('External Auth Login failed for "%s"', uname) @@ -718,7 +719,12 @@ def provider_login(request): # Failure is again redirected to the login dialog. username = user.username password = request.POST.get('password', None) - user = authenticate(username=username, password=password) + try: + user = authenticate(username=username, password=password, request=request) + except RateLimitException: + AUDIT_LOG.warning('OpenID - Too many failed login attempts.') + return HttpResponseRedirect(openid_request_url) + if user is None: request.session['openid_error'] = True msg = "OpenID login failed - password for %s is invalid" diff --git a/common/djangoapps/student/admin.py b/common/djangoapps/student/admin.py index 4d6976d7d4..209f7cf6c0 100644 --- a/common/djangoapps/student/admin.py +++ b/common/djangoapps/student/admin.py @@ -4,7 +4,7 @@ django admin pages for courseware model from student.models import UserProfile, UserTestGroup, CourseEnrollmentAllowed from student.models import CourseEnrollment, Registration, PendingNameChange -from django.contrib import admin +from ratelimitbackend import admin admin.site.register(UserProfile) diff --git a/common/djangoapps/student/migrations/0023_add_test_center_registration.py b/common/djangoapps/student/migrations/0023_add_test_center_registration.py index 4c7de6dcd9..6186f5deef 100644 --- a/common/djangoapps/student/migrations/0023_add_test_center_registration.py +++ b/common/djangoapps/student/migrations/0023_add_test_center_registration.py @@ -21,7 +21,7 @@ class Migration(SchemaMigration): ('eligibility_appointment_date_first', self.gf('django.db.models.fields.DateField')(db_index=True)), ('eligibility_appointment_date_last', self.gf('django.db.models.fields.DateField')(db_index=True)), ('accommodation_code', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)), - ('accommodation_request', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=1024, blank=True)), + ('accommodation_request', self.gf('django.db.models.fields.CharField')(db_index=False, max_length=1024, blank=True)), ('uploaded_at', self.gf('django.db.models.fields.DateTimeField')(null=True, db_index=True)), ('processed_at', self.gf('django.db.models.fields.DateTimeField')(null=True, db_index=True)), ('upload_status', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=20, blank=True)), @@ -163,7 +163,7 @@ class Migration(SchemaMigration): 'student.testcenterregistration': { 'Meta': {'object_name': 'TestCenterRegistration'}, 'accommodation_code': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), - 'accommodation_request': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'blank': 'True'}), + 'accommodation_request': ('django.db.models.fields.CharField', [], {'db_index': 'False', 'max_length': '1024', 'blank': 'True'}), 'authorization_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}), 'client_authorization_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}), 'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), diff --git a/common/djangoapps/student/migrations/0024_add_allow_certificate.py b/common/djangoapps/student/migrations/0024_add_allow_certificate.py index 56eccf8d70..5753f0176e 100644 --- a/common/djangoapps/student/migrations/0024_add_allow_certificate.py +++ b/common/djangoapps/student/migrations/0024_add_allow_certificate.py @@ -93,7 +93,7 @@ class Migration(SchemaMigration): 'student.testcenterregistration': { 'Meta': {'object_name': 'TestCenterRegistration'}, 'accommodation_code': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), - 'accommodation_request': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'blank': 'True'}), + 'accommodation_request': ('django.db.models.fields.CharField', [], {'db_index': 'False', 'max_length': '1024', 'blank': 'True'}), 'authorization_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}), 'client_authorization_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}), 'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), diff --git a/common/djangoapps/student/migrations/0025_auto__add_field_courseenrollmentallowed_auto_enroll.py b/common/djangoapps/student/migrations/0025_auto__add_field_courseenrollmentallowed_auto_enroll.py index 8ce1d0cda1..1cb21e9b33 100644 --- a/common/djangoapps/student/migrations/0025_auto__add_field_courseenrollmentallowed_auto_enroll.py +++ b/common/djangoapps/student/migrations/0025_auto__add_field_courseenrollmentallowed_auto_enroll.py @@ -94,7 +94,7 @@ class Migration(SchemaMigration): 'student.testcenterregistration': { 'Meta': {'object_name': 'TestCenterRegistration'}, 'accommodation_code': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), - 'accommodation_request': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'blank': 'True'}), + 'accommodation_request': ('django.db.models.fields.CharField', [], {'db_index': 'False', 'max_length': '1024', 'blank': 'True'}), 'authorization_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}), 'client_authorization_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}), 'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), diff --git a/common/djangoapps/student/migrations/0026_auto__remove_index_student_testcenterregistration_accommodation_request.py b/common/djangoapps/student/migrations/0026_auto__remove_index_student_testcenterregistration_accommodation_request.py new file mode 100644 index 0000000000..23fc476348 --- /dev/null +++ b/common/djangoapps/student/migrations/0026_auto__remove_index_student_testcenterregistration_accommodation_request.py @@ -0,0 +1,180 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models +from django.db.utils import DatabaseError + + +class Migration(SchemaMigration): + """ + Remove an unwanted index from environments that have it. + This is a one-way migration in that backwards is a no-op and will not undo the removal. + This migration is only relevant to dev environments that existed before a migration rewrite + which removed the creation of this index. + """ + + def forwards(self, orm): + try: + # Removing index on 'TestCenterRegistration', fields ['accommodation_request'] + db.delete_index('student_testcenterregistration', ['accommodation_request']) + except DatabaseError: + print "-- skipping delete_index of student_testcenterregistration.accommodation_request (index does not exist)" + + + def backwards(self, orm): + pass + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'student.courseenrollment': { + 'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'CourseEnrollment'}, + 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'student.courseenrollmentallowed': { + 'Meta': {'unique_together': "(('email', 'course_id'),)", 'object_name': 'CourseEnrollmentAllowed'}, + 'auto_enroll': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'student.pendingemailchange': { + 'Meta': {'object_name': 'PendingEmailChange'}, + 'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'new_email': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) + }, + 'student.pendingnamechange': { + 'Meta': {'object_name': 'PendingNameChange'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'new_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'rationale': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) + }, + 'student.registration': { + 'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"}, + 'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'}) + }, + 'student.testcenterregistration': { + 'Meta': {'object_name': 'TestCenterRegistration'}, + 'accommodation_code': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), + 'accommodation_request': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), + 'authorization_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}), + 'client_authorization_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}), + 'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), + 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'eligibility_appointment_date_first': ('django.db.models.fields.DateField', [], {'db_index': 'True'}), + 'eligibility_appointment_date_last': ('django.db.models.fields.DateField', [], {'db_index': 'True'}), + 'exam_series_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'processed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), + 'testcenter_user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['student.TestCenterUser']"}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}), + 'upload_error_message': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'upload_status': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), + 'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}) + }, + 'student.testcenteruser': { + 'Meta': {'object_name': 'TestCenterUser'}, + 'address_1': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'address_2': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}), + 'address_3': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}), + 'candidate_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}), + 'client_candidate_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'}), + 'company_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '50', 'blank': 'True'}), + 'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'extension': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '8', 'blank': 'True'}), + 'fax': ('django.db.models.fields.CharField', [], {'max_length': '35', 'blank': 'True'}), + 'fax_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), + 'middle_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '35'}), + 'phone_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'blank': 'True'}), + 'processed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), + 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), + 'state': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}), + 'suffix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}), + 'upload_error_message': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'upload_status': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'unique': 'True'}), + 'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}) + }, + 'student.userprofile': { + 'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"}, + 'allow_certificate': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}), + 'gender': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}), + 'goals': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'level_of_education': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'mailing_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'meta': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}), + 'year_of_birth': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}) + }, + 'student.usertestgroup': { + 'Meta': {'object_name': 'UserTestGroup'}, + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'db_index': 'True', 'symmetrical': 'False'}) + } + } + + complete_apps = ['student'] diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py index 4c41427ca6..34278c5581 100644 --- a/common/djangoapps/student/models.py +++ b/common/djangoapps/student/models.py @@ -370,7 +370,7 @@ class TestCenterRegistration(models.Model): accommodation_code = models.CharField(max_length=64, blank=True) # store the original text of the accommodation request. - accommodation_request = models.CharField(max_length=1024, blank=True, db_index=True) + accommodation_request = models.CharField(max_length=1024, blank=True, db_index=False) # time at which edX sent the registration to the test center uploaded_at = models.DateTimeField(null=True, db_index=True) diff --git a/common/djangoapps/student/tests/test_auto_auth.py b/common/djangoapps/student/tests/test_auto_auth.py index dca2937b01..f9c4ae63de 100644 --- a/common/djangoapps/student/tests/test_auto_auth.py +++ b/common/djangoapps/student/tests/test_auto_auth.py @@ -11,9 +11,9 @@ class AutoAuthEnabledTestCase(UrlResetMixin, TestCase): Tests for the Auto auth view that we have for load testing. """ - @patch.dict("django.conf.settings.MITX_FEATURES", {"AUTOMATIC_AUTH_FOR_LOAD_TESTING": True}) + @patch.dict("django.conf.settings.MITX_FEATURES", {"AUTOMATIC_AUTH_FOR_TESTING": True}) def setUp(self): - # Patching the settings.MITX_FEATURES['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] + # Patching the settings.MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] # value affects the contents of urls.py, # so we need to call super.setUp() which reloads urls.py (because # of the UrlResetMixin) @@ -37,6 +37,26 @@ class AutoAuthEnabledTestCase(UrlResetMixin, TestCase): user = qset[0] assert user.is_active + def test_create_defined_user(self): + """ + Test that the user gets created with the correct attributes + when they are passed as parameters on the auto-auth page. + """ + + self.client.get( + self.url, + {'username': 'robot', 'password': 'test', 'email': 'robot@edx.org'} + ) + + qset = User.objects.all() + + # assert user was created with the correct username and password + self.assertEqual(qset.count(), 1) + user = qset[0] + self.assertEqual(user.username, 'robot') + self.assertTrue(user.check_password('test')) + self.assertEqual(user.email, 'robot@edx.org') + @patch('student.views.random.randint') def test_create_multiple_users(self, randint): """ @@ -50,8 +70,13 @@ class AutoAuthEnabledTestCase(UrlResetMixin, TestCase): qset = User.objects.all() - # make sure that USER_1 and USER_2 were created + # make sure that USER_1 and USER_2 were created correctly self.assertEqual(qset.count(), 2) + user1 = qset[0] + self.assertEqual(user1.username, 'USER_1') + self.assertTrue(user1.check_password('PASS_1')) + self.assertEqual(user1.email, 'USER_1_dummy_test@mitx.mit.edu') + self.assertEqual(qset[1].username, 'USER_2') @patch.dict("django.conf.settings.MITX_FEATURES", {"MAX_AUTO_AUTH_USERS": 1}) def test_login_already_created_user(self): @@ -77,9 +102,9 @@ class AutoAuthDisabledTestCase(UrlResetMixin, TestCase): Test that the page is inaccessible with default settings """ - @patch.dict("django.conf.settings.MITX_FEATURES", {"AUTOMATIC_AUTH_FOR_LOAD_TESTING": False}) + @patch.dict("django.conf.settings.MITX_FEATURES", {"AUTOMATIC_AUTH_FOR_TESTING": False}) def setUp(self): - # Patching the settings.MITX_FEATURES['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] + # Patching the settings.MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] # value affects the contents of urls.py, # so we need to call super.setUp() which reloads urls.py (because # of the UrlResetMixin) diff --git a/common/djangoapps/student/tests/test_login.py b/common/djangoapps/student/tests/test_login.py index 5a6cd043ae..e8def470c0 100644 --- a/common/djangoapps/student/tests/test_login.py +++ b/common/djangoapps/student/tests/test_login.py @@ -6,6 +6,7 @@ from mock import patch from django.test import TestCase from django.test.client import Client +from django.core.cache import cache from django.core.urlresolvers import reverse, NoReverseMatch from student.tests.factories import UserFactory, RegistrationFactory, UserProfileFactory @@ -29,6 +30,7 @@ class LoginTest(TestCase): # Create the test client self.client = Client() + cache.clear() # Store the login url try: @@ -95,6 +97,27 @@ class LoginTest(TestCase): self.assertEqual(response.status_code, 302) self._assert_audit_log(mock_audit_log, 'info', [u'Logout', u'test']) + def test_login_ratelimited_success(self): + # Try (and fail) logging in with fewer attempts than the limit of 30 + # and verify that you can still successfully log in afterwards. + for i in xrange(20): + password = u'test_password{0}'.format(i) + response, _audit_log = self._login_response('test@edx.org', password) + self._assert_response(response, success=False) + # now try logging in with a valid password + response, _audit_log = self._login_response('test@edx.org', 'test_password') + self._assert_response(response, success=True) + + def test_login_ratelimited(self): + # try logging in 30 times, the default limit in the number of failed + # login attempts in one 5 minute period before the rate gets limited + for i in xrange(30): + password = u'test_password{0}'.format(i) + self._login_response('test@edx.org', password) + # check to see if this response indicates that this was ratelimited + response, _audit_log = self._login_response('test@edx.org', 'wrong_password') + self._assert_response(response, success=False, value='Too many failed login attempts') + def _login_response(self, email, password, patched_audit_log='student.views.AUDIT_LOG'): ''' Post the login info ''' post_params = {'email': email, 'password': password} diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py index 3e36016316..513216ba17 100644 --- a/common/djangoapps/student/tests/tests.py +++ b/common/djangoapps/student/tests/tests.py @@ -23,6 +23,7 @@ from textwrap import dedent from student.models import unique_id_for_user from student.views import process_survey_link, _cert_info, password_reset, password_reset_confirm_wrapper +from student.views import enroll_in_course, is_enrolled_in_course from student.tests.factories import UserFactory from student.tests.test_email import mock_render_to_string COURSE_1 = 'edX/toy/2012_Fall' @@ -205,3 +206,15 @@ class CourseEndingTest(TestCase): 'show_survey_button': False, 'grade': '67' }) + + +class EnrollInCourseTest(TestCase): + """ Tests the helper method for enrolling a user in a class """ + + def test_enroll_in_course(self): + user = User.objects.create_user("joe", "joe@joe.com", "password") + user.save() + course_id = "course_id" + self.assertFalse(is_enrolled_in_course(user, course_id)) + enroll_in_course(user, course_id) + self.assertTrue(is_enrolled_in_course(user, course_id)) diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 40bd4a3034..0b061f5a94 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -28,6 +28,8 @@ from django.utils.http import cookie_date from django.utils.http import base36_to_int from django.utils.translation import ugettext as _ +from ratelimitbackend.exceptions import RateLimitException + from mitxmako.shortcuts import render_to_response, render_to_string from bs4 import BeautifulSoup @@ -376,7 +378,7 @@ def change_enrollment(request): "run:{0}".format(run)]) try: - enrollment, _created = CourseEnrollment.objects.get_or_create(user=user, course_id=course.id) + enroll_in_course(user, course.id) except IntegrityError: # If we've already created this enrollment in a separate transaction, # then just continue @@ -401,6 +403,23 @@ def change_enrollment(request): return HttpResponseBadRequest(_("Enrollment action is invalid")) +def enroll_in_course(user, course_id): + """ + Helper method to enroll a user in a particular class. + + It is expected that this method is called from a method which has already + verified the user authentication and access. + """ + CourseEnrollment.objects.get_or_create(user=user, course_id=course_id) + + +def is_enrolled_in_course(user, course_id): + """ + Helper method that returns whether or not the user is enrolled in a particular course. + """ + return CourseEnrollment.objects.filter(user=user, course_id=course_id).count() > 0 + + @ensure_csrf_cookie def accounts_login(request, error=""): @@ -421,13 +440,23 @@ def login_user(request, error=""): user = User.objects.get(email=email) except User.DoesNotExist: AUDIT_LOG.warning(u"Login failed - Unknown user email: {0}".format(email)) - return HttpResponse(json.dumps({'success': False, - 'value': _('Email or password is incorrect.')})) # TODO: User error message + user = None - username = user.username - user = authenticate(username=username, password=password) + # if the user doesn't exist, we want to set the username to an invalid + # username so that authentication is guaranteed to fail and we can take + # advantage of the ratelimited backend + username = user.username if user else "" + try: + user = authenticate(username=username, password=password, request=request) + # this occurs when there are too many attempts from the same IP address + except RateLimitException: + return HttpResponse(json.dumps({'success': False, + 'value': _('Too many failed login attempts. Try again later.')})) if user is None: - AUDIT_LOG.warning(u"Login failed - password for {0} is invalid".format(email)) + # if we didn't find this username earlier, the account for this email + # doesn't exist, and doesn't have a corresponding password + if username != "": + AUDIT_LOG.warning(u"Login failed - password for {0} is invalid".format(email)) return HttpResponse(json.dumps({'success': False, 'value': _('Email or password is incorrect.')})) @@ -674,7 +703,7 @@ def create_account(request, post_override=None): message = render_to_string('emails/activation_email.txt', d) # dont send email if we are doing load testing or random user generation for some reason - if not (settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_LOAD_TESTING')): + if not (settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING')): try: if settings.MITX_FEATURES.get('REROUTE_ACTIVATION_EMAIL'): dest_addr = settings.MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] @@ -913,41 +942,46 @@ def auto_auth(request): """ Automatically logs the user in with a generated random credentials This view is only accessible when - settings.MITX_SETTINGS['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] is true. + settings.MITX_SETTINGS['AUTOMATIC_AUTH_FOR_TESTING'] is true. """ - def get_dummy_post_data(username, password): + def get_dummy_post_data(username, password, email, name): """ Return a dictionary suitable for passing to post_vars of _do_create_account or post_override - of create_account, with specified username and password. + of create_account, with specified values. """ - return {'username': username, - 'email': username + "_dummy_test@mitx.mit.edu", + 'email': email, 'password': password, - 'name': username + " " + username, + 'name': name, 'honor_code': u'true', 'terms_of_service': u'true', } - # generate random user ceredentials from a small name space (determined by settings) + # generate random user credentials from a small name space (determined by settings) name_base = 'USER_' pass_base = 'PASS_' max_users = settings.MITX_FEATURES.get('MAX_AUTO_AUTH_USERS', 200) number = random.randint(1, max_users) - username = name_base + str(number) - password = pass_base + str(number) + # Get the params from the request to override default user attributes if specified + qdict = request.GET + + # Use the params from the request, otherwise use these defaults + username = qdict.get('username', name_base + str(number)) + password = qdict.get('password', pass_base + str(number)) + email = qdict.get('email', '%s_dummy_test@mitx.mit.edu' % username) + name = qdict.get('name', '%s Test' % username) # if they already are a user, log in try: user = User.objects.get(username=username) - user = authenticate(username=username, password=password) + user = authenticate(username=username, password=password, request=request) login(request, user) # else create and activate account info except ObjectDoesNotExist: - post_override = get_dummy_post_data(username, password) + post_override = get_dummy_post_data(username, password, email, name) create_account(request, post_override=post_override) request.user.is_active = True request.user.save() diff --git a/common/djangoapps/terrain/course_helpers.py b/common/djangoapps/terrain/course_helpers.py index 081e2a3bc2..afef8bf2e1 100644 --- a/common/djangoapps/terrain/course_helpers.py +++ b/common/djangoapps/terrain/course_helpers.py @@ -34,33 +34,17 @@ def create_user(uname, password): @world.absorb -def log_in(username, password): +def log_in(username='robot', password='test', email='robot@edx.org', name='Robot'): """ - Log the user in programatically. - This will delete any existing cookies to ensure that the user - logs in to the correct session. + Use the auto_auth feature to programmatically log the user in """ + url = '/auto_auth?username=%s&password=%s&name=%s&email=%s' % (username, + password, name, email) + world.visit(url) - # Authenticate the user - world.scenario_dict['USER'] = authenticate(username=username, password=password) - assert(world.scenario_dict['USER'] is not None and world.scenario_dict['USER'].is_active) - - # Send a fake HttpRequest to log the user in - # We need to process the request using - # Session middleware and Authentication middleware - # to ensure that session state can be stored - request = HttpRequest() - SessionMiddleware().process_request(request) - AuthenticationMiddleware().process_request(request) - login(request, world.scenario_dict['USER']) - - # Save the session - request.session.save() - - # Retrieve the sessionid and add it to the browser's cookies - cookie_dict = {settings.SESSION_COOKIE_NAME: request.session.session_key} - world.browser.cookies.delete() - world.browser.cookies.add(cookie_dict) + # Save the user info in the world scenario_dict for use in the tests + user = User.objects.get(username=username) + world.scenario_dict['USER'] = user @world.absorb diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py index 1c2e1e624c..9cf2aeda49 100644 --- a/common/djangoapps/terrain/steps.py +++ b/common/djangoapps/terrain/steps.py @@ -88,13 +88,13 @@ def the_page_title_should_contain(step, title): @step('I log in$') def i_log_in(step): - world.log_in('robot', 'test') + world.log_in(username='robot', password='test') @step('I am a logged in user$') def i_am_logged_in_user(step): world.create_user('robot', 'test') - world.log_in('robot', 'test') + world.log_in(username='robot', password='test') @step('I am not logged in$') @@ -147,7 +147,7 @@ def should_see_in_the_page(step, doesnt_appear, text): @step('I am logged in$') def i_am_logged_in(step): world.create_user('robot', 'test') - world.log_in('robot', 'test') + world.log_in(username='robot', password='test') world.browser.visit(django_url('/')) # You should not see the login link assert_equals(world.browser.find_by_css('a#login'), []) diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py index 2b81e9bd7f..3ab7e11b47 100644 --- a/common/djangoapps/terrain/ui_helpers.py +++ b/common/djangoapps/terrain/ui_helpers.py @@ -44,8 +44,8 @@ def is_css_not_present(css_selector, wait_time=5): @world.absorb -def css_has_text(css_selector, text): - return world.css_text(css_selector) == text +def css_has_text(css_selector, text, index=0, max_attempts=5): + return world.css_text(css_selector, index=index, max_attempts=max_attempts) == text @world.absorb @@ -235,6 +235,13 @@ def click_tools(): def is_mac(): return platform.mac_ver()[0] is not '' +@world.absorb +def is_firefox(): + return world.browser.driver_name is 'Firefox' + +@world.absorb +def trigger_event(css_selector, event='change', index=0): + world.browser.execute_script("$('{}:eq({})').trigger('{}')".format(css_selector, index, event)) @world.absorb def retry_on_exception(func, max_attempts=5): diff --git a/common/djangoapps/track/admin.py b/common/djangoapps/track/admin.py index d75f206846..e0835f5a8a 100644 --- a/common/djangoapps/track/admin.py +++ b/common/djangoapps/track/admin.py @@ -3,6 +3,6 @@ django admin pages for courseware model ''' from track.models import TrackingLog -from django.contrib import admin +from ratelimitbackend import admin admin.site.register(TrackingLog) diff --git a/common/lib/xmodule/test_files/test_tabseditingdescriptor.css b/common/lib/xmodule/test_files/test_tabseditingdescriptor.css new file mode 100644 index 0000000000..eba23dedfd --- /dev/null +++ b/common/lib/xmodule/test_files/test_tabseditingdescriptor.css @@ -0,0 +1,4 @@ +.supertestclass{ + color: red; +} + diff --git a/common/lib/xmodule/test_files/test_tabseditingdescriptor.scss b/common/lib/xmodule/test_files/test_tabseditingdescriptor.scss new file mode 100644 index 0000000000..eba23dedfd --- /dev/null +++ b/common/lib/xmodule/test_files/test_tabseditingdescriptor.scss @@ -0,0 +1,4 @@ +.supertestclass{ + color: red; +} + diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py index 8489b5f986..dbd535a471 100644 --- a/common/lib/xmodule/xmodule/capa_module.py +++ b/common/lib/xmodule/xmodule/capa_module.py @@ -534,8 +534,16 @@ class CapaModule(CapaFields, XModule): id=self.location.html_id(), ajax_url=self.system.ajax_url ) + html + "
      " - # now do the substitutions which are filesystem based, e.g. '/static/' prefixes - return self.system.replace_urls(html) + # now do all the substitutions which the LMS module_render normally does, but + # we need to do here explicitly since we can get called for our HTML via AJAX + html = self.system.replace_urls(html) + if self.system.replace_course_urls: + html = self.system.replace_course_urls(html) + + if self.system.replace_jump_to_id_urls: + html = self.system.replace_jump_to_id_urls(html) + + return html def handle_ajax(self, dispatch, data): """ diff --git a/common/lib/xmodule/xmodule/contentstore/content.py b/common/lib/xmodule/xmodule/contentstore/content.py index 28a78ea8c1..eaf3f48dea 100644 --- a/common/lib/xmodule/xmodule/contentstore/content.py +++ b/common/lib/xmodule/xmodule/contentstore/content.py @@ -58,6 +58,20 @@ class StaticContent(object): else: return None + @staticmethod + def get_static_path_from_location(location): + """ + This utility static method will take a location identifier and create a 'durable' /static/.. URL representation of it. + This link is 'durable' as it can maintain integrity across cloning of courseware across course-ids, e.g. reruns of + courses. + In the LMS/CMS, we have runtime link-rewriting, so at render time, this /static/... format will get translated into + the actual /c4x/... path which the client needs to reference static content + """ + if location is not None: + return "/static/{name}".format(**location.dict()) + else: + return None + @staticmethod def get_base_url_path_for_course_assets(loc): if loc is not None: diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py index 3c9f5c0683..57b13c10b3 100644 --- a/common/lib/xmodule/xmodule/course_module.py +++ b/common/lib/xmodule/xmodule/course_module.py @@ -362,6 +362,11 @@ class CourseFields(object): # Explicit comparison to True because we always want to return a bool. hide_progress_tab = Boolean(help="DO NOT USE THIS", scope=Scope.settings) + display_organization = String(help="An optional display string for the course organization that will get rendered in the LMS", + scope=Scope.settings) + + display_coursenumber = String(help="An optional display string for the course number that will get rendered in the LMS", + scope=Scope.settings) class CourseDescriptor(CourseFields, SequenceDescriptor): module_class = SequenceModule @@ -933,6 +938,26 @@ class CourseDescriptor(CourseFields, SequenceDescriptor): def number(self): return self.location.course + @property + def display_number_with_default(self): + """ + Return a display course number if it has been specified, otherwise return the 'course' that is in the location + """ + if self.display_coursenumber: + return self.display_coursenumber + + return self.number + @property def org(self): return self.location.org + + @property + def display_org_with_default(self): + """ + Return a display organization if it has been specified, otherwise return the 'org' that is in the location + """ + if self.display_organization: + return self.display_organization + + return self.org diff --git a/common/lib/xmodule/xmodule/css/tabs/codemirror.scss b/common/lib/xmodule/xmodule/css/tabs/codemirror.scss new file mode 100644 index 0000000000..0b10a1a09d --- /dev/null +++ b/common/lib/xmodule/xmodule/css/tabs/codemirror.scss @@ -0,0 +1,19 @@ +.editor{ + @include clearfix(); + + .CodeMirror { + @include box-sizing(border-box); + width: 100%; + position: relative; + height: 379px; + border: 1px solid #3c3c3c; + border-top: 1px solid #8891a1; + background: $white; + color: #3c3c3c; + } + + .CodeMirror-scroll { + height: 100%; + } +} + diff --git a/common/lib/xmodule/xmodule/css/tabs/tabs.scss b/common/lib/xmodule/xmodule/css/tabs/tabs.scss new file mode 100644 index 0000000000..3991bbad23 --- /dev/null +++ b/common/lib/xmodule/xmodule/css/tabs/tabs.scss @@ -0,0 +1,137 @@ +// styles duped from _unit.scss - Edit Header (Component Name, Mode-Editor, Mode-Settings) + + +.tabs-wrapper{ + padding-top: 0; + position: relative; + + .wrapper-comp-settings { + // set visibility to metadata editor + display: block; + } +} + +.editor-single-tab-name { + display: none; +} + + +.editor-with-tabs { + @include clearfix(); + position: relative; + + + .edit-header { + @include box-sizing(border-box); + padding: 18px 0 18px $baseline; + top: 0 !important; // ugly override for second level tab override + right: 0; + background-color: $blue; + border-bottom: 1px solid $blue-d2; + color: $white; + + //Component Name + .component-name { + @extend .t-copy-sub1; + position: relative; + top: 0; + left: 0; + width: 50%; + color: $white; + font-weight: 600; + + + + em { + display: inline-block; + margin-right: ($baseline/4); + font-weight: 400; + color: $white; + } + } + + //Nav-Edit Modes + .editor-tabs { + list-style: none; + right: 0; + top: ($baseline/4); + position: absolute; + padding: 12px ($baseline*0.75); + + .inner_tab_wrap { + display: inline-block; + margin-left: 8px; + + a.tab { + @include font-size(14); + @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)); + border: 1px solid $blue-d1; + border-radius: 3px; + padding: ($baseline/4) ($baseline); + background-color: $blue; + font-weight: bold; + color: $white; + + &.current { + @include linear-gradient($blue, $blue); + color: $blue-d1; + box-shadow: inset 0 1px 2px 1px $shadow-l1; + background-color: $blue-d4; + cursor: default; + } + + &:hover { + box-shadow: inset 0 1px 2px 1px $shadow; + background-image: linear-gradient(#009FE6, #009FE6) !important; + } + } + } + } + } + + .is-inactive { + display: none; + } + + .comp-subtitles-entry { + text-align: center; + + .file-upload { + display: none; + } + + .comp-subtitles-import-list { + > li { + display: block; + margin: $baseline/2 0px $baseline/2 0; + } + + .blue-button { + font-size: 1em; + display: block; + width: 70%; + margin: 0 auto; + text-align: center; + } + } + } + + +} + +.component-tab { + background: $white; + position: relative; + border-top: 1px solid #8891a1; + + &#advanced { + padding: 0; + border: none; + } + + .blue-button { + @include blue-button; + } +} + + diff --git a/common/lib/xmodule/xmodule/css/videoalpha/common_tabs_edit.scss b/common/lib/xmodule/xmodule/css/videoalpha/common_tabs_edit.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common/lib/xmodule/xmodule/css/videoalpha/display.scss b/common/lib/xmodule/xmodule/css/videoalpha/display.scss index 3b40809fa3..93c387315a 100644 --- a/common/lib/xmodule/xmodule/css/videoalpha/display.scss +++ b/common/lib/xmodule/xmodule/css/videoalpha/display.scss @@ -133,7 +133,6 @@ div.videoalpha { line-height: 46px; padding: 0 lh(.75); text-indent: -9999px; - @include transition(background-color 0.75s linear 0s, opacity 0.75s linear 0s); width: 14px; background: url('../images/vcr.png') 15px 15px no-repeat; outline: 0; @@ -150,7 +149,7 @@ div.videoalpha { &.play { background-position: 17px -114px; - &:hover { + &:hover, &:focus { background-color: #444; } } @@ -158,7 +157,7 @@ div.videoalpha { &.pause { background-position: 16px -50px; - &:hover { + &:hover, &:focus { background-color: #444; } } @@ -300,12 +299,15 @@ div.videoalpha { &.muted { &>a { - background: url('../images/mute.png') 10px center no-repeat; + background-image: url('../images/mute.png'); } } > a { - background: url('../images/volume.png') 10px center no-repeat; + background-image: url('../images/volume.png'); + background-position: 10px center; + background-repeat: no-repeat; + border-right: 1px solid #000; box-shadow: 1px 0 0 #555, inset 1px 0 0 #555; @include clearfix(); @@ -382,7 +384,7 @@ div.videoalpha { @include transition(none); width: 30px; - &:hover { + &:hover, &:active, &:focus { background-color: #444; color: #fff; text-decoration: none; @@ -403,7 +405,7 @@ div.videoalpha { @include transition(none); width: 30px; - &:hover { + &:hover, &:focus { background-color: #444; color: #fff; text-decoration: none; @@ -419,7 +421,6 @@ div.videoalpha { a.hide-subtitles { background: url('../images/cc.png') center no-repeat; - display: block; float: left; font-weight: 800; line-height: 46px; //height of play pause buttons @@ -432,7 +433,7 @@ div.videoalpha { -webkit-font-smoothing: antialiased; width: 30px; - &:hover { + &:hover, &:focus { background-color: #444; color: #fff; text-decoration: none; @@ -442,9 +443,7 @@ div.videoalpha { opacity: 0.7; } - background-color: #444; - color: #fff; - text-decoration: none; + color: #797979; } } } @@ -513,12 +512,6 @@ div.videoalpha { z-index: 1; } - article.video-wrapper section.video-controls div.secondary-controls a.hide-subtitles { - background-color: inherit; - color: #797979; - text-decoration: inherit; - } - article.video-wrapper div.video-player-pre, article.video-wrapper div.video-player-post { height: 0px; } diff --git a/common/lib/xmodule/xmodule/editing_module.py b/common/lib/xmodule/xmodule/editing_module.py index df4ebc5646..eed8fb310f 100644 --- a/common/lib/xmodule/xmodule/editing_module.py +++ b/common/lib/xmodule/xmodule/editing_module.py @@ -1,3 +1,5 @@ +"""Descriptors for XBlocks/Xmodules, that provide editing of atrributes""" + from pkg_resources import resource_string from xmodule.mako_module import MakoModuleDescriptor from xblock.core import Scope, String @@ -7,6 +9,7 @@ log = logging.getLogger(__name__) class EditingFields(object): + """Contains specific template information (the raw data body)""" data = String(scope=Scope.content, default='') @@ -29,6 +32,46 @@ class EditingDescriptor(EditingFields, MakoModuleDescriptor): return _context +class TabsEditingDescriptor(EditingFields, MakoModuleDescriptor): + """ + Module that provides a raw editing view of its data and children. It does not + perform any validation on its definition---just passes it along to the browser. + + This class is intended to be used as a mixin. + + Engine (module_edit.js) wants for metadata editor + template to be always loaded, so don't forget to include + settings tab in your module descriptor. + """ + mako_template = "widgets/tabs-aggregator.html" + css = {'scss': [resource_string(__name__, 'css/tabs/tabs.scss')]} + js = {'coffee': [resource_string( + __name__, 'js/src/tabs/tabs-aggregator.coffee')]} + js_module_name = "TabsEditingDescriptor" + tabs = [] + + def get_context(self): + _context = super(TabsEditingDescriptor, self).get_context() + _context.update({ + 'tabs': self.tabs, + 'html_id': self.location.html_id(), # element_id + 'data': self.data, + }) + return _context + + @classmethod + def get_css(cls): + # load every tab's css + for tab in cls.tabs: + tab_styles = tab.get('css', {}) + for css_type, css_content in tab_styles.items(): + if css_type in cls.css: + cls.css[css_type].extend(css_content) + else: + cls.css[css_type] = css_content + return cls.css + + class XMLEditingDescriptor(EditingDescriptor): """ Module that provides a raw editing view of its data as XML. It does not perform diff --git a/common/lib/xmodule/xmodule/exceptions.py b/common/lib/xmodule/xmodule/exceptions.py index d0a8e76557..48c083cbf1 100644 --- a/common/lib/xmodule/xmodule/exceptions.py +++ b/common/lib/xmodule/xmodule/exceptions.py @@ -13,6 +13,7 @@ class ProcessingError(Exception): ''' pass + class InvalidVersionError(Exception): """ Tried to save an item with a location that a store cannot support (e.g., draft version @@ -21,3 +22,12 @@ class InvalidVersionError(Exception): def __init__(self, location): super(InvalidVersionError, self).__init__() self.location = location + + +class SerializationError(Exception): + """ + Thrown when a module cannot be exported to XML + """ + def __init__(self, location, msg): + super(SerializationError, self).__init__(msg) + self.location = location diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py index 1cc7bed948..567f5c7eef 100644 --- a/common/lib/xmodule/xmodule/html_module.py +++ b/common/lib/xmodule/xmodule/html_module.py @@ -14,6 +14,7 @@ from xmodule.stringify import stringify_children from xmodule.x_module import XModule from xmodule.xml_module import XmlDescriptor, name_to_pathname import textwrap +from xmodule.contentstore.content import StaticContent log = logging.getLogger("mitx.courseware") @@ -79,6 +80,17 @@ class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor): nc.append(candidate[:-4] + '.html') return candidates + nc + def get_context(self): + """ + an override to add in specific rendering context, in this case we need to + add in a base path to our c4x content addressing scheme + """ + _context = EditingDescriptor.get_context(self) + # Add some specific HTML rendering context when editing HTML modules where we pass + # the root /c4x/ url for assets. This allows client-side substitutions to occur. + _context.update({'base_asset_url': StaticContent.get_base_url_path_for_course_assets(self.location) + '/'}) + return _context + # NOTE: html descriptors are special. We do not want to parse and # export them ourselves, because that can break things (e.g. lxml # adds body tags when it exports, but they should just be html diff --git a/common/lib/xmodule/xmodule/js/fixtures/html-edit-with-links.html b/common/lib/xmodule/xmodule/js/fixtures/html-edit-with-links.html new file mode 100644 index 0000000000..46d6313699 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/fixtures/html-edit-with-links.html @@ -0,0 +1,10 @@ +
      + +
      + + +
      +
      \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/js/fixtures/video.html b/common/lib/xmodule/xmodule/js/fixtures/video.html index 1b27255b1e..3273dd3aa7 100644 --- a/common/lib/xmodule/xmodule/js/fixtures/video.html +++ b/common/lib/xmodule/xmodule/js/fixtures/video.html @@ -2,8 +2,8 @@
      + navigator.userAgent.match /iPhone|iPod|iPad/i + jasmine.stubbedCaption = end: [3120, 6270, 8490, 21620, 24920, 25750, 27900, 34380, 35550, 40250] start: [1180, 3120, 6270, 14910, 21620, 24920, 25750, 27900, 34380, 35550] @@ -36,7 +39,7 @@ jasmine.stubbedCaption = # # We will replace it with a function that does: # -# 1.) Return a hard coded captions object if the file name contains 'test_name_of_the_subtitles'. +# 1.) Return a hard coded captions object if the file name contains 'Z5KLxerq05Y'. # 2.) Behaves the same a as the origianl in all other cases. window.jQuery.ajaxWithPrefix = (url, settings) -> @@ -46,7 +49,7 @@ window.jQuery.ajaxWithPrefix = (url, settings) -> success = settings.success data = settings.data - if url.match(/test_name_of_the_subtitles/g) isnt null or url.match(/slowerSpeedYoutubeId/g) isnt null or url.match(/normalSpeedYoutubeId/g) isnt null + if url.match(/Z5KLxerq05Y/g) isnt null or url.match(/7tqY6eQzVhE/g) isnt null or url.match(/cogebirgzzM/g) isnt null if window.jQuery.isFunction(success) is true success jasmine.stubbedCaption else if window.jQuery.isFunction(data) is true @@ -60,11 +63,11 @@ window.WAIT_TIMEOUT = 1000 jasmine.getFixtures().fixturesPath = 'xmodule/js/fixtures' jasmine.stubbedMetadata = - slowerSpeedYoutubeId: - id: 'slowerSpeedYoutubeId' + '7tqY6eQzVhE': + id: '7tqY6eQzVhE' duration: 300 - normalSpeedYoutubeId: - id: 'normalSpeedYoutubeId' + 'cogebirgzzM': + id: 'cogebirgzzM' duration: 200 bogus: duration: 100 @@ -117,7 +120,7 @@ jasmine.stubVideoPlayer = (context, enableParts, createPlayer=true) -> loadFixtures 'video.html' jasmine.stubRequests() YT.Player = undefined - videosDefinition = '0.75:slowerSpeedYoutubeId,1.0:normalSpeedYoutubeId' + videosDefinition = '0.75:7tqY6eQzVhE,1.0:cogebirgzzM' context.video = new Video '#example', videosDefinition jasmine.stubYoutubePlayer() if createPlayer @@ -135,7 +138,7 @@ jasmine.stubVideoPlayerAlpha = (context, enableParts, html5=false) -> YT.Player = undefined window.OldVideoPlayerAlpha = undefined jasmine.stubYoutubePlayer() - return new VideoAlpha '#example', '.75:slowerSpeedYoutubeId,1.0:normalSpeedYoutubeId' + return new VideoAlpha '#example', '.75:7tqY6eQzVhE,1.0:cogebirgzzM' # Stub jQuery.cookie diff --git a/common/lib/xmodule/xmodule/js/spec/html/edit_spec.coffee b/common/lib/xmodule/xmodule/js/spec/html/edit_spec.coffee index 554235ef9c..11aaf8e526 100644 --- a/common/lib/xmodule/xmodule/js/spec/html/edit_spec.coffee +++ b/common/lib/xmodule/xmodule/js/spec/html/edit_spec.coffee @@ -48,6 +48,16 @@ describe 'HTMLEditingDescriptor', -> expect(@descriptor.showingVisualEditor).toEqual(true) data = @descriptor.save().data expect(data).toEqual('from visual editor') + it 'Performs link rewriting for static assets when saving', -> + visualEditorStub = + isDirty: () -> true + getContent: () -> 'from visual editor with /c4x/foo/bar/asset/image.jpg' + spyOn(@descriptor, 'getVisualEditor').andCallFake () -> + visualEditorStub + expect(@descriptor.showingVisualEditor).toEqual(true) + @descriptor.base_asset_url = '/c4x/foo/bar/asset/' + data = @descriptor.save().data + expect(data).toEqual('from visual editor with /static/image.jpg') describe 'Can switch to Advanced Editor', -> beforeEach -> loadFixtures 'html-edit.html' @@ -88,3 +98,23 @@ describe 'HTMLEditingDescriptor', -> expect(visualEditorStub.isDirty()).toEqual(false) expect(visualEditorStub.getContent()).toEqual('Advanced Editor Text') expect(visualEditorStub.startContent).toEqual('Advanced Editor Text') + it 'When switching to visual editor links are rewritten to c4x format', -> + loadFixtures 'html-edit-with-links.html' + @descriptor = new HTMLEditingDescriptor($('.html-edit')) + @descriptor.base_asset_url = '/c4x/foo/bar/asset/' + @descriptor.showingVisualEditor = false + + visualEditorStub = + isNotDirty: false + content: 'not set' + startContent: 'not set', + focus: () -> true + isDirty: () -> not @isNotDirty + setContent: (x) -> @content = x + getContent: -> @content + + @descriptor.showVisualEditor(visualEditorStub) + expect(@descriptor.showingVisualEditor).toEqual(true) + expect(visualEditorStub.isDirty()).toEqual(false) + expect(visualEditorStub.getContent()).toEqual('Advanced Editor Text with link /c4x/foo/bar/asset/dummy.jpg') + expect(visualEditorStub.startContent).toEqual('Advanced Editor Text with link /c4x/foo/bar/asset/dummy.jpg') \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/js/spec/video/display/video_caption_spec.coffee b/common/lib/xmodule/xmodule/js/spec/video/display/video_caption_spec.coffee index 7f4f6073cb..2c339b3ca2 100644 --- a/common/lib/xmodule/xmodule/js/spec/video/display/video_caption_spec.coffee +++ b/common/lib/xmodule/xmodule/js/spec/video/display/video_caption_spec.coffee @@ -19,7 +19,7 @@ describe 'VideoCaption', -> @caption = @player.caption it 'set the youtube id', -> - expect(@caption.youtubeId).toEqual 'normalSpeedYoutubeId' + expect(@caption.youtubeId).toEqual 'cogebirgzzM' it 'create the caption element', -> expect($('.video')).toContain 'ol.subtitles' diff --git a/common/lib/xmodule/xmodule/js/spec/video/display/video_player_spec.coffee b/common/lib/xmodule/xmodule/js/spec/video/display/video_player_spec.coffee index dab8c0815a..9cec0e6e96 100644 --- a/common/lib/xmodule/xmodule/js/spec/video/display/video_player_spec.coffee +++ b/common/lib/xmodule/xmodule/js/spec/video/display/video_player_spec.coffee @@ -35,7 +35,7 @@ describe 'VideoPlayer', -> expect(window.VideoCaption.prototype.initialize).toHaveBeenCalled() expect(@player.caption).toBeDefined() expect(@player.caption.el).toBe @player.el - expect(@player.caption.youtubeId).toEqual 'normalSpeedYoutubeId' + expect(@player.caption.youtubeId).toEqual 'cogebirgzzM' expect(@player.caption.currentSpeed).toEqual '1.0' expect(@player.caption.captionAssetPath).toEqual '/static/subs/' @@ -60,7 +60,7 @@ describe 'VideoPlayer', -> showinfo: 0 enablejsapi: 1 modestbranding: 1 - videoId: 'normalSpeedYoutubeId' + videoId: 'cogebirgzzM' events: onReady: @player.onReady onStateChange: @player.onStateChange @@ -290,7 +290,7 @@ describe 'VideoPlayer', -> @player.onSpeedChange {}, '0.75' it 'load the video', -> - expect(@player.player.loadVideoById).toHaveBeenCalledWith 'slowerSpeedYoutubeId', '80.000' + expect(@player.player.loadVideoById).toHaveBeenCalledWith '7tqY6eQzVhE', '80.000' it 'trigger updatePlayTime event', -> expect(@player.updatePlayTime).toHaveBeenCalledWith '80.000' @@ -301,7 +301,7 @@ describe 'VideoPlayer', -> @player.onSpeedChange {}, '0.75' it 'cue the video', -> - expect(@player.player.cueVideoById).toHaveBeenCalledWith 'slowerSpeedYoutubeId', '80.000' + expect(@player.player.cueVideoById).toHaveBeenCalledWith '7tqY6eQzVhE', '80.000' it 'trigger updatePlayTime event', -> expect(@player.updatePlayTime).toHaveBeenCalledWith '80.000' diff --git a/common/lib/xmodule/xmodule/js/spec/video/display_spec.coffee b/common/lib/xmodule/xmodule/js/spec/video/display_spec.coffee index 0ba0cc85f8..35a56a83ae 100644 --- a/common/lib/xmodule/xmodule/js/spec/video/display_spec.coffee +++ b/common/lib/xmodule/xmodule/js/spec/video/display_spec.coffee @@ -5,14 +5,14 @@ describe 'Video', -> loadFixtures 'video.html' jasmine.stubRequests() - @slowerSpeedYoutubeId = 'slowerSpeedYoutubeId' - @normalSpeedYoutubeId = 'normalSpeedYoutubeId' + @['7tqY6eQzVhE'] = '7tqY6eQzVhE' + @['cogebirgzzM'] = 'cogebirgzzM' metadata = - slowerSpeedYoutubeId: - id: @slowerSpeedYoutubeId + '7tqY6eQzVhE': + id: @['7tqY6eQzVhE'] duration: 300 - normalSpeedYoutubeId: - id: @normalSpeedYoutubeId + 'cogebirgzzM': + id: @['cogebirgzzM'] duration: 200 afterEach -> @@ -38,8 +38,8 @@ describe 'Video', -> it 'parse the videos', -> expect(@video.videos).toEqual - '0.75': @slowerSpeedYoutubeId - '1.0': @normalSpeedYoutubeId + '0.75': @['7tqY6eQzVhE'] + '1.0': @['cogebirgzzM'] it 'fetch the video metadata', -> expect(@video.fetchMetadata).toHaveBeenCalled @@ -102,12 +102,12 @@ describe 'Video', -> describe 'with speed', -> it 'return the video id for given speed', -> - expect(@video.youtubeId('0.75')).toEqual @slowerSpeedYoutubeId - expect(@video.youtubeId('1.0')).toEqual @normalSpeedYoutubeId + expect(@video.youtubeId('0.75')).toEqual @['7tqY6eQzVhE'] + expect(@video.youtubeId('1.0')).toEqual @['cogebirgzzM'] describe 'without speed', -> it 'return the video id for current speed', -> - expect(@video.youtubeId()).toEqual @normalSpeedYoutubeId + expect(@video.youtubeId()).toEqual @cogebirgzzM describe 'setSpeed', -> beforeEach -> @@ -148,6 +148,6 @@ describe 'Video', -> it 'call the logger with valid parameters', -> expect(Logger.log).toHaveBeenCalledWith 'someEvent', id: 'id' - code: @normalSpeedYoutubeId + code: @cogebirgzzM currentTime: 25 speed: '1.0' diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/general_spec.js b/common/lib/xmodule/xmodule/js/spec/videoalpha/general_spec.js index 415ac440ad..bde4e6b43f 100644 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/general_spec.js +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/general_spec.js @@ -6,9 +6,9 @@ jasmine.stubRequests(); oldOTBD = window.onTouchBasedDevice; window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn(false); - this.videosDefinition = '0.75:slowerSpeedYoutubeId,1.0:normalSpeedYoutubeId'; - this.slowerSpeedYoutubeId = 'slowerSpeedYoutubeId'; - this.normalSpeedYoutubeId = 'normalSpeedYoutubeId'; + this.videosDefinition = '0.75:7tqY6eQzVhE,1.0:cogebirgzzM'; + this['7tqY6eQzVhE'] = '7tqY6eQzVhE'; + this['cogebirgzzM'] = 'cogebirgzzM'; }); afterEach(function () { @@ -45,8 +45,8 @@ it('parse the videos', function () { expect(this.state.videos).toEqual({ - '0.75': this.slowerSpeedYoutubeId, - '1.0': this.normalSpeedYoutubeId + '0.75': this['7tqY6eQzVhE'], + '1.0': this['cogebirgzzM'] }); }); @@ -91,7 +91,7 @@ }); it('parse the videos if subtitles exist', function () { - var sub = 'test_name_of_the_subtitles'; + var sub = 'Z5KLxerq05Y'; expect(state.videos).toEqual({ '0.75': sub, @@ -165,14 +165,14 @@ describe('with speed', function () { it('return the video id for given speed', function () { - expect(state.youtubeId('0.75')).toEqual(this.slowerSpeedYoutubeId); - expect(state.youtubeId('1.0')).toEqual(this.normalSpeedYoutubeId); + expect(state.youtubeId('0.75')).toEqual(this['7tqY6eQzVhE']); + expect(state.youtubeId('1.0')).toEqual(this['cogebirgzzM']); }); }); describe('without speed', function () { it('return the video id for current speed', function () { - expect(state.youtubeId()).toEqual(this.normalSpeedYoutubeId); + expect(state.youtubeId()).toEqual(this.cogebirgzzM); }); }); }); diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/readme.md b/common/lib/xmodule/xmodule/js/spec/videoalpha/readme.md index 570827b910..1462c14acf 100644 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/readme.md +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/readme.md @@ -1,7 +1,8 @@ Jasmine JavaScript tests status ------------------------------- -As of 22.07.2013, all the tests in this directory pass. To disable each of them, change the top level "describe(" to "xdescribe(". +As of 22.07.2013, all the tests in this directory pass. To enable a test file, change +the top level "xdescribe(" to "describe(". PS: When you are running the tests in chrome locally, make sure that chrome is started with the option "--allow-file-access-from-files". diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_caption_spec.js b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_caption_spec.js index 2c138a734c..07c6c196c9 100644 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_caption_spec.js +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_caption_spec.js @@ -130,7 +130,6 @@ describe('mouse movement', function() { beforeEach(function() { - //initialize(); window.setTimeout.andReturn(100); spyOn(window, 'clearTimeout'); }); @@ -221,10 +220,6 @@ }); describe('search', function() { - beforeEach(function() { - //initialize(); - }); - it('return a correct caption index', function() { expect(videoCaption.search(0)).toEqual(0); expect(videoCaption.search(3120)).toEqual(1); @@ -277,7 +272,6 @@ describe('pause', function() { beforeEach(function() { - //initialize(); videoCaption.playing = true; videoCaption.pause(); }); @@ -288,10 +282,6 @@ }); describe('updatePlayTime', function() { - /*beforeEach(function() { - initialize(); - });*/ - describe('when the video speed is 1.0x', function() { beforeEach(function() { videoSpeedControl.currentSpeed = '1.0'; @@ -369,16 +359,21 @@ }); it('when CC button is disabled ', function() { - var realHeight = parseInt($('.subtitles').css('maxHeight'), 10), - videoWrapperHeight = $('.video-wrapper').height(), - controlsHeight = videoControl.el.height(), - progressSliderHeight = videoControl.sliderEl.height(), - shouldBeHeight = videoWrapperHeight - controlsHeight \ - - 0.5 * controlsHeight; + var realHeight, videoWrapperHeight, progressSliderHeight, + controlHeight, shouldBeHeight; state.captionsHidden = true; videoCaption.setSubtitlesHeight(); - expect(realHeight).toBeCloseTo($('.video-wrapper').height(shouldBeHeight, 2)); + + realHeight = parseInt($('.subtitles').css('maxHeight'), 10); + videoWrapperHeight = $('.video-wrapper').height(); + progressSliderHeight = videoControl.sliderEl.height(); + controlHeight = videoControl.el.height(); + shouldBeHeight = videoWrapperHeight - + 0.5 * progressSliderHeight - + controlHeight; + + expect(realHeight).toBe(shouldBeHeight); }); }); @@ -434,17 +429,6 @@ }); it('scroll to current caption', function() { - // Check for calledWith(parameters) for some reason fails... - // - // var offset = -0.5 * ($('.video-wrapper').height() - $('.subtitles .current:first').height()); - // - // expect($.fn.scrollTo).toHaveBeenCalledWith( - // $('.subtitles .current:first', videoCaption.el), - // { - // offset: offset - // } - // ); - expect($.fn.scrollTo).toHaveBeenCalled(); }); }); @@ -454,7 +438,6 @@ describe('seekPlayer', function() { describe('when the video speed is 1.0x', function() { beforeEach(function() { - //initialize(); videoSpeedControl.currentSpeed = '1.0'; $('.subtitles li[data-start="14910"]').trigger('click'); }); diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_player_spec.js b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_player_spec.js index 467ecc75a2..5e4e40cdec 100644 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_player_spec.js +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_player_spec.js @@ -34,12 +34,6 @@ }); describe('constructor', function() { - beforeEach(function() { - $.fn.qtip.andCallFake(function() { - $(this).data('qtip', true); - }); - }); - describe('always', function() { beforeEach(function() { initialize(); @@ -60,7 +54,7 @@ it('create video caption', function() { expect(videoCaption).toBeDefined(); - expect(state.youtubeId()).toEqual('test_name_of_the_subtitles'); + expect(state.youtubeId()).toEqual('Z5KLxerq05Y'); expect(state.speed).toEqual('1.0'); expect(state.config.caption_asset_path).toEqual('/static/subs/'); }); @@ -80,38 +74,6 @@ // All the toHandleWith() expect tests are not necessary for this version of Video Alpha. // jQuery event system is not used to trigger and invoke methods. This is an artifact from // previous version of Video Alpha. - // - // xit('bind to video control play event', function() { - // expect($(videoControl)).toHandleWith('play', player.play); - // }); - // - // xit('bind to video control pause event', function() { - // expect($(videoControl)).toHandleWith('pause', player.pause); - // }); - // - // xit('bind to video caption seek event', function() { - // expect($(videoCaption)).toHandleWith('caption_seek', player.onSeek); - // }); - // - // xit('bind to video speed control speedChange event', function() { - // expect($(videoSpeedControl)).toHandleWith('speedChange', player.onSpeedChange); - // }); - // - // xit('bind to video progress slider seek event', function() { - // expect($(videoProgressSlider)).toHandleWith('slide_seek', player.onSeek); - // }); - // - // xit('bind to video volume control volumeChange event', function() { - // expect($(videoVolumeControl)).toHandleWith('volumeChange', player.onVolumeChange); - // }); - // - // xit('bind to key press', function() { - // expect($(document.documentElement)).toHandleWith('keyup', player.bindExitFullScreen); - // }); - // - // xit('bind to fullscreen switching button', function() { - // expect($('.add-fullscreen')).toHandleWith('click', player.toggleFullScreen); - // }); }); it('create Youtube player', function() { @@ -136,7 +98,7 @@ modestbranding: 1, html5: 1 }, - videoId: 'normalSpeedYoutubeId', + videoId: 'cogebirgzzM', events: { onReady: videoPlayer.onReady, onStateChange: videoPlayer.onStateChange, @@ -149,20 +111,6 @@ // We can't test the invocation of HTML5Video because it is not available // globally. It is defined within the scope of Require JS. - // - // xit('create HTML5 player', function() { - // spyOn(state.HTML5Video, 'Player').andCallThrough(); - // initialize(); - // - // expect(window.HTML5Video.Player).toHaveBeenCalledWith(this.video.el, { - // playerVars: playerVars, - // videoSources: this.video.html5Sources, - // events: { - // onReady: player.onReady, - // onStateChange: player.onStateChange - // } - // }); - // }); describe('when not on a touch based device', function() { beforeEach(function() { @@ -170,10 +118,6 @@ initialize(); }); - it('does not add the tooltip to fullscreen button', function() { - expect($('.add-fullscreen')).not.toHaveData('qtip'); - }); - it('create video volume control', function() { expect(videoVolumeControl).toBeDefined(); expect(videoVolumeControl.el).toHaveClass('volume'); @@ -187,10 +131,6 @@ initialize(); }); - it('add the tooltip to fullscreen button', function() { - expect($('.add-fullscreen')).toHaveData('qtip'); - }); - it('controls are in paused state', function() { expect(videoControl.isPlaying).toBe(false); }); @@ -433,11 +373,9 @@ expect(state.setSpeed).toHaveBeenCalledWith('0.75', false); }); - // Not relevant any more. + // Not relevant any more: // - // it('tell video caption that the speed has changed', function() { - // expect(this.player.caption.currentSpeed).toEqual('0.75'); - // }); + // expect( "tell video caption that the speed has changed" ) ... }); describe('when the video is playing', function() { @@ -548,8 +486,9 @@ expect(true).toBe(false); } - // The below test has been replaced by above trickery. - // expect($('.vidtime')).toHaveHtml('1:00 / 1:01'); + // The below test has been replaced by above trickery: + // + // expect($('.vidtime')).toHaveHtml('1:00 / 1:01'); }); }); diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_progress_slider_spec.js b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_progress_slider_spec.js index 93b839dedf..f0e177d5d7 100644 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_progress_slider_spec.js +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_progress_slider_spec.js @@ -39,21 +39,6 @@ it('build the seek handle', function() { expect(videoProgressSlider.handle).toBe('.slider .ui-slider-handle'); - expect($.fn.qtip).toHaveBeenCalledWith({ - content: "0:00", - position: { - my: 'bottom center', - at: 'top center', - container: videoProgressSlider.handle - }, - hide: { - delay: 700 - }, - style: { - classes: 'ui-tooltip-slider', - widget: true - } - }); }); }); @@ -69,7 +54,6 @@ // We can't expect $.fn.slider not to have been called, // because sliders are used in other parts of VideoAlpha. - // expect($.fn.slider).not.toHaveBeenCalled(); }); }); }); @@ -94,43 +78,6 @@ }); // Currently, the slider is not rebuilt if it does not exist. - // - // describe('when the slider was not already built', function() { - // beforeEach(function() { - // spyOn($.fn, 'slider').andCallThrough(); - // videoProgressSlider.slider = null; - // videoPlayer.play(); - // }); - // - // it('build the slider', function() { - // expect(videoProgressSlider.slider).toBe('.slider'); - // expect($.fn.slider).toHaveBeenCalledWith({ - // range: 'min', - // change: videoProgressSlider.onChange, - // slide: videoProgressSlider.onSlide, - // stop: videoProgressSlider.onStop - // }); - // }); - // - // it('build the seek handle', function() { - // expect(videoProgressSlider.handle).toBe('.ui-slider-handle'); - // expect($.fn.qtip).toHaveBeenCalledWith({ - // content: "0:00", - // position: { - // my: 'bottom center', - // at: 'top center', - // container: videoProgressSlider.handle - // }, - // hide: { - // delay: 700 - // }, - // style: { - // classes: 'ui-tooltip-slider', - // widget: true - // } - // }); - // }); - // }); }); describe('updatePlayTime', function() { @@ -181,10 +128,6 @@ expect(videoProgressSlider.frozen).toBeTruthy(); }); - it('update the tooltip', function() { - expect($.fn.qtip).toHaveBeenCalled(); - }); - it('trigger seek event', function() { expect(videoPlayer.onSlideSeek).toHaveBeenCalled(); expect(videoPlayer.currentTime).toEqual(20); @@ -199,9 +142,6 @@ value: 20 }); }); - it('update the tooltip', function() { - expect($.fn.qtip).toHaveBeenCalled(); - }); }); describe('onStop', function() { @@ -228,18 +168,6 @@ expect(videoProgressSlider.frozen).toBeFalsy(); }); }); - - describe('updateTooltip', function() { - beforeEach(function() { - initialize(); - spyOn($.fn, 'slider').andCallThrough(); - videoProgressSlider.updateTooltip(90); - }); - - it('set the tooltip value', function() { - expect($.fn.qtip).toHaveBeenCalledWith('option', 'content.text', '1:30'); - }); - }); }); }).call(this); diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_speed_control_spec.js b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_speed_control_spec.js index c56375f6f7..c40a9c7295 100644 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_speed_control_spec.js +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_speed_control_spec.js @@ -90,19 +90,7 @@ // detect (and do not do anything) if there is a request for a speed that // is already set. // - // describe('when new speed is the same', function() { - // beforeEach(function() { - // initialize(); - // videoSpeedControl.setSpeed(1.0); - // spyOn(videoPlayer, 'onSpeedChange').andCallThrough(); - // - // $('li[data-speed="1.0"] a').click(); - // }); - // - // it('does not trigger speedChange event', function() { - // expect(videoPlayer.onSpeedChange).not.toHaveBeenCalled(); - // }); - // }); + // describe("when new speed is the same") ... describe('when new speed is not the same', function() { beforeEach(function() { diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_volume_control_spec.js b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_volume_control_spec.js index f7f6c6c583..872b1fe18e 100644 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_volume_control_spec.js +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_volume_control_spec.js @@ -39,7 +39,6 @@ range: "min", min: 0, max: 100, - /* value: 100, */ value: videoVolumeControl.currentVolume, change: videoVolumeControl.onChange, slide: videoVolumeControl.onChange diff --git a/common/lib/xmodule/xmodule/js/src/html/edit.coffee b/common/lib/xmodule/xmodule/js/src/html/edit.coffee index eae9df0f20..4f29ffa0f2 100644 --- a/common/lib/xmodule/xmodule/js/src/html/edit.coffee +++ b/common/lib/xmodule/xmodule/js/src/html/edit.coffee @@ -3,6 +3,9 @@ class @HTMLEditingDescriptor constructor: (element) -> @element = element; + @base_asset_url = @element.find("#editor-tab").data('base-asset-url') + if @base_asset_url == undefined + @base_asset_url = null @advanced_editor = CodeMirror.fromTextArea($(".edit-box", @element)[0], { mode: "text/html" @@ -25,6 +28,9 @@ class @HTMLEditingDescriptor convert_urls : false, # TODO: we should share this CSS with studio (and LMS) content_css : "/static/css/tiny-mce.css", + # The default popup_css path uses an absolute path referencing page in which tinyMCE is being hosted. + # Supply the correct relative path instead. + popup_css: '/static/js/vendor/tiny_mce/themes/advanced/skins/default/dialog.css', formats : { # Disable h4, h5, and h6 styles as we don't have CSS for them. h4: {}, @@ -47,7 +53,7 @@ class @HTMLEditingDescriptor setup : @setupTinyMCE, # Cannot get access to tinyMCE Editor instance (for focusing) until after it is rendered. # The tinyMCE callback passes in the editor as a paramter. - init_instance_callback: @focusVisualEditor + init_instance_callback: @initInstanceCallback }) @showingVisualEditor = true @@ -95,21 +101,34 @@ class @HTMLEditingDescriptor # Show the Advanced (codemirror) Editor. Pulled out as a helper method for unit testing. showAdvancedEditor: (visualEditor) -> if visualEditor.isDirty() - @advanced_editor.setValue(visualEditor.getContent({no_events: 1})) + content = @rewriteStaticLinks(visualEditor.getContent({no_events: 1}), @base_asset_url, '/static/') + @advanced_editor.setValue(content) @advanced_editor.setCursor(0) @advanced_editor.refresh() @advanced_editor.focus() @showingVisualEditor = false + rewriteStaticLinks: (content, from, to) -> + if from == null || to == null + return content + + regex = new RegExp(from, 'g') + return content.replace(regex, to) + # Show the Visual (tinyMCE) Editor. Pulled out as a helper method for unit testing. showVisualEditor: (visualEditor) -> - visualEditor.setContent(@advanced_editor.getValue()) # In order for isDirty() to return true ONLY if edits have been made after setting the text, # both the startContent must be sync'ed up and the dirty flag set to false. - visualEditor.startContent = visualEditor.getContent({format: "raw", no_events: 1}); + content = @rewriteStaticLinks(@advanced_editor.getValue(), '/static/', @base_asset_url) + visualEditor.setContent(content) + visualEditor.startContent = content @focusVisualEditor(visualEditor) @showingVisualEditor = true + initInstanceCallback: (visualEditor) => + visualEditor.setContent(@rewriteStaticLinks(@advanced_editor.getValue(), '/static/', @base_asset_url)) + @focusVisualEditor(visualEditor) + focusVisualEditor: (visualEditor) => visualEditor.focus() # Need to mark editor as not dirty both when it is initially created and when we switch back to it. @@ -131,5 +150,5 @@ class @HTMLEditingDescriptor text = @advanced_editor.getValue() visualEditor = @getVisualEditor() if @showingVisualEditor and visualEditor.isDirty() - text = visualEditor.getContent({no_events: 1}) + text = @rewriteStaticLinks(visualEditor.getContent({no_events: 1}), @base_asset_url, '/static/') data: text diff --git a/common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.coffee b/common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.coffee new file mode 100644 index 0000000000..7c6e85e34b --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.coffee @@ -0,0 +1,125 @@ +class @TabsEditingDescriptor + @isInactiveClass : "is-inactive" + + constructor: (element) -> + @element = element; + ### + Not tested on syncing of multiple editors of same type in tabs + (Like many CodeMirrors). + ### + + # hide editor/settings bar + $('.component-edit-header').hide() + + @$tabs = $(".tab", @element) + @$content = $(".component-tab", @element) + + @element.find('.editor-tabs .tab').each (index, value) => + $(value).on('click', @onSwitchEditor) + + # If default visible tab is not setted or if were marked as current + # more than 1 tab just first tab will be shown + currentTab = @$tabs.filter('.current') + currentTab = @$tabs.first() if currentTab.length isnt 1 + @html_id = @$tabs.closest('.wrapper-comp-editor').data('html_id') + currentTab.trigger("click", [true, @html_id]) + + onSwitchEditor: (e, firstTime, html_id) => + e.preventDefault(); + + isInactiveClass = TabsEditingDescriptor.isInactiveClass + $currentTarget = $(e.currentTarget) + + if not $currentTarget.hasClass('current') or firstTime is true + previousTab = null + + @$tabs.each( (index, value) -> + if $(value).hasClass('current') + previousTab = $(value).html() + ) + + # init and save data from previous tab + TabsEditingDescriptor.Model.updateValue(@html_id, previousTab) + + # Save data from editor in previous tab to editor in current tab here. + # (to be implemented when there is a use case for this functionality) + + # call onswitch + onSwitchFunction = TabsEditingDescriptor.Model.modules[@html_id].tabSwitch[$currentTarget.text()] + onSwitchFunction() if $.isFunction(onSwitchFunction) + + @$tabs.removeClass('current') + $currentTarget.addClass('current') + + # Tabs are implemeted like anchors. Therefore we can use hash to find + # corresponding content + content_id = $currentTarget.attr('href') + + @$content + .addClass(isInactiveClass) + .filter(content_id) + .removeClass(isInactiveClass) + + save: -> + @element.off('click', '.editor-tabs .tab', @onSwitchEditor) + current_tab = @$tabs.filter('.current').html() + data: TabsEditingDescriptor.Model.getValue(@html_id, current_tab) + + @Model : + addModelUpdate : (id, tabName, modelUpdateFunction) -> + ### + Function that registers 'modelUpdate' functions of every tab. + These functions are used to update value, which will be returned + by calling save on component. + ### + @initialize(id) + @modules[id].modelUpdate[tabName] = modelUpdateFunction + + addOnSwitch : (id, tabName, onSwitchFunction) -> + ### + Function that registers functions invoked when switching + to particular tab. + ### + @initialize(id) + @modules[id].tabSwitch[tabName] = onSwitchFunction + + updateValue : (id, tabName) -> + ### + Function that invokes when switching tabs. + It ensures that data from previous tab is stored. + If new tab need this data, it should retrieve it from + stored value. + ### + @initialize(id) + modelUpdateFunction = @modules[id]['modelUpdate'][tabName] + @modules[id]['value'] = modelUpdateFunction() if $.isFunction(modelUpdateFunction) + + getValue : (id, tabName) -> + ### + Retrieves stored data on component save. + 1. When we switching tabs - previous tab data is always saved to @[id].value + 2. If current tab have registered 'modelUpdate' method, it should be invoked 1st. + (If we have edited in 1st tab, then switched to 2nd, 2nd tab should + care about getting data from @[id].value in onSwitch.) + ### + if not @modules[id] + return null + if $.isFunction(@modules[id]['modelUpdate'][tabName]) + return @modules[id]['modelUpdate'][tabName]() + else + if typeof @modules[id]['value'] is 'undefined' + return null + else + return @modules[id]['value'] + + # html_id's of descriptors will be stored in modules variable as + # containers for callbacks. + modules: {} + + initialize : (id) -> + ### + Initialize objects per id. Id is html_id of descriptor. + ### + @modules[id] = @modules[id] or {} + @modules[id].tabSwitch = @modules[id]['tabSwitch'] or {} + @modules[id].modelUpdate = @modules[id]['modelUpdate'] or {} diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/01_initialize.js b/common/lib/xmodule/xmodule/js/src/videoalpha/01_initialize.js index 800cb62f98..88d866cd32 100644 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/01_initialize.js +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/01_initialize.js @@ -93,14 +93,7 @@ function (VideoPlayer) { fadeOutTimeout: 1400, - availableQualities: ['hd720', 'hd1080', 'highres'], - - qTipConfig: { - position: { - my: 'top right', - at: 'top center' - } - } + availableQualities: ['hd720', 'hd1080', 'highres'] }; if (!(_parseYouTubeIDs(state))) { @@ -148,7 +141,7 @@ function (VideoPlayer) { // Option // this.config.show_captions = true | false // - // defines whether to turn off/on the captions altogether. User will not have the ability to turn them on/off. + // Defines whether or not captions are shown on first viewing. // // Option // this.hide_captions = true | false diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/03_video_player.js b/common/lib/xmodule/xmodule/js/src/videoalpha/03_video_player.js index 6f2e232844..be2287be6e 100644 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/03_video_player.js +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/03_video_player.js @@ -318,7 +318,14 @@ function (HTML5Video) { availablePlaybackRates = this.videoPlayer.player.getAvailablePlaybackRates(); if ((this.currentPlayerMode === 'html5') && (this.videoType === 'youtube')) { if (availablePlaybackRates.length === 1) { - restartUsingFlash(this); + // This condition is needed in cases when Firefox version is less than 20. In those versions + // HTML5 playback could only happen at 1 speed (no speed changing). Therefore, in this case, + // we need to switch back to Flash. + // + // This might also happen in other browsers, therefore when we have 1 speed available, we fall + // back to Flash. + + _restartUsingFlash(this); return; } else if (availablePlaybackRates.length > 1) { diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/04_video_control.js b/common/lib/xmodule/xmodule/js/src/videoalpha/04_video_control.js index c7a575046f..d1a662712f 100644 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/04_video_control.js +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/04_video_control.js @@ -53,9 +53,6 @@ function () { if (!onTouchBasedDevice()) { state.videoControl.pause(); - - state.videoControl.playPauseEl.qtip(state.config.qTipConfig); - state.videoControl.fullScreenEl.qtip(state.config.qTipConfig); } else { state.videoControl.play(); } @@ -77,7 +74,8 @@ function () { $(document).on('keyup', state.videoControl.exitFullScreen); if (state.videoType === 'html5') { - state.el.on('mousemove', state.videoControl.showControls) + state.el.on('mousemove', state.videoControl.showControls); + state.el.on('keydown', state.videoControl.showControls); } } diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/05_video_quality_control.js b/common/lib/xmodule/xmodule/js/src/videoalpha/05_video_quality_control.js index 952d760610..24363cafed 100644 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/05_video_quality_control.js +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/05_video_quality_control.js @@ -43,10 +43,6 @@ function () { state.videoQualityControl.el.show(); state.videoQualityControl.quality = null; - - if (!onTouchBasedDevice()) { - state.videoQualityControl.el.qtip(state.config.qTipConfig); - } } // function _bindHandlers(state) diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/06_video_progress_slider.js b/common/lib/xmodule/xmodule/js/src/videoalpha/06_video_progress_slider.js index 4409446c2a..b36fac6cd0 100644 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/06_video_progress_slider.js +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/06_video_progress_slider.js @@ -32,9 +32,7 @@ function () { // get the 'state' object as a context. function _makeFunctionsPublic(state) { state.videoProgressSlider.onSlide = _.bind(onSlide, state); - state.videoProgressSlider.onChange = _.bind(onChange, state); state.videoProgressSlider.onStop = _.bind(onStop, state); - state.videoProgressSlider.updateTooltip = _.bind(updateTooltip, state); state.videoProgressSlider.updatePlayTime = _.bind(updatePlayTime, state); //Added for tests -- JM state.videoProgressSlider.buildSlider = _.bind(buildSlider, state); @@ -56,22 +54,6 @@ function () { function _buildHandle(state) { state.videoProgressSlider.handle = state.videoProgressSlider.el.find('.ui-slider-handle'); - - state.videoProgressSlider.handle.qtip({ - content: '' + Time.format(state.videoProgressSlider.slider.slider('value')), - position: { - my: 'bottom center', - at: 'top center', - container: state.videoProgressSlider.handle - }, - hide: { - delay: 700 - }, - style: { - classes: 'ui-tooltip-slider', - widget: true - } - }); } // *************************************************************** @@ -83,7 +65,6 @@ function () { function buildSlider(state) { state.videoProgressSlider.slider = state.videoProgressSlider.el.slider({ range: 'min', - change: state.videoProgressSlider.onChange, slide: state.videoProgressSlider.onSlide, stop: state.videoProgressSlider.onStop }); @@ -91,15 +72,10 @@ function () { function onSlide(event, ui) { this.videoProgressSlider.frozen = true; - this.videoProgressSlider.updateTooltip(ui.value); this.trigger('videoPlayer.onSlideSeek', {'type': 'onSlideSeek', 'time': ui.value}); } - function onChange(event, ui) { - this.videoProgressSlider.updateTooltip(ui.value); - } - function onStop(event, ui) { var _this = this; @@ -112,10 +88,6 @@ function () { }, 200); } - function updateTooltip(value) { - this.videoProgressSlider.handle.qtip('option', 'content.text', '' + Time.format(value)); - } - //Changed for tests -- JM: Check if it is the cause of Chrome Bug Valera noticed function updatePlayTime(params) { if ((this.videoProgressSlider.slider) && (!this.videoProgressSlider.frozen)) { diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/07_video_volume_control.js b/common/lib/xmodule/xmodule/js/src/videoalpha/07_video_volume_control.js index b778a2cbd0..0f1cd1182d 100644 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/07_video_volume_control.js +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/07_video_volume_control.js @@ -61,6 +61,9 @@ function () { slide: state.videoVolumeControl.onChange }); + // Make sure that we can focus the actual volume slider while Tabing. + state.videoVolumeControl.volumeSliderEl.find('a').attr('tabindex', '0'); + state.videoVolumeControl.el.toggleClass('muted', state.videoVolumeControl.currentVolume === 0); } @@ -74,9 +77,21 @@ function () { $(this).addClass('open'); }); + state.videoVolumeControl.buttonEl.on('focus', function() { + $(this).parent().addClass('open'); + }); + state.videoVolumeControl.el.on('mouseleave', function() { $(this).removeClass('open'); }); + + state.videoVolumeControl.buttonEl.on('blur', function() { + state.videoVolumeControl.volumeSliderEl.find('a').focus(); + }); + + state.videoVolumeControl.volumeSliderEl.find('a').on('blur', function () { + state.videoVolumeControl.el.removeClass('open'); + }); } // *************************************************************** diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/08_video_speed_control.js b/common/lib/xmodule/xmodule/js/src/videoalpha/08_video_speed_control.js index a13aa03f4f..b0f55d49a1 100644 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/08_video_speed_control.js +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/08_video_speed_control.js @@ -21,34 +21,41 @@ function () { // function _makeFunctionsPublic(state) // - // Functions which will be accessible via 'state' object. When called, these functions will - // get the 'state' object as a context. + // Functions which will be accessible via 'state' object. When called, + // these functions will get the 'state' object as a context. function _makeFunctionsPublic(state) { - state.videoSpeedControl.changeVideoSpeed = _.bind(changeVideoSpeed, state); + state.videoSpeedControl.changeVideoSpeed = _.bind( + changeVideoSpeed, state + ); state.videoSpeedControl.setSpeed = _.bind(setSpeed, state); state.videoSpeedControl.reRender = _.bind(reRender, state); } // function _renderElements(state) // - // Create any necessary DOM elements, attach them, and set their initial configuration. Also - // make the created DOM elements available via the 'state' object. Much easier to work this - // way - you don't have to do repeated jQuery element selects. + // Create any necessary DOM elements, attach them, and set their + // initial configuration. Also make the created DOM elements available + // via the 'state' object. Much easier to work this way - you don't + // have to do repeated jQuery element selects. function _renderElements(state) { state.videoSpeedControl.speeds = state.speeds; state.videoSpeedControl.el = state.el.find('div.speeds'); - state.videoSpeedControl.videoSpeedsEl = state.videoSpeedControl.el.find('.video_speeds'); + state.videoSpeedControl.videoSpeedsEl = state.videoSpeedControl.el + .find('.video_speeds'); - state.videoControl.secondaryControlsEl.prepend(state.videoSpeedControl.el); + state.videoControl.secondaryControlsEl.prepend( + state.videoSpeedControl.el + ); $.each(state.videoSpeedControl.speeds, function(index, speed) { + var link = '' + speed + 'x'; - //var link = $('' + speed + 'x'); - var link = '' + speed + 'x'; - - state.videoSpeedControl.videoSpeedsEl.prepend($('
    • ' + link + '
      • ')); + state.videoSpeedControl.videoSpeedsEl + .prepend( + $('
    • ' + link + '
      • ') + ); }); state.videoSpeedControl.setSpeed(state.speed); @@ -56,9 +63,11 @@ function () { // function _bindHandlers(state) // - // Bind any necessary function callbacks to DOM events (click, mousemove, etc.). + // Bind any necessary function callbacks to DOM events (click, + // mousemove, etc.). function _bindHandlers(state) { - state.videoSpeedControl.videoSpeedsEl.find('a').on('click', state.videoSpeedControl.changeVideoSpeed); + state.videoSpeedControl.videoSpeedsEl.find('a') + .on('click', state.videoSpeedControl.changeVideoSpeed); if (onTouchBasedDevice()) { state.videoSpeedControl.el.on('click', function(event) { @@ -77,18 +86,36 @@ function () { event.preventDefault(); $(this).removeClass('open'); }); + + state.videoSpeedControl.el.children('a') + .on('focus', function () { + $(this).parent().addClass('open'); + }) + .on('blur', function () { + state.videoSpeedControl.videoSpeedsEl + .find('a.speed_link:first') + .focus(); + }); + + state.videoSpeedControl.videoSpeedsEl.find('a.speed_link:last') + .on('blur', function () { + state.videoSpeedControl.el.removeClass('open'); + }); } } // *************************************************************** // Public functions start here. - // These are available via the 'state' object. Their context ('this' keyword) is the 'state' object. - // The magic private function that makes them available and sets up their context is makeFunctionsPublic(). + // These are available via the 'state' object. Their context ('this' + // keyword) is the 'state' object. The magic private function that makes + // them available and sets up their context is makeFunctionsPublic(). // *************************************************************** function setSpeed(speed) { this.videoSpeedControl.videoSpeedsEl.find('li').removeClass('active'); - this.videoSpeedControl.videoSpeedsEl.find("li[data-speed='" + speed + "']").addClass('active'); + this.videoSpeedControl.videoSpeedsEl + .find("li[data-speed='" + speed + "']") + .addClass('active'); this.videoSpeedControl.el.find('p.active').html('' + speed + 'x'); } @@ -102,10 +129,15 @@ function () { this.videoSpeedControl.setSpeed( // To meet the API expected format. - parseFloat(this.videoSpeedControl.currentSpeed).toFixed(2).replace(/\.00$/, '.0') + parseFloat(this.videoSpeedControl.currentSpeed) + .toFixed(2) + .replace(/\.00$/, '.0') ); - this.trigger('videoPlayer.onSpeedChange', this.videoSpeedControl.currentSpeed); + this.trigger( + 'videoPlayer.onSpeedChange', + this.videoSpeedControl.currentSpeed + ); } } @@ -119,7 +151,6 @@ function () { $.each(this.videoSpeedControl.speeds, function(index, speed) { var link, listItem; - //link = $('' + speed + 'x'); link = '' + speed + 'x'; listItem = $('
    • ' + link + '
      • '); @@ -131,7 +162,11 @@ function () { _this.videoSpeedControl.videoSpeedsEl.prepend(listItem); }); - this.videoSpeedControl.videoSpeedsEl.find('a').on('click', this.videoSpeedControl.changeVideoSpeed); + this.videoSpeedControl.videoSpeedsEl.find('a') + .on('click', this.videoSpeedControl.changeVideoSpeed); + + // TODO: After the control was re-rendered, we should attach 'focus' + // and 'blur' events once more. } }); diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/09_video_caption.js b/common/lib/xmodule/xmodule/js/src/videoalpha/09_video_caption.js index e95f99109e..b8bc432a1b 100644 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/09_video_caption.js +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/09_video_caption.js @@ -109,6 +109,7 @@ function () { if (this.videoType === 'html5') { this.el.on('mousemove', this.videoCaption.autoShowCaptions); + this.el.on('keydown', this.videoCaption.autoShowCaptions); // Moving slider on subtitles is not a mouse move, // but captions and controls should be showed. @@ -122,6 +123,10 @@ function () { this.videoCaption.hideCaptions(this.hide_captions); + if (!this.youtubeId('1.0')) { + return; + } + $.ajaxWithPrefix({ url: _this.videoCaption.captionURL(), notifyOnError: false, diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/10_main.js b/common/lib/xmodule/xmodule/js/src/videoalpha/10_main.js index b586687697..b5f647f563 100644 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/10_main.js +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/10_main.js @@ -60,10 +60,7 @@ function ( VideoProgressSlider(state); VideoVolumeControl(state); VideoSpeedControl(state); - - if (state.config.show_captions) { - VideoCaption(state); - } + VideoCaption(state); // Because the 'state' object is only available inside this closure, we will also make // it available to the caller by returning it. This is necessary so that we can test diff --git a/common/lib/xmodule/xmodule/modulestore/store_utilities.py b/common/lib/xmodule/xmodule/modulestore/store_utilities.py index 3c29627d84..e0f3db6810 100644 --- a/common/lib/xmodule/xmodule/modulestore/store_utilities.py +++ b/common/lib/xmodule/xmodule/modulestore/store_utilities.py @@ -1,10 +1,150 @@ +import re from xmodule.contentstore.content import StaticContent from xmodule.modulestore import Location from xmodule.modulestore.mongo import MongoModuleStore +from xmodule.modulestore.inheritance import own_metadata import logging +def _prefix_only_url_replace_regex(prefix): + """ + Match static urls in quotes that don't end in '?raw'. + + To anyone contemplating making this more complicated: + http://xkcd.com/1171/ + """ + return r""" + (?x) # flags=re.VERBOSE + (?P\\?['"]) # the opening quotes + (?P{prefix}) # the prefix + (?P.*?) # everything else in the url + (?P=quote) # the first matching closing quote + """.format(prefix=re.escape(prefix)) + + +def _prefix_and_category_url_replace_regex(prefix): + """ + Match static urls in quotes that don't end in '?raw'. + + To anyone contemplating making this more complicated: + http://xkcd.com/1171/ + """ + return r""" + (?x) # flags=re.VERBOSE + (?P\\?['"]) # the opening quotes + (?P{prefix}) # the prefix + (?P[^/]+)/ + (?P.*?) # everything else in the url + (?P=quote) # the first matching closing quote + """.format(prefix=re.escape(prefix)) + + +def rewrite_nonportable_content_links(source_course_id, dest_course_id, text): + """ + Does a regex replace on non-portable links: + /c4x///asset/ -> /static/ + /jump_to/i4x:///// -> /jump_to_id/ + + """ + + org, course, run = source_course_id.split("/") + dest_org, dest_course, dest_run = dest_course_id.split("/") + + def portable_asset_link_subtitution(match): + quote = match.group('quote') + rest = match.group('rest') + return quote + '/static/' + rest + quote + + def portable_jump_to_link_substitution(match): + quote = match.group('quote') + rest = match.group('rest') + return quote + '/jump_to_id/' + rest + quote + + def generic_courseware_link_substitution(match): + quote = match.group('quote') + rest = match.group('rest') + dest_generic_courseware_lik_base = '/courses/{org}/{course}/{run}/'.format( + org=dest_org, course=dest_course, run=dest_run + ) + return quote + dest_generic_courseware_lik_base + rest + quote + + course_location = Location(['i4x', org, course, 'course', run]) + + # NOTE: ultimately link updating is not a hard requirement, so if something blows up with + # the regex subsitution, log the error and continue + try: + c4x_link_base = '{0}/'.format(StaticContent.get_base_url_path_for_course_assets(course_location)) + text = re.sub(_prefix_only_url_replace_regex(c4x_link_base), portable_asset_link_subtitution, text) + except Exception, e: + logging.warning("Error going regex subtituion %r on text = %r.\n\nError msg = %s", c4x_link_base, text, str(e)) + + try: + jump_to_link_base = '/courses/{org}/{course}/{run}/jump_to/i4x://{org}/{course}/'.format( + org=org, course=course, run=run + ) + text = re.sub(_prefix_and_category_url_replace_regex(jump_to_link_base), portable_jump_to_link_substitution, text) + except Exception, e: + logging.warning("Error going regex subtituion %r on text = %r.\n\nError msg = %s", jump_to_link_base, text, str(e)) + + # Also, there commonly is a set of link URL's used in the format: + # /courses/// which will be broken if migrated to a different course_id + # so let's rewrite those, but the target will also be non-portable, + # + # Note: we only need to do this if we are changing course-id's + # + if source_course_id != dest_course_id: + try: + generic_courseware_link_base = '/courses/{org}/{course}/{run}/'.format( + org=org, course=course, run=run + ) + text = re.sub(_prefix_only_url_replace_regex(generic_courseware_link_base), portable_asset_link_subtitution, text) + except Exception, e: + logging.warning("Error going regex subtituion %r on text = %r.\n\nError msg = %s", generic_courseware_link_base, text, str(e)) + + return text + + +def _clone_modules(modulestore, modules, source_location, dest_location): + for module in modules: + original_loc = Location(module.location) + + if original_loc.category != 'course': + module.location = module.location._replace( + tag=dest_location.tag, org=dest_location.org, course=dest_location.course) + else: + # on the course module we also have to update the module name + module.location = module.location._replace( + tag=dest_location.tag, org=dest_location.org, course=dest_location.course, name=dest_location.name) + + print "Cloning module {0} to {1}....".format(original_loc, module.location) + + # NOTE: usage of the the internal module.xblock_kvs._data does not include any 'default' values for the fields + data = module.xblock_kvs._data + if isinstance(data, basestring): + data = rewrite_nonportable_content_links( + source_location.course_id, dest_location.course_id, data) + + modulestore.update_item(module.location, data) + + # repoint children + if module.has_children: + new_children = [] + for child_loc_url in module.children: + child_loc = Location(child_loc_url) + child_loc = child_loc._replace( + tag=dest_location.tag, + org=dest_location.org, + course=dest_location.course + ) + new_children.append(child_loc.url()) + + modulestore.update_children(module.location, new_children) + + # save metadata + modulestore.update_metadata(module.location, own_metadata(module)) + + def clone_course(modulestore, contentstore, source_location, dest_location, delete_original=False): # first check to see if the modulestore is Mongo backed if not isinstance(modulestore, MongoModuleStore): @@ -37,38 +177,10 @@ def clone_course(modulestore, contentstore, source_location, dest_location, dele # Get all modules under this namespace which is (tag, org, course) tuple modules = modulestore.get_items([source_location.tag, source_location.org, source_location.course, None, None, None]) + _clone_modules(modulestore, modules, source_location, dest_location) - for module in modules: - original_loc = Location(module.location) - - if original_loc.category != 'course': - module.location = module.location._replace(tag=dest_location.tag, org=dest_location.org, - course=dest_location.course) - else: - # on the course module we also have to update the module name - module.location = module.location._replace(tag=dest_location.tag, org=dest_location.org, - course=dest_location.course, name=dest_location.name) - - print "Cloning module {0} to {1}....".format(original_loc, module.location) - - modulestore.update_item(module.location, module._model_data._kvs._data) - - # repoint children - if module.has_children: - new_children = [] - for child_loc_url in module.children: - child_loc = Location(child_loc_url) - child_loc = child_loc._replace( - tag=dest_location.tag, - org=dest_location.org, - course=dest_location.course - ) - new_children.append(child_loc.url()) - - modulestore.update_children(module.location, new_children) - - # save metadata - modulestore.update_metadata(module.location, module._model_data._kvs._metadata) + modules = modulestore.get_items([source_location.tag, source_location.org, source_location.course, None, None, 'draft']) + _clone_modules(modulestore, modules, source_location, dest_location) # now iterate through all of the assets and clone them # first the thumbnails diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py index 8df768f442..0b30a884be 100644 --- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py +++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py @@ -1,7 +1,6 @@ import logging import os import mimetypes -from lxml.html import rewrite_links as lxml_rewrite_links from path import path from xblock.core import Scope @@ -11,6 +10,7 @@ from xmodule.modulestore import Location from xmodule.contentstore.content import StaticContent from .inheritance import own_metadata from xmodule.errortracker import make_error_tracker +from .store_utilities import rewrite_nonportable_content_links log = logging.getLogger(__name__) @@ -61,117 +61,6 @@ def import_static_content(modules, course_loc, course_data_path, static_content_ return remap_dict -def verify_content_links(module, base_dir, static_content_store, link, remap_dict=None): - if link.startswith('/static/'): - # yes, then parse out the name - path = link[len('/static/'):] - - static_pathname = base_dir / path - - if os.path.exists(static_pathname): - try: - content_loc = StaticContent.compute_location(module.location.org, module.location.course, path) - filename = os.path.basename(path) - mime_type = mimetypes.guess_type(filename)[0] - - with open(static_pathname, 'rb') as f: - data = f.read() - - content = StaticContent(content_loc, filename, mime_type, data, import_path=path) - - # first let's save a thumbnail so we can get back a thumbnail location - (thumbnail_content, thumbnail_location) = static_content_store.generate_thumbnail(content) - - if thumbnail_content is not None: - content.thumbnail_location = thumbnail_location - - #then commit the content - static_content_store.save(content) - - new_link = StaticContent.get_url_path_from_location(content_loc) - - if remap_dict is not None: - remap_dict[link] = new_link - - return new_link - except Exception, e: - logging.exception('Skipping failed content load from {0}. Exception: {1}'.format(path, e)) - - return link - - -def import_module_from_xml(modulestore, static_content_store, course_data_path, module, target_location_namespace=None, verbose=False): - # remap module to the new namespace - if target_location_namespace is not None: - # This looks a bit wonky as we need to also change the 'name' of the imported course to be what - # the caller passed in - if module.location.category != 'course': - module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, - course=target_location_namespace.course) - else: - module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, - course=target_location_namespace.course, name=target_location_namespace.name) - - # then remap children pointers since they too will be re-namespaced - if module.has_children: - children_locs = module.children - new_locs = [] - for child in children_locs: - child_loc = Location(child) - new_child_loc = child_loc._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, - course=target_location_namespace.course) - - new_locs.append(new_child_loc.url()) - - module.children = new_locs - - if hasattr(module, 'data'): - # cdodge: now go through any link references to '/static/' and make sure we've imported - # it as a StaticContent asset - try: - remap_dict = {} - - # use the rewrite_links as a utility means to enumerate through all links - # in the module data. We use that to load that reference into our asset store - # IMPORTANT: There appears to be a bug in lxml.rewrite_link which makes us not be able to - # do the rewrites natively in that code. - # For example, what I'm seeing is -> - # Note the dropped element closing tag. This causes the LMS to fail when rendering modules - that's - # no good, so we have to do this kludge - if isinstance(module.data, str) or isinstance(module.data, unicode): # some module 'data' fields are non strings which blows up the link traversal code - lxml_rewrite_links(module.data, lambda link: verify_content_links(module, course_data_path, static_content_store, link, remap_dict)) - - for key in remap_dict.keys(): - module.data = module.data.replace(key, remap_dict[key]) - - except Exception: - logging.exception("failed to rewrite links on {0}. Continuing...".format(module.location)) - - modulestore.update_item(module.location, module.data) - - if module.has_children: - modulestore.update_children(module.location, module.children) - - modulestore.update_metadata(module.location, own_metadata(module)) - - -def import_course_from_xml(modulestore, static_content_store, course_data_path, module, target_location_namespace=None, verbose=False): - # cdodge: more hacks (what else). Seems like we have a problem when importing a course (like 6.002) which - # does not have any tabs defined in the policy file. The import goes fine and then displays fine in LMS, - # but if someone tries to add a new tab in the CMS, then the LMS barfs because it expects that - - # if there is *any* tabs - then there at least needs to be some predefined ones - if module.tabs is None or len(module.tabs) == 0: - module.tabs = [{"type": "courseware"}, - {"type": "course_info", "name": "Course Info"}, - {"type": "discussion", "name": "Discussion"}, - {"type": "wiki", "name": "Wiki"}] # note, add 'progress' when we can support it on Edge - - # a bit of a hack, but typically the "course image" which is shown on marketing pages is hard coded to /images/course_image.jpg - # so let's make sure we import in case there are no other references to it in the modules - verify_content_links(module, course_data_path, static_content_store, '/static/images/course_image.jpg') - import_module_from_xml(modulestore, static_content_store, course_data_path, module, target_location_namespace, verbose=verbose) - - def import_from_xml(store, data_dir, course_dirs=None, default_class='xmodule.raw_module.RawDescriptor', load_error_modules=True, static_content_store=None, target_location_namespace=None, @@ -239,11 +128,8 @@ def import_from_xml(store, data_dir, course_dirs=None, {"type": "discussion", "name": "Discussion"}, {"type": "wiki", "name": "Wiki"}] # note, add 'progress' when we can support it on Edge - import_module(module, store, course_data_path, static_content_store) - - # a bit of a hack, but typically the "course image" which is shown on marketing pages is hard coded to /images/course_image.jpg - # so let's make sure we import in case there are no other references to it in the modules - verify_content_links(module, course_data_path, static_content_store, '/static/images/course_image.jpg') + import_module(module, store, course_data_path, static_content_store, course_location, + target_location_namespace or course_location) course_items.append(module) @@ -257,7 +143,6 @@ def import_from_xml(store, data_dir, course_dirs=None, # finally loop through all the modules for module in xml_module_store.modules[course_id].itervalues(): - if module.category == 'course': # we've already saved the course module up at the top of the loop # so just skip over it in the inner loop @@ -270,25 +155,31 @@ def import_from_xml(store, data_dir, course_dirs=None, if verbose: log.debug('importing module location {0}'.format(module.location)) - import_module(module, store, course_data_path, static_content_store) + import_module(module, store, course_data_path, static_content_store, course_location, + target_location_namespace if target_location_namespace else course_location) # now import any 'draft' items if draft_store is not None: import_course_draft(xml_module_store, store, draft_store, course_data_path, - static_content_store, target_location_namespace if target_location_namespace is not None + static_content_store, course_location, target_location_namespace if target_location_namespace else course_location) finally: # turn back on all write signalling if pseudo_course_id in store.ignore_write_events_on_courses: store.ignore_write_events_on_courses.remove(pseudo_course_id) - store.refresh_cached_metadata_inheritance_tree(target_location_namespace if - target_location_namespace is not None else course_location) + store.refresh_cached_metadata_inheritance_tree( + target_location_namespace if target_location_namespace is not None else course_location + ) return xml_module_store, course_items -def import_module(module, store, course_data_path, static_content_store, allow_not_found=False): +def import_module(module, store, course_data_path, static_content_store, + source_course_location, dest_course_location, allow_not_found=False): + + logging.debug('processing import of module {0}...'.format(module.location.url())) + content = {} for field in module.fields: if field.scope != Scope.content: @@ -302,30 +193,15 @@ def import_module(module, store, course_data_path, static_content_store, allow_n module_data = {} if 'data' in content: module_data = content['data'] - - # cdodge: now go through any link references to '/static/' and make sure we've imported - # it as a StaticContent asset - try: - remap_dict = {} - - # use the rewrite_links as a utility means to enumerate through all links - # in the module data. We use that to load that reference into our asset store - # IMPORTANT: There appears to be a bug in lxml.rewrite_link which makes us not be able to - # do the rewrites natively in that code. - # For example, what I'm seeing is -> - # Note the dropped element closing tag. This causes the LMS to fail when rendering modules - that's - # no good, so we have to do this kludge - if isinstance(module_data, str) or isinstance(module_data, unicode): # some module 'data' fields are non strings which blows up the link traversal code - lxml_rewrite_links(module_data, lambda link: verify_content_links(module, course_data_path, static_content_store, link, remap_dict)) - - for key in remap_dict.keys(): - module_data = module_data.replace(key, remap_dict[key]) - - except Exception: - logging.exception("failed to rewrite links on {0}. Continuing...".format(module.location)) else: module_data = content + if isinstance(module_data, basestring): + # we want to convert all 'non-portable' links in the module_data (if it is a string) to + # portable strings (e.g. /static/) + module_data = rewrite_nonportable_content_links( + source_course_location.course_id, dest_course_location.course_id, module_data) + if allow_not_found: store.update_item(module.location, module_data, allow_not_found=allow_not_found) else: @@ -339,7 +215,7 @@ def import_module(module, store, course_data_path, static_content_store, allow_n store.update_metadata(module.location, dict(own_metadata(module))) -def import_course_draft(xml_module_store, store, draft_store, course_data_path, static_content_store, target_location_namespace): +def import_course_draft(xml_module_store, store, draft_store, course_data_path, static_content_store, source_location_namespace, target_location_namespace): ''' This will import all the content inside of the 'drafts' folder, if it exists NOTE: This is not a full course import, basically in our current application only verticals (and downwards) @@ -396,7 +272,8 @@ def import_course_draft(xml_module_store, store, draft_store, course_data_path, del module.xml_attributes['parent_sequential_url'] del module.xml_attributes['index_in_children_list'] - import_module(module, draft_store, course_data_path, static_content_store, allow_not_found=True) + import_module(module, draft_store, course_data_path, static_content_store, + source_location_namespace, target_location_namespace, allow_not_found=True) for child in module.get_children(): _import_module(child) @@ -613,3 +490,57 @@ def perform_xlint(data_dir, course_dirs, print "This course can be imported successfully." return err_cnt + + +# +# UNSURE IF THIS IS UNUSED CODE - IF SO NEEDS TO BE PRUNED. TO BE INVESTIGATED. +# +def import_module_from_xml(modulestore, static_content_store, course_data_path, module, target_location_namespace=None, verbose=False): + # remap module to the new namespace + if target_location_namespace is not None: + # This looks a bit wonky as we need to also change the 'name' of the imported course to be what + # the caller passed in + if module.location.category != 'course': + module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, + course=target_location_namespace.course) + else: + module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, + course=target_location_namespace.course, name=target_location_namespace.name) + + # then remap children pointers since they too will be re-namespaced + if module.has_children: + children_locs = module.children + new_locs = [] + for child in children_locs: + child_loc = Location(child) + new_child_loc = child_loc._replace(tag=target_location_namespace.tag, org=target_location_namespace.org, + course=target_location_namespace.course) + + new_locs.append(new_child_loc.url()) + + module.children = new_locs + + if hasattr(module, 'data'): + modulestore.update_item(module.location, module.data) + + if module.has_children: + modulestore.update_children(module.location, module.children) + + modulestore.update_metadata(module.location, own_metadata(module)) + + +def import_course_from_xml(modulestore, static_content_store, course_data_path, module, target_location_namespace=None, verbose=False): + # CDODGE: Is this unused code (along with import_module_from_xml)? I can't find any references to it. If so, then + # we need to delete this apparently duplicate code. + + # cdodge: more hacks (what else). Seems like we have a problem when importing a course (like 6.002) which + # does not have any tabs defined in the policy file. The import goes fine and then displays fine in LMS, + # but if someone tries to add a new tab in the CMS, then the LMS barfs because it expects that - + # if there is *any* tabs - then there at least needs to be some predefined ones + if module.tabs is None or len(module.tabs) == 0: + module.tabs = [{"type": "courseware"}, + {"type": "course_info", "name": "Course Info"}, + {"type": "discussion", "name": "Discussion"}, + {"type": "wiki", "name": "Wiki"}] # note, add 'progress' when we can support it on Edge + + import_module_from_xml(modulestore, static_content_store, course_data_path, module, target_location_namespace, verbose=verbose) diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py index 10f939b270..e2b343669c 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py @@ -11,7 +11,7 @@ from .peer_grading_service import PeerGradingService, MockPeerGradingService import controller_query_service from datetime import datetime -from django.utils.timezone import UTC +from pytz import UTC log = logging.getLogger("mitx.courseware") @@ -126,7 +126,7 @@ class OpenEndedChild(object): pass def closed(self): - if self.close_date is not None and datetime.now(UTC()) > self.close_date: + if self.close_date is not None and datetime.now(UTC) > self.close_date: return True return False diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py index 56bd1ec0a8..3c25b301ab 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py @@ -36,21 +36,18 @@ class PeerGradingService(GradingService): return self.try_to_decode(response) def get_next_submission(self, problem_location, grader_id): - response = self.get(self.get_next_submission_url, - {'location': problem_location, 'grader_id': grader_id}) + response = self.get( + self.get_next_submission_url, + { + 'location': problem_location, + 'grader_id': grader_id + } + ) return self.try_to_decode(self._render_rubric(response)) - def save_grade(self, location, grader_id, submission_id, score, feedback, submission_key, rubric_scores, - submission_flagged): - data = {'grader_id': grader_id, - 'submission_id': submission_id, - 'score': score, - 'feedback': feedback, - 'submission_key': submission_key, - 'location': location, - 'rubric_scores': rubric_scores, - 'rubric_scores_complete': True, - 'submission_flagged': submission_flagged} + def save_grade(self, **kwargs): + data = kwargs + data.update({'rubric_scores_complete': True}) return self.try_to_decode(self.post(self.save_grade_url, data)) def is_student_calibrated(self, problem_location, grader_id): @@ -62,16 +59,9 @@ class PeerGradingService(GradingService): response = self.get(self.show_calibration_essay_url, params) return self.try_to_decode(self._render_rubric(response)) - def save_calibration_essay(self, problem_location, grader_id, calibration_essay_id, submission_key, - score, feedback, rubric_scores): - data = {'location': problem_location, - 'student_id': grader_id, - 'calibration_essay_id': calibration_essay_id, - 'submission_key': submission_key, - 'score': score, - 'feedback': feedback, - 'rubric_scores[]': rubric_scores, - 'rubric_scores_complete': True} + def save_calibration_essay(self, **kwargs): + data = kwargs + data.update({'rubric_scores_complete': True}) return self.try_to_decode(self.post(self.save_calibration_essay_url, data)) def get_problem_list(self, course_id, grader_id): @@ -100,16 +90,17 @@ without making actual service calls to the grading controller class MockPeerGradingService(object): def get_next_submission(self, problem_location, grader_id): - return {'success': True, - 'submission_id': 1, - 'submission_key': "", - 'student_response': 'fake student response', - 'prompt': 'fake submission prompt', - 'rubric': 'fake rubric', - 'max_score': 4} + return { + 'success': True, + 'submission_id': 1, + 'submission_key': "", + 'student_response': 'fake student response', + 'prompt': 'fake submission prompt', + 'rubric': 'fake rubric', + 'max_score': 4 + } - def save_grade(self, location, grader_id, submission_id, - score, feedback, submission_key, rubric_scores, submission_flagged): + def save_grade(self, **kwargs): return {'success': True} def is_student_calibrated(self, problem_location, grader_id): @@ -124,9 +115,7 @@ class MockPeerGradingService(object): 'rubric': 'fake rubric', 'max_score': 4} - def save_calibration_essay(self, problem_location, grader_id, - calibration_essay_id, submission_key, score, - feedback, rubric_scores): + def save_calibration_essay(self, **kwargs): return {'success': True, 'actual_score': 2} def get_problem_list(self, course_id, grader_id): diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py index 09cac9a6b4..1ef3883d82 100644 --- a/common/lib/xmodule/xmodule/peer_grading_module.py +++ b/common/lib/xmodule/xmodule/peer_grading_module.py @@ -12,7 +12,7 @@ from xmodule.modulestore.django import modulestore from xmodule.modulestore.exceptions import ItemNotFoundError from .timeinfo import TimeInfo from xblock.core import Dict, String, Scope, Boolean, Integer, Float -from xmodule.fields import Date +from xmodule.fields import Date, Timedelta from xmodule.open_ended_grading_classes.peer_grading_service import PeerGradingService, GradingServiceError, MockPeerGradingService from open_ended_grading_classes import combined_open_ended_rubric @@ -23,6 +23,7 @@ log = logging.getLogger(__name__) EXTERNAL_GRADER_NO_CONTACT_ERROR = "Failed to contact external graders. Please notify course staff." + class PeerGradingFields(object): use_for_single_location = Boolean( display_name="Show Single Problem", @@ -47,9 +48,8 @@ class PeerGradingFields(object): help="Due date that should be displayed.", default=None, scope=Scope.settings) - grace_period_string = String( + graceperiod = Timedelta( help="Amount of grace to give on the due date.", - default=None, scope=Scope.settings ) student_data_for_location = Dict( @@ -68,9 +68,11 @@ class PeerGradingFields(object): scope=Scope.settings, default="Peer Grading Interface" ) - data = String(help="Html contents to display for this module", + data = String( + help="Html contents to display for this module", default='', - scope=Scope.content) + scope=Scope.content + ) class PeerGradingModule(PeerGradingFields, XModule): @@ -79,11 +81,14 @@ class PeerGradingModule(PeerGradingFields, XModule): """ _VERSION = 1 - js = {'coffee': [resource_string(__name__, 'js/src/peergrading/peer_grading.coffee'), - resource_string(__name__, 'js/src/peergrading/peer_grading_problem.coffee'), - resource_string(__name__, 'js/src/collapsible.coffee'), - resource_string(__name__, 'js/src/javascript_loader.coffee'), - ]} + js = { + 'coffee': [ + resource_string(__name__, 'js/src/peergrading/peer_grading.coffee'), + resource_string(__name__, 'js/src/peergrading/peer_grading_problem.coffee'), + resource_string(__name__, 'js/src/collapsible.coffee'), + resource_string(__name__, 'js/src/javascript_loader.coffee'), + ] + } js_module_name = "PeerGrading" css = {'scss': [resource_string(__name__, 'css/combinedopenended/display.scss')]} @@ -105,12 +110,12 @@ class PeerGradingModule(PeerGradingFields, XModule): log.error("Linked location {0} for peer grading module {1} does not exist".format( self.link_to_location, self.location)) raise - due_date = self.linked_problem._model_data.get('due', None) + due_date = self.linked_problem.lms.due if due_date: - self._model_data['due'] = due_date + self.lms.due = due_date try: - self.timeinfo = TimeInfo(self.due, self.grace_period_string) + self.timeinfo = TimeInfo(self.due, self.graceperiod) except Exception: log.error("Error parsing due date information in location {0}".format(self.location)) raise @@ -134,7 +139,6 @@ class PeerGradingModule(PeerGradingFields, XModule): return True return False - def _err_response(self, msg): """ Return a HttpResponse with a json dump with success=False, and the given error message. @@ -308,31 +312,22 @@ class PeerGradingModule(PeerGradingFields, XModule): error: if there was an error in the submission, this is the error message """ - required = set(['location', 'submission_id', 'submission_key', 'score', 'feedback', 'rubric_scores[]', - 'submission_flagged']) + required = set(['location', 'submission_id', 'submission_key', 'score', 'feedback', 'rubric_scores[]', 'submission_flagged', 'answer_unknown']) success, message = self._check_required(data, required) if not success: return self._err_response(message) - grader_id = self.system.anonymous_student_id - location = data.get('location') - submission_id = data.get('submission_id') - score = data.get('score') - feedback = data.get('feedback') - submission_key = data.get('submission_key') - rubric_scores = data.getlist('rubric_scores[]') - submission_flagged = data.get('submission_flagged') + data_dict = {k:data.get(k) for k in required} + data_dict['rubric_scores'] = data.getlist('rubric_scores[]') + data_dict['grader_id'] = self.system.anonymous_student_id try: - response = self.peer_gs.save_grade(location, grader_id, submission_id, - score, feedback, submission_key, rubric_scores, submission_flagged) + response = self.peer_gs.save_grade(**data_dict) return response except GradingServiceError: # This is a dev_facing_error - log.exception("""Error saving grade to open ended grading service. server url: {0}, location: {1}, submission_id:{2}, - submission_key: {3}, score: {4}""" - .format(self.peer_gs.url, - location, submission_id, submission_key, score) + log.exception("""Error saving grade to open ended grading service. server url: {0}""" + .format(self.peer_gs.url) ) # This is a student_facing_error return { @@ -451,27 +446,21 @@ class PeerGradingModule(PeerGradingFields, XModule): success, message = self._check_required(data, required) if not success: return self._err_response(message) - grader_id = self.system.anonymous_student_id - location = data.get('location') - calibration_essay_id = data.get('submission_id') - submission_key = data.get('submission_key') - score = data.get('score') - feedback = data.get('feedback') - rubric_scores = data.getlist('rubric_scores[]') + data_dict = {k:data.get(k) for k in required} + data_dict['rubric_scores'] = data.getlist('rubric_scores[]') + data_dict['student_id'] = self.system.anonymous_student_id + data_dict['calibration_essay_id'] = data_dict['submission_id'] try: - response = self.peer_gs.save_calibration_essay(location, grader_id, calibration_essay_id, - submission_key, score, feedback, rubric_scores) + response = self.peer_gs.save_calibration_essay(**data_dict) if 'actual_rubric' in response: rubric_renderer = combined_open_ended_rubric.CombinedOpenEndedRubric(self.system, True) response['actual_rubric'] = rubric_renderer.render_rubric(response['actual_rubric'])['html'] return response except GradingServiceError: # This is a dev_facing_error - log.exception( - "Error saving calibration grade, location: {0}, submission_key: {1}, grader_id: {2}".format( - location, submission_key, grader_id)) + log.exception("Error saving calibration grade") # This is a student_facing_error return self._err_response('There was an error saving your score. Please notify course staff.') @@ -533,10 +522,10 @@ class PeerGradingModule(PeerGradingFields, XModule): problem_location = problem['location'] descriptor = _find_corresponding_module_for_location(problem_location) if descriptor: - problem['due'] = descriptor._model_data.get('due', None) - grace_period_string = descriptor._model_data.get('graceperiod', None) + problem['due'] = descriptor.lms.due + grace_period = descriptor.lms.graceperiod try: - problem_timeinfo = TimeInfo(problem['due'], grace_period_string) + problem_timeinfo = TimeInfo(problem['due'], grace_period) except: log.error("Malformed due date or grace period string for location {0}".format(problem_location)) raise @@ -629,5 +618,5 @@ class PeerGradingDescriptor(PeerGradingFields, RawDescriptor): @property def non_editable_metadata_fields(self): non_editable_fields = super(PeerGradingDescriptor, self).non_editable_metadata_fields - non_editable_fields.extend([PeerGradingFields.due, PeerGradingFields.grace_period_string]) + non_editable_fields.extend([PeerGradingFields.due, PeerGradingFields.graceperiod]) return non_editable_fields diff --git a/common/lib/xmodule/xmodule/raw_module.py b/common/lib/xmodule/xmodule/raw_module.py index b972d7c8eb..4c6ddb5b51 100644 --- a/common/lib/xmodule/xmodule/raw_module.py +++ b/common/lib/xmodule/xmodule/raw_module.py @@ -4,6 +4,7 @@ from xmodule.xml_module import XmlDescriptor import logging import sys from xblock.core import String, Scope +from exceptions import SerializationError log = logging.getLogger(__name__) @@ -27,11 +28,11 @@ class RawDescriptor(XmlDescriptor, XMLEditingDescriptor): # re-raise lines = self.data.split('\n') line, offset = err.position - msg = ("Unable to create xml for problem {loc}. " + msg = ("Unable to create xml for module {loc}. " "Context: '{context}'".format( context=lines[line - 1][offset - 40:offset + 40], loc=self.location)) - raise Exception, msg, sys.exc_info()[2] + raise SerializationError(self.location, msg) class EmptyDataRawDescriptor(XmlDescriptor, XMLEditingDescriptor): diff --git a/common/lib/xmodule/xmodule/tests/test_course_module.py b/common/lib/xmodule/xmodule/tests/test_course_module.py index 53181b5a28..48690a8b25 100644 --- a/common/lib/xmodule/xmodule/tests/test_course_module.py +++ b/common/lib/xmodule/xmodule/tests/test_course_module.py @@ -53,7 +53,7 @@ def get_dummy_course(start, announcement=None, is_new=None, advertised_start=Non end = to_attrb('end', end) start_xml = ''' - Test Template HTML
      ") + self.tabs = [ + { + 'name': "Test_css", + 'template': "tabs/codemirror-edit.html", + 'current': True, + 'css': { + 'scss': [resource_string(__name__, + '../../test_files/test_tabseditingdescriptor.scss')], + 'css': [resource_string(__name__, + '../../test_files/test_tabseditingdescriptor.css')] + } + }, + { + 'name': "Subtitles", + 'template': "videoalpha/subtitles.html", + }, + { + 'name': "Settings", + 'template': "tabs/video-metadata-edit-tab.html" + } + ] + + TabsEditingDescriptor.tabs = self.tabs + self.descriptor = TabsEditingDescriptor( + runtime=system, + model_data={}) + + def test_get_css(self): + """test get_css""" + css = self.descriptor.get_css() + test_files_dir = os.path.dirname(__file__).replace('xmodule/tests', 'test_files') + test_css_file = os.path.join(test_files_dir, 'test_tabseditingdescriptor.scss') + with open(test_css_file) as new_css: + added_css = new_css.read() + self.assertEqual(css['scss'].pop(), added_css) + self.assertEqual(css['css'].pop(), added_css) + + def test_get_context(self): + """"test get_context""" + rendered_context = self.descriptor.get_context() + self.assertListEqual(rendered_context['tabs'], self.tabs) + diff --git a/common/lib/xmodule/xmodule/tests/test_export.py b/common/lib/xmodule/xmodule/tests/test_export.py index fd3c635d82..91ef1bae57 100644 --- a/common/lib/xmodule/xmodule/tests/test_export.py +++ b/common/lib/xmodule/xmodule/tests/test_export.py @@ -40,6 +40,8 @@ def strip_filenames(descriptor): for d in descriptor.get_children(): strip_filenames(d) + descriptor.save() + class RoundTripTestCase(unittest.TestCase): ''' Check that our test courses roundtrip properly. diff --git a/common/lib/xmodule/xmodule/tests/test_peer_grading.py b/common/lib/xmodule/xmodule/tests/test_peer_grading.py index c386f77e9b..fcdb0bb1ac 100644 --- a/common/lib/xmodule/xmodule/tests/test_peer_grading.py +++ b/common/lib/xmodule/xmodule/tests/test_peer_grading.py @@ -28,6 +28,7 @@ class PeerGradingModuleTest(unittest.TestCase, DummyModulestore): 'feedback': "", 'rubric_scores[]': [0, 1], 'submission_flagged': False, + 'answer_unknown' : False, }) def setUp(self): diff --git a/common/lib/xmodule/xmodule/tests/test_videoalpha.py b/common/lib/xmodule/xmodule/tests/test_videoalpha.py index f2258d1b55..76f86d6d4a 100644 --- a/common/lib/xmodule/xmodule/tests/test_videoalpha.py +++ b/common/lib/xmodule/xmodule/tests/test_videoalpha.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- +#pylint: disable=W0212 """Test for Video Alpha Xmodule functional logic. -These tests data readed from xml, not from mongo. +These test data read from xml, not from mongo. -we have a ModuleStoreTestCase class defined in +We have a ModuleStoreTestCase class defined in common/lib/xmodule/xmodule/modulestore/tests/django_utils.py. You can search for usages of this in the cms and lms tests for examples. You use this so that it will do things like point the modulestore setting to mongo, @@ -12,9 +13,15 @@ in common/lib/xmodule/xmodule/modulestore/tests/factories.py to create the course, section, subsection, unit, etc. """ -from xmodule.videoalpha_module import VideoAlphaDescriptor +import unittest from . import LogicTest -from lxml import etree +from .import get_test_system +from xmodule.modulestore import Location +from xmodule.videoalpha_module import VideoAlphaDescriptor, _create_youtube_string +from xmodule.video_module import VideoDescriptor +from .test_import import DummySystem + +from textwrap import dedent class VideoAlphaModuleTest(LogicTest): @@ -25,27 +32,338 @@ class VideoAlphaModuleTest(LogicTest): 'data': '' } - def test_get_timeframe_no_parameters(self): - "Make sure that timeframe() works correctly w/o parameters" - xmltree = etree.fromstring('test') - output = self.xmodule.get_timeframe(xmltree) - self.assertEqual(output, ('', '')) + def test_parse_time_empty(self): + """Ensure parse_time returns correctly with None or empty string.""" + expected = '' + self.assertEqual(VideoAlphaDescriptor._parse_time(None), expected) + self.assertEqual(VideoAlphaDescriptor._parse_time(''), expected) - def test_get_timeframe_with_one_parameter(self): - "Make sure that timeframe() works correctly with one parameter" - xmltree = etree.fromstring( - 'test' - ) - output = self.xmodule.get_timeframe(xmltree) - self.assertEqual(output, (247, '')) + def test_parse_time(self): + """Ensure that times are parsed correctly into seconds.""" + expected = 247 + output = VideoAlphaDescriptor._parse_time('00:04:07') + self.assertEqual(output, expected) - def test_get_timeframe_with_two_parameters(self): - "Make sure that timeframe() works correctly with two parameters" - xmltree = etree.fromstring( - '''test''' + def test_parse_youtube(self): + """Test parsing old-style Youtube ID strings into a dict.""" + youtube_str = '0.75:jNCf2gIqpeE,1.00:ZwkTiUPN0mg,1.25:rsq9auxASqI,1.50:kMyNdzVHHgg' + output = VideoAlphaDescriptor._parse_youtube(youtube_str) + self.assertEqual(output, {'0.75': 'jNCf2gIqpeE', + '1.00': 'ZwkTiUPN0mg', + '1.25': 'rsq9auxASqI', + '1.50': 'kMyNdzVHHgg'}) + + def test_parse_youtube_one_video(self): + """ + Ensure that all keys are present and missing speeds map to the + empty string. + """ + youtube_str = '0.75:jNCf2gIqpeE' + output = VideoAlphaDescriptor._parse_youtube(youtube_str) + self.assertEqual(output, {'0.75': 'jNCf2gIqpeE', + '1.00': '', + '1.25': '', + '1.50': ''}) + + def test_parse_youtube_key_format(self): + """ + Make sure that inconsistent speed keys are parsed correctly. + """ + youtube_str = '1.00:p2Q6BrNhdh8' + youtube_str_hack = '1.0:p2Q6BrNhdh8' + self.assertEqual( + VideoAlphaDescriptor._parse_youtube(youtube_str), + VideoAlphaDescriptor._parse_youtube(youtube_str_hack) ) - output = self.xmodule.get_timeframe(xmltree) - self.assertEqual(output, (247, 47079)) + + def test_parse_youtube_empty(self): + """ + Some courses have empty youtube attributes, so we should handle + that well. + """ + self.assertEqual( + VideoAlphaDescriptor._parse_youtube(''), + {'0.75': '', + '1.00': '', + '1.25': '', + '1.50': ''} + ) + + +class VideoAlphaDescriptorTest(unittest.TestCase): + """Test for VideoAlphaDescriptor""" + + def setUp(self): + system = get_test_system() + self.descriptor = VideoAlphaDescriptor( + runtime=system, + model_data={}) + + def test_get_context(self): + """"test get_context""" + correct_tabs = [ + { + 'name': "Settings", + 'template': "tabs/metadata-edit-tab.html", + 'current': True + } + ] + rendered_context = self.descriptor.get_context() + self.assertListEqual(rendered_context['tabs'], correct_tabs) + + def test_create_youtube_string(self): + """ + Test that Youtube ID strings are correctly created when writing + back out to XML. + """ + system = DummySystem(load_error_modules=True) + location = Location(["i4x", "edX", "videoalpha", "default", "SampleProblem1"]) + model_data = {'location': location} + descriptor = VideoAlphaDescriptor(system, model_data) + descriptor.youtube_id_0_75 = 'izygArpw-Qo' + descriptor.youtube_id_1_0 = 'p2Q6BrNhdh8' + descriptor.youtube_id_1_25 = '1EeWXzPdhSA' + descriptor.youtube_id_1_5 = 'rABDYkeK0x8' + expected = "0.75:izygArpw-Qo,1.00:p2Q6BrNhdh8,1.25:1EeWXzPdhSA,1.50:rABDYkeK0x8" + self.assertEqual(_create_youtube_string(descriptor), expected) + + def test_create_youtube_string_missing(self): + """ + Test that Youtube IDs which aren't explicitly set aren't included + in the output string. + """ + system = DummySystem(load_error_modules=True) + location = Location(["i4x", "edX", "videoalpha", "default", "SampleProblem1"]) + model_data = {'location': location} + descriptor = VideoAlphaDescriptor(system, model_data) + descriptor.youtube_id_0_75 = 'izygArpw-Qo' + descriptor.youtube_id_1_0 = 'p2Q6BrNhdh8' + descriptor.youtube_id_1_25 = '1EeWXzPdhSA' + expected = "0.75:izygArpw-Qo,1.00:p2Q6BrNhdh8,1.25:1EeWXzPdhSA" + self.assertEqual(_create_youtube_string(descriptor), expected) + + +class VideoAlphaDescriptorImportTestCase(unittest.TestCase): + """ + Make sure that VideoAlphaDescriptor can import an old XML-based video correctly. + """ + + def assert_attributes_equal(self, video, attrs): + """ + Assert that `video` has the correct attributes. `attrs` is a map + of {metadata_field: value}. + """ + for key, value in attrs.items(): + self.assertEquals(getattr(video, key), value) + + def test_constructor(self): + sample_xml = ''' + + + + + + ''' + location = Location(["i4x", "edX", "videoalpha", "default", + "SampleProblem1"]) + model_data = {'data': sample_xml, + 'location': location} + system = DummySystem(load_error_modules=True) + descriptor = VideoAlphaDescriptor(system, model_data) + self.assert_attributes_equal(descriptor, { + 'youtube_id_0_75': 'izygArpw-Qo', + 'youtube_id_1_0': 'p2Q6BrNhdh8', + 'youtube_id_1_25': '1EeWXzPdhSA', + 'youtube_id_1_5': 'rABDYkeK0x8', + 'show_captions': False, + 'start_time': 1.0, + 'end_time': 60, + 'track': 'http://www.example.com/track', + 'html5_sources': ['http://www.example.com/source.mp4', 'http://www.example.com/source.ogg'], + 'data': '' + }) + + def test_from_xml(self): + module_system = DummySystem(load_error_modules=True) + xml_data = ''' + + + + + ''' + output = VideoAlphaDescriptor.from_xml(xml_data, module_system) + self.assert_attributes_equal(output, { + 'youtube_id_0_75': 'izygArpw-Qo', + 'youtube_id_1_0': 'p2Q6BrNhdh8', + 'youtube_id_1_25': '1EeWXzPdhSA', + 'youtube_id_1_5': 'rABDYkeK0x8', + 'show_captions': False, + 'start_time': 1.0, + 'end_time': 60, + 'track': 'http://www.example.com/track', + 'source': 'http://www.example.com/source.mp4', + 'html5_sources': ['http://www.example.com/source.mp4'], + 'data': '' + }) + + def test_from_xml_missing_attributes(self): + """ + Ensure that attributes have the right values if they aren't + explicitly set in XML. + """ + module_system = DummySystem(load_error_modules=True) + xml_data = ''' + + + + + ''' + output = VideoAlphaDescriptor.from_xml(xml_data, module_system) + self.assert_attributes_equal(output, { + 'youtube_id_0_75': '', + 'youtube_id_1_0': 'p2Q6BrNhdh8', + 'youtube_id_1_25': '1EeWXzPdhSA', + 'youtube_id_1_5': '', + 'show_captions': True, + 'start_time': 0.0, + 'end_time': 0.0, + 'track': 'http://www.example.com/track', + 'source': 'http://www.example.com/source.mp4', + 'html5_sources': ['http://www.example.com/source.mp4'], + 'data': '' + }) + + def test_from_xml_no_attributes(self): + """ + Make sure settings are correct if none are explicitly set in XML. + """ + module_system = DummySystem(load_error_modules=True) + xml_data = '' + output = VideoAlphaDescriptor.from_xml(xml_data, module_system) + self.assert_attributes_equal(output, { + 'youtube_id_0_75': '', + 'youtube_id_1_0': 'OEoXaMPEzfM', + 'youtube_id_1_25': '', + 'youtube_id_1_5': '', + 'show_captions': True, + 'start_time': 0.0, + 'end_time': 0.0, + 'track': '', + 'source': '', + 'html5_sources': [], + 'data': '' + }) + + def test_old_video_format(self): + """ + Test backwards compatibility with VideoModule's XML format. + """ + module_system = DummySystem(load_error_modules=True) + xml_data = """ + + + + + """ + output = VideoAlphaDescriptor.from_xml(xml_data, module_system) + self.assert_attributes_equal(output, { + 'youtube_id_0_75': 'izygArpw-Qo', + 'youtube_id_1_0': 'p2Q6BrNhdh8', + 'youtube_id_1_25': '1EeWXzPdhSA', + 'youtube_id_1_5': 'rABDYkeK0x8', + 'show_captions': False, + 'start_time': 1.0, + 'end_time': 60, + 'track': 'http://www.example.com/track', + 'html5_sources': ['http://www.example.com/source.mp4'], + 'data': '' + }) + + def test_old_video_data(self): + """ + Ensure that Video Alpha is able to read VideoModule's model data. + """ + module_system = DummySystem(load_error_modules=True) + xml_data = """ + + """ + video = VideoDescriptor.from_xml(xml_data, module_system) + video_alpha = VideoAlphaDescriptor(module_system, video._model_data) + self.assert_attributes_equal(video_alpha, { + 'youtube_id_0_75': 'izygArpw-Qo', + 'youtube_id_1_0': 'p2Q6BrNhdh8', + 'youtube_id_1_25': '1EeWXzPdhSA', + 'youtube_id_1_5': 'rABDYkeK0x8', + 'show_captions': False, + 'start_time': 1.0, + 'end_time': 60, + 'track': 'http://www.example.com/track', + 'html5_sources': ['http://www.example.com/source.mp4'], + 'data': '' + }) + + +class VideoAlphaExportTestCase(unittest.TestCase): + """ + Make sure that VideoAlphaDescriptor can export itself to XML + correctly. + """ + + def test_export_to_xml(self): + """Test that we write the correct XML on export.""" + module_system = DummySystem(load_error_modules=True) + location = Location(["i4x", "edX", "videoalpha", "default", "SampleProblem1"]) + desc = VideoAlphaDescriptor(module_system, {'location': location}) + + desc.youtube_id_0_75 = 'izygArpw-Qo' + desc.youtube_id_1_0 = 'p2Q6BrNhdh8' + desc.youtube_id_1_25 = '1EeWXzPdhSA' + desc.youtube_id_1_5 = 'rABDYkeK0x8' + desc.show_captions = False + desc.start_time = 1.0 + desc.end_time = 60 + desc.track = 'http://www.example.com/track' + desc.html5_sources = ['http://www.example.com/source.mp4', 'http://www.example.com/source.ogg'] + + xml = desc.export_to_xml(None) # We don't use the `resource_fs` parameter + expected = dedent('''\ + + + + + + ''') + + self.assertEquals(expected, xml) + + def test_export_to_xml_empty_parameters(self): + """Test XML export with defaults.""" + module_system = DummySystem(load_error_modules=True) + location = Location(["i4x", "edX", "videoalpha", "default", "SampleProblem1"]) + desc = VideoAlphaDescriptor(module_system, {'location': location}) + + xml = desc.export_to_xml(None) + expected = '\n' + + self.assertEquals(expected, xml) diff --git a/common/lib/xmodule/xmodule/tests/test_xml_module.py b/common/lib/xmodule/xmodule/tests/test_xml_module.py index a277ff2900..fdcff8ade2 100644 --- a/common/lib/xmodule/xmodule/tests/test_xml_module.py +++ b/common/lib/xmodule/xmodule/tests/test_xml_module.py @@ -39,7 +39,8 @@ class TestFields(object): float_non_select = Float(scope=Scope.settings, default=.999, values={'min': 0, 'step': .3}) # Used for testing that Booleans get mapped to select type boolean_select = Boolean(scope=Scope.settings) - + # Used for testing Lists + list_field = List(scope=Scope.settings, default=[]) class EditableMetadataFieldsTest(unittest.TestCase): def test_display_name_field(self): @@ -63,7 +64,7 @@ class EditableMetadataFieldsTest(unittest.TestCase): def test_integer_field(self): descriptor = self.get_descriptor({'max_attempts': '7'}) editable_fields = descriptor.editable_metadata_fields - self.assertEqual(6, len(editable_fields)) + self.assertEqual(7, len(editable_fields)) self.assert_field_values( editable_fields, 'max_attempts', TestFields.max_attempts, explicitly_set=True, inheritable=False, value=7, default_value=1000, type='Integer', @@ -137,6 +138,12 @@ class EditableMetadataFieldsTest(unittest.TestCase): type='Float', options={'min': 0, 'step': .3} ) + self.assert_field_values( + editable_fields, 'list_field', TestFields.list_field, + explicitly_set=False, inheritable=False, value=[], default_value=[], + type='List' + ) + # Start of helper methods def get_xml_editable_fields(self, model_data): system = get_test_system() diff --git a/common/lib/xmodule/xmodule/timeinfo.py b/common/lib/xmodule/xmodule/timeinfo.py index 8f4d99506a..76f24a0b23 100644 --- a/common/lib/xmodule/xmodule/timeinfo.py +++ b/common/lib/xmodule/xmodule/timeinfo.py @@ -14,20 +14,23 @@ class TimeInfo(object): """ _delta_standin = Timedelta() - def __init__(self, due_date, grace_period_string): + def __init__(self, due_date, grace_period_string_or_timedelta): if due_date is not None: self.display_due_date = due_date else: self.display_due_date = None - if grace_period_string is not None and self.display_due_date: - try: - self.grace_period = TimeInfo._delta_standin.from_json(grace_period_string) - self.close_date = self.display_due_date + self.grace_period - except: - log.error("Error parsing the grace period {0}".format(grace_period_string)) - raise + if grace_period_string_or_timedelta is not None and self.display_due_date: + if isinstance(grace_period_string_or_timedelta, basestring): + try: + self.grace_period = TimeInfo._delta_standin.from_json(grace_period_string_or_timedelta) + except: + log.error("Error parsing the grace period {0}".format(grace_period_string_or_timedelta)) + raise + else: + self.grace_period = grace_period_string_or_timedelta + self.close_date = self.display_due_date + self.grace_period else: self.grace_period = None self.close_date = self.display_due_date diff --git a/common/lib/xmodule/xmodule/videoalpha_module.py b/common/lib/xmodule/xmodule/videoalpha_module.py index 4ca337dcb0..176b192377 100644 --- a/common/lib/xmodule/xmodule/videoalpha_module.py +++ b/common/lib/xmodule/xmodule/videoalpha_module.py @@ -14,41 +14,105 @@ import json import logging from lxml import etree -from pkg_resources import resource_string, resource_listdir +from pkg_resources import resource_string from django.http import Http404 from django.conf import settings from xmodule.x_module import XModule -from xmodule.raw_module import RawDescriptor +from xmodule.editing_module import TabsEditingDescriptor +from xmodule.raw_module import EmptyDataRawDescriptor from xmodule.modulestore.mongo import MongoModuleStore from xmodule.modulestore.django import modulestore from xmodule.contentstore.content import StaticContent -from xblock.core import Integer, Scope, String +from xblock.core import Scope, String, Boolean, Float, List, Integer import datetime import time -import textwrap log = logging.getLogger(__name__) class VideoAlphaFields(object): """Fields for `VideoAlphaModule` and `VideoAlphaDescriptor`.""" - data = String(help="XML data for the problem", - default=textwrap.dedent('''\ - - - - - '''), - scope=Scope.content) - position = Integer(help="Current position in the video", scope=Scope.user_state, default=0) display_name = String( - display_name="Display Name", help="Display name for this module", + display_name="Display Name", help="Display name for this module.", default="Video Alpha", scope=Scope.settings ) + position = Integer( + help="Current position in the video", + scope=Scope.user_state, + default=0 + ) + show_captions = Boolean( + help="This controls whether or not captions are shown by default.", + display_name="Show Captions", + scope=Scope.settings, + default=True + ) + # TODO: This should be moved to Scope.content, but this will + # require data migration to support the old video module. + youtube_id_1_0 = String( + help="This is the Youtube ID reference for the normal speed video.", + display_name="Youtube ID", + scope=Scope.settings, + default="OEoXaMPEzfM" + ) + youtube_id_0_75 = String( + help="The Youtube ID for the .75x speed video.", + display_name="Youtube ID for .75x speed", + scope=Scope.settings, + default="" + ) + youtube_id_1_25 = String( + help="The Youtube ID for the 1.25x speed video.", + display_name="Youtube ID for 1.25x speed", + scope=Scope.settings, + default="" + ) + youtube_id_1_5 = String( + help="The Youtube ID for the 1.5x speed video.", + display_name="Youtube ID for 1.5x speed", + scope=Scope.settings, + default="" + ) + start_time = Float( + help="Start time for the video.", + display_name="Start Time", + scope=Scope.settings, + default=0.0 + ) + end_time = Float( + help="End time for the video.", + display_name="End Time", + scope=Scope.settings, + default=0.0 + ) + source = String( + help="The external URL to download the video. This appears as a link beneath the video.", + display_name="Download Video", + scope=Scope.settings, + default="" + ) + html5_sources = List( + help="A list of filenames to be used with HTML5 video. The first supported filetype will be displayed.", + display_name="Video Sources", + scope=Scope.settings, + default=[] + ) + track = String( + help="The external URL to download the subtitle track. This appears as a link beneath the video.", + display_name="Download Track", + scope=Scope.settings, + default="" + ) + sub = String( + help="The name of the subtitle track (for non-Youtube videos).", + display_name="HTML5 Subtitles", + scope=Scope.settings, + default="" + ) class VideoAlphaModule(VideoAlphaFields, XModule): @@ -84,72 +148,6 @@ class VideoAlphaModule(VideoAlphaFields, XModule): css = {'scss': [resource_string(__name__, 'css/videoalpha/display.scss')]} js_module_name = "VideoAlpha" - def __init__(self, *args, **kwargs): - XModule.__init__(self, *args, **kwargs) - xmltree = etree.fromstring(self.data) - - # Front-end expects an empty string, or a properly formatted string with YouTube IDs. - self.youtube_streams = xmltree.get('youtube', '') - - self.sub = xmltree.get('sub') - - self.autoplay = xmltree.get('autoplay') or '' - if self.autoplay.lower() not in ['true', 'false']: - self.autoplay = 'true' - - self.position = 0 - self.show_captions = xmltree.get('show_captions', 'true') - self.sources = { - 'main': self._get_source(xmltree), - 'mp4': self._get_source(xmltree, ['mp4']), - 'webm': self._get_source(xmltree, ['webm']), - 'ogv': self._get_source(xmltree, ['ogv']), - } - self.track = self._get_track(xmltree) - self.start_time, self.end_time = self.get_timeframe(xmltree) - - def _get_source(self, xmltree, exts=None): - """Find the first valid source, which ends with one of `exts`.""" - exts = ['mp4', 'ogv', 'avi', 'webm'] if exts is None else exts - condition = lambda src: any([src.endswith(ext) for ext in exts]) - return self._get_first_external(xmltree, 'source', condition) - - def _get_track(self, xmltree): - """Find the first valid track.""" - return self._get_first_external(xmltree, 'track') - - def _get_first_external(self, xmltree, tag, condition=bool): - """Will return the first 'valid' element of the given tag. - 'valid' means that `condition('src' attribute) == True` - """ - result = None - - for element in xmltree.findall(tag): - src = element.get('src') - if condition(src): - result = src - break - return result - - def get_timeframe(self, xmltree): - """ Converts 'start_time' and 'end_time' parameters in video tag to seconds. - If there are no parameters, returns empty string. """ - - def parse_time(str_time): - """Converts s in '12:34:45' format to seconds. If s is - None, returns empty string""" - if str_time is None: - return '' - else: - obj_time = time.strptime(str_time, '%H:%M:%S') - return datetime.timedelta( - hours=obj_time.tm_hour, - minutes=obj_time.tm_min, - seconds=obj_time.tm_sec - ).total_seconds() - - return parse_time(xmltree.get('start_time')), parse_time(xmltree.get('end_time')) - def handle_ajax(self, dispatch, data): """This is not being called right now and we raise 404 error.""" log.debug(u"GET {0}".format(data)) @@ -168,25 +166,202 @@ class VideoAlphaModule(VideoAlphaFields, XModule): # cdodge: filesystem static content support. caption_asset_path = "/static/subs/" + get_ext = lambda filename: filename.rpartition('.')[-1] + sources = {get_ext(src): src for src in self.html5_sources} + sources['main'] = self.source + return self.system.render_template('videoalpha.html', { - 'youtube_streams': self.youtube_streams, + 'youtube_streams': _create_youtube_string(self), 'id': self.location.html_id(), 'sub': self.sub, - 'autoplay': self.autoplay, - 'sources': self.sources, + 'sources': sources, 'track': self.track, 'display_name': self.display_name_with_default, # This won't work when we move to data that # isn't on the filesystem 'data_dir': getattr(self, 'data_dir', None), 'caption_asset_path': caption_asset_path, - 'show_captions': self.show_captions, + 'show_captions': json.dumps(self.show_captions), 'start': self.start_time, 'end': self.end_time, 'autoplay': settings.MITX_FEATURES.get('AUTOPLAY_VIDEOS', True) }) -class VideoAlphaDescriptor(VideoAlphaFields, RawDescriptor): +class VideoAlphaDescriptor(VideoAlphaFields, TabsEditingDescriptor, EmptyDataRawDescriptor): """Descriptor for `VideoAlphaModule`.""" module_class = VideoAlphaModule + + tabs = [ + # { + # 'name': "Subtitles", + # 'template': "videoalpha/subtitles.html", + # }, + { + 'name': "Settings", + 'template': "tabs/metadata-edit-tab.html", + 'current': True + } + ] + + def __init__(self, *args, **kwargs): + super(VideoAlphaDescriptor, self).__init__(*args, **kwargs) + # For backwards compatibility -- if we've got XML data, parse + # it out and set the metadata fields + if self.data: + model_data = VideoAlphaDescriptor._parse_video_xml(self.data) + self._model_data.update(model_data) + del self.data + + @classmethod + def from_xml(cls, xml_data, system, org=None, course=None): + """ + Creates an instance of this descriptor from the supplied xml_data. + This may be overridden by subclasses + + xml_data: A string of xml that will be translated into data and children for + this module + system: A DescriptorSystem for interacting with external resources + org and course are optional strings that will be used in the generated modules + url identifiers + """ + # Calling from_xml of XmlDescritor, to get right Location, when importing from XML + video = super(VideoAlphaDescriptor, cls).from_xml(xml_data, system, org, course) + return video + + def export_to_xml(self, resource_fs): + """ + Returns an xml string representing this module. + """ + xml = etree.Element('videoalpha') + attrs = { + 'display_name': self.display_name, + 'show_captions': json.dumps(self.show_captions), + 'youtube': _create_youtube_string(self), + 'start_time': datetime.timedelta(seconds=self.start_time), + 'end_time': datetime.timedelta(seconds=self.end_time), + 'sub': self.sub + } + for key, value in attrs.items(): + if value: + xml.set(key, str(value)) + + for source in self.html5_sources: + ele = etree.Element('source') + ele.set('src', source) + xml.append(ele) + + if self.track: + ele = etree.Element('track') + ele.set('src', self.track) + xml.append(ele) + + return etree.tostring(xml, pretty_print=True) + + @staticmethod + def _parse_youtube(data): + """ + Parses a string of Youtube IDs such as "1.0:AXdE34_U,1.5:VO3SxfeD" + into a dictionary. Necessary for backwards compatibility with + XML-based courses. + """ + ret = {'0.75': '', '1.00': '', '1.25': '', '1.50': ''} + if data == '': + return ret + videos = data.split(',') + for video in videos: + pieces = video.split(':') + # HACK + # To elaborate somewhat: in many LMS tests, the keys for + # Youtube IDs are inconsistent. Sometimes a particular + # speed isn't present, and formatting is also inconsistent + # ('1.0' versus '1.00'). So it's necessary to either do + # something like this or update all the tests to work + # properly. + ret['%.2f' % float(pieces[0])] = pieces[1] + return ret + + @staticmethod + def _parse_video_xml(xml_data): + """ + Parse video fields out of xml_data. The fields are set if they are + present in the XML. + """ + xml = etree.fromstring(xml_data) + model_data = {} + + conversions = { + 'show_captions': json.loads, + 'start_time': VideoAlphaDescriptor._parse_time, + 'end_time': VideoAlphaDescriptor._parse_time + } + + # VideoModule and VideoAlphaModule use different names for + # these attributes -- need to convert between them + video_compat = { + 'from': 'start_time', + 'to': 'end_time' + } + + sources = xml.findall('source') + if sources: + model_data['html5_sources'] = [ele.get('src') for ele in sources] + model_data['source'] = model_data['html5_sources'][0] + + track = xml.find('track') + if track is not None: + model_data['track'] = track.get('src') + + for attr, value in xml.items(): + if attr in video_compat: + attr = video_compat[attr] + if attr == 'youtube': + speeds = VideoAlphaDescriptor._parse_youtube(value) + for speed, youtube_id in speeds.items(): + # should have made these youtube_id_1_00 for + # cleanliness, but hindsight doesn't need glasses + normalized_speed = speed[:-1] if speed.endswith('0') else speed + # If the user has specified html5 sources, make sure we don't use the default video + if youtube_id != '' or 'html5_sources' in model_data: + model_data['youtube_id_{0}'.format(normalized_speed.replace('.', '_'))] = youtube_id + else: + # Convert XML attrs into Python values. + if attr in conversions: + value = conversions[attr](value) + model_data[attr] = value + + return model_data + + @staticmethod + def _parse_time(str_time): + """Converts s in '12:34:45' format to seconds. If s is + None, returns empty string""" + if not str_time: + return '' + else: + obj_time = time.strptime(str_time, '%H:%M:%S') + return datetime.timedelta( + hours=obj_time.tm_hour, + minutes=obj_time.tm_min, + seconds=obj_time.tm_sec + ).total_seconds() + + +def _create_youtube_string(module): + """ + Create a string of Youtube IDs from `module`'s metadata + attributes. Only writes a speed if an ID is present in the + module. Necessary for backwards compatibility with XML-based + courses. + """ + youtube_ids = [ + module.youtube_id_0_75, + module.youtube_id_1_0, + module.youtube_id_1_25, + module.youtube_id_1_5 + ] + youtube_speeds = ['0.75', '1.00', '1.25', '1.50'] + return ','.join([':'.join(pair) + for pair + in zip(youtube_speeds, youtube_ids) + if pair[1]]) diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index 7e4802d208..1ec5f09e3c 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -10,7 +10,7 @@ from pkg_resources import resource_listdir, resource_string, resource_isdir from xmodule.modulestore import inheritance, Location from xmodule.modulestore.exceptions import ItemNotFoundError, InsufficientSpecificationError, InvalidLocationError -from xblock.core import XBlock, Scope, String, Integer, Float, ModelType +from xblock.core import XBlock, Scope, String, Integer, Float, List, ModelType from xblock.fragment import Fragment from xblock.runtime import Runtime from xmodule.modulestore.locator import BlockUsageLocator @@ -766,7 +766,7 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock): # 2. Number editors for integers and floats. # 3. A generic string editor for anything else (editing JSON representation of the value). editor_type = "Generic" - values = [] if field.values is None else copy.deepcopy(field.values) + values = copy.deepcopy(field.values) if isinstance(values, tuple): values = list(values) if isinstance(values, list): @@ -783,11 +783,13 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock): editor_type = "Integer" elif isinstance(field, Float): editor_type = "Float" + elif isinstance(field, List): + editor_type = "List" metadata_fields[field.name] = {'field_name': field.name, 'type': editor_type, 'display_name': field.display_name, 'value': field.to_json(value), - 'options': values, + 'options': [] if values is None else values, 'default_value': field.to_json(default_value), 'inheritable': inheritable, 'explicitly_set': explicitly_set, @@ -902,6 +904,8 @@ class ModuleSystem(Runtime): s3_interface=None, cache=None, can_execute_unsafe_code=None, + replace_course_urls=None, + replace_jump_to_id_urls=None ): ''' Create a closure around the system environment. @@ -978,6 +982,8 @@ class ModuleSystem(Runtime): self.cache = cache or DoNothingCache() self.can_execute_unsafe_code = can_execute_unsafe_code or (lambda: False) + self.replace_course_urls = replace_course_urls + self.replace_jump_to_id_urls = replace_jump_to_id_urls def get(self, attr): ''' provide uniform access to attributes (like etree).''' diff --git a/common/static/js/utility.js b/common/static/js/utility.js index 6407faad48..a983535b46 100644 --- a/common/static/js/utility.js +++ b/common/static/js/utility.js @@ -1,20 +1,20 @@ // checks whether or not the url is external to the local site. // generously provided by StackOverflow: http://stackoverflow.com/questions/6238351/fastest-way-to-detect-external-urls -function isExternal(url) { +window.isExternal = function (url) { // parse the url into protocol, host, path, query, and fragment. More information can be found here: http://tools.ietf.org/html/rfc3986#appendix-B var match = url.match(/^([^:\/?#]+:)?(?:\/\/([^\/?#]*))?([^?#]+)?(\?[^#]*)?(#.*)?/); // match[1] matches a protocol if one exists in the url // if the protocol in the url does not match the protocol in the window's location, this url is considered external - if (typeof match[1] === "string" && - match[1].length > 0 - && match[1].toLowerCase() !== location.protocol) + if (typeof match[1] === "string" && + match[1].length > 0 && + match[1].toLowerCase() !== location.protocol) return true; // match[2] matches the host if one exists in the url // if the host in the url does not match the host of the window location, this url is considered external - if (typeof match[2] === "string" && - match[2].length > 0 && + if (typeof match[2] === "string" && + match[2].length > 0 && // this regex removes the port number if it patches the current location's protocol - match[2].replace(new RegExp(":("+{"http:":80,"https:":443}[location.protocol]+")?$"), "") !== location.host) + match[2].replace(new RegExp(":("+{"http:":80,"https:":443}[location.protocol]+")?$"), "") !== location.host) return true; return false; -} +}; diff --git a/common/test/data/toy/course/2012_Fall.xml b/common/test/data/toy/course/2012_Fall.xml index 679f7bbfdb..9b14d49dcd 100644 --- a/common/test/data/toy/course/2012_Fall.xml +++ b/common/test/data/toy/course/2012_Fall.xml @@ -4,6 +4,9 @@ + + +
      -

    1. ${_("Course Number")}

      ${course.number}
      2. +

    2. ${_("Course Number")}

      ${course.display_number_with_default | h}

    3. ${_("Classes Start")}

      ${course.start_date_text}
      4. ## We plan to ditch end_date (which is not stored in course metadata), diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index 8d033434f0..2a52b50b09 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -2,7 +2,7 @@ <%inherit file="/main.html" /> <%namespace name='static' file='/static_content.html'/> <%block name="bodyclass">courseware ${course.css_class} -<%block name="title">${_("{course_number} Courseware").format(course_number=course.number)} +<%block name="title">${_("{course_number} Courseware").format(course_number=course.display_number_with_default) | h} <%block name="headextra"> <%static:css group='course'/> diff --git a/lms/templates/courseware/info.html b/lms/templates/courseware/info.html index 4bb961428e..a1aad363a9 100644 --- a/lms/templates/courseware/info.html +++ b/lms/templates/courseware/info.html @@ -7,8 +7,7 @@ <%static:css group='course'/> -<%block name="title">${_("{course.number} Course Info").format(course=course)} - +<%block name="title">${_("{course.display_number_with_default} Course Info").format(course=course) | h} <%include file="/courseware/course_navigation.html" args="active_page='info'" /> <%! from courseware.courses import get_course_info_section diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html index bdc8b9d059..5b254fc86e 100644 --- a/lms/templates/courseware/instructor_dashboard.html +++ b/lms/templates/courseware/instructor_dashboard.html @@ -201,7 +201,7 @@ function goto( mode)

      ${_("Course-specific grade adjustment")}

      - {_("Specify a particular problem in the course here by its url:")} + ${_("Specify a particular problem in the course here by its url:")}

      @@ -385,7 +385,7 @@ function goto( mode) ${_("Notify students by email")}

      ${_("Auto-enroll students when they activate")} - +

      @@ -639,7 +639,7 @@ function goto( mode) %if instructor_tasks is not None and len(instructor_tasks) > 0:

      -

      $_("Pending Instructor Tasks")}

      +

      ${_("Pending Instructor Tasks")}

      diff --git a/lms/templates/courseware/mktg_course_about.html b/lms/templates/courseware/mktg_course_about.html index a2c1bd7d0a..be623b5baa 100644 --- a/lms/templates/courseware/mktg_course_about.html +++ b/lms/templates/courseware/mktg_course_about.html @@ -8,7 +8,7 @@ <%inherit file="../mktg_iframe.html" /> -<%block name="title">${_("About {course_number}").format(course_number=course.number)} +<%block name="title">${_("About {course_number}").format(course_number=course.display_number_with_default) | h} <%block name="bodyclass">view-partial-mktgregister @@ -52,7 +52,7 @@
      ${_("You Are Registered")}
      %endif %elif allow_registration: - ${_("Register for")} ${course.number} + ${_("Register for")} ${course.display_number_with_default | h} %else:
      ${_("Registration Is Closed")}
      %endif diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html index 51feed23ab..324eadf560 100644 --- a/lms/templates/courseware/progress.html +++ b/lms/templates/courseware/progress.html @@ -8,7 +8,7 @@ <%namespace name="progress_graph" file="/courseware/progress_graph.js"/> -<%block name="title">${_("{course_number} Progress").format(course_number=course.number)} +<%block name="title">${_("{course_number} Progress").format(course_number=course.display_number_with_default) | h} <%! from django.core.urlresolvers import reverse diff --git a/lms/templates/courseware/static_tab.html b/lms/templates/courseware/static_tab.html index 5b6e1480dd..f03dcacb80 100644 --- a/lms/templates/courseware/static_tab.html +++ b/lms/templates/courseware/static_tab.html @@ -6,7 +6,7 @@ <%static:css group='course'/> -<%block name="title">${course.number} ${tab['name']} +<%block name="title">${course.display_number_with_default | h} ${tab['name']} <%include file="/courseware/course_navigation.html" args="active_page='static_tab_{0}'.format(tab['url_slug'])" /> diff --git a/lms/templates/courseware/syllabus.html b/lms/templates/courseware/syllabus.html index f9b5455273..e2f3c53739 100644 --- a/lms/templates/courseware/syllabus.html +++ b/lms/templates/courseware/syllabus.html @@ -6,7 +6,7 @@ <%static:css group='course'/> -<%block name="title">${_("{course.number} Course Info").format(course=course)} +<%block name="title">${_("{course.display_number_with_default} Course Info").format(course=course) | h} <%include file="/courseware/course_navigation.html" args="active_page='syllabus'" /> <%! diff --git a/lms/templates/courseware/welcome-back.html b/lms/templates/courseware/welcome-back.html index a622fe3c57..b9f4681403 100644 --- a/lms/templates/courseware/welcome-back.html +++ b/lms/templates/courseware/welcome-back.html @@ -2,7 +2,7 @@

      ${chapter_module.display_name_with_default}

      ${_("You were most recently in {section_link}. If you\'re done with that, choose another section on the left.").format( - section_link='{section_name}'.format( + section_link=u'{section_name}'.format( url=prev_section_url, section_name=prev_section.display_name_with_default, ) diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 6356b64209..1dfa66461c 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -140,7 +140,7 @@ % if course.id in show_courseware_links_for: - ${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')} + ${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}') |h} % else:

      @@ -162,9 +162,9 @@

      ${get_course_about_section(course, 'university')}

      % if course.id in show_courseware_links_for: - ${course.number} ${course.display_name_with_default} + ${course.display_number_with_default | h} ${course.display_name_with_default} % else: - ${course.number} ${course.display_name_with_default} + ${course.display_number_with_default | h} ${course.display_name_with_default} % endif

      @@ -202,7 +202,7 @@ link_start=''.format(url=testcenter_register_target), link_end='')} ${_("Otherwise {link_start}contact edX at {email}{link_end} for further help.").format( - link_start=''.format(email="exam-help@edx.org", about=get_course_about_section(course, 'university'), number=course.number), + link_start=''.format(email="exam-help@edx.org", about=get_course_about_section(course, 'university'), number=course.display_number_with_default), link_end='', email="exam-help@edx.org", )} diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html index 3b6937b7d5..de53433790 100644 --- a/lms/templates/discussion/index.html +++ b/lms/templates/discussion/index.html @@ -6,7 +6,7 @@ <%inherit file="../main.html" /> <%namespace name='static' file='../static_content.html'/> <%block name="bodyclass">discussion -<%block name="title">${_("Discussion - {course_number}").format(course_number=course.number) | h} +<%block name="title">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h} <%block name="headextra"> <%static:css group='course'/> diff --git a/lms/templates/discussion/single_thread.html b/lms/templates/discussion/single_thread.html index 6aae08a7a7..5bd6c6ca03 100644 --- a/lms/templates/discussion/single_thread.html +++ b/lms/templates/discussion/single_thread.html @@ -7,7 +7,7 @@ <%inherit file="../main.html" /> <%namespace name='static' file='../static_content.html'/> <%block name="bodyclass">discussion -<%block name="title">${_("Discussion - {course_number}").format(course_number=course.number) | h} +<%block name="title">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h} <%block name="headextra"> <%static:css group='course'/> diff --git a/lms/templates/discussion/user_profile.html b/lms/templates/discussion/user_profile.html index 1c1901c10b..dbfa79d4e7 100644 --- a/lms/templates/discussion/user_profile.html +++ b/lms/templates/discussion/user_profile.html @@ -4,7 +4,7 @@ <%inherit file="../main.html" /> <%namespace name='static' file='../static_content.html'/> <%block name="bodyclass">discussion -<%block name="title">${_("Discussion - {course_number}").format(course_number=course.number) | h} +<%block name="title">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h} <%block name="headextra"> <%static:css group='course'/> diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html index 6692d02d09..41a751aae4 100644 --- a/lms/templates/help_modal.html +++ b/lms/templates/help_modal.html @@ -31,7 +31,7 @@ discussion_link = get_discussion_link(course) if course else None

      % endif -

      ${_('Have general questions about {platform_name}? You can find lots of helpful information in the {platform_name} {link_start}FAQ{link_end}.').format(link_start='', link_end='').format(platform_name=settings.PLATFORM_NAME)}

      +

      ${_('Have general questions about {platform_name}? You can find lots of helpful information in the {platform_name} {link_start}FAQ{link_end}.').format(link_start='', link_end='', platform_name=settings.PLATFORM_NAME)}

      ${_('Have a question about something specific? You can contact the {platform_name} general support team directly:').format(platform_name=settings.PLATFORM_NAME)}

      diff --git a/lms/templates/index.html b/lms/templates/index.html index e7c0d638c7..0fecd24e84 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -186,7 +186,7 @@ else: youtube_video_id = "XNaiOGxWeto" %> - +
      diff --git a/lms/templates/instructor/instructor_dashboard_2/analytics.html b/lms/templates/instructor/instructor_dashboard_2/analytics.html index ebb8a8cb3c..8469c1db93 100644 --- a/lms/templates/instructor/instructor_dashboard_2/analytics.html +++ b/lms/templates/instructor/instructor_dashboard_2/analytics.html @@ -1,12 +1,54 @@ <%page args="section_data"/> -

      Distributions

      - -
      -
      -
      -
      -
      -
      + + + + +
      + +
      + +
      + +
      diff --git a/lms/templates/instructor/instructor_dashboard_2/student_admin.html b/lms/templates/instructor/instructor_dashboard_2/student_admin.html index a24288f4de..bf99fcea57 100644 --- a/lms/templates/instructor/instructor_dashboard_2/student_admin.html +++ b/lms/templates/instructor/instructor_dashboard_2/student_admin.html @@ -1,6 +1,6 @@ <%page args="section_data"/> -
      +

      Student-specific grade adjustment

      @@ -47,12 +47,11 @@
      %endif +
      %if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS') and section_data['access']['instructor']: -
      - -
      +

      Course-specific grade adjustment

      @@ -81,9 +80,9 @@

      -
      -
      +
      +

      Pending Instructor Tasks

      diff --git a/lms/templates/instructor/staff_grading.html b/lms/templates/instructor/staff_grading.html index fb6766fe15..40e80de11e 100644 --- a/lms/templates/instructor/staff_grading.html +++ b/lms/templates/instructor/staff_grading.html @@ -7,7 +7,7 @@ <%static:css group='course'/> -<%block name="title">${_("{course_number} Staff Grading").format(course_number=course.number)} +<%block name="title">${_("{course_number} Staff Grading").format(course_number=course.display_number_with_default) | h} <%include file="/courseware/course_navigation.html" args="active_page='staff_grading'" /> diff --git a/lms/templates/module-error.html b/lms/templates/module-error.html index b0641ea5c4..f43db37dfc 100644 --- a/lms/templates/module-error.html +++ b/lms/templates/module-error.html @@ -1,7 +1,7 @@ <%! from django.utils.translation import ugettext as _ %>
      -

      ${_("There has been an error on the {platform_name} servers")}

      +

      ${_("There has been an error on the {platform_name} servers").format(platform_name=settings.PLATFORM_NAME)}

      ${_("We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at {tech_support_email} to report any problems or downtime.").format(platform_name=settings.PLATFORM_NAME, tech_support_email=settings.TECH_SUPPORT_EMAIL)}

      % if staff_access: diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html index 589d12666d..ee9b400251 100644 --- a/lms/templates/navigation.html +++ b/lms/templates/navigation.html @@ -50,7 +50,7 @@ site_status_msg = get_site_status_msg(course_id) % if course: -

      ${course.org}: ${course.number} ${course.display_name_with_default}

      +

      ${course.display_org_with_default | h}: ${course.display_number_with_default | h} ${course.display_name_with_default}

      % endif % if user.is_authenticated(): diff --git a/lms/templates/open_ended_problems/combined_notifications.html b/lms/templates/open_ended_problems/combined_notifications.html index 86eb4083dd..ce22a5c580 100644 --- a/lms/templates/open_ended_problems/combined_notifications.html +++ b/lms/templates/open_ended_problems/combined_notifications.html @@ -7,7 +7,7 @@ <%static:css group='course'/> -<%block name="title">${_("{course_number} Combined Notifications").format(course_number=course.number)} +<%block name="title">${_("{course_number} Combined Notifications").format(course_number=course.display_number_with_default) | h} <%include file="/courseware/course_navigation.html" args="active_page='open_ended'" /> diff --git a/lms/templates/open_ended_problems/open_ended_flagged_problems.html b/lms/templates/open_ended_problems/open_ended_flagged_problems.html index ab60e54300..8e746f585f 100644 --- a/lms/templates/open_ended_problems/open_ended_flagged_problems.html +++ b/lms/templates/open_ended_problems/open_ended_flagged_problems.html @@ -7,7 +7,7 @@ <%static:css group='course'/> -<%block name="title">${_("{course_number} Flagged Open Ended Problems").format(course_number=course.number)} +<%block name="title">${_("{course_number} Flagged Open Ended Problems").format(course_number=course.display_number_with_default) | h} <%include file="/courseware/course_navigation.html" args="active_page='open_ended_flagged_problems'" /> diff --git a/lms/templates/open_ended_problems/open_ended_problems.html b/lms/templates/open_ended_problems/open_ended_problems.html index 56b269d8b7..68882984f5 100644 --- a/lms/templates/open_ended_problems/open_ended_problems.html +++ b/lms/templates/open_ended_problems/open_ended_problems.html @@ -7,7 +7,7 @@ <%static:css group='course'/> -<%block name="title">${_("{course_number} Open Ended Problems").format(course_number=course.number)} +<%block name="title">${_("{course_number} Open Ended Problems").format(course_number=course.display_number_with_default) | h} <%include file="/courseware/course_navigation.html" args="active_page='open_ended_problems'" /> diff --git a/lms/templates/static_htmlbook.html b/lms/templates/static_htmlbook.html index 67274e30c9..60421502e6 100644 --- a/lms/templates/static_htmlbook.html +++ b/lms/templates/static_htmlbook.html @@ -2,7 +2,7 @@ <%inherit file="main.html" /> <%namespace name='static' file='static_content.html'/> -<%block name="title">${_('{course_number} Textbook').format(course_number=course.number)} +<%block name="title">${_('{course_number} Textbook').format(course_number=course.display_number_with_default) | h} <%block name="headextra"> diff --git a/lms/templates/static_pdfbook.html b/lms/templates/static_pdfbook.html index dfa7a47157..4e9f604a0c 100644 --- a/lms/templates/static_pdfbook.html +++ b/lms/templates/static_pdfbook.html @@ -5,7 +5,7 @@ <%block name="title"> -${_('{course_number} Textbook').format(course_number=course.number)} +${_('{course_number} Textbook').format(course_number=course.display_number_with_default) | h} <%block name="headextra"> diff --git a/lms/templates/static_templates/about.html b/lms/templates/static_templates/about.html index fbaaf4e816..fa6188746a 100644 --- a/lms/templates/static_templates/about.html +++ b/lms/templates/static_templates/about.html @@ -52,7 +52,7 @@

      ${_("{massachusetts_institute_of_technology}").format(massachusetts_institute_of_technology="Massachusetts Institute of Technology")}

      ${_("The {massachusetts_institute_of_technology} — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; {Sloan} School of Management; and Science.").format(massachusetts_institute_of_technology="Massachusetts Institute of Technology", Sloan="Sloan")}

      -

      ${_("{MIT}'s commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.")}

      +

      ${_("{MIT}'s commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.").format(MIT="MIT")}

      ${_("Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.")}

      diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html index ea3e0e4725..9b90fd5c6c 100644 --- a/lms/templates/static_templates/faq.html +++ b/lms/templates/static_templates/faq.html @@ -21,7 +21,7 @@

      ${_("Organization")}

      ${_("What is {edX}?").format(edX="edX")}

      -

      ${_('{edX} is a not-for-profit enterprise of its founding partners, the {MIT_long} ({MIT}) and {harvard_u} that offers online learning to on-campus students and to millions of people around the world. To do so, {edX} is building an open-source online learning platform and hosts an online web portal at www.edx.org for online education.').format(edX="edX", MIT_long="Massachusetts Institute of Technology", MIT="MIT", harvard_u="Harvard University")}

      +

      ${_('{EdX} is a not-for-profit enterprise of its founding partners, the {MIT_long} ({MIT}) and {harvard_u} that offers online learning to on-campus students and to millions of people around the world. To do so, {edX} is building an open-source online learning platform and hosts an online web portal at www.edx.org for online education.').format(EdX="EdX", edX="edX", MIT_long="Massachusetts Institute of Technology", MIT="MIT", harvard_u="Harvard University")}

      ${_("{EdX} currently offers {HarvardX}, {MITx} and {BerkeleyX} classes online for free. Beginning in fall 2013, {edX} will offer {WellesleyX} , {GeorgetownX} and the {UTexas} classes online for free. The {UT} System includes nine universities and six health institutions. In 2014, {edX} will further expand its consortium, including several international schools, when it begins offering courses from {EPFL}, {McGill}, {Toronto}, {ANU}, {Delft}, and {Rice}. The {edX} institutions aim to extend their collective reach to build a global community of online students. Along with offering online courses, the three universities undertake research on how students learn and how technology can transform learning both on-campus and online throughout the world.").format( EdX="EdX", edX="edX", @@ -32,7 +32,7 @@ GeorgetownX="GeorgetownX", UTexas="University of Texas System", UT="UT", - EPFL="École Polytechnique Fédérale de Lausanne", + EPFL=u"École Polytechnique Fédérale de Lausanne", McGill="McGill University", Toronto="University of Toronto", ANU="Australian National University", @@ -44,12 +44,12 @@

      ${_("Will {edX} be adding additional X Universities?").format(edX="edX")}

      -

      ${_("More than 200 institutions from around the world have expressed interest in collaborating with {edX} since {Harvard} and {MIT} announced its creation in May. {EdX} is focused above all on quality and developing the best not-for-profit model for online education. In addition to providing online courses on the {edX} platform, the {x_consortium} will be a forum in which members can share experiences around online learning. {Harvard}, {MIT}, {Berkeley}, the {UTexas} and the other {consortium} members will work collaboratively to establish the {\"X_University\" Consortium}, whose membership will expand to include additional \"{X_Universities}.\" As noted above, {edX}'s newest {consortium} members include {Wellesley}, {Georgetown}, {EPFL}, {McGill}, {Toronto}, {ANU}, {Delft}, and {Rice}. Each member of the {consortium} will offer courses on the {edX} platform as an \"{X_University}\". The gathering of many universities' educational content together on one site will enable learners worldwide to access the offered course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.").format( +

      ${_("More than 200 institutions from around the world have expressed interest in collaborating with {edX} since {Harvard} and {MIT} announced its creation in May. {EdX} is focused above all on quality and developing the best not-for-profit model for online education. In addition to providing online courses on the {edX} platform, the {x_consortium} will be a forum in which members can share experiences around online learning. {Harvard}, {MIT}, {Berkeley}, the {UTexas} and the other {consortium} members will work collaboratively to establish the {x_consortium}, whose membership will expand to include additional \"{X_Universities}.\" As noted above, {edX}'s newest {consortium} members include {Wellesley}, {Georgetown}, {EPFL}, {McGill}, {Toronto}, {ANU}, {Delft}, and {Rice}. Each member of the {consortium} will offer courses on the {edX} platform as an \"{X_University}\". The gathering of many universities' educational content together on one site will enable learners worldwide to access the offered course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.").format( EdX="EdX", edX="edX", Harvard="Harvard", MIT="MIT", - x_consortium="\"X_University\" Consortium", + x_consortium="\"X University\" Consortium", consortium="consortium", X_Universities="X Universities", X_University="X University", @@ -57,14 +57,14 @@ Wellesley="Wellesley", Georgetown="Georgetown", UTexas="University of Texas System", - EPFL="École Polytechnique Fédérale de Lausanne", + EPFL=u"École Polytechnique Fédérale de Lausanne", McGill="McGill University", Toronto="University of Toronto", ANU="Australian National University", Delft="Delft University of Technology", Rice="Rice University", )}

      -

      ${_("{edX} will actively explore the addition of other institutions from around the world to the {edX} platform, and looks forward to adding more \"{X Universities}\".").format(edX="edX", X_Universities="X Universities")} +

      ${_("{EdX} will actively explore the addition of other institutions from around the world to the {edX} platform, and looks forward to adding more \"{X_Universities}\".").format(EdX="EdX", edX="edX", X_Universities="X Universities")}

      @@ -79,7 +79,7 @@

      ${_("Will certificates be awarded?")}

      ${_("Yes. Online learners who demonstrate mastery of subjects can earn a certificate " "of mastery. Certificates will be issued at the discretion of {edX} and the underlying " - "{X_University} that offered the course under the name of the underlying \"{X_University}\" from where the course originated, i.e. {HarvardX}, {MITx} or {BerkeleyX}. " + "\"{X_University}\" that offered the course under the name of the underlying \"{X_University}\" from where the course originated, i.e. {HarvardX}, {MITx} or {BerkeleyX}. " "For the courses in Fall 2012, those certificates will be free. There is a plan to " "charge a modest fee for certificates in the future. Note: At this time, {edX} is " "holding certificates for learners connected with Cuba, Iran, Syria and Sudan " @@ -102,7 +102,7 @@

      ${_("{EdX} institutions have assembled faculty members who will collect and analyze data to assess results and the impact {edX} is having on learning.").format(EdX="EdX", edX="edX")}

      -

      ${_("How may I apply to study with {edX}?")}

      +

      ${_("How may I apply to study with {edX}?").format(edX="edX")}

      ${_('Simply complete the online {link_start}signup form{link_end}. Enrolling will create your unique student record in the {edX} database, allow you to register for classes, and to receive a certificate on successful completion.').format(link_start='', link_end='', edX="edX")}

      diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html index b2743f892f..f4f65be053 100644 --- a/lms/templates/static_templates/help.html +++ b/lms/templates/static_templates/help.html @@ -139,7 +139,7 @@

      ${_("How can I talk to professors, fellows and teaching assistants?")}

      -

      ${_("The Discussion Forums are the best place to reach out to the {edX} teaching team for your class, and you don\'t have to wait in line or rearrange your schedule to fit your professor'\s - just post your questions. The response isn\'t always immediate, but it\'s usually pretty darned quick.").format(edX="edX")}

      +

      ${_("The Discussion Forums are the best place to reach out to the {edX} teaching team for your class, and you don\'t have to wait in line or rearrange your schedule to fit your professor\'s - just post your questions. The response isn\'t always immediate, but it\'s usually pretty darned quick.").format(edX="edX")}

      @@ -189,7 +189,7 @@

      ${_("How are {edX} certificates delivered?").format(edX="edX")}

      -

      ${_("{EdX} certificates are delivered online through edx.org. So be sure to check your email in the weeks following the final grading - you will be able to download and print your certificate.").format(edX="edX")}

      +

      ${_("{EdX} certificates are delivered online through edx.org. So be sure to check your email in the weeks following the final grading - you will be able to download and print your certificate.").format(EdX="EdX")}

      @@ -319,7 +319,7 @@ ${_("The Classes")} ${_("Certificates and Credits")} ${_("{edX} & Open source").format(edX="edX")} - $${_("Other Help Questions - Account Questions")} + ${_("Other Help Questions - Account Questions")} diff --git a/lms/templates/static_templates/press.html b/lms/templates/static_templates/press.html index 8abead7175..58acbca332 100644 --- a/lms/templates/static_templates/press.html +++ b/lms/templates/static_templates/press.html @@ -18,7 +18,9 @@ % for article in articles:
      - ${"" % static.url('images/press/' + article.image)} + + +
      diff --git a/lms/templates/staticbook.html b/lms/templates/staticbook.html index 980448b482..09741e0a9e 100644 --- a/lms/templates/staticbook.html +++ b/lms/templates/staticbook.html @@ -2,7 +2,7 @@ <%inherit file="main.html" /> <%namespace name='static' file='static_content.html'/> -<%block name="title">${_("{course_number} Textbook").format(course_number=course.number)} +<%block name="title">${_("{course_number} Textbook").format(course_number=course.display_number_with_default) | h} <%block name="headextra"> <%static:css group='course'/> diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html index df6845e577..c35acf9914 100644 --- a/lms/templates/test_center_register.html +++ b/lms/templates/test_center_register.html @@ -95,7 +95,7 @@
      -

      ${get_course_about_section(course, 'university')} ${course.number} ${course.display_name_with_default}

      +

      ${get_course_about_section(course, 'university')} ${course.display_number_with_default | h} ${course.display_name_with_default | h}

      % if registration:

      ${_('Your Pearson VUE Proctored Exam Registration')}

      @@ -442,7 +442,7 @@ % endif
      -

      ${_("About {university} {course_number}").format(university=get_course_about_section(course, 'university'), course_number=course.number)}

      +

      ${_("About {university} {course_number}").format(university=get_course_about_section(course, 'university'), course_number=course.course.display_number_with_default) | h}

      % if course.has_ended(): ${_('Course Completed:')} ${course.end_date_text} diff --git a/lms/templates/university_profile/edge.html b/lms/templates/university_profile/edge.html new file mode 100644 index 0000000000..166a95a106 --- /dev/null +++ b/lms/templates/university_profile/edge.html @@ -0,0 +1,66 @@ +<%! from django.utils.translation import ugettext as _ %> +<%inherit file="../stripped-main.html" /> +<%! from django.core.urlresolvers import reverse %> +<%block name="title">${_("edX edge")} +<%block name="bodyclass">no-header edge-landing + +<%block name="content"> +

      +
      ${_("edX edge")}
      +
      + + +
      +
      + + + +<%block name="js_extra"> + + + +<%include file="../signup_modal.html" /> +<%include file="../forgot_password_modal.html" /> \ No newline at end of file diff --git a/lms/templates/videoalpha.html b/lms/templates/videoalpha.html index 416620a4b5..d0eb7290a7 100644 --- a/lms/templates/videoalpha.html +++ b/lms/templates/videoalpha.html @@ -1,86 +1,86 @@ <%! from django.utils.translation import ugettext as _ %> % if display_name is not UNDEFINED and display_name is not None: -

      ${display_name}

      +

      ${display_name}

      % endif
      -
      - +
      +
      - % if show_captions == 'true': -
      - % endif - -
      +
      +
      % if sources.get('main'): -
      -

      ${_('Download video here.') % sources.get('main')}

      -
      +
      +

      ${(_('Download video') + ' ' + _('here') + '.') % sources.get('main')}

      +
      % endif % if track: -
      -

      ${_('Download subtitles here.') % track}

      -
      +
      +

      ${(_('Download subtitles') + ' ' + _('here') + '.') % track}

      +
      % endif diff --git a/lms/templates/word_cloud.html b/lms/templates/word_cloud.html index 5ec83afcc7..dc66b04a9b 100644 --- a/lms/templates/word_cloud.html +++ b/lms/templates/word_cloud.html @@ -1,3 +1,5 @@ +<%! from django.utils.translation import ugettext as _ %> +
      =1.3 +pip>=1.4 polib==1.0.3 pycrypto>=2.6 pygments==1.5 @@ -52,6 +52,7 @@ sorl-thumbnail==11.12 South==0.7.6 sympy==0.7.1 xmltodict==0.4.1 +django-ratelimit-backend==0.6 # Used for debugging ipython==0.13.1 @@ -68,8 +69,8 @@ newrelic==1.8.0.13 sphinx==1.1.3 # Used for Internationalization and localization -Babel==0.9.6 -transifex-client==0.8 +Babel==1.3 +transifex-client==0.9.1 # Used for testing coverage==3.6 @@ -80,7 +81,7 @@ nosexcover==1.0.7 pep8==1.4.5 pylint==0.28 rednose==0.3 -selenium==2.33.0 +selenium==2.34.0 splinter==0.5.4 django_nose==1.1 django-jasmine==0.3.2 diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 0d77dac179..a2b4dde59c 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -8,6 +8,6 @@ -e git+https://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk # Our libraries: --e git+https://github.com/edx/XBlock.git@b697bebd45deebd0f868613fab6722a0460ca0c1#egg=XBlock +-e git+https://github.com/edx/XBlock.git@446668fddc75b78512eef4e9425cbc9a3327606f#egg=XBlock -e git+https://github.com/edx/codejail.git@0a1b468#egg=codejail --e git+https://github.com/edx/diff-cover.git@v0.2.0#egg=diff_cover +-e git+https://github.com/edx/diff-cover.git@v0.2.1#egg=diff_cover diff --git a/scripts/create-dev-env.sh b/scripts/create-dev-env.sh index 25e1b7520b..73ae93ab2d 100755 --- a/scripts/create-dev-env.sh +++ b/scripts/create-dev-env.sh @@ -387,12 +387,12 @@ export WORKON_HOME=$PYTHON_DIR if [[ `type -t mkvirtualenv` != "function" ]]; then case `uname -s` in Darwin) - source `which virtualenvwrapper.sh` + VEWRAPPER=`which virtualenvwrapper.sh` ;; [Ll]inux) if [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then - source /etc/bash_completion.d/virtualenvwrapper + VEWRAPPER=/etc/bash_completion.d/virtualenvwrapper else error "Could not find virtualenvwrapper" exit 1 @@ -401,6 +401,7 @@ if [[ `type -t mkvirtualenv` != "function" ]]; then esac fi +source $VEWRAPPER # Create edX virtualenv and link it to repo # virtualenvwrapper automatically sources the activation script if [[ $systempkgs ]]; then @@ -514,11 +515,11 @@ if [[ ! $quiet ]]; then environment. Ensure the following lines are added to your login script, and source your login script if needed: - source `which virtualenvwrapper.sh` + source $VEWRAPPER Then, every time you're ready to work on the project, just run - $ workon mitx + $ workon edx-platform To start the Django on port 8000