diff --git a/AUTHORS b/AUTHORS index c700eab277..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 @@ -83,4 +83,4 @@ Ian Hoover Mukul Goyal Robert Marks Yarko Tymciurak - +Miles Steele diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 68308980ad..897ea3ae3a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,33 @@ 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 +status has changed. This will not be in use until the course creator table +is enabled. + +Studio: Added improvements to Course Creation: richer error messaging, tip +text, and fourth field for course run. + +Blades: New features for VideoAlpha player: +1.) Controls are auto hidden after a delay of mouse inactivity - the full video +becomes visible. +2.) When captions (CC) button is pressed, captions stick (not auto hidden after +a delay of mouse inactivity). The video player size does not change - the video +is down-sized and placed in the middle of the black area. +3.) All source code of Video Alpha 2 is written in JavaScript. It is not a basic +conversion from CoffeeScript. The structure of the player has been changed. +4.) A lot of additional unit tests. + LMS: Added user preferences (arbitrary user/key/value tuples, for which which user/key is unique) and a REST API for reading users and preferences. Access to the REST API is restricted by use of the @@ -14,10 +41,16 @@ the setting is not present, the API is disabled). LMS: Added endpoints for AJAX requests to enable/disable notifications (which are not yet implemented) and a one-click unsubscribe page. +Studio: Allow instructors of a course to designate other staff as instructors; +this allows instructors to hand off management of a course to someone else. + Common: Add a manage.py that knows about edx-platform specific settings and projects 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/README.md b/README.md index 4ab07b3550..0261f87b46 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,10 @@ installation process. Providers. You should use VirtualBox >= 4.2.12. (Windows: later/earlier VirtualBox versions than 4.2.12 have been reported to not work well with Vagrant. If this is still a problem, you can - install 4.2.12 from https://www.virtualbox.org/wiki/Download_Old_Builds_4_2). + install 4.2.12 from http://download.virtualbox.org/virtualbox/4.2.12/). 4. Install Vagrant: http://www.vagrantup.com/ (Vagrant 1.2.2 or later) 5. Open a terminal -6. Download the project: `git clone git://github.com/edx/edx-platform.git` +6. Download the project: `git clone https://github.com/edx/edx-platform.git` 7. Enter the project directory: `cd edx-platform/` 8. (Windows only) Run the commands to [deal with line endings and symlinks under Windows](https://github.com/edx/edx-platform/wiki/Simplified-install-with-vagrant#dealing-with-line-endings-and-symlinks-under-windows) diff --git a/cms/djangoapps/auth/authz.py b/cms/djangoapps/auth/authz.py index 0f2e60dd6e..4923851445 100644 --- a/cms/djangoapps/auth/authz.py +++ b/cms/djangoapps/auth/authz.py @@ -178,10 +178,12 @@ def _remove_user_from_group(user, group_name): user.save() -def is_user_in_course_group_role(user, location, role): +def is_user_in_course_group_role(user, location, role, check_staff=True): if user.is_active and user.is_authenticated: # all "is_staff" flagged accounts belong to all groups - return user.is_staff or user.groups.filter(name=get_course_groupname_for_role(location, role)).count() > 0 + if check_staff and user.is_staff: + return True + return user.groups.filter(name=get_course_groupname_for_role(location, role)).count() > 0 return False diff --git a/cms/djangoapps/contentstore/course_info_model.py b/cms/djangoapps/contentstore/course_info_model.py index 7e1e6470ff..7ea09333ed 100644 --- a/cms/djangoapps/contentstore/course_info_model.py +++ b/cms/djangoapps/contentstore/course_info_model.py @@ -1,7 +1,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError from xmodule.modulestore import Location from xmodule.modulestore.django import modulestore -from lxml import html +from lxml import html, etree import re from django.http import HttpResponseBadRequest import logging @@ -74,34 +74,44 @@ def update_course_updates(location, update, passed_id=None): escaped = django.utils.html.escape(course_updates.data) course_html_parsed = html.fromstring("
  1. " + escaped + "
") + # if there's no ol, create it + if course_html_parsed.tag != 'ol': + # surround whatever's there w/ an ol + if course_html_parsed.tag != 'li': + # but first wrap in an li + li = etree.Element('li') + li.append(course_html_parsed) + course_html_parsed = li + ol = etree.Element('ol') + ol.append(course_html_parsed) + course_html_parsed = ol + # No try/catch b/c failure generates an error back to client new_html_parsed = html.fromstring('

  • ' + update['date'] + '

    ' + update['content'] + '
    • ') - # Confirm that root is
      , iterate over
    1. , pull out

      subs and then rest of val - if course_html_parsed.tag == 'ol': - # ??? Should this use the id in the json or in the url or does it matter? - if passed_id is not None: - idx = get_idx(passed_id) - # idx is count from end of list - course_html_parsed[-idx] = new_html_parsed - else: - course_html_parsed.insert(0, new_html_parsed) + # ??? Should this use the id in the json or in the url or does it matter? + if passed_id is not None: + idx = get_idx(passed_id) + # idx is count from end of list + course_html_parsed[-idx] = new_html_parsed + else: + course_html_parsed.insert(0, new_html_parsed) - idx = len(course_html_parsed) - passed_id = course_updates.location.url() + "/" + str(idx) + idx = len(course_html_parsed) + passed_id = course_updates.location.url() + "/" + str(idx) - # update db record - course_updates.data = html.tostring(course_html_parsed) - modulestore('direct').update_item(location, course_updates.data) + # update db record + course_updates.data = html.tostring(course_html_parsed) + modulestore('direct').update_item(location, course_updates.data) - if (len(new_html_parsed) == 1): - content = new_html_parsed[0].tail - else: - content = "\n".join([html.tostring(ele) for ele in new_html_parsed[1:]]) + if (len(new_html_parsed) == 1): + content = new_html_parsed[0].tail + else: + content = "\n".join([html.tostring(ele) for ele in new_html_parsed[1:]]) - return {"id": passed_id, - "date": update['date'], - "content": content} + return {"id": passed_id, + "date": update['date'], + "content": content} def delete_course_update(location, update, passed_id): 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/advanced-settings.py b/cms/djangoapps/contentstore/features/advanced-settings.py index cdba6d9cb2..18e179abdb 100644 --- a/cms/djangoapps/contentstore/features/advanced-settings.py +++ b/cms/djangoapps/contentstore/features/advanced-settings.py @@ -2,7 +2,7 @@ #pylint: disable=W0621 from lettuce import world, step -from nose.tools import assert_false, assert_equal, assert_regexp_matches, assert_true +from nose.tools import assert_false, assert_equal, assert_regexp_matches from common import type_in_codemirror, press_the_notification_button KEY_CSS = '.key input.policy-key' @@ -90,18 +90,18 @@ def the_policy_key_value_is_changed(step): ############# HELPERS ############### def assert_policy_entries(expected_keys, expected_values): - for counter in range(len(expected_keys)): - index = get_index_of(expected_keys[counter]) - assert_false(index == -1, "Could not find key: " + expected_keys[counter]) - assert_equal(expected_values[counter], world.css_find(VALUE_CSS)[index].value, "value is incorrect") + for key, value in zip(expected_keys, expected_values): + index = get_index_of(key) + assert_false(index == -1, "Could not find key: {key}".format(key=key)) + assert_equal(value, world.css_find(VALUE_CSS)[index].value, "value is incorrect") def get_index_of(expected_key): - for counter in range(len(world.css_find(KEY_CSS))): - # Sometimes get stale reference if I hold on to the array of elements - key = world.css_value(KEY_CSS, index=counter) + for i, element in enumerate(world.css_find(KEY_CSS)): + # Sometimes get stale reference if I hold on to the array of elements + key = world.css_value(KEY_CSS, index=i) if key == expected_key: - return counter + return i return -1 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 d357c8ae96..69d2213eb4 100644 --- a/cms/djangoapps/contentstore/features/common.py +++ b/cms/djangoapps/contentstore/features/common.py @@ -4,10 +4,11 @@ from lettuce import world, step from nose.tools import assert_true -from auth.authz import get_user_by_email +from auth.authz import get_user_by_email, get_course_groupname_for_role from selenium.webdriver.common.keys import Keys import time +from django.contrib.auth.models import Group from logging import getLogger logger = getLogger(__name__) @@ -53,6 +54,12 @@ def i_have_opened_a_new_course(_step): open_new_course() +@step('(I select|s?he selects) the new course') +def select_new_course(_step, whom): + course_link_css = 'a.course-link' + world.css_click(course_link_css) + + @step(u'I press the "([^"]*)" notification button$') def press_the_notification_button(_step, name): css = 'a.action-%s' % name.lower() @@ -63,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 "(.*)"$') @@ -118,14 +129,18 @@ def create_studio_user( registration.register(studio_user) registration.activate() + return studio_user + def fill_in_course_info( name='Robot Super Course', org='MITx', - num='999'): + num='101', + run='2013_Spring'): world.css_fill('.new-course-name', name) world.css_fill('.new-course-org', org) world.css_fill('.new-course-number', num) + world.css_fill('.new-course-run', run) def log_into_studio( @@ -133,40 +148,30 @@ def log_into_studio( email='robot+studio@edx.org', password='test'): - world.browser.cookies.delete() + world.log_in(username=uname, password=password, email=email, name='Robot Studio') + # 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) - def create_a_course(): - world.scenario_dict['COURSE'] = world.CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') + course = world.CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') + world.scenario_dict['COURSE'] = course + + user = world.scenario_dict.get("USER") + if not user: + user = get_user_by_email('robot+studio@edx.org') # Add the user to the instructor group of the course # so they will have the permissions to see it in studio - - course = world.GroupFactory.create(name='instructor_MITx/{}/{}'.format(world.scenario_dict['COURSE'].number, - world.scenario_dict['COURSE'].display_name.replace(" ", "_"))) - if world.scenario_dict.get('USER') is None: - user = world.scenario_dict['USER'] - else: - user = get_user_by_email('robot+studio@edx.org') - user.groups.add(course) + for role in ("staff", "instructor"): + groupname = get_course_groupname_for_role(course.location, role) + 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)) @@ -214,6 +219,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') @@ -222,14 +247,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$') @@ -242,7 +267,7 @@ def save_button_disabled(step): @step('I confirm the prompt') def confirm_the_prompt(step): prompt_css = 'a.button.action-primary' - world.css_click(prompt_css) + world.css_click(prompt_css, success_condition=lambda: not world.css_visible(prompt_css)) @step(u'I am shown a (.*)$') @@ -251,7 +276,8 @@ 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(): g._element.send_keys(Keys.COMMAND + 'a') @@ -259,3 +285,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 2b206e4466..606e3dcee8 100644 --- a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py +++ b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py @@ -12,11 +12,20 @@ def create_component_instance(step, component_button_css, category, has_multiple_templates=True): click_new_component_button(step, component_button_css) + if category in ('problem', 'html'): + def animation_done(_driver): + return world.browser.evaluate_script("$('div.new-component').css('display')") == 'none' + world.wait_for(animation_done) if has_multiple_templates: click_component_from_menu(category, boilerplate, expected_css) - assert_equal(1, len(world.css_find(expected_css))) + assert_equal( + 1, + len(world.css_find(expected_css)), + "Component instance with css {css} was not created successfully".format(css=expected_css)) + + @world.absorb def click_new_component_button(step, component_button_css): @@ -39,19 +48,32 @@ def click_component_from_menu(category, boilerplate, expected_css): elem_css = "a[data-category='{}']:not([data-boilerplate])".format(category) elements = world.css_find(elem_css) assert_equal(len(elements), 1) - world.css_click(elem_css) + world.wait_for(lambda _driver: world.css_visible(elem_css)) + world.css_click(elem_css, success_condition=lambda: 1 == len(world.css_find(expected_css))) @world.absorb 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 a') + + +@world.absorb +def edit_component(): + world.wait_for(lambda _driver: world.css_visible('a.edit-button')) world.css_click('a.edit-button') - world.css_click('#settings-mode') @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')) @@ -92,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.feature b/cms/djangoapps/contentstore/features/course-overview.feature index b3041b9b18..a9aed5d982 100644 --- a/cms/djangoapps/contentstore/features/course-overview.feature +++ b/cms/djangoapps/contentstore/features/course-overview.feature @@ -63,3 +63,10 @@ Feature: Course Overview When I navigate to the course overview page And I change an assignment's grading status Then I am shown a notification + + Scenario: Notification is shown on subsection reorder + Given I have opened a new course section in Studio + And I have added a new subsection + And I have added a new subsection + When I reorder subsections + Then I am shown a notification diff --git a/cms/djangoapps/contentstore/features/course-overview.py b/cms/djangoapps/contentstore/features/course-overview.py index 10fa6453b2..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) @@ -124,3 +124,14 @@ def all_sections_are_collapsed(step): def change_grading_status(step): world.css_find('a.menu-toggle').click() world.css_find('.menu li').first.click() + + +@step(u'I reorder subsections') +def reorder_subsections(_step): + draggable_css = 'a.drag-handle' + ele = world.css_find(draggable_css).first + ele.action_chains.drag_and_drop_by_offset( + ele._element, + 30, + 0 + ).perform() diff --git a/cms/djangoapps/contentstore/features/course-team.feature b/cms/djangoapps/contentstore/features/course-team.feature index fc1212f398..95843fc423 100644 --- a/cms/djangoapps/contentstore/features/course-team.feature +++ b/cms/djangoapps/contentstore/features/course-team.feature @@ -1,7 +1,7 @@ Feature: Course Team As a course author, I want to be able to add others to my team - Scenario: Users can add other users + Scenario: Admins can add other users Given I have opened a new course in Studio And the user "alice" exists And I am viewing the course team settings @@ -9,16 +9,18 @@ Feature: Course Team And "alice" logs in Then she does see the course on her page - Scenario: Added users cannot delete or add other users + Scenario: Added admins cannot delete or add other users Given I have opened a new course in Studio And the user "bob" exists 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 - Scenario: Users can delete other users + Scenario: Admins can delete other users Given I have opened a new course in Studio And the user "carol" exists And I am viewing the course team settings @@ -27,8 +29,60 @@ Feature: Course Team And "carol" logs in Then she does not see the course on her page - Scenario: Users cannot add users that do not exist + Scenario: Admins cannot add users that do not exist Given I have opened a new course in Studio And I am viewing the course team settings When I add "dennis" to the course team Then I should see "Could not find user by email address" somewhere on the page + + Scenario: Admins should be able to make other people into admins + Given I have opened a new course in Studio + And the user "emily" exists + And I am viewing the course team settings + And I add "emily" to the course team + When I make "emily" a course team admin + And "emily" logs in + And she selects the new course + And she views the course team settings + Then "emily" should be marked as an admin + And she can add users + And she can delete users + + Scenario: Admins should be able to remove other admins + Given I have opened a new course in Studio + And the user "frank" exists as a course admin + And I am viewing the course team settings + When I remove admin rights from "frank" + And "frank" logs in + And he selects the new course + And he views the course team settings + Then "frank" should not be marked as an admin + And he cannot add users + And he cannot delete users + + Scenario: Admins should be able to give course ownership to someone else + Given I have opened a new course in Studio + And the user "gina" exists + And I am viewing the course team settings + When I add "gina" to the course team + And I make "gina" a course team admin + And I remove admin rights from myself + And "gina" logs in + 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 + Then I do not see the course on my page + + Scenario: Admins should be able to remove their own admin rights + Given I have opened a new course in Studio + And the user "harry" exists as a course admin + And I am viewing the course team settings + Then I should be marked as an admin + And I can add users + And I can delete users + When I remove admin rights from myself + Then I should not be marked as an admin + And I cannot add users + And I cannot delete users + And I cannot make myself a course team admin diff --git a/cms/djangoapps/contentstore/features/course-team.py b/cms/djangoapps/contentstore/features/course-team.py index ad5d31977c..07c30e1187 100644 --- a/cms/djangoapps/contentstore/features/course-team.py +++ b/cms/djangoapps/contentstore/features/course-team.py @@ -3,40 +3,88 @@ from lettuce import world, step from common import create_studio_user, log_into_studio +from django.contrib.auth.models import Group +from auth.authz import get_course_groupname_for_role PASSWORD = 'test' EMAIL_EXTENSION = '@edx.org' -@step(u'I am viewing the course team settings') -def view_grading_settings(_step): +@step(u'(I am viewing|s?he views) the course team settings') +def view_grading_settings(_step, whom): world.click_course_settings() link_css = 'li.nav-course-settings-team a' world.css_click(link_css) -@step(u'the user "([^"]*)" exists$') -def create_other_user(_step, name): - create_studio_user(uname=name, password=PASSWORD, email=(name + EMAIL_EXTENSION)) +@step(u'the user "([^"]*)" exists( as a course (admin|staff member))?$') +def create_other_user(_step, name, has_extra_perms, role_name): + email = name + EMAIL_EXTENSION + user = create_studio_user(uname=name, password=PASSWORD, email=email) + if has_extra_perms: + location = world.scenario_dict["COURSE"].location + if role_name == "admin": + # admins get staff privileges, as well + roles = ("staff", "instructor") + else: + roles = ("staff",) + for role in roles: + groupname = get_course_groupname_for_role(location, role) + group, __ = Group.objects.get_or_create(name=groupname) + user.groups.add(group) + user.save() @step(u'I add "([^"]*)" to the course team') def add_other_user(_step, name): - new_user_css = 'a.new-user-button' + new_user_css = 'a.create-user-button' world.css_click(new_user_css) + world.wait(0.5) - email_css = 'input.email-input' - f = world.css_find(email_css) - f._element.send_keys(name, EMAIL_EXTENSION) - - confirm_css = '#add_user' + email_css = 'input#user-email-input' + 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) @step(u'I delete "([^"]*)" from the course team') def delete_other_user(_step, name): - to_delete_css = 'a.remove-user[data-id="{name}{extension}"]'.format(name=name, extension=EMAIL_EXTENSION) + to_delete_css = '.user-item .item-actions a.remove-user[data-id="{email}"]'.format( + 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") + + +@step(u's?he deletes me from the course team') +def other_delete_self(_step): + to_delete_css = '.user-item .item-actions a.remove-user[data-id="{email}"]'.format( + email="robot+studio@edx.org") + world.css_click(to_delete_css) + # confirm prompt + world.css_click(".wrapper-prompt-warning .action-primary") + + +@step(u'I make "([^"]*)" a course team admin') +def make_course_team_admin(_step, name): + admin_btn_css = '.user-item[data-email="{email}"] .user-actions .add-admin-role'.format( + email=name+EMAIL_EXTENSION) + world.css_click(admin_btn_css) + + +@step(u'I remove admin rights from ("([^"]*)"|myself)') +def remove_course_team_admin(_step, outer_capture, name): + if outer_capture == "myself": + email = world.scenario_dict["USER"].email + else: + email = name + EMAIL_EXTENSION + admin_btn_css = '.user-item[data-email="{email}"] .user-actions .remove-admin-role'.format( + email=email) + world.css_click(admin_btn_css) @step(u'"([^"]*)" logs in$') @@ -44,24 +92,62 @@ def other_user_login(_step, name): log_into_studio(uname=name, password=PASSWORD, 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, doesnt_see_course, gender): - class_css = 'span.class-name' +def see_course(_step, inverted, gender='self'): + 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 doesnt_see_course: + if inverted: assert not world.scenario_dict['COURSE'].display_name in all_names else: assert world.scenario_dict['COURSE'].display_name in all_names -@step(u's?he cannot delete users') -def cannot_delete(_step): +@step(u'"([^"]*)" should( not)? be marked as an admin') +def marked_as_admin(_step, name, inverted): + flag_css = '.user-item[data-email="{email}"] .flag-role.flag-role-admin'.format( + email=name+EMAIL_EXTENSION) + if inverted: + assert world.is_css_not_present(flag_css) + else: + assert world.is_css_present(flag_css) + + +@step(u'I should( not)? be marked as an admin') +def self_marked_as_admin(_step, inverted): + return marked_as_admin(_step, "robot+studio", inverted) + + +@step(u'I can(not)? delete users') +@step(u's?he can(not)? delete users') +def can_delete_users(_step, inverted): to_delete_css = 'a.remove-user' - assert world.is_css_not_present(to_delete_css) + if inverted: + assert world.is_css_not_present(to_delete_css) + else: + assert world.is_css_present(to_delete_css) -@step(u's?he cannot add users') -def cannot_add(_step): - add_css = 'a.new-user' - assert world.is_css_not_present(add_css) +@step(u'I can(not)? add users') +@step(u's?he can(not)? add users') +def can_add_users(_step, inverted): + add_css = 'a.create-user-button' + if inverted: + assert world.is_css_not_present(add_css) + else: + assert world.is_css_present(add_css) + + +@step(u'I can(not)? make ("([^"]*)"|myself) a course team admin') +@step(u's?he can(not)? make ("([^"]*)"|me) a course team admin') +def can_make_course_admin(_step, inverted, outer_capture, name): + if outer_capture == "myself": + email = world.scenario_dict["USER"].email + else: + email = name + EMAIL_EXTENSION + add_button_css = '.user-item[data-email="{email}"] .add-admin-role'.format(email=email) + if inverted: + assert world.is_css_not_present(add_button_css) + else: + assert world.is_css_present(add_button_css) diff --git a/cms/djangoapps/contentstore/features/course-updates.feature b/cms/djangoapps/contentstore/features/course-updates.feature index 81714c43ae..fb18e51f2d 100644 --- a/cms/djangoapps/contentstore/features/course-updates.feature +++ b/cms/djangoapps/contentstore/features/course-updates.feature @@ -6,6 +6,7 @@ Feature: Course updates And I go to the course updates page When I add a new update with the text "Hello" Then I should see the update "Hello" + And I see a "saving" notification Scenario: Users can edit updates Given I have opened a new course in Studio @@ -13,15 +14,16 @@ Feature: Course updates When I add a new update with the text "Hello" And I modify the text to "Goodbye" Then I should see the update "Goodbye" + And I see a "saving" notification Scenario: Users can delete updates Given I have opened a new course in Studio And I go to the course updates page And I add a new update with the text "Hello" - When I will confirm all alerts And I delete the update + And I confirm the prompt Then I should not see the update "Hello" - + And I see a "deleting" notification Scenario: Users can edit update dates Given I have opened a new course in Studio @@ -29,9 +31,11 @@ Feature: Course updates And I add a new update with the text "Hello" When I edit the date to "June 1, 2013" Then I should see the date "June 1, 2013" + And I see a "saving" notification Scenario: Users can change handouts Given I have opened a new course in Studio And I go to the course updates page When I modify the handout to "
        Test
      " Then I see the handout "Test" + And I see a "saving" notification 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/discussion-editor.py b/cms/djangoapps/contentstore/features/discussion-editor.py index 13927a7d89..15a7c4b9ab 100644 --- a/cms/djangoapps/contentstore/features/discussion-editor.py +++ b/cms/djangoapps/contentstore/features/discussion-editor.py @@ -19,7 +19,7 @@ def i_see_only_the_settings_and_values(step): world.verify_all_setting_entries( [ ['Category', "Week 1", False], - ['Display Name', "Discussion Tag", False], + ['Display Name', "Discussion", False], ['Subcategory', "Topic-Level Student-Visible Label", False] ]) diff --git a/cms/djangoapps/contentstore/features/html-editor.feature b/cms/djangoapps/contentstore/features/html-editor.feature index 6cd455d681..4cd5e1c1b9 100644 --- a/cms/djangoapps/contentstore/features/html-editor.feature +++ b/cms/djangoapps/contentstore/features/html-editor.feature @@ -11,3 +11,8 @@ Feature: HTML Editor And I edit and select Settings Then I can modify the display name And my display name change is persisted on save + + Scenario: Edit High Level source is available for LaTeX html + Given I have created an E-text Written in LaTeX + When I edit and select Settings + Then Edit High Level Source is visible diff --git a/cms/djangoapps/contentstore/features/html-editor.py b/cms/djangoapps/contentstore/features/html-editor.py index c3e0afa480..d89f052dcc 100644 --- a/cms/djangoapps/contentstore/features/html-editor.py +++ b/cms/djangoapps/contentstore/features/html-editor.py @@ -15,3 +15,14 @@ def i_created_blank_html_page(step): @step('I see only the HTML display name setting$') def i_see_only_the_html_display_name(step): world.verify_all_setting_entries([['Display Name', "Text", False]]) + + +@step('I have created an E-text Written in LaTeX$') +def i_created_blank_html_page(step): + world.create_component_instance( + step, + '.large-html-icon', + 'html', + '.xmodule_HtmlModule', + 'latex_html.yaml' + ) 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 565a35f802..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') @@ -155,6 +165,10 @@ def cancel_does_not_save_changes(step): @step('I have created a LaTeX Problem') def create_latex_problem(step): world.click_new_component_button(step, '.large-problem-icon') + + def animation_done(_driver): + return world.browser.evaluate_script("$('div.new-component').css('display')") == 'none' + world.wait_for(animation_done) # Go to advanced tab. world.css_click('#ui-id-2') world.click_component_from_menu("problem", "latex_problem.yaml", '.xmodule_CapaModule') @@ -209,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 4b69b9b37e..3ca8e1676d 100644 --- a/cms/djangoapps/contentstore/features/section.py +++ b/cms/djangoapps/contentstore/features/section.py @@ -35,15 +35,20 @@ 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') -@step('I see a "saving" notification') -def i_see_a_saving_notification(step): +@step('I see a "(saving|deleting)" notification') +def i_see_a_mini_notification(_step, _type): saving_css = '.wrapper-notification-mini' assert world.is_css_present(saving_css) diff --git a/cms/djangoapps/contentstore/features/signup.feature b/cms/djangoapps/contentstore/features/signup.feature index 03a1c9524a..c249ad61e8 100644 --- a/cms/djangoapps/contentstore/features/signup.feature +++ b/cms/djangoapps/contentstore/features/signup.feature @@ -8,5 +8,21 @@ Feature: Sign in When I click the link with the text "Sign Up" And I fill in the registration form And I press the Create My Account button on the registration form - Then I should see be on the studio home page - And I should see the message "please click on the activation link in your email." + Then I should see an email verification prompt + + Scenario: Login with a valid redirect + Given I have opened a new course in Studio + And I am not logged in + And I visit the url "/MITx/999/course/Robot_Super_Course" + And I should see that the path is "/signin?next=/MITx/999/course/Robot_Super_Course" + When I fill in and submit the signin form + And I wait for "2" seconds + Then I should see that the path is "/MITx/999/course/Robot_Super_Course" + + Scenario: Login with an invalid redirect + Given I have opened a new course in Studio + And I am not logged in + And I visit the url "/signin?next=http://www.google.com/" + When I fill in and submit the signin form + And I wait for "2" seconds + Then I should see that the path is "/" diff --git a/cms/djangoapps/contentstore/features/signup.py b/cms/djangoapps/contentstore/features/signup.py index 49a305f70b..94c6e6f18e 100644 --- a/cms/djangoapps/contentstore/features/signup.py +++ b/cms/djangoapps/contentstore/features/signup.py @@ -2,7 +2,6 @@ #pylint: disable=W0621 from lettuce import world, step -from common import * @step('I fill in the registration form$') @@ -23,11 +22,17 @@ def i_press_the_button_on_the_registration_form(step): world.css_click(submit_css) -@step('I should see be on the studio home page$') -def i_should_see_be_on_the_studio_home_page(step): - assert world.browser.find_by_css('div.inner-wrapper') +@step('I should see an email verification prompt') +def i_should_see_an_email_verification_prompt(step): + world.css_has_text('h1.page-header', u'My Courses') + world.css_has_text('div.msg h3.title', u'We need to verify your email address') -@step(u'I should see the message "([^"]*)"$') -def i_should_see_the_message(step, msg): - assert world.browser.is_text_present(msg, 5) +@step(u'I fill in and submit the signin form$') +def i_fill_in_the_signin_form(step): + def fill_login_form(): + login_form = world.browser.find_by_css('form#login_form') + login_form.find_by_name('email').fill('robot+studio@edx.org') + login_form.find_by_name('password').fill('test') + login_form.find_by_name('submit').click() + world.retry_on_exception(fill_login_form) 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 0c700956e3..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) @@ -58,7 +53,7 @@ def delete_file(_step, file_name): world.css_click(delete_css, index=index) prompt_confirm_css = 'li.nav-item > a.action-primary' - world.css_click(prompt_confirm_css) + world.css_click(prompt_confirm_css, success_condition=lambda: not world.css_visible(prompt_confirm_css)) @step(u'I should see only one "([^"]*)"$') @@ -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 93d638e621..ad3229ab53 100644 --- a/cms/djangoapps/contentstore/features/video-editor.py +++ b/cms/djangoapps/contentstore/features/video-editor.py @@ -19,5 +19,22 @@ def i_see_the_correct_settings_and_values(step): @step('I have set "show captions" to (.*)') def set_show_captions(step, setting): world.css_click('a.edit-button') + 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.py deleted file mode 100644 index 0ca50acb50..0000000000 --- a/cms/djangoapps/contentstore/management/commands/clone.py +++ /dev/null @@ -1,37 +0,0 @@ -### -### Script for cloning a course -### -from django.core.management.base import BaseCommand, CommandError -from xmodule.modulestore.store_utilities import clone_course -from xmodule.modulestore.django import modulestore -from xmodule.contentstore.django import contentstore -from xmodule.course_module import CourseDescriptor - -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 -# - - -class Command(BaseCommand): - help = 'Clone a MongoDB backed course to another location' - - def handle(self, *args, **options): - if len(args) != 2: - raise CommandError("clone requires two arguments: ") - - source_location_str = args[0] - dest_location_str = args[1] - - ms = modulestore('direct') - cs = contentstore() - - print "Cloning course {0} to {1}".format(source_location_str, dest_location_str) - - source_location = CourseDescriptor.id_to_location(source_location_str) - dest_location = CourseDescriptor.id_to_location(dest_location_str) - - if clone_course(ms, cs, source_location, dest_location): - print "copying User permissions..." - _copy_course_group(source_location, dest_location) diff --git a/cms/djangoapps/contentstore/management/commands/clone_course.py b/cms/djangoapps/contentstore/management/commands/clone_course.py new file mode 100644 index 0000000000..5fffe29543 --- /dev/null +++ b/cms/djangoapps/contentstore/management/commands/clone_course.py @@ -0,0 +1,54 @@ +""" +Script for cloning a course +""" +from django.core.management.base import BaseCommand, CommandError +from xmodule.modulestore.store_utilities import clone_course +from xmodule.modulestore.django import modulestore +from xmodule.contentstore.django import contentstore +from xmodule.course_module import CourseDescriptor + +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""" + help = 'Clone a MongoDB backed course to another location' + + def handle(self, *args, **options): + "Execute the command" + if len(args) != 2: + raise CommandError("clone requires two arguments: ") + + source_course_id = args[0] + dest_course_id = args[1] + + mstore = modulestore('direct') + cstore = contentstore() + + 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)) + + 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/management/commands/dump_course_structure.py b/cms/djangoapps/contentstore/management/commands/dump_course_structure.py index d9b7c55cbd..139c603172 100644 --- a/cms/djangoapps/contentstore/management/commands/dump_course_structure.py +++ b/cms/djangoapps/contentstore/management/commands/dump_course_structure.py @@ -1,3 +1,6 @@ +""" +Script for dumping course dumping the course structure +""" from django.core.management.base import BaseCommand, CommandError from xmodule.course_module import CourseDescriptor from xmodule.modulestore.django import modulestore @@ -9,10 +12,14 @@ filter_list = ['xml_attributes', 'checklists'] class Command(BaseCommand): + """ + The Django command for dumping course structure + """ help = '''Write out to stdout a structural and metadata information about a course in a flat dictionary serialized in a JSON format. This can be used for analytics.''' def handle(self, *args, **options): + "Execute the command" if len(args) < 2 or len(args) > 3: raise CommandError("dump_course_structure requires two or more arguments: ||") @@ -32,7 +39,7 @@ class Command(BaseCommand): try: course = store.get_item(loc, depth=4) except: - print 'Could not find course at {0}'.format(course_id) + print('Could not find course at {0}'.format(course_id)) return info = {} diff --git a/cms/djangoapps/contentstore/management/commands/export.py b/cms/djangoapps/contentstore/management/commands/export.py index 90db8750d9..efeb5dc339 100644 --- a/cms/djangoapps/contentstore/management/commands/export.py +++ b/cms/djangoapps/contentstore/management/commands/export.py @@ -1,6 +1,6 @@ -### -### Script for exporting courseware from Mongo to a tar.gz file -### +""" +Script for exporting courseware from Mongo to a tar.gz file +""" import os from django.core.management.base import BaseCommand, CommandError @@ -10,20 +10,21 @@ from xmodule.contentstore.django import contentstore from xmodule.course_module import CourseDescriptor -unnamed_modules = 0 - - class Command(BaseCommand): + """ + Export the specified data directory into the default ModuleStore + """ help = 'Export the specified data directory into the default ModuleStore' def handle(self, *args, **options): + "Execute the command" if len(args) != 2: raise CommandError("export requires two arguments: ") course_id = args[0] output_path = args[1] - print "Exporting course id = {0} to {1}".format(course_id, output_path) + print("Exporting course id = {0} to {1}".format(course_id, output_path)) location = CourseDescriptor.id_to_location(course_id) diff --git a/cms/djangoapps/contentstore/management/commands/export_all_courses.py b/cms/djangoapps/contentstore/management/commands/export_all_courses.py index 69cfb298fb..2118551138 100644 --- a/cms/djangoapps/contentstore/management/commands/export_all_courses.py +++ b/cms/djangoapps/contentstore/management/commands/export_all_courses.py @@ -1,8 +1,6 @@ -### -### Script for exporting all courseware from Mongo to a directory -### -import os - +""" +Script for exporting all courseware from Mongo to a directory +""" from django.core.management.base import BaseCommand, CommandError from xmodule.modulestore.xml_exporter import export_to_xml from xmodule.modulestore.django import modulestore @@ -10,13 +8,12 @@ from xmodule.contentstore.django import contentstore from xmodule.course_module import CourseDescriptor -unnamed_modules = 0 - - class Command(BaseCommand): + """Export all courses from mongo to the specified data directory""" help = 'Export all courses from mongo to the specified data directory' def handle(self, *args, **options): + "Execute the command" if len(args) != 1: raise CommandError("export requires one argument: ") @@ -27,14 +24,14 @@ class Command(BaseCommand): root_dir = output_path courses = ms.get_courses() - print "%d courses to export:" % len(courses) + print("%d courses to export:" % len(courses)) cids = [x.id for x in courses] - print cids + print(cids) for course_id in cids: - print "-"*77 - print "Exporting course id = {0} to {1}".format(course_id, output_path) + print("-"*77) + print("Exporting course id = {0} to {1}".format(course_id, output_path)) if 1: try: @@ -42,6 +39,6 @@ class Command(BaseCommand): course_dir = course_id.replace('/', '...') export_to_xml(ms, cs, location, root_dir, course_dir, modulestore()) except Exception as err: - print "="*30 + "> Oops, failed to export %s" % course_id - print "Error:" - print err + print("="*30 + "> Oops, failed to export %s" % course_id) + print("Error:") + print(err) diff --git a/cms/djangoapps/contentstore/management/commands/import.py b/cms/djangoapps/contentstore/management/commands/import.py index 9b919daad0..46f439b055 100644 --- a/cms/djangoapps/contentstore/management/commands/import.py +++ b/cms/djangoapps/contentstore/management/commands/import.py @@ -1,6 +1,6 @@ -### -### Script for importing courseware from XML format -### +""" +Script for importing courseware from XML format +""" from django.core.management.base import BaseCommand, CommandError from xmodule.modulestore.xml_importer import import_from_xml @@ -8,13 +8,14 @@ from xmodule.modulestore.django import modulestore from xmodule.contentstore.django import contentstore -unnamed_modules = 0 - - class Command(BaseCommand): + """ + Import the specified data directory into the default ModuleStore + """ help = 'Import the specified data directory into the default ModuleStore' def handle(self, *args, **options): + "Execute the command" if len(args) == 0: raise CommandError("import requires at least one argument: [...]") @@ -23,8 +24,8 @@ class Command(BaseCommand): course_dirs = args[1:] else: course_dirs = None - print "Importing. Data_dir={data}, course_dirs={courses}".format( + print("Importing. Data_dir={data}, course_dirs={courses}".format( data=data_dir, - courses=course_dirs) + courses=course_dirs)) import_from_xml(modulestore('direct'), data_dir, course_dirs, load_error_modules=False, static_content_store=contentstore(), verbose=True) diff --git a/cms/djangoapps/contentstore/management/commands/populate_creators.py b/cms/djangoapps/contentstore/management/commands/populate_creators.py index 90d8b3c668..37d647fd1a 100644 --- a/cms/djangoapps/contentstore/management/commands/populate_creators.py +++ b/cms/djangoapps/contentstore/management/commands/populate_creators.py @@ -39,7 +39,7 @@ class Command(BaseCommand): # added with status granted above, and add_user_with_status_unrequested # will not try to add them again if they already exist in the course creator database. for user in get_users_with_staff_role(): - add_user_with_status_unrequested(admin, user) + add_user_with_status_unrequested(user) # There could be users who are not in either staff or instructor (they've # never actually done anything in Studio). I plan to add those as unrequested diff --git a/cms/djangoapps/contentstore/management/commands/xlint.py b/cms/djangoapps/contentstore/management/commands/xlint.py index 21c8e7d1f8..835b8b84df 100644 --- a/cms/djangoapps/contentstore/management/commands/xlint.py +++ b/cms/djangoapps/contentstore/management/commands/xlint.py @@ -1,18 +1,17 @@ +""" +Verify the structure of courseware as to it's suitability for import +To run test: rake cms:xlint DATA_DIR=../data [COURSE_DIR=content-edx-101 (optional parameter)] +""" from django.core.management.base import BaseCommand, CommandError from xmodule.modulestore.xml_importer import perform_xlint -unnamed_modules = 0 - - class Command(BaseCommand): - help = \ - ''' - Verify the structure of courseware as to it's suitability for import - To run test: rake cms:xlint DATA_DIR=../data [COURSE_DIR=content-edx-101 (optional parameter)] - ''' + """Verify the structure of courseware as to it's suitability for import""" + help = "Verify the structure of courseware as to it's suitability for import" def handle(self, *args, **options): + "Execute the command" if len(args) == 0: raise CommandError("import requires at least one argument: [...]") @@ -21,7 +20,7 @@ class Command(BaseCommand): course_dirs = args[1:] else: course_dirs = None - print "Importing. Data_dir={data}, course_dirs={courses}".format( + print("Importing. Data_dir={data}, course_dirs={courses}".format( data=data_dir, - courses=course_dirs) + courses=course_dirs)) perform_xlint(data_dir, course_dirs, load_error_modules=False) diff --git a/cms/djangoapps/contentstore/tests/test_assets.py b/cms/djangoapps/contentstore/tests/test_assets.py index 58aee3c77d..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): """ @@ -50,9 +57,9 @@ class UploadTestCase(CourseTestCase): @skip("CorruptGridFile error on continuous integration server") def test_happy_path(self): - file = BytesIO("sample content") - file.name = "sample.txt" - resp = self.client.post(self.url, {"name": "my-name", "file": file}) + f = BytesIO("sample content") + f.name = "sample.txt" + resp = self.client.post(self.url, {"name": "my-name", "file": f}) self.assert2XX(resp.status_code) def test_no_file(self): diff --git a/cms/djangoapps/contentstore/tests/test_checklists.py b/cms/djangoapps/contentstore/tests/test_checklists.py index 02999f6567..5a99c37fbb 100644 --- a/cms/djangoapps/contentstore/tests/test_checklists.py +++ b/cms/djangoapps/contentstore/tests/test_checklists.py @@ -1,5 +1,5 @@ """ Unit tests for checklist methods in views.py. """ -from contentstore.utils import get_modulestore, get_url_reverse +from contentstore.utils import get_modulestore from xmodule.modulestore.inheritance import own_metadata from xmodule.modulestore.tests.factories import CourseFactory from django.core.urlresolvers import reverse @@ -27,6 +27,7 @@ class ChecklistTestCase(CourseTestCase): """ self.assertEqual(persisted['short_description'], request['short_description']) compare_urls = (persisted.get('action_urls_expanded') == request.get('action_urls_expanded')) + pers, req = None, None for pers, req in zip(persisted['items'], request['items']): self.assertEqual(pers['short_description'], req['short_description']) self.assertEqual(pers['long_description'], req['long_description']) @@ -38,7 +39,11 @@ class ChecklistTestCase(CourseTestCase): def test_get_checklists(self): """ Tests the get checklists method. """ - checklists_url = get_url_reverse('Checklists', self.course) + checklists_url = reverse("checklists", kwargs={ + 'org': self.course.location.org, + 'course': self.course.location.course, + 'name': self.course.location.name, + }) response = self.client.get(checklists_url) self.assertContains(response, "Getting Started With Studio") payload = response.content diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py index a51110163d..838af2cafa 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 @@ -95,8 +95,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): self.client.login(username=uname, password=password) def tearDown(self): - mongo = MongoClient() - mongo.drop_database(TEST_DATA_CONTENTSTORE['OPTIONS']['db']) + MongoClient().drop_database(TEST_DATA_CONTENTSTORE['OPTIONS']['db']) _CONTENTSTORE.clear() def check_components_on_page(self, component_types, expected_types): @@ -304,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']) @@ -604,6 +613,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): 'org': 'MITx', 'number': '999', 'display_name': 'Robot Super Course', + 'run': '2013_Spring' } module_store = modulestore('direct') @@ -612,12 +622,12 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): 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/Robot_Super_Course') + self.assertEqual(data['id'], 'i4x://MITx/999/course/2013_Spring') content_store = contentstore() source_location = CourseDescriptor.id_to_location('edX/toy/2012_Fall') - dest_location = CourseDescriptor.id_to_location('MITx/999/Robot_Super_Course') + dest_location = CourseDescriptor.id_to_location('MITx/999/2013_Spring') clone_course(module_store, content_store, source_location, dest_location) @@ -855,6 +865,68 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase): shutil.rmtree(root_dir) + def test_export_course_with_metadata_only_word_cloud(self): + """ + Similar to `test_export_course_with_metadata_only_video`. + """ + module_store = modulestore('direct') + draft_store = modulestore('draft') + content_store = contentstore() + + import_from_xml(module_store, 'common/test/data/', ['word_cloud']) + location = CourseDescriptor.id_to_location('HarvardX/ER22x/2013_Spring') + + verticals = module_store.get_items(['i4x', 'HarvardX', 'ER22x', 'vertical', None, None]) + + self.assertGreater(len(verticals), 0) + + parent = verticals[0] + + ItemFactory.create(parent_location=parent.location, category="word_cloud", display_name="untitled") + + root_dir = path(mkdtemp_clean()) + + print 'Exporting to tempdir = {0}'.format(root_dir) + + # export out to a tempdir + export_to_xml(module_store, content_store, location, root_dir, 'test_export', draft_modulestore=draft_store) + + shutil.rmtree(root_dir) + + def test_empty_data_roundtrip(self): + """ + Test that an empty `data` field is preserved through + export/import. + """ + module_store = modulestore('direct') + draft_store = modulestore('draft') + content_store = contentstore() + + import_from_xml(module_store, 'common/test/data/', ['toy']) + location = CourseDescriptor.id_to_location('edX/toy/2012_Fall') + + verticals = module_store.get_items(['i4x', 'edX', 'toy', 'vertical', None, None]) + + self.assertGreater(len(verticals), 0) + + parent = verticals[0] + + # Create a module, and ensure that its `data` field is empty + word_cloud = ItemFactory.create(parent_location=parent.location, category="word_cloud", display_name="untitled") + del word_cloud.data + self.assertEquals(word_cloud.data, '') + + # Export the course + root_dir = path(mkdtemp_clean()) + export_to_xml(module_store, content_store, location, root_dir, 'test_roundtrip', draft_modulestore=draft_store) + + # Reimport and get the video back + import_from_xml(module_store, root_dir) + imported_word_cloud = module_store.get_item(Location(['i4x', 'edX', 'toy', 'word_cloud', 'untitled', None])) + + # It should now contain empty data + self.assertEquals(imported_word_cloud.data, '') + def test_course_handouts_rewrites(self): module_store = modulestore('direct') @@ -954,6 +1026,7 @@ class ContentStoreTest(ModuleStoreTestCase): 'org': 'MITx', 'number': '999', 'display_name': 'Robot Super Course', + 'run': '2013_Spring' } def tearDown(self): @@ -965,40 +1038,58 @@ class ContentStoreTest(ModuleStoreTestCase): """Test new course creation - happy path""" self.assert_created_course() - def assert_created_course(self): + def assert_created_course(self, number_suffix=None): """ Checks that the course was created properly. """ - resp = self.client.post(reverse('create_new_course'), self.course_data) + test_course_data = {} + test_course_data.update(self.course_data) + if number_suffix: + test_course_data['number'] = '{0}_{1}'.format(test_course_data['number'], number_suffix) + resp = self.client.post(reverse('create_new_course'), test_course_data) self.assertEqual(resp.status_code, 200) data = parse_json(resp) - self.assertEqual(data['id'], 'i4x://MITx/999/course/Robot_Super_Course') + 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 """ - self.assert_created_course() - self.assertTrue(are_permissions_roles_seeded('MITx/999/Robot_Super_Course')) + test_course_data = self.assert_created_course(number_suffix=uuid4().hex) + 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""" self.client.post(reverse('create_new_course'), self.course_data) - self.assert_course_creation_failed('There is already a course defined with this name.') + self.assert_course_creation_failed('There is already a course defined with the same organization, course number, and course run. Please change either organization or course number to be unique.') def assert_course_creation_failed(self, error_message): """ 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""" self.client.post(reverse('create_new_course'), self.course_data) self.course_data['display_name'] = 'Robot Super Course Two' + self.course_data['run'] = '2013_Summer' - self.assert_course_creation_failed('There is already a course defined with the same organization and course number.') + self.assert_course_creation_failed('There is already a course defined with the same organization and course number. Please change at least one field to be unique.') def test_create_course_with_bad_organization(self): """Test new course creation - error path for bad organization name""" @@ -1071,7 +1162,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 ) @@ -1167,7 +1258,9 @@ class ContentStoreTest(ModuleStoreTestCase): # manage users resp = self.client.get(reverse('manage_users', - kwargs={'location': loc.url()})) + kwargs={'org': loc.org, + 'course': loc.course, + 'name': loc.name})) self.assertEqual(200, resp.status_code) # course info @@ -1359,3 +1452,63 @@ class ContentStoreTest(ModuleStoreTestCase): self.assertEqual(course.textbooks, fetched_course.textbooks) # is this test too strict? i.e., it requires the dicts to be == self.assertEqual(course.checklists, fetched_course.checklists) + + +class MetadataSaveTestCase(ModuleStoreTestCase): + """ + Test that metadata is correctly decached. + """ + + def setUp(self): + sample_xml = ''' + + ''' + CourseFactory.create(org='edX', course='999', display_name='Robot Super Course') + course_location = Location(['i4x', 'edX', '999', 'course', 'Robot_Super_Course', None]) + + model_data = {'data': sample_xml} + self.descriptor = ItemFactory.create(parent_location=course_location, category='video', data=model_data) + + def test_metadata_persistence(self): + """ + Test that descriptors which set metadata fields in their + constructor are correctly persisted. + """ + # We should start with a source field, from the XML's tag + self.assertIn('source', own_metadata(self.descriptor)) + attrs_to_strip = { + 'show_captions', + 'youtube_id_1_0', + 'youtube_id_0_75', + 'youtube_id_1_25', + 'youtube_id_1_5', + 'start_time', + 'end_time', + 'source', + 'track' + } + # We strip out all metadata fields to reproduce a bug where + # constructors which set their fields (e.g. Video) didn't have + # those changes persisted. So in the end we have the XML data + # in `descriptor.data`, but not in the individual fields + fields = self.descriptor.fields + for field in fields: + if field.name in attrs_to_strip: + field.delete_from(self.descriptor) + + # Assert that we correctly stripped the field + self.assertNotIn('source', own_metadata(self.descriptor)) + get_modulestore(self.descriptor.location).update_metadata( + self.descriptor.location, + own_metadata(self.descriptor) + ) + module = get_modulestore(self.descriptor.location).get_item(self.descriptor.location) + # Assert that get_item correctly sets the metadata + self.assertIn('source', own_metadata(module)) diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py index 0862eb462d..2007ba2f69 100644 --- a/cms/djangoapps/contentstore/tests/test_course_settings.py +++ b/cms/djangoapps/contentstore/tests/test_course_settings.py @@ -18,8 +18,6 @@ from xmodule.modulestore.tests.factories import CourseFactory from models.settings.course_metadata import CourseMetadata -from xmodule.modulestore.xml_importer import import_from_xml -from xmodule.modulestore.django import modulestore from xmodule.fields import Date from .utils import CourseTestCase @@ -167,8 +165,8 @@ class CourseDetailsViewTest(CourseTestCase): self.compare_details_with_encoding(json.loads(resp.content), details.__dict__, field + str(val)) @staticmethod - def convert_datetime_to_iso(dt): - return Date().to_json(dt) + def convert_datetime_to_iso(datetime_obj): + return Date().to_json(datetime_obj) def test_update_and_fetch(self): loc = self.course.location diff --git a/cms/djangoapps/contentstore/tests/test_course_updates.py b/cms/djangoapps/contentstore/tests/test_course_updates.py index 30114496c8..c121b1bc09 100644 --- a/cms/djangoapps/contentstore/tests/test_course_updates.py +++ b/cms/djangoapps/contentstore/tests/test_course_updates.py @@ -2,6 +2,7 @@ from contentstore.tests.test_course_settings import CourseTestCase from django.core.urlresolvers import reverse import json +from xmodule.modulestore.django import modulestore class CourseUpdateTest(CourseTestCase): @@ -145,3 +146,36 @@ class CourseUpdateTest(CourseTestCase): resp = self.client.delete(url) payload = json.loads(resp.content) self.assertTrue(len(payload) == before_delete - 1) + + def test_no_ol_course_update(self): + '''Test trying to add to a saved course_update which is not an ol.''' + # get the updates and set to something wrong + location = self.course.location.replace(category='course_info', name='updates') + modulestore('direct').create_and_save_xmodule(location) + course_updates = modulestore('direct').get_item(location) + course_updates.data = 'bad news' + modulestore('direct').update_item(location, course_updates.data) + + init_content = '' + payload = {'content': content, + 'date': 'January 8, 2013'} + url = reverse('course_info_json', + kwargs={'org': self.course.location.org, + 'course': self.course.location.course, + 'provided_id': ''}) + + resp = self.client.post(url, json.dumps(payload), "application/json") + + payload = json.loads(resp.content) + + self.assertHTMLEqual(payload['content'], content) + + # now confirm that the bad news and the iframe make up 2 updates + url = reverse('course_info_json', + kwargs={'org': self.course.location.org, + 'course': self.course.location.course, + 'provided_id': ''}) + resp = self.client.get(url) + payload = json.loads(resp.content) + self.assertTrue(len(payload) == 2) diff --git a/cms/djangoapps/contentstore/tests/test_crud.py b/cms/djangoapps/contentstore/tests/test_crud.py index 84643f7787..e12711a6ff 100644 --- a/cms/djangoapps/contentstore/tests/test_crud.py +++ b/cms/djangoapps/contentstore/tests/test_crud.py @@ -127,7 +127,7 @@ class TemplateTests(unittest.TestCase): persistent_factories.ItemFactory.create(display_name='chapter 1', parent_location=test_course.location) - id_locator = CourseLocator(course_id=test_course.location.course_id, revision='draft') + id_locator = CourseLocator(course_id=test_course.location.course_id, branch='draft') guid_locator = CourseLocator(version_guid=test_course.location.version_guid) # verify it can be retireved by id self.assertIsInstance(modulestore('split').get_course(id_locator), CourseDescriptor) diff --git a/cms/djangoapps/contentstore/tests/test_i18n.py b/cms/djangoapps/contentstore/tests/test_i18n.py index 88df19ec2d..e6baf57213 100644 --- a/cms/djangoapps/contentstore/tests/test_i18n.py +++ b/cms/djangoapps/contentstore/tests/test_i18n.py @@ -85,9 +85,11 @@ class InternationalizationTest(ModuleStoreTestCase): HTTP_ACCEPT_LANGUAGE='fr' ) - TEST_STRING = u'

      ' \ - + u'My \xc7\xf6\xfcrs\xe9s L#' \ - + u'

      ' + TEST_STRING = ( + u'

      ' + u'My \xc7\xf6\xfcrs\xe9s L#' + u'

      ' + ) self.assertContains(resp, TEST_STRING, diff --git a/cms/djangoapps/contentstore/tests/test_item.py b/cms/djangoapps/contentstore/tests/test_item.py index 578b82b3cf..827dd1b054 100644 --- a/cms/djangoapps/contentstore/tests/test_item.py +++ b/cms/djangoapps/contentstore/tests/test_item.py @@ -14,19 +14,26 @@ class DeleteItem(CourseTestCase): super(DeleteItem, self).setUp() self.course = CourseFactory.create(org='mitX', number='333', display_name='Dummy Course') - def testDeleteStaticPage(self): + def test_delete_static_page(self): # Add static tab data = json.dumps({ 'parent_location': 'i4x://mitX/333/course/Dummy_Course', 'category': 'static_tab' }) - resp = self.client.post(reverse('create_item'), data, - content_type="application/json") + resp = self.client.post( + reverse('create_item'), + data, + content_type="application/json" + ) self.assertEqual(resp.status_code, 200) # Now delete it. There was a bug that the delete was failing (static tabs do not exist in draft modulestore). - resp = self.client.post(reverse('delete_item'), resp.content, "application/json") + resp = self.client.post( + reverse('delete_item'), + resp.content, + "application/json" + ) self.assertEqual(resp.status_code, 200) @@ -122,6 +129,7 @@ class TestCreateItem(CourseTestCase): ) self.assertEqual(resp.status_code, 200) + class TestEditItem(CourseTestCase): """ Test contentstore.views.item.save_item @@ -151,10 +159,10 @@ class TestEditItem(CourseTestCase): chap_location = self.response_id(resp) resp = self.client.post( reverse('create_item'), - json.dumps( - {'parent_location': chap_location, - 'category': 'sequential' - }), + json.dumps({ + 'parent_location': chap_location, + 'category': 'sequential', + }), content_type="application/json" ) self.seq_location = self.response_id(resp) @@ -162,9 +170,10 @@ class TestEditItem(CourseTestCase): template_id = 'multiplechoice.yaml' resp = self.client.post( reverse('create_item'), - json.dumps({'parent_location': self.seq_location, - 'category': 'problem', - 'boilerplate': template_id + json.dumps({ + 'parent_location': self.seq_location, + 'category': 'problem', + 'boilerplate': template_id, }), content_type="application/json" ) @@ -195,7 +204,6 @@ class TestEditItem(CourseTestCase): problem = modulestore('draft').get_item(self.problems[0]) self.assertEqual(problem.rerandomize, 'never') - def test_null_field(self): """ Sending null in for a field 'deletes' it @@ -240,4 +248,3 @@ class TestEditItem(CourseTestCase): sequential = modulestore().get_item(self.seq_location) self.assertEqual(sequential.lms.due, datetime.datetime(2010, 11, 22, 4, 0, tzinfo=UTC)) self.assertEqual(sequential.lms.start, datetime.datetime(2010, 9, 12, 14, 0, tzinfo=UTC)) - diff --git a/cms/djangoapps/contentstore/tests/test_users.py b/cms/djangoapps/contentstore/tests/test_users.py index f945ef50fc..a9216da612 100644 --- a/cms/djangoapps/contentstore/tests/test_users.py +++ b/cms/djangoapps/contentstore/tests/test_users.py @@ -1,15 +1,384 @@ +""" +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): def setUp(self): super(UsersTestCase, self).setUp() - self.url = reverse("add_user", kwargs={"location": ""}) + self.ext_user = User.objects.create_user( + "joe", "joe@comedycentral.com", "haha") + self.ext_user.is_active = True + self.ext_user.is_staff = False + self.ext_user.save() + self.inactive_user = User.objects.create_user( + "carl", "carl@comedycentral.com", "haha") + self.inactive_user.is_active = False + self.inactive_user.is_staff = False + self.inactive_user.save() - def test_empty(self): - resp = self.client.post(self.url) + self.index_url = reverse("manage_users", kwargs={ + "org": self.course.location.org, + "course": self.course.location.course, + "name": self.course.location.name, + }) + self.detail_url = reverse("course_team_user", kwargs={ + "org": self.course.location.org, + "course": self.course.location.course, + "name": self.course.location.name, + "email": self.ext_user.email, + }) + self.inactive_detail_url = reverse("course_team_user", kwargs={ + "org": self.course.location.org, + "course": self.course.location.course, + "name": self.course.location.name, + "email": self.inactive_user.email, + }) + self.invalid_detail_url = reverse("course_team_user", kwargs={ + "org": self.course.location.org, + "course": self.course.location.course, + "name": self.course.location.name, + "email": "nonexistent@user.com", + }) + self.staff_groupname = get_course_groupname_for_role(self.course.location, "staff") + self.inst_groupname = get_course_groupname_for_role(self.course.location, "instructor") + + def test_index(self): + resp = self.client.get(self.index_url) + # ext_user is not currently a member of the course team, and so should + # not show up on the page. + self.assertNotContains(resp, self.ext_user.email) + + def test_index_member(self): + group, _ = Group.objects.get_or_create(name=self.staff_groupname) + self.ext_user.groups.add(group) + self.ext_user.save() + + resp = self.client.get(self.index_url) + self.assertContains(resp, self.ext_user.email) + + def test_detail(self): + resp = self.client.get(self.detail_url) + self.assertEqual(resp.status_code, 200) + result = json.loads(resp.content) + self.assertEqual(result["role"], None) + self.assertTrue(result["active"]) + + def test_detail_inactive(self): + resp = self.client.get(self.inactive_detail_url) + self.assert2XX(resp.status_code) + result = json.loads(resp.content) + self.assertFalse(result["active"]) + + def test_detail_invalid(self): + resp = self.client.get(self.invalid_detail_url) + self.assert4XX(resp.status_code) + result = json.loads(resp.content) + self.assertIn("error", result) + + def test_detail_post(self): + resp = self.client.post( + self.detail_url, + data={"role": None}, + ) + self.assert2XX(resp.status_code) + # reload user from DB + ext_user = User.objects.get(email=self.ext_user.email) + groups = [g.name for g in ext_user.groups.all()] + # 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( + self.detail_url, + data=json.dumps({"role": "staff"}), + content_type="application/json", + HTTP_ACCEPT="application/json", + ) + self.assert2XX(resp.status_code) + # reload user from DB + 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) + 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) + self.user.groups.add(inst_group) + self.user.save() + + resp = self.client.post( + self.detail_url, + data=json.dumps({"role": "staff"}), + content_type="application/json", + HTTP_ACCEPT="application/json", + ) + self.assert2XX(resp.status_code) + # reload user from DB + 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) + 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()] + self.assertNotIn(self.staff_groupname, groups) + self.assertIn(self.inst_groupname, groups) + + def test_detail_post_instructor(self): + 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) + # reload user from DB + ext_user = User.objects.get(email=self.ext_user.email) + 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( + self.detail_url, + data=json.dumps({"toys": "fun"}), + content_type="application/json", + HTTP_ACCEPT="application/json", + ) + 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( + self.detail_url, + data="{foo}", + content_type="application/json", + HTTP_ACCEPT="application/json", + ) + 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( + self.detail_url, + data={"role": "staff"}, + HTTP_ACCEPT="application/json", + ) + self.assert2XX(resp.status_code) + # reload user from DB + 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) + 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) + self.ext_user.groups.add(group) + self.ext_user.save() + + resp = self.client.delete( + self.detail_url, + HTTP_ACCEPT="application/json", + ) + self.assert2XX(resp.status_code) + # reload user from DB + ext_user = User.objects.get(email=self.ext_user.email) + groups = [g.name for g in ext_user.groups.all()] + self.assertNotIn(self.staff_groupname, groups) + + def test_detail_delete_instructor(self): + group, _ = Group.objects.get_or_create(name=self.inst_groupname) + self.user.groups.add(group) + self.ext_user.groups.add(group) + self.user.save() + self.ext_user.save() + + resp = self.client.delete( + self.detail_url, + HTTP_ACCEPT="application/json", + ) + self.assert2XX(resp.status_code) + # reload user from DB + ext_user = User.objects.get(email=self.ext_user.email) + groups = [g.name for g in ext_user.groups.all()] + self.assertNotIn(self.inst_groupname, groups) + + def test_delete_last_instructor(self): + group, _ = Group.objects.get_or_create(name=self.inst_groupname) + self.ext_user.groups.add(group) + self.ext_user.save() + + resp = self.client.delete( + self.detail_url, + HTTP_ACCEPT="application/json", + ) self.assertEqual(resp.status_code, 400) - content = json.loads(resp.content) - self.assertEqual(content["Status"], "Failed") + result = json.loads(resp.content) + self.assertIn("error", result) + # reload user from DB + ext_user = User.objects.get(email=self.ext_user.email) + groups = [g.name for g in ext_user.groups.all()] + self.assertIn(self.inst_groupname, groups) + + def test_post_last_instructor(self): + group, _ = Group.objects.get_or_create(name=self.inst_groupname) + self.ext_user.groups.add(group) + self.ext_user.save() + + resp = self.client.post( + self.detail_url, + data={"role": "staff"}, + HTTP_ACCEPT="application/json", + ) + self.assertEqual(resp.status_code, 400) + result = json.loads(resp.content) + self.assertIn("error", result) + # reload user from DB + ext_user = User.objects.get(email=self.ext_user.email) + groups = [g.name for g in ext_user.groups.all()] + self.assertIn(self.inst_groupname, groups) + + def test_permission_denied_self(self): + group, _ = Group.objects.get_or_create(name=self.staff_groupname) + self.user.groups.add(group) + self.user.is_staff = False + self.user.save() + + self_url = reverse("course_team_user", kwargs={ + "org": self.course.location.org, + "course": self.course.location.course, + "name": self.course.location.name, + "email": self.user.email, + }) + + resp = self.client.post( + self_url, + data={"role": "instructor"}, + HTTP_ACCEPT="application/json", + ) + self.assert4XX(resp.status_code) + result = json.loads(resp.content) + self.assertIn("error", result) + + def test_permission_denied_other(self): + group, _ = Group.objects.get_or_create(name=self.staff_groupname) + self.user.groups.add(group) + self.user.is_staff = False + self.user.save() + + resp = self.client.post( + self.detail_url, + data={"role": "instructor"}, + HTTP_ACCEPT="application/json", + ) + self.assert4XX(resp.status_code) + result = json.loads(resp.content) + self.assertIn("error", result) + + def test_staff_can_delete_self(self): + group, _ = Group.objects.get_or_create(name=self.staff_groupname) + self.user.groups.add(group) + self.user.is_staff = False + self.user.save() + + self_url = reverse("course_team_user", kwargs={ + "org": self.course.location.org, + "course": self.course.location.course, + "name": self.course.location.name, + "email": self.user.email, + }) + + resp = self.client.delete(self_url) + self.assert2XX(resp.status_code) + # reload user from DB + user = User.objects.get(email=self.user.email) + groups = [g.name for g in user.groups.all()] + self.assertNotIn(self.staff_groupname, groups) + + def test_staff_cannot_delete_other(self): + group, _ = Group.objects.get_or_create(name=self.staff_groupname) + self.user.groups.add(group) + self.user.is_staff = False + self.user.save() + self.ext_user.groups.add(group) + self.ext_user.save() + + resp = self.client.delete(self.detail_url) + self.assert4XX(resp.status_code) + result = json.loads(resp.content) + self.assertIn("error", result) + # reload user from DB + 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/test_utils.py b/cms/djangoapps/contentstore/tests/test_utils.py index fec82db1bb..26c49843b5 100644 --- a/cms/djangoapps/contentstore/tests/test_utils.py +++ b/cms/djangoapps/contentstore/tests/test_utils.py @@ -72,50 +72,6 @@ class LMSLinksTestCase(TestCase): ) -class UrlReverseTestCase(ModuleStoreTestCase): - """ Tests for get_url_reverse """ - def test_course_page_names(self): - """ Test the defined course pages. """ - course = CourseFactory.create(org='mitX', number='666', display_name='URL Reverse Course') - - self.assertEquals( - '/manage_users/i4x://mitX/666/course/URL_Reverse_Course', - utils.get_url_reverse('ManageUsers', course) - ) - - self.assertEquals( - '/mitX/666/settings-details/URL_Reverse_Course', - utils.get_url_reverse('SettingsDetails', course) - ) - - self.assertEquals( - '/mitX/666/settings-grading/URL_Reverse_Course', - utils.get_url_reverse('SettingsGrading', course) - ) - - self.assertEquals( - '/mitX/666/course/URL_Reverse_Course', - utils.get_url_reverse('CourseOutline', course) - ) - - self.assertEquals( - '/mitX/666/checklists/URL_Reverse_Course', - utils.get_url_reverse('Checklists', course) - ) - - def test_unknown_passes_through(self): - """ Test that unknown values pass through. """ - course = CourseFactory.create(org='mitX', number='666', display_name='URL Reverse Course') - self.assertEquals( - 'foobar', - utils.get_url_reverse('foobar', course) - ) - self.assertEquals( - 'https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about', - utils.get_url_reverse('https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about', course) - ) - - class ExtraPanelTabTestCase(TestCase): """ Tests adding and removing extra course tabs. """ diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py index d55a7eff55..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 @@ -15,14 +16,16 @@ class ContentStoreTestCase(ModuleStoreTestCase): Login. View should always return 200. The success/fail is in the returned json """ - resp = self.client.post(reverse('login_post'), - {'email': email, 'password': password}) + resp = self.client.post( + reverse('login_post'), + {'email': email, 'password': password} + ) self.assertEqual(resp.status_code, 200) return resp - def login(self, email, pw): + def login(self, email, password): """Login, check that it worked.""" - resp = self._login(email, pw) + resp = self._login(email, password) data = parse_json(resp) self.assertTrue(data['success']) return resp @@ -77,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) @@ -117,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 @@ -178,11 +195,15 @@ class ForumTestCase(CourseTestCase): def test_blackouts(self): now = datetime.datetime.now(UTC) - self.course.discussion_blackouts = [(t.isoformat(), t2.isoformat()) for t, t2 in - [(now - datetime.timedelta(days=14), now - datetime.timedelta(days=11)), - (now + datetime.timedelta(days=24), now + datetime.timedelta(days=30))]] + times1 = [ + (now - datetime.timedelta(days=14), now - datetime.timedelta(days=11)), + (now + datetime.timedelta(days=24), now + datetime.timedelta(days=30)) + ] + self.course.discussion_blackouts = [(t.isoformat(), t2.isoformat()) for t, t2 in times1] self.assertTrue(self.course.forum_posts_allowed) - self.course.discussion_blackouts = [(t.isoformat(), t2.isoformat()) for t, t2 in - [(now - datetime.timedelta(days=14), now + datetime.timedelta(days=2)), - (now + datetime.timedelta(days=24), now + datetime.timedelta(days=30))]] + times2 = [ + (now - datetime.timedelta(days=14), now + datetime.timedelta(days=2)), + (now + datetime.timedelta(days=24), now + datetime.timedelta(days=30)) + ] + self.course.discussion_blackouts = [(t.isoformat(), t2.isoformat()) for t, t2 in times2] self.assertFalse(self.course.forum_posts_allowed) diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py index 4973bddaca..a2e927ef46 100644 --- a/cms/djangoapps/contentstore/utils.py +++ b/cms/djangoapps/contentstore/utils.py @@ -188,38 +188,6 @@ def update_item(location, value): get_modulestore(location).update_item(location, value) -def get_url_reverse(course_page_name, course_module): - """ - Returns the course URL link to the specified location. This value is suitable to use as an href link. - - course_page_name should correspond to an attribute in CoursePageNames (for example, 'ManageUsers' - or 'SettingsDetails'), or else it will simply be returned. This method passes back unknown values of - course_page_names so that it can also be used for absolute (known) URLs. - - course_module is used to obtain the location, org, course, and name properties for a course, if - course_page_name corresponds to an attribute in CoursePageNames. - """ - url_name = getattr(CoursePageNames, course_page_name, None) - ctx_loc = course_module.location - - if CoursePageNames.ManageUsers == url_name: - return reverse(url_name, kwargs={"location": ctx_loc}) - elif url_name in [CoursePageNames.SettingsDetails, CoursePageNames.SettingsGrading, - CoursePageNames.CourseOutline, CoursePageNames.Checklists]: - return reverse(url_name, kwargs={'org': ctx_loc.org, 'course': ctx_loc.course, 'name': ctx_loc.name}) - else: - return course_page_name - - -class CoursePageNames: - """ Constants for pages that are recognized by get_url_reverse method. """ - ManageUsers = "manage_users" - SettingsDetails = "settings_details" - SettingsGrading = "settings_grading" - CourseOutline = "course_index" - Checklists = "checklists" - - def add_extra_panel_tab(tab_type, course): """ Used to add the panel tab to a course if it does not exist. diff --git a/cms/djangoapps/contentstore/views/__init__.py b/cms/djangoapps/contentstore/views/__init__.py index f3e98ec216..197c54ff36 100644 --- a/cms/djangoapps/contentstore/views/__init__.py +++ b/cms/djangoapps/contentstore/views/__init__.py @@ -15,3 +15,7 @@ from .public import * from .user import * from .tabs import * from .requests import * +try: + from .dev import * +except ImportError: + pass diff --git a/cms/djangoapps/contentstore/views/assets.py b/cms/djangoapps/contentstore/views/assets.py index 0bb9551ac9..1c22114d76 100644 --- a/cms/djangoapps/contentstore/views/assets.py +++ b/cms/djangoapps/contentstore/views/assets.py @@ -29,7 +29,6 @@ from xmodule.util.date_utils import get_default_time_display from xmodule.modulestore import InvalidLocationError from xmodule.exceptions import NotFoundError -from ..utils import get_url_reverse from .access import get_location_and_verify_access from util.json_request import JsonResponse @@ -106,6 +105,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) @@ -188,12 +188,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 @@ -284,7 +284,7 @@ def import_course(request, org, course, name): tar_file.extractall(course_dir + '/') # find the 'course.xml' file - + dirpath = None for dirpath, _dirnames, filenames in os.walk(course_dir): for filename in filenames: if filename == 'course.xml': @@ -320,7 +320,11 @@ def import_course(request, org, course, name): return render_to_response('import.html', { 'context_course': course_module, - 'successful_import_redirect_url': get_url_reverse('CourseOutline', course_module) + 'successful_import_redirect_url': reverse('course_index', kwargs={ + 'org': location.org, + 'course': location.course, + 'name': location.name, + }) }) diff --git a/cms/djangoapps/contentstore/views/checklist.py b/cms/djangoapps/contentstore/views/checklist.py index bcf4a1a5b9..74f0a33769 100644 --- a/cms/djangoapps/contentstore/views/checklist.py +++ b/cms/djangoapps/contentstore/views/checklist.py @@ -4,12 +4,13 @@ from util.json_request import JsonResponse from django.http import HttpResponseBadRequest from django.contrib.auth.decorators import login_required from django.views.decorators.http import require_http_methods +from django.core.urlresolvers import reverse from django_future.csrf import ensure_csrf_cookie from mitxmako.shortcuts import render_to_response from xmodule.modulestore.inheritance import own_metadata -from ..utils import get_modulestore, get_url_reverse +from ..utils import get_modulestore from .access import get_location_and_verify_access from xmodule.course_module import CourseDescriptor @@ -96,10 +97,25 @@ def expand_checklist_action_urls(course_module): """ checklists = course_module.checklists modified = False + urlconf_map = { + "ManageUsers": "manage_users", + "SettingsDetails": "settings_details", + "SettingsGrading": "settings_grading", + "CourseOutline": "course_index", + "Checklists": "checklists", + } for checklist in checklists: if not checklist.get('action_urls_expanded', False): for item in checklist.get('items'): - item['action_url'] = get_url_reverse(item.get('action_url'), course_module) + action_url = item.get('action_url') + if action_url not in urlconf_map: + continue + urlconf_name = urlconf_map[action_url] + item['action_url'] = reverse(urlconf_name, kwargs={ + 'org': course_module.location.org, + 'course': course_module.location.course, + 'name': course_module.location.name, + }) checklist['action_urls_expanded'] = True modified = True diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py index 1be6ac2822..7cb503db1e 100644 --- a/cms/djangoapps/contentstore/views/component.py +++ b/cms/djangoapps/contentstore/views/component.py @@ -46,13 +46,19 @@ COMPONENT_TYPES = ['discussion', 'html', 'problem', 'video'] OPEN_ENDED_COMPONENT_TYPES = ["combinedopenended", "peergrading"] NOTE_COMPONENT_TYPES = ['notes'] -ADVANCED_COMPONENT_TYPES = ['annotatable', 'word_cloud', 'videoalpha'] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES +ADVANCED_COMPONENT_TYPES = [ + 'annotatable', + 'word_cloud', + 'videoalpha', + 'graphical_slider_tool' +] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES ADVANCED_COMPONENT_CATEGORY = 'advanced' ADVANCED_COMPONENT_POLICY_KEY = 'advanced_modules' @login_required def edit_subsection(request, location): + "Edit the subsection of a course" # check that we have permissions to edit this item try: course = get_course_for_item(location) @@ -264,6 +270,7 @@ def assignment_type_update(request, org, course, category, name): @login_required @expect_json def create_draft(request): + "Create a draft" location = request.POST['id'] # check permissions for this user within this course @@ -280,6 +287,7 @@ def create_draft(request): @login_required @expect_json def publish_draft(request): + "Publish a draft" location = request.POST['id'] # check permissions for this user within this course @@ -295,6 +303,7 @@ def publish_draft(request): @login_required @expect_json def unpublish_unit(request): + "Unpublish a unit" location = request.POST['id'] # check permissions for this user within this course @@ -312,6 +321,7 @@ def unpublish_unit(request): @login_required @ensure_csrf_cookie def module_info(request, module_location): + "Get or set information for a module in the modulestore" location = Location(module_location) # check that logged in user has permissions to this item diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py index 02eb4c65b8..8ac1d223cb 100644 --- a/cms/djangoapps/contentstore/views/course.py +++ b/cms/djangoapps/contentstore/views/course.py @@ -3,6 +3,7 @@ Views related to operations on course objects """ import json import random +from django.utils.translation import ugettext as _ import string # pylint: disable=W0402 from django.contrib.auth.decorators import login_required @@ -43,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', @@ -101,12 +104,13 @@ def create_new_course(request): org = request.POST.get('org') number = request.POST.get('number') display_name = request.POST.get('display_name') + run = request.POST.get('run') try: - dest_location = Location('i4x', org, number, 'course', Location.clean(display_name)) + dest_location = Location('i4x', org, number, 'course', run) except InvalidLocationError as error: return JsonResponse({ - "ErrMsg": "Unable to create course '{name}'.\n\n{err}".format( + "ErrMsg": _("Unable to create course '{name}'.\n\n{err}").format( name=display_name, err=error.message)}) # see if the course already exists @@ -116,12 +120,24 @@ def create_new_course(request): except ItemNotFoundError: pass if existing_course is not None: - return JsonResponse({'ErrMsg': 'There is already a course defined with this name.'}) + return JsonResponse( + { + 'ErrMsg': _('There is already a course defined with the same organization, course number, and course run. Please change either organization or course number to be unique.'), + 'OrgErrMsg': _('Please change either the organization or course number so that it is unique.'), + 'CourseErrMsg': _('Please change either the organization or course number so that it is unique.'), + } + ) course_search_location = ['i4x', dest_location.org, dest_location.course, 'course', None] courses = modulestore().get_items(course_search_location) if len(courses) > 0: - return JsonResponse({'ErrMsg': 'There is already a course defined with the same organization and course number.'}) + return JsonResponse( + { + 'ErrMsg': _('There is already a course defined with the same organization and course number. Please change at least one field to be unique.'), + 'OrgErrMsg': _('Please change either the organization or course number so that it is unique.'), + 'CourseErrMsg': _('Please change either the organization or course number so that it is unique.'), + } + ) # instantiate the CourseDescriptor and then persist it # note: no system to pass @@ -148,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/dev.py b/cms/djangoapps/contentstore/views/dev.py new file mode 100644 index 0000000000..0fcc355c11 --- /dev/null +++ b/cms/djangoapps/contentstore/views/dev.py @@ -0,0 +1,12 @@ +""" +Views that are only activated when the project is running in development mode. +These views will NOT be shown on production: trying to access them will result +in a 404 error. +""" +# pylint: disable=W0613 +from mitxmako.shortcuts import render_to_response + + +def dev_mode(request): + "Sample static view" + return render_to_response("dev/dev_mode.html") diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py index 35af3e9ac3..f2a07abe32 100644 --- a/cms/djangoapps/contentstore/views/preview.py +++ b/cms/djangoapps/contentstore/views/preview.py @@ -68,6 +68,7 @@ def preview_dispatch(request, preview_id, location, dispatch=None): @login_required def preview_component(request, location): + "Return the HTML preview of a component" # TODO (vshnayder): change name from id to location in coffee+html as well. if not has_access(request.user, location): return HttpResponseForbidden() @@ -91,6 +92,7 @@ def preview_module_system(request, preview_id, descriptor): """ def preview_model_data(descriptor): + "Helper method to create a DbModel from a descriptor" return DbModel( SessionKeyValueStore(request, descriptor._model_data), descriptor.module_class, @@ -105,7 +107,7 @@ def preview_module_system(request, preview_id, descriptor): # TODO (cpennington): Do we want to track how instructors are using the preview problems? track_function=lambda event_type, event: None, filestore=descriptor.system.resources_fs, - get_module=partial(get_preview_module, request, preview_id), + get_module=partial(load_preview_module, request, preview_id), render_template=render_from_lms, debug=True, replace_urls=partial(static_replace.replace_static_urls, data_directory=None, course_namespace=descriptor.location), @@ -115,28 +117,13 @@ def preview_module_system(request, preview_id, descriptor): ) -def get_preview_module(request, preview_id, descriptor): - """ - Returns a preview XModule at the specified location. The preview_data is chosen arbitrarily - from the set of preview data for the descriptor specified by Location - - request: The active django request - preview_id (str): An identifier specifying which preview this module is used for - location: A Location - """ - - return load_preview_module(request, preview_id, descriptor) - - def load_preview_module(request, preview_id, descriptor): """ - Return a preview XModule instantiated from the supplied descriptor, instance_state, and shared_state + Return a preview XModule instantiated from the supplied descriptor. request: The active django request preview_id (str): An identifier specifying which preview this module is used for descriptor: An XModuleDescriptor - instance_state: An instance state string - shared_state: A shared state string """ system = preview_module_system(request, preview_id, descriptor) try: diff --git a/cms/djangoapps/contentstore/views/public.py b/cms/djangoapps/contentstore/views/public.py index 0ee228b996..2f74df1d8c 100644 --- a/cms/djangoapps/contentstore/views/public.py +++ b/cms/djangoapps/contentstore/views/public.py @@ -1,3 +1,6 @@ +""" +Public views +""" from django_future.csrf import ensure_csrf_cookie from django.core.context_processors import csrf from django.shortcuts import redirect @@ -10,10 +13,6 @@ from .user import index __all__ = ['signup', 'old_login_redirect', 'login_page', 'howitworks'] -""" -Public views -""" - @ensure_csrf_cookie def signup(request): @@ -45,6 +44,7 @@ def login_page(request): def howitworks(request): + "Proxy view" if request.user.is_authenticated(): return index(request) else: diff --git a/cms/djangoapps/contentstore/views/requests.py b/cms/djangoapps/contentstore/views/requests.py index 8a05bf1258..abbf84755e 100644 --- a/cms/djangoapps/contentstore/views/requests.py +++ b/cms/djangoapps/contentstore/views/requests.py @@ -1,4 +1,5 @@ from django.http import HttpResponse +from django.shortcuts import redirect from mitxmako.shortcuts import render_to_string, render_to_response __all__ = ['edge', 'event', 'landing'] @@ -11,7 +12,7 @@ def landing(request, org, course, coursename): # points to the temporary edge page def edge(request): - return render_to_response('university_profiles/edge.html', {}) + return redirect('/') def event(request): diff --git a/cms/djangoapps/contentstore/views/tabs.py b/cms/djangoapps/contentstore/views/tabs.py index d55932e33d..f38685edfc 100644 --- a/cms/djangoapps/contentstore/views/tabs.py +++ b/cms/djangoapps/contentstore/views/tabs.py @@ -1,3 +1,6 @@ +""" +Views related to course tabs +""" from access import has_access from util.json_request import expect_json @@ -39,6 +42,7 @@ def initialize_course_tabs(course): @login_required @expect_json def reorder_static_tabs(request): + "Order the static tabs in the requested order" tabs = request.POST['tabs'] course = get_course_for_item(tabs[0]) @@ -86,6 +90,7 @@ def reorder_static_tabs(request): @login_required @ensure_csrf_cookie def edit_tabs(request, org, course, coursename): + "Edit tabs" location = ['i4x', org, course, 'course', coursename] store = get_modulestore(location) course_item = store.get_item(location) @@ -122,6 +127,7 @@ def edit_tabs(request, org, course, coursename): @login_required @ensure_csrf_cookie def static_pages(request, org, course, coursename): + "Static pages view" location = get_location_and_verify_access(request, org, course, coursename) diff --git a/cms/djangoapps/contentstore/views/user.py b/cms/djangoapps/contentstore/views/user.py index 020e4b5cb9..a5c495597c 100644 --- a/cms/djangoapps/contentstore/views/user.py +++ b/cms/djangoapps/contentstore/views/user.py @@ -1,20 +1,30 @@ +import json from django.conf import settings from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse +from django.contrib.auth.models import User, Group from django.contrib.auth.decorators import login_required +from django.views.decorators.http import require_http_methods from django.utils.translation import ugettext as _ +from django.views.decorators.http import require_POST from django_future.csrf import ensure_csrf_cookie from mitxmako.shortcuts import render_to_response +from django.core.context_processors import csrf -from xmodule.modulestore import Location from xmodule.modulestore.django import modulestore -from contentstore.utils import get_url_reverse, get_lms_link_for_item -from util.json_request import expect_json, JsonResponse -from auth.authz import STAFF_ROLE_NAME, INSTRUCTOR_ROLE_NAME, get_users_in_course_group_by_role -from auth.authz import get_user_by_email, add_user_to_course_group, remove_user_from_course_group +from xmodule.modulestore import Location +from contentstore.utils import get_lms_link_for_item +from util.json_request import JsonResponse +from auth.authz import ( + STAFF_ROLE_NAME, INSTRUCTOR_ROLE_NAME, get_course_groupname_for_role) +from course_creators.views import ( + get_course_creator_status, add_user_with_status_unrequested, + user_requested_access) from .access import has_access +from student.views import enroll_in_course + @login_required @ensure_csrf_cookie @@ -34,113 +44,209 @@ def index(request): and course.location.name != '') courses = filter(course_filter, courses) + def format_course_for_view(course): + return ( + course.display_name, + reverse("course_index", kwargs={ + 'org': course.location.org, + 'course': course.location.course, + 'name': course.location.name, + }), + get_lms_link_for_item( + 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': [(course.display_name, - get_url_reverse('CourseOutline', course), - get_lms_link_for_item(course.location, course_id=course.location.course_id)) - for course in courses], + 'courses': [format_course_for_view(c) for c in courses], 'user': request.user, - 'disable_course_creation': settings.MITX_FEATURES.get('DISABLE_COURSE_CREATION', False) and not request.user.is_staff + 'request_course_creator_url': reverse('request_course_creator'), + 'course_creator_status': _get_course_creator_status(request.user), + 'csrf': csrf(request)['csrf_token'] }) +@require_POST +@login_required +def request_course_creator(request): + """ + User has requested course creation access. + """ + user_requested_access(request.user) + return JsonResponse({"Status": "OK"}) + + @login_required @ensure_csrf_cookie -def manage_users(request, location): +def manage_users(request, org, course, name): ''' This view will return all CMS users who are editors for the specified course ''' + location = Location('i4x', org, course, 'course', name) # check that logged in user has permissions to this item if not has_access(request.user, location, role=INSTRUCTOR_ROLE_NAME) and not has_access(request.user, location, role=STAFF_ROLE_NAME): raise PermissionDenied() course_module = modulestore().get_item(location) + staff_groupname = get_course_groupname_for_role(location, "staff") + staff_group, __ = Group.objects.get_or_create(name=staff_groupname) + inst_groupname = get_course_groupname_for_role(location, "instructor") + inst_group, __ = Group.objects.get_or_create(name=inst_groupname) + return render_to_response('manage_users.html', { 'context_course': course_module, - 'staff': get_users_in_course_group_by_role(location, STAFF_ROLE_NAME), - 'add_user_postback_url': reverse('add_user', args=[location]).rstrip('/'), - 'remove_user_postback_url': reverse('remove_user', args=[location]).rstrip('/'), + 'staff': staff_group.user_set.all(), + 'instructors': inst_group.user_set.all(), 'allow_actions': has_access(request.user, location, role=INSTRUCTOR_ROLE_NAME), - 'request_user_id': request.user.id }) -@expect_json @login_required @ensure_csrf_cookie -def add_user(request, location): - ''' - This POST-back view will add a user - specified by email - to the list of editors for - the specified course - ''' - email = request.POST.get("email") - - if not email: +@require_http_methods(("GET", "POST", "PUT", "DELETE")) +def course_team_user(request, org, course, name, email): + location = Location('i4x', org, course, 'course', name) + # check that logged in user has permissions to this item + if has_access(request.user, location, role=INSTRUCTOR_ROLE_NAME): + # instructors have full permissions + pass + elif has_access(request.user, location, role=STAFF_ROLE_NAME) and email == request.user.email: + # staff can only affect themselves + pass + else: msg = { - 'Status': 'Failed', - 'ErrMsg': _('Please specify an email address.'), + "error": _("Insufficient permissions") } return JsonResponse(msg, 400) - # remove leading/trailing whitespace if necessary - email = email.strip() - - # check that logged in user has admin permissions to this course - if not has_access(request.user, location, role=INSTRUCTOR_ROLE_NAME): - raise PermissionDenied() - - user = get_user_by_email(email) - - # user doesn't exist?!? Return error. - if user is None: + try: + user = User.objects.get(email=email) + except: msg = { - 'Status': 'Failed', - 'ErrMsg': _("Could not find user by email address '{email}'.").format(email=email), + "error": _("Could not find user by email address '{email}'.").format(email=email), } return JsonResponse(msg, 404) - # user exists, but hasn't activated account?!? + # role hierarchy: "instructor" has more permissions than "staff" (in a course) + roles = ["instructor", "staff"] + + if request.method == "GET": + # just return info about the user + msg = { + "email": user.email, + "active": user.is_active, + "role": None, + } + # what's the highest role that this user has? + groupnames = set(g.name for g in user.groups.all()) + for role in roles: + role_groupname = get_course_groupname_for_role(location, role) + if role_groupname in groupnames: + msg["role"] = role + break + return JsonResponse(msg) + + # can't modify an inactive user if not user.is_active: msg = { - 'Status': 'Failed', - 'ErrMsg': _('User {email} has registered but has not yet activated his/her account.').format(email=email), + "error": _('User {email} has registered but has not yet activated his/her account.').format(email=email), } return JsonResponse(msg, 400) - # ok, we're cool to add to the course group - add_user_to_course_group(request.user, user, location, STAFF_ROLE_NAME) + # make sure that the role groups exist + groups = {} + for role in roles: + groupname = get_course_groupname_for_role(location, role) + group, __ = Group.objects.get_or_create(name=groupname) + groups[role] = group - return JsonResponse({"Status": "OK"}) + if request.method == "DELETE": + # remove all roles in this course from this user: but fail if the user + # is the last instructor in the course team + instructors = set(groups["instructor"].user_set.all()) + staff = set(groups["staff"].user_set.all()) + if user in instructors and len(instructors) == 1: + msg = { + "error": _("You may not remove the last instructor from a course") + } + return JsonResponse(msg, 400) + + if user in instructors: + user.groups.remove(groups["instructor"]) + if user in staff: + user.groups.remove(groups["staff"]) + user.save() + return JsonResponse() + + # all other operations require the requesting user to specify a role + if request.META.get("CONTENT_TYPE", "").startswith("application/json") and request.body: + try: + payload = json.loads(request.body) + except: + return JsonResponse({"error": _("malformed JSON")}, 400) + try: + role = payload["role"] + except KeyError: + return JsonResponse({"error": _("`role` is required")}, 400) + else: + if not "role" in request.POST: + return JsonResponse({"error": _("`role` is required")}, 400) + role = request.POST["role"] + + if role == "instructor": + if not has_access(request.user, location, role=INSTRUCTOR_ROLE_NAME): + msg = { + "error": _("Only instructors may create other instructors") + } + 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. + instructors = set(groups["instructor"].user_set.all()) + if user in instructors: + if len(instructors) == 1: + msg = { + "error": _("You may not remove the last instructor from a course") + } + return JsonResponse(msg, 400) + 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() -@expect_json -@login_required -@ensure_csrf_cookie -def remove_user(request, location): - ''' - This POST-back view will remove a user - specified by email - from the list of editors for - the specified course - ''' +def _get_course_creator_status(user): + """ + Helper method for returning the course creator status for a particular user, + taking into account the values of DISABLE_COURSE_CREATION and ENABLE_CREATOR_GROUP. - email = request.POST["email"] + If the user passed in has not previously visited the index page, it will be + added with status 'unrequested' if the course creator group is in use. + """ + if user.is_staff: + course_creator_status = 'granted' + elif settings.MITX_FEATURES.get('DISABLE_COURSE_CREATION', False): + course_creator_status = 'disallowed_for_this_site' + elif settings.MITX_FEATURES.get('ENABLE_CREATOR_GROUP', False): + course_creator_status = get_course_creator_status(user) + if course_creator_status is None: + # User not grandfathered in as an existing user, has not previously visited the dashboard page. + # Add the user to the course creator admin table with status 'unrequested'. + add_user_with_status_unrequested(user) + course_creator_status = get_course_creator_status(user) + else: + course_creator_status = 'granted' - # check that logged in user has admin permissions on this course - if not has_access(request.user, location, role=INSTRUCTOR_ROLE_NAME): - raise PermissionDenied() - - user = get_user_by_email(email) - if user is None: - msg = { - 'Status': 'Failed', - 'ErrMsg': _("Could not find user by email address '{email}'.").format(email=email), - } - return JsonResponse(msg, 404) - - # make sure we're not removing ourselves - if user.id == request.user.id: - raise PermissionDenied() - - remove_user_from_course_group(request.user, user, location, STAFF_ROLE_NAME) - - return JsonResponse({"Status": "OK"}) + return course_creator_status diff --git a/cms/djangoapps/course_creators/admin.py b/cms/djangoapps/course_creators/admin.py index 7518946270..df2baa1aa2 100644 --- a/cms/djangoapps/course_creators/admin.py +++ b/cms/djangoapps/course_creators/admin.py @@ -2,11 +2,19 @@ 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 + +log = logging.getLogger("studio.coursecreatoradmin") def get_email(obj): @@ -22,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 @@ -37,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 @@ -60,4 +78,60 @@ def update_creator_group_callback(sender, **kwargs): """ Callback for when the model's creator status has changed. """ - update_course_creator_group(kwargs['caller'], kwargs['user'], kwargs['add']) + user = kwargs['user'] + updated_state = kwargs['state'] + update_course_creator_group(kwargs['caller'], user, updated_state == CourseCreator.GRANTED) + + +@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) + subject = ''.join(subject.splitlines()) + if updated_state == CourseCreator.GRANTED: + message_template = 'emails/course_creator_granted.txt' + elif updated_state == CourseCreator.DENIED: + message_template = 'emails/course_creator_denied.txt' + else: + # changed to unrequested or pending + message_template = 'emails/course_creator_revoked.txt' + message = render_to_string(message_template, context) + + try: + 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 607dae4af2..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): @@ -39,7 +45,7 @@ class CourseCreator(models.Model): "why course creation access was denied)")) def __unicode__(self): - return u'%str | %str [%str] | %str' % (self.user, self.state, self.state_changed, self.note) + return u"{0} | {1} [{2}]".format(self.user, self.state, self.state_changed) @receiver(post_init, sender=CourseCreator) @@ -54,18 +60,40 @@ def post_init_callback(sender, **kwargs): @receiver(post_save, sender=CourseCreator) def post_save_callback(sender, **kwargs): """ - Extend to update state_changed time and modify the course creator group in authz.py. + Extend to update state_changed time and fire event to update course creator group, if appropriate. """ instance = kwargs['instance'] # 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: - update_creator_state.send( - sender=sender, - caller=instance.admin, - user=instance.user, - add=instance.state == CourseCreator.GRANTED - ) + 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 granted_state_change: + assert hasattr(instance, 'admin'), 'Must have stored staff user to change course creator group' + update_creator_state.send( + sender=sender, + caller=instance.admin, + user=instance.user, + 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 6ef48746e7..aa293e008e 100644 --- a/cms/djangoapps/course_creators/tests/test_admin.py +++ b/cms/djangoapps/course_creators/tests/test_admin.py @@ -11,6 +11,12 @@ 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): + """Return a string that encodes template_name and context""" + return str((template_name, context)) class CourseCreatorAdminTest(TestCase): @@ -32,31 +38,104 @@ class CourseCreatorAdminTest(TestCase): self.creator_admin = CourseCreatorAdmin(self.table_entry, AdminSite()) - def test_change_status(self): + 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. + Tests that updates to state impact the creator group maintained in authz.py and that e-mails are sent. """ - 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)) - with mock.patch.dict('django.conf.settings.MITX_FEATURES', {"ENABLE_CREATOR_GROUP": True}): + context = {'studio_request_email': self.studio_request_email} + if state == CourseCreator.GRANTED: + template = 'emails/course_creator_granted.txt' + elif state == CourseCreator.DENIED: + template = 'emails/course_creator_denied.txt' + else: + template = 'emails/course_creator_revoked.txt' + email_user.assert_called_with( + mock_render_to_string('emails/course_creator_subject.txt', context), + mock_render_to_string(template, context), + self.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): """ @@ -78,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/course_creators/tests/test_views.py b/cms/djangoapps/course_creators/tests/test_views.py index bd91208b9c..95c50ffb76 100644 --- a/cms/djangoapps/course_creators/tests/test_views.py +++ b/cms/djangoapps/course_creators/tests/test_views.py @@ -7,7 +7,7 @@ from django.contrib.auth.models import User from django.core.exceptions import PermissionDenied from course_creators.views import add_user_with_status_unrequested, add_user_with_status_granted -from course_creators.views import get_course_creator_status, update_course_creator_group +from course_creators.views import get_course_creator_status, update_course_creator_group, user_requested_access from course_creators.models import CourseCreator from auth.authz import is_user_in_creator_group import mock @@ -26,14 +26,11 @@ class CourseCreatorView(TestCase): def test_staff_permission_required(self): """ - Tests that add methods and course creator group method must be called with staff permissions. + Tests that any method changing the course creator authz group must be called with staff permissions. """ with self.assertRaises(PermissionDenied): add_user_with_status_granted(self.user, self.user) - with self.assertRaises(PermissionDenied): - add_user_with_status_unrequested(self.user, self.user) - with self.assertRaises(PermissionDenied): update_course_creator_group(self.user, self.user, True) @@ -41,7 +38,7 @@ class CourseCreatorView(TestCase): self.assertIsNone(get_course_creator_status(self.user)) def test_add_unrequested(self): - add_user_with_status_unrequested(self.admin, self.user) + add_user_with_status_unrequested(self.user) self.assertEqual('unrequested', get_course_creator_status(self.user)) # Calling add again will be a no-op (even if state is different). @@ -57,7 +54,7 @@ class CourseCreatorView(TestCase): self.assertEqual('granted', get_course_creator_status(self.user)) # Calling add again will be a no-op (even if state is different). - add_user_with_status_unrequested(self.admin, self.user) + add_user_with_status_unrequested(self.user) self.assertEqual('granted', get_course_creator_status(self.user)) self.assertTrue(is_user_in_creator_group(self.user)) @@ -69,3 +66,27 @@ class CourseCreatorView(TestCase): self.assertTrue(is_user_in_creator_group(self.user)) update_course_creator_group(self.admin, self.user, False) self.assertFalse(is_user_in_creator_group(self.user)) + + def test_user_requested_access(self): + add_user_with_status_unrequested(self.user) + self.assertEqual('unrequested', get_course_creator_status(self.user)) + user_requested_access(self.user) + self.assertEqual('pending', get_course_creator_status(self.user)) + + def test_user_requested_already_granted(self): + add_user_with_status_granted(self.admin, self.user) + self.assertEqual('granted', get_course_creator_status(self.user)) + # Will not "downgrade" to pending because that would require removing the + # user from the authz course creator group (and that can only be done by an admin). + user_requested_access(self.user) + self.assertEqual('granted', get_course_creator_status(self.user)) + + def test_add_user_unrequested_staff(self): + # Users marked as is_staff will not be added to the course creator table. + add_user_with_status_unrequested(self.admin) + self.assertIsNone(get_course_creator_status(self.admin)) + + def test_add_user_granted_staff(self): + # Users marked as is_staff will not be added to the course creator table. + add_user_with_status_granted(self.admin, self.admin) + self.assertIsNone(get_course_creator_status(self.admin)) diff --git a/cms/djangoapps/course_creators/views.py b/cms/djangoapps/course_creators/views.py index 902406e620..e9b38ed169 100644 --- a/cms/djangoapps/course_creators/views.py +++ b/cms/djangoapps/course_creators/views.py @@ -2,32 +2,38 @@ Methods for interacting programmatically with the user creator table. """ from course_creators.models import CourseCreator -from django.core.exceptions import PermissionDenied from auth.authz import add_user_to_creator_group, remove_user_from_creator_group -def add_user_with_status_unrequested(caller, user): +def add_user_with_status_unrequested(user): """ Adds a user to the course creator table with status 'unrequested'. If the user is already in the table, this method is a no-op - (state will not be changed). Caller must have staff permissions. + (state will not be changed). + + If the user is marked as is_staff, this method is a no-op (user + will not be added to table). """ - _add_user(caller, user, CourseCreator.UNREQUESTED) + _add_user(user, CourseCreator.UNREQUESTED) def add_user_with_status_granted(caller, user): """ Adds a user to the course creator table with status 'granted'. - If the user is already in the table, this method is a no-op - (state will not be changed). Caller must have staff permissions. + If appropriate, this method also adds the user to the course creator group maintained by authz.py. + Caller must have staff permissions. - This method also adds the user to the course creator group maintained by authz.py. + If the user is already in the table, this method is a no-op + (state will not be changed). + + If the user is marked as is_staff, this method is a no-op (user + will not be added to table, nor added to authz.py group). """ - _add_user(caller, user, CourseCreator.GRANTED) - update_course_creator_group(caller, user, True) + if _add_user(user, CourseCreator.GRANTED): + update_course_creator_group(caller, user, True) def update_course_creator_group(caller, user, add): @@ -61,16 +67,33 @@ def get_course_creator_status(user): return user[0].state -def _add_user(caller, user, state): +def user_requested_access(user): + """ + User has requested course creator access. + + This changes the user state to CourseCreator.PENDING, unless the user + state is already CourseCreator.GRANTED, in which case this method is a no-op. + """ + user = CourseCreator.objects.get(user=user) + if user.state != CourseCreator.GRANTED: + user.state = CourseCreator.PENDING + user.save() + + +def _add_user(user, state): """ Adds a user to the course creator table with the specified state. - If the user is already in the table, this method is a no-op - (state will not be changed). - """ - if not caller.is_active or not caller.is_authenticated or not caller.is_staff: - raise PermissionDenied + Returns True if user was added to table, else False. - if CourseCreator.objects.filter(user=user).count() == 0: + If the user is already in the table, this method is a no-op + (state will not be changed, method will return False). + + If the user is marked as is_staff, this method is a no-op (False will be returned). + """ + if not user.is_staff and CourseCreator.objects.filter(user=user).count() == 0: entry = CourseCreator(user=user, state=state) entry.save() + return True + + return False 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/aws_migrate.py b/cms/envs/aws_migrate.py new file mode 100644 index 0000000000..54ced39c7c --- /dev/null +++ b/cms/envs/aws_migrate.py @@ -0,0 +1,24 @@ +""" +A Django settings file for use on AWS while running +database migrations, since we don't want to normally run the +LMS with enough privileges to modify the database schema. +""" + +# We intentionally define lots of variables that aren't used, and +# want to import all variables from base settings files +# pylint: disable=W0401, W0614 + +# Import everything from .aws so that our settings are based on those. +from .aws import * +import os +from django.core.exceptions import ImproperlyConfigured + +USER = os.environ.get('DB_MIGRATION_USER', 'root') +PASSWORD = os.environ.get('DB_MIGRATION_PASS', None) + +if not PASSWORD: + raise ImproperlyConfigured("No database password was provided for running " + "migrations. This is fatal.") + +DATABASES['default']['USER'] = USER +DATABASES['default']['PASSWORD'] = PASSWORD diff --git a/cms/envs/common.py b/cms/envs/common.py index 260aa30cd2..40084c20ae 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -42,8 +42,8 @@ MITX_FEATURES = { # do not display video when running automated acceptance tests 'STUB_VIDEO_FOR_TESTING': False, - # email address for staff (eg to request course creation) - 'STAFF_EMAIL': '', + # email address for studio staff (eg to request course creation) + 'STUDIO_REQUEST_EMAIL': '', 'STUDIO_NPS_SURVEY': True, @@ -62,9 +62,6 @@ MITX_FEATURES = { } ENABLE_JASMINE = False -# needed to use lms student app -GENERATE_RANDOM_USER_CREDENTIALS = False - ############################# SET PATH INFORMATION ############################# PROJECT_ROOT = path(__file__).abspath().dirname().dirname() # /mitx/cms @@ -108,7 +105,12 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.static', 'django.contrib.messages.context_processors.messages', 'django.contrib.auth.context_processors.auth', # this is required for admin - 'django.core.context_processors.csrf', # necessary for csrf protection + 'django.core.context_processors.csrf' +) + +# use the ratelimit backend to prevent brute force attacks +AUTHENTICATION_BACKENDS = ( + 'ratelimitbackend.backends.RateLimitModelBackend', ) LMS_BASE = None @@ -141,8 +143,8 @@ MIDDLEWARE_CLASSES = ( 'request_cache.middleware.RequestCache', 'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', 'method_override.middleware.MethodOverrideMiddleware', # Instead of AuthenticationMiddleware, we use a cache-backed version @@ -155,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 ################################ @@ -179,9 +184,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' DEFAULT_FROM_EMAIL = 'registration@edx.org' DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org' SERVER_EMAIL = 'devops@edx.org' -ADMINS = ( - ('edX Admins', 'admin@edx.org'), -) +ADMINS = () MANAGERS = ADMINS # Static content @@ -193,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 @@ -241,10 +244,11 @@ PIPELINE_JS = { rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.js') + rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.js') ) + ['js/hesitate.js', 'js/base.js', 'js/views/feedback.js', + 'js/models/course.js', 'js/models/section.js', 'js/views/section.js', 'js/models/metadata_model.js', 'js/views/metadata_editor_view.js', 'js/models/textbook.js', 'js/views/textbook.js', - 'js/views/assets.js'], + 'js/views/assets.js', 'js/utility.js'], 'output_filename': 'js/cms-application.js', 'test_order': 0 }, 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/models/course_spec.coffee b/cms/static/coffee/spec/models/course_spec.coffee new file mode 100644 index 0000000000..07fe6930f4 --- /dev/null +++ b/cms/static/coffee/spec/models/course_spec.coffee @@ -0,0 +1,9 @@ +describe "CMS.Models.Course", -> + describe "basic", -> + beforeEach -> + @model = new CMS.Models.Course({ + name: "Greek Hero" + }) + + it "should take a name argument", -> + expect(@model.get("name")).toEqual("Greek Hero") 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", ->

      2. - """#" + """ 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 14b64b7b9e..fd679c289b 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -41,7 +41,12 @@ class CMS.Views.UnitEdit extends Backbone.View id: unit_location_analytics payload = children : @components() - options = success : => @model.unset('children') + saving = new CMS.Views.Notification.Mini + title: gettext('Saving') + '…' + saving.show() + options = success : => + @model.unset('children') + saving.hide() @model.save(payload, options) helper: 'clone' opacity: '0.5' diff --git a/cms/static/js/base.js b/cms/static/js/base.js index 3a30e0bc81..80b24776da 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -60,12 +60,10 @@ $(document).ready(function() { $('.nav-dd .nav-item .title').removeClass('is-selected'); }); - $('.nav-dd .nav-item .title').click(function(e) { + $('.nav-dd .nav-item').click(function(e) { - $subnav = $(this).parent().find('.wrapper-nav-sub'); - $title = $(this).parent().find('.title'); - e.preventDefault(); - e.stopPropagation(); + $subnav = $(this).find('.wrapper-nav-sub'); + $title = $(this).find('.title'); if ($subnav.hasClass('is-shown')) { $subnav.removeClass('is-shown'); @@ -75,6 +73,9 @@ $(document).ready(function() { $('.nav-dd .nav-item .wrapper-nav-sub').removeClass('is-shown'); $title.addClass('is-selected'); $subnav.addClass('is-shown'); + // if propogation is not stopped, the event will bubble up to the + // body element, which will close the dropdown. + e.stopPropagation(); } }); @@ -252,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) { @@ -306,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", @@ -596,11 +604,9 @@ function cancelNewSection(e) { function addNewCourse(e) { e.preventDefault(); - - $(e.target).hide(); - var $newCourse = $($('#new-course-template').html()); + $('.new-course-button').addClass('is-disabled'); + var $newCourse = $('.wrapper-create-course').addClass('is-shown'); var $cancelButton = $newCourse.find('.new-course-cancel'); - $('.inner-wrapper').prepend($newCourse); $newCourse.find('.new-course-name').focus().select(); $newCourse.find('form').bind('submit', saveNewCourse); $cancelButton.bind('click', cancelNewCourse); @@ -612,41 +618,97 @@ function addNewCourse(e) { function saveNewCourse(e) { e.preventDefault(); - var $newCourse = $(this).closest('.new-course'); - var org = $newCourse.find('.new-course-org').val(); - var number = $newCourse.find('.new-course-number').val(); - var display_name = $newCourse.find('.new-course-name').val(); + var $newCourseForm = $(this).closest('#create-course-form'); + var display_name = $newCourseForm.find('.new-course-name').val(); + var org = $newCourseForm.find('.new-course-org').val(); + var number = $newCourseForm.find('.new-course-number').val(); + var run = $newCourseForm.find('.new-course-run').val(); - if (org == '' || number == '' || display_name == '') { - alert(gettext('You must specify all fields in order to create a new course.')); - return; + var required_field_text = gettext('Required field'); + + var display_name_errMsg = (display_name === '') ? required_field_text : null; + var org_errMsg = (org === '') ? required_field_text : null; + var number_errMsg = (number === '') ? required_field_text : null; + var run_errMsg = (run === '') ? required_field_text : null; + + var bInErr = (display_name_errMsg || org_errMsg || number_errMsg || run_errMsg); + + // check for suitable encoding + if (!bInErr) { + var encoding_errMsg = gettext('Please do not use any spaces or special characters in this field.'); + + if (encodeURIComponent(org) != org) + org_errMsg = encoding_errMsg; + if (encodeURIComponent(number) != number) + number_errMsg = encoding_errMsg; + if (encodeURIComponent(run) != run) + run_errMsg = encoding_errMsg; + + bInErr = (org_errMsg || number_errMsg || run_errMsg); } + var header_err_msg = (bInErr) ? gettext('Please correct the fields below.') : null; + + var setNewCourseErrMsgs = function(header_err_msg, display_name_errMsg, org_errMsg, number_errMsg, run_errMsg) { + if (header_err_msg) { + $('.wrapper-create-course').addClass('has-errors'); + $('.wrap-error').addClass('is-shown'); + $('#course_creation_error').html('

      ' + header_err_msg + '

      '); + } else { + $('.wrap-error').removeClass('is-shown'); + $('#course_creation_error').html(''); + } + + var setNewCourseFieldInErr = function(el, msg) { + el.children('.tip-error').remove(); + if (msg !== null && msg !== '') { + el.addClass('error'); + el.append('' + msg + ''); + } else { + el.removeClass('error'); + } + }; + + setNewCourseFieldInErr($('#field-course-name'), display_name_errMsg); + setNewCourseFieldInErr($('#field-organization'), org_errMsg); + setNewCourseFieldInErr($('#field-course-number'), number_errMsg); + setNewCourseFieldInErr($('#field-course-run'), run_errMsg); + }; + + setNewCourseErrMsgs(header_err_msg, display_name_errMsg, org_errMsg, number_errMsg, run_errMsg); + + if (bInErr) + return; + analytics.track('Created a Course', { 'org': org, 'number': number, - 'display_name': display_name + 'display_name': display_name, + 'run': run }); $.post('/create_new_course', { - 'org': org, - 'number': number, - 'display_name': display_name - }, - - function(data) { - if (data.id != undefined) { - window.location = '/' + data.id.replace(/.*:\/\//, ''); - } else if (data.ErrMsg != undefined) { - alert(data.ErrMsg); + 'org': org, + 'number': number, + 'display_name': display_name, + 'run': run + }, + function(data) { + if (data.id !== undefined) { + window.location = '/' + data.id.replace(/.*:\/\//, ''); + } else if (data.ErrMsg !== undefined) { + var orgErrMsg = (data.OrgErrMsg !== undefined) ? data.OrgErrMsg : null; + var courseErrMsg = (data.CourseErrMsg !== undefined) ? data.CourseErrMsg : null; + setNewCourseErrMsgs(data.ErrMsg, null, orgErrMsg, courseErrMsg, null); + } } - }); + ); } function cancelNewCourse(e) { e.preventDefault(); - $('.new-course-button').show(); - $(this).parents('section.new-course').remove(); + $('.new-course-button').removeClass('is-disabled'); + $('.wrapper-create-course').removeClass('is-shown'); } function addNewSubsection(e) { @@ -717,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 @@ -743,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/course.js b/cms/static/js/models/course.js new file mode 100644 index 0000000000..4f2325e94c --- /dev/null +++ b/cms/static/js/models/course.js @@ -0,0 +1,10 @@ +CMS.Models.Course = Backbone.Model.extend({ + defaults: { + "name": "" + }, + validate: function(attrs, options) { + if (!attrs.name) { + return gettext("You must specify a name"); + } + } +}); 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/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/course_info_edit.js b/cms/static/js/views/course_info_edit.js index ecd9ebe78d..a12fd5eb76 100644 --- a/cms/static/js/views/course_info_edit.js +++ b/cms/static/js/views/course_info_edit.js @@ -34,16 +34,8 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ }, initialize: function() { - var self = this; - // instantiates an editor template for each update in the collection - window.templateLoader.loadRemoteTemplate("course_info_update", - // TODO Where should the template reside? how to use the static.url to create the path? - "/static/client_templates/course_info_update.html", - function (raw_template) { - self.template = _.template(raw_template); - self.render(); - } - ); + this.template = _.template($("#course_info_update-tpl").text()); + this.render(); // when the client refetches the updates as a whole, re-render them this.listenTo(this.collection, 'reset', this.render); }, @@ -105,7 +97,19 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ var targetModel = this.eventModel(event); targetModel.set({ date : this.dateEntry(event).val(), content : this.$codeMirror.getValue() }); // push change to display, hide the editor, submit the change - targetModel.save({}); + var saving = new CMS.Views.Notification.Mini({ + title: gettext('Saving') + '…' + }); + saving.show(); + var ele = this.modelDom(event); + targetModel.save({}, { + success: function() { + saving.hide(); + }, + error: function() { + ele.remove(); + } + }); this.closeEditor(this); analytics.track('Saved Course Update', { @@ -148,29 +152,48 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ onDelete: function(event) { event.preventDefault(); - if (!confirm('Are you sure you want to delete this update? This action cannot be undone.')) { - return; - } - - analytics.track('Deleted Course Update', { - 'course': course_location_analytics, - 'date': this.dateEntry(event).val() - }); - + var self = this; var targetModel = this.eventModel(event); - this.modelDom(event).remove(); - var cacheThis = this; - targetModel.destroy({ - success: function (model, response) { - cacheThis.collection.fetch({ - success: function() { - cacheThis.render(); - }, - reset: true - }); + var confirm = new CMS.Views.Prompt.Warning({ + title: gettext('Are you sure you want to delete this update?'), + message: gettext('This action cannot be undone.'), + actions: { + primary: { + text: gettext('OK'), + click: function () { + analytics.track('Deleted Course Update', { + 'course': course_location_analytics, + 'date': self.dateEntry(event).val() + }); + self.modelDom(event).remove(); + var deleting = new CMS.Views.Notification.Mini({ + title: gettext('Deleting') + '…' + }); + deleting.show(); + targetModel.destroy({ + success: function (model, response) { + self.collection.fetch({ + success: function() { + self.render(); + deleting.hide(); + }, + reset: true + }); + } + }); + confirm.hide(); + } + }, + secondary: { + text: gettext('Cancel'), + click: function() { + confirm.hide(); + } + } } }); - }, + confirm.show(); +}, closeEditor: function(self, removePost) { var targetModel = self.collection.get(self.$currentPost.attr('name')); @@ -241,16 +264,11 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({ }, initialize: function() { + this.template = _.template($("#course_info_handouts-tpl").text()); var self = this; this.model.fetch({ complete: function() { - window.templateLoader.loadRemoteTemplate("course_info_handouts", - "/static/client_templates/course_info_handouts.html", - function (raw_template) { - self.template = _.template(raw_template); - self.render(); - } - ); + self.render(); }, reset: true }); @@ -293,7 +311,15 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({ onSave: function(event) { this.model.set('data', this.$codeMirror.getValue()); this.render(); - this.model.save({}); + var saving = new CMS.Views.Notification.Mini({ + title: gettext('Saving') + '…' + }); + saving.show(); + this.model.save({}, { + success: function() { + saving.hide(); + } + }); this.$form.hide(); this.closeEditor(this); 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( + '
    2. ' + + '' + + 'Remove' + + '
      3. ' + ); + 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 42ed2d6920..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) { @@ -225,12 +225,19 @@ function _handleReorder(event, ui, parentIdField, childrenSelector) { ui.draggable.attr("style", "position:relative;"); // STYLE hack too children.push(ui.draggable.data('id')); } + var saving = new CMS.Views.Notification.Mini({ + title: gettext('Saving') + '…' + }); + saving.show(); $.ajax({ url: "/save_item", type: "POST", dataType: "json", contentType: "application/json", - data:JSON.stringify({ 'id' : subsection_id, 'children' : children}) + data:JSON.stringify({ 'id' : subsection_id, 'children' : children}), + success: function() { + saving.hide(); + } }); } diff --git a/cms/static/js/views/settings/advanced_view.js b/cms/static/js/views/settings/advanced_view.js index 90e84adf2b..5ae0c19570 100644 --- a/cms/static/js/views/settings/advanced_view.js +++ b/cms/static/js/views/settings/advanced_view.js @@ -11,16 +11,9 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({ // TODO enable/disable save based on validation (currently enabled whenever there are changes) }, initialize : function() { - var self = this; - // instantiates an editor template for each update in the collection - window.templateLoader.loadRemoteTemplate("advanced_entry", - "/static/client_templates/advanced_entry.html", - function (raw_template) { - self.template = _.template(raw_template); - self.render(); - } - ); + this.template = _.template($("#advanced_entry-tpl").text()); this.listenTo(this.model, 'invalid', this.handleValidationError); + this.render(); }, render: function() { // catch potential outside call before template loaded @@ -56,7 +49,7 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({ CodeMirror.fromTextArea(textarea, { mode: "application/json", lineNumbers: false, lineWrapping: false, onChange: function(instance, changeobj) { - instance.save() + instance.save(); // this event's being called even when there's no change :-( if (instance.getValue() !== oldValue) { var message = gettext("Your changes will not take effect until you save your progress. Take care with key and value formatting, as validation is not implemented."); @@ -105,8 +98,7 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({ // call validateKey on each to ensure proper format // check for dupes var self = this; - this.model.save({}, - { + this.model.save({}, { success : function() { self.render(); var title = gettext("Your policy changes have been saved."); diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 054a401e4b..e4495d0248 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -368,42 +368,6 @@ p, ul, ol, dl { color: $gray-d3; } } - - .introduction { - @include box-sizing(border-box); - @extend .t-copy-sub1; - width: flex-grid(12); - margin: 0 0 $baseline 0; - - .copy strong { - font-weight: 600; - } - - &.has-links { - @include clearfix(); - - .copy { - float: left; - width: flex-grid(8,12); - margin-right: flex-gutter(); - } - - .nav-introduction-supplementary { - @extend .t-copy-sub2; - float: right; - width: flex-grid(4,12); - display: block; - text-align: right; - - .icon { - @extend .t-action3; - display: inline-block; - vertical-align: middle; - margin-right: ($baseline/4); - } - } - } - } } .content-primary, .content-supplementary { @@ -482,6 +446,24 @@ p, ul, ol, dl { } } + // actions + .list-actions { + @extend .cont-no-list; + + .action-item { + margin-bottom: ($baseline/4); + border-bottom: 1px dotted $gray-l4; + padding-bottom: ($baseline/4); + + + &:last-child { + margin-bottom: 0; + border: none; + padding-bottom: 0; + } + } + } + // navigation .nav-related, .nav-page { diff --git a/cms/static/sass/_shame.scss b/cms/static/sass/_shame.scss index 2a11037007..85d133af1f 100644 --- a/cms/static/sass/_shame.scss +++ b/cms/static/sass/_shame.scss @@ -2,10 +2,39 @@ // // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/) // ==================== +// view - dashboard +body.dashboard { + + // elements - authorship controls + .wrapper-authorshiprights { + + .ui-toggle-control { + // needed to override general a element transition properties - need to fix. + transition-duration: 0.25s; + transition-timing-function: ease-in-out; + } + + .icon-remove-sign { + // needed to override general a element transition properties - need to fix. + transition-duration: 0.25s; + transition-timing-function: ease-in-out; + } + } +} + + +// yes we have no boldness today - need to fix the resets +body strong, +body b { + font-weight: 700; +} // known things to do (paint the fence, sand the floor, wax on/off) // ==================== + + +// known things to do (paint the fence, sand the floor, wax on/off): + // * centralize and move form styling into forms.scss - cms/static/sass/views/_textbooks.scss and cms/static/sass/views/_settings.scss // * move dialogue styles into cms/static/sass/elements/_modal.scss // * use the @include placeholder Bourbon mixin (http://bourbon.io/docs/#placeholder) for any placeholder styling - diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index 660ba23e8c..7011089527 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -66,6 +66,7 @@ // xmodule @import 'xmodule/modules/css/module-styles.scss'; @import 'xmodule/descriptors/css/module-styles.scss'; +@import 'elements/xmodules'; // styling for Studio-specific contexts @import 'shame'; // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/) diff --git a/cms/static/sass/elements/_forms.scss b/cms/static/sass/elements/_forms.scss index 9907b05995..c78e2f3692 100644 --- a/cms/static/sass/elements/_forms.scss +++ b/cms/static/sass/elements/_forms.scss @@ -93,6 +93,227 @@ form { } } +// ELEM: form wrapper +.wrapper-create-element { + height: 0; + margin-bottom: $baseline; + opacity: 0.0; + pointer-events: none; + overflow: hidden; + + &.animate { + @include transition(opacity $tmg-f1 ease-in-out 0s, height $tmg-f1 ease-in-out 0s); + } + + &.is-shown { + height: auto; // define a specific height for the animating version of this UI to work properly + opacity: 1.0; + pointer-events: auto; + } +} + +// ELEM: form +// form styling for creating a new content item (course, user, textbook) +form[class^="create-"] { + @extend .ui-window; + + .title { + @extend .t-title4; + font-weight: 600; + padding: $baseline ($baseline*1.5) 0 ($baseline*1.5); + } + + fieldset { + padding: $baseline ($baseline*1.5); + } + + + .list-input { + @extend .cont-no-list; + + .field { + margin: 0 0 ($baseline*0.75) 0; + + &:last-child { + margin-bottom: 0; + } + + &.required { + + label { + font-weight: 600; + } + + label:after { + margin-left: ($baseline/4); + content: "*"; + } + } + + label, input, textarea { + display: block; + } + + label { + @extend .t-copy-sub1; + @include transition(color $tmg-f3 ease-in-out 0s); + margin: 0 0 ($baseline/4) 0; + + &.is-focused { + color: $blue; + } + } + + + input, textarea { + @extend .t-copy-base; + @include transition(all $tmg-f2 ease-in-out 0s); + height: 100%; + width: 100%; + padding: ($baseline/2); + + &.long { + width: 100%; + } + + &.short { + width: 25%; + } + + /*@include placeholder { + color: $gray-l3; + }*/ + + &:focus { + + + .tip { + color: $gray; + } + } + } + + textarea.long { + height: ($baseline*5); + } + + input[type="checkbox"] { + display: inline-block; + margin-right: ($baseline/4); + width: auto; + height: auto; + + & + label { + display: inline-block; + } + } + + .tip { + @extend .t-copy-sub2; + @include transition(color, 0.15s, ease-in-out); + display: block; + margin-top: ($baseline/4); + color: $gray-l3; + } + + .tip-error { + display: none; + float: none; + } + + &.error { + label { + color: $red; + } + + .tip-error { + @extend .anim-fadeIn; + display: block; + color: $red; + } + + input { + border-color: $red; + } + } + } + + .field-inline { + + input, textarea, select { + width: 62%; + display: inline-block; + } + + .tip-stacked { + display: inline-block; + float: right; + width: 35%; + margin-top: 0; + } + + &.error { + .tip-error { + } + } + + } + + .field-group { + @include clearfix(); + margin: 0 0 ($baseline/2) 0; + + .field { + display: block; + width: 47%; + border-bottom: none; + margin: 0 ($baseline*0.75) 0 0; + padding: ($baseline/4) 0 0 0; + float: left; + position: relative; + + &:nth-child(odd) { + float: left; + } + + &:nth-child(even) { + float: right; + margin-right: 0; + } + + input, textarea { + width: 100%; + } + } + } + } + + .actions { + box-shadow: inset 0 1px 2px $shadow; + margin-top: ($baseline*0.75); + border-top: 1px solid $gray-l1; + padding: ($baseline*0.75) ($baseline*1.5); + background: $gray-l6; + + .action { + @include transition(all $tmg-f2 linear 0s); + display: inline-block; + padding: ($baseline/5) $baseline; + font-weight: 600; + text-transform: uppercase; + } + + .action-primary { + @include blue-button; + @extend .t-action2; + } + + .action-secondary { + @include grey-button; + @extend .t-action2; + } + } +} + // ==================== // forms - grandfathered diff --git a/cms/static/sass/elements/_icons.scss b/cms/static/sass/elements/_icons.scss index a75c97ea76..9bbb72d67e 100644 --- a/cms/static/sass/elements/_icons.scss +++ b/cms/static/sass/elements/_icons.scss @@ -1,4 +1,4 @@ -// studio - elements - icons +// studio - elements - icons & badges // ==================== .icon { @@ -14,3 +14,45 @@ vertical-align: middle; margin-right: ($baseline/4); } + +// ui - badges +.wrapper-ui-badge { + position: absolute; + top: -1px; + left: ($baseline*1.5); + width: 100%; +} + +.ui-badge { + @extend .t-title9; + position: relative; + border-bottom-right-radius: ($baseline/10); + border-bottom-left-radius: ($baseline/10); + padding: ($baseline/4) ($baseline/2) ($baseline/4) ($baseline/2); + font-weight: 600; + text-transform: uppercase; + + * [class^="icon-"] { + margin-right: ($baseline/5); + } + + // OPTION: add this class for a visual hanging display + &.is-hanging { + @include box-sizing(border-box); + @extend .ui-depth2; + top: -($baseline/4); + + &:after { + position: absolute; + top: 0; + right: -($baseline/4); + display: block; + height: 0; + width: 0; + border-bottom: ($baseline/4) solid $black-t3; + border-right: ($baseline/4) solid transparent; + content: ""; + opacity: 0.5; + } + } +} diff --git a/cms/static/sass/elements/_navigation.scss b/cms/static/sass/elements/_navigation.scss index d05965d83c..a9e2f45533 100644 --- a/cms/static/sass/elements/_navigation.scss +++ b/cms/static/sass/elements/_navigation.scss @@ -64,12 +64,16 @@ nav { opacity: 0.0; pointer-events: none; width: ($baseline*8); + overflow: hidden; + height: 0; // dropped down state &.is-shown { opacity: 1.0; pointer-events: auto; + overflow: visible; + height: auto; } } diff --git a/cms/static/sass/elements/_system-feedback.scss b/cms/static/sass/elements/_system-feedback.scss index be1b41bf29..74187aca62 100644 --- a/cms/static/sass/elements/_system-feedback.scss +++ b/cms/static/sass/elements/_system-feedback.scss @@ -1,4 +1,46 @@ // studio - elements - system feedback +// ==================== + +// messages +.message { + @extend .t-copy-sub1; + display: block; +} + +.message-status { + display: none; + @include border-top-radius(2px); + @include box-sizing(border-box); + border-bottom: 2px solid $yellow-d2; + margin: 0 0 $baseline 0; + padding: ($baseline/2) $baseline; + font-weight: 500; + background: $yellow-d1; + color: $white; + + [class^="icon-"] { + position: relative; + top: 1px; + @include font-size(16); + display: inline-block; + margin-right: ($baseline/2); + } + + .text { + display: inline-block; + } + + &.error { + border-color: $red-d3; + background: $red-l1; + } + + &.is-shown { + display: block; + } +} + + // alerts, notifications, prompts, and status communication // ==================== diff --git a/cms/static/sass/elements/_system-help.scss b/cms/static/sass/elements/_system-help.scss index d1b0584fc4..c5fcc6a0ec 100644 --- a/cms/static/sass/elements/_system-help.scss +++ b/cms/static/sass/elements/_system-help.scss @@ -1,40 +1,213 @@ // studio - elements - system help // ==================== -// notices - in-context: to be used as notices to users within the context of a form/action -.notice-incontext { - @extend .ui-well; - border-radius: ($baseline/10); +// view introductions - common greeting/starting points for the UI +.content .introduction { + @include box-sizing(border-box); + margin-bottom: $baseline; .title { - @extend .t-title7; - margin-bottom: ($baseline/4); + @extend .t-title4; font-weight: 600; } .copy { @extend .t-copy-sub1; - @include transition(opacity $tmg-f2 ease-in-out 0s); - opacity: 0.75; } strong { font-weight: 600; } - &:hover { + // CASE: has links alongside + &.has-links { + @include clearfix(); .copy { - opacity: 1.0; + float: left; + width: flex-grid(8,12); + margin-right: flex-gutter(); + } + + .nav-introduction-supplementary { + @extend .t-copy-sub2; + float: right; + width: flex-grid(4,12); + display: block; + text-align: right; + + .icon { + @extend .t-action3; + display: inline-block; + vertical-align: middle; + margin-right: ($baseline/4); + } } } } -// particular warnings around a workflow for something +// notices - in-context: to be used as notices to users within the context of a form/action +.notice-incontext { + @extend .ui-well; + border-radius: ($baseline/10); + position: relative; + overflow: hidden; + margin-bottom: $baseline; + + .title { + @extend .t-title6; + margin-bottom: ($baseline/2); + font-weight: 700; + } + + .copy { + @extend .t-copy-sub1; + @include transition(opacity $tmg-f2 ease-in-out 0s); + opacity: 0.75; + margin-bottom: $baseline; + + &:last-child { + margin-bottom: 0; + } + } + + strong { + font-weight: 600; + } + + &.has-status { + + .status-indicator { + position: absolute; + top: 0; + left: 0; + display: block; + width: 100%; + height: ($baseline/4); + opacity: 0.40; + } + } + + // CASE: notice has actions { + &.has-actions { + + .list-actions { + margin-top: ($baseline*0.75); + + .action-item { + + } + + .action-primary { + @extend .btn-primary-blue; + @extend .t-action3; + } + } + } + + // list of notices all in one + &.list-notices { + + .notice-item { + margin-bottom: $baseline; + border-bottom: 1px solid $gray-l3; + padding-bottom: $baseline; + + &:last-child { + margin-bottom: 0; + border: none; + padding-bottom: 0; + } + } + } +} + +// particular notice - warnings around a workflow for something .notice-workflow { background: $yellow-l5; - .copy { + .status-indicator { + background: $yellow; + } + + title { color: $gray-d1; } + + .copy { + color: $gray; + } +} + +// particular notice - instructional +.notice-instruction { + background-color: $gray-l4; + + .title { + color: $gray-d2; + } + + .copy { + color: $gray-d2; + } + + &.has-actions { + + .list-actions { + + .action-item { + + } + + .action-primary { + @extend .btn-primary-blue; + @extend .t-action3; + } + } + } +} + +// particular notice - create +.notice-create { + background-color: $gray-l4; + + .title { + color: $gray-d2; + } + + .copy { + color: $gray-d2; + } + + &.has-actions { + + .list-actions { + + .action-item { + + } + + .action-primary { + @extend .btn-primary-green; + @extend .t-action3; + } + } + } +} + +// particular notice - confirmation +.notice-confirmation { + background-color: $green-l5; + + .status-indicator { + background: $green-s1; + } + + .title { + color: $green; + } + + .copy { + color: $gray; + } } diff --git a/cms/static/sass/elements/_xmodules.scss b/cms/static/sass/elements/_xmodules.scss new file mode 100644 index 0000000000..a8ec208b02 --- /dev/null +++ b/cms/static/sass/elements/_xmodules.scss @@ -0,0 +1,15 @@ +// studio - elements - xmodules +// ==================== + +// Video Alpha +.xmodule_VideoAlphaModule { + + // display mode + &.xmodule_display { + + // full screen + .video-controls .add-fullscreen { + display: none !important; // nasty, but needed to override the bad specificity of the xmodule css selectors + } + } +} diff --git a/cms/static/sass/views/_account.scss b/cms/static/sass/views/_account.scss index 53f01eee6d..c2cf139400 100644 --- a/cms/static/sass/views/_account.scss +++ b/cms/static/sass/views/_account.scss @@ -252,44 +252,3 @@ body.signup, body.signin { } } } - -// ==================== - -// messages -.message { - @extend .t-copy-sub1; - display: block; -} - -.message-status { - display: none; - @include border-top-radius(2px); - @include box-sizing(border-box); - border-bottom: 2px solid $yellow-d2; - margin: 0 0 $baseline 0; - padding: ($baseline/2) $baseline; - font-weight: 500; - background: $yellow-d1; - color: $white; - - [class^="icon-"] { - position: relative; - top: 1px; - @include font-size(16); - display: inline-block; - margin-right: ($baseline/2); - } - - .text { - display: inline-block; - } - - &.error { - border-color: shade($red, 50%); - background: tint($red, 20%); - } - - &.is-shown { - display: block; - } -} diff --git a/cms/static/sass/views/_dashboard.scss b/cms/static/sass/views/_dashboard.scss index 8d1b068256..817fc726c0 100644 --- a/cms/static/sass/views/_dashboard.scss +++ b/cms/static/sass/views/_dashboard.scss @@ -3,84 +3,438 @@ body.dashboard { - .my-classes { - margin-top: $baseline; + // temp + .content { + margin-bottom: ($baseline*5); + + &:last-child { + margin-bottom: 0; + } } - .class-list { - margin-top: 20px; - border-radius: 3px; - border: 1px solid $darkGrey; - background: #fff; - box-shadow: 0 1px 2px rgba(0, 0, 0, .1); + // ==================== - li { - position: relative; - border-bottom: 1px solid $mediumGrey; + // basic layout + .content-primary, .content-supplementary { + @include box-sizing(border-box); + float: left; + } - &:last-child { - border-bottom: none; + .content-primary { + width: flex-grid(9, 12); + margin-right: flex-gutter(); + } + + .content-supplementary { + width: flex-grid(3, 12); + } + + // ==================== + + // elements - notices + .content .notice-incontext { + width: flexgrid(9, 9); + + // CASE: notice has actions { + &.has-actions, &.list-notices .notice-item.has-actions { + + .msg, .list-actions { + display: inline-block; + vertical-align: middle; + } + + .msg { + width: flex-grid(6, 9); + margin-right: flex-gutter(); + } + + .list-actions { + width: flex-grid(3, 9); + text-align: right; + margin-top: 0; + + .action-item { + + } + + .action-create-course { + @extend .btn-primary-green; + @extend .t-action3; + } + } + } + } + + + + // elements - course creation rights controls + .wrapper-creationrights { + overflow: hidden; + + .ui-toggle-control { + @extend .ui-depth2; + @extend .btn-secondary-gray; + @include clearfix(); + display: block; + text-align: left; + + // STATE: hover - syncing up colors with current so transition is smoother + &:hover { + background: $gray-d1; + color: $white; } - .class-link { - z-index: 100; + .label { + @extend .t-action3; + float: left; + width: flex-grid(8, 9); + margin: 3px flex-gutter() 0 0; + } + + .icon-remove-sign { + @extend .t-action1; + @include transform(rotate(45deg)); + @include transform-origin(center center); + @include transition(all $tmg-f1 linear 0s); + float: right; + text-align: right; + } + } + + .ui-toggle-target { + @extend .ui-depth1; + @include transition(opacity $tmg-f1 ease-in-out 0s); + position: relative; + top: -2px; + display: none; + opacity: 0; + } + + // CASE: when the content area is shown + &.is-shown { + + .ui-toggle-control { + @include border-bottom-radius(0); + + .icon-remove-sign { + @include transform(rotate(90deg)); + @include transform-origin(center center); + } + } + + .ui-toggle-target { display: block; - padding: 20px 25px; - line-height: 1.3; + opacity: 1.0; + } + } - &:hover { - background: $paleYellow; - + .view-live-button { + } + + // elements - course creation rights controls + .status-creationrights { + margin-top: $baseline; + + .title { + @extend .t-title7; + margin-bottom: ($baseline/4); + font-weight: 700; + color: $gray-d1; + } + + .copy { + + } + + .list-actions, .form-actions { + margin-top: ($baseline*0.75); + + .action-item { + + } + + .action-primary { + @extend .btn-primary-blue; + @extend .t-action3; + } + + // specific - request button + // BT: should we abstract these states out for all buttons like this + .action-request { + position: relative; + overflow: hidden; + + .icon-cog { + @include transition(all $tmg-f1 ease-in-out $tmg-f1); + @include font-size(20); + position: absolute; + top: ($baseline/2); + left: -($baseline); + visibility: hidden; + opacity: 0.0; + } + + // state: submitting + &.is-submitting { + padding-left: ($baseline*2); + + .icon-cog { + left: ($baseline*0.75); + visibility: visible; opacity: 1.0; - pointer-events: auto; } + } + + // state: has an error + &.has-error { + padding-left: ($baseline*2); + background: $red; + border-color: $red-d1; + + .icon-cog { + left: ($baseline*0.75); + visibility: visible; + opacity: 1.0; + } + } + } + } + + .status-update { + + .label { + @extend .cont-text-sr; + } + + .value { + border-radius: ($baseline/4); + position: relative; + overflow: hidden; + padding: ($baseline/5) ($baseline/2); + background: $gray; + + .status-indicator { + position: absolute; + top: 0; + left: 0; + display: block; + width: 100%; + height: ($baseline/4); + opacity: 0.40; + } + } + + .value-formal, .value-description { + border-radius: ($baseline/10); + display: inline-block; + vertical-align: middle; + color: $white; + } + + .value-formal { + @extend .t-title5; + margin: ($baseline/2); + font-weight: 700; + + [class^="icon-"] { + margin-right: ($baseline/4); + } + } + + .value-description { + @extend .t-copy-sub1; + position: relative; + color: $white; + opacity: 0.85; + } + } + + // CASE: rights are not requested yet + &.is-unrequested { + + .title { + @extend .cont-text-sr; + } + } + + // CASE: status is pending + &.is-pending { + + .status-update { + + .value { + background: $orange; + } + + .status-indicator { + background: $orange-d1; } } } - .class-name { - display: block; - font-size: 19px; - font-weight: 300; - } - .detail { - font-size: 14px; - font-weight: 400; - margin-right: 20px; - color: #3c3c3c; - } + // CASE: status is denied + &.is-denied { - // view live button - .view-live-button { - z-index: 10000; - position: absolute; - top: 15px; - right: $baseline; - padding: ($baseline/4) ($baseline/2); - opacity: 0.0; - pointer-events: none; + .status-update { - &:hover { - opacity: 1.0; - pointer-events: auto; - } + .value { + background: $red-l1; + } + + .status-indicator { + background: $red-s1; + } + } + } + } + + // ==================== + + // ELEM: course listings + .courses { + margin: $baseline 0; + } + + .list-courses { + margin-top: $baseline; + border-radius: 3px; + border: 1px solid $gray; + background: $white; + 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; + + // STATE: hover/focus + &:hover { + background: $paleYellow; + + .course-actions .view-live-button { + opacity: 1.0; + pointer-events: auto; + } + + .course-title { + color: $orange-d1; + } + + .course-metadata { + opacity: 1.0; + } + } + + .course-link, .course-actions { + @include box-sizing(border-box); + display: inline-block; + vertical-align: middle; + } + + // encompassing course link + .course-link { + @extend .ui-depth2; + width: flex-grid(7, 9); + margin-right: flex-gutter(); + } + + // course title + .course-title { + @extend .t-title4; + margin: 0 ($baseline*2) ($baseline/4) 0; + font-weight: 300; + } + + // 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; + } + } } } - .new-course { - padding: 15px 25px; - margin-top: 20px; - border-radius: 3px; - border: 1px solid $darkGrey; - background: #fff; - box-shadow: 0 1px 2px rgba(0, 0, 0, .1); - @include clearfix; + // ELEM: new user form + .wrapper-create-course { + + // CASE: when form is animating + &.animate { + + // STATE: shown + &.is-shown { + height: ($baseline*26); + + // STATE: errors + &.has-errors { + height: ($baseline*33); + } + } + } + } + + // ==================== + + // course listings + + .create-course { .row { - margin-bottom: 15px; - @include clearfix; + @include clearfix(); + margin-bottom: ($baseline*0.75); } .column { @@ -92,24 +446,21 @@ body.dashboard { margin-right: 4%; } - .course-info { - width: 600px; - } - label { + @extend .t-title7; display: block; - font-size: 13px; font-weight: 700; } .new-course-org, .new-course-number, - .new-course-name { + .new-course-name, + .new-course-run { width: 100%; } .new-course-name { - font-size: 19px; + @extend .t-title5; font-weight: 300; } @@ -120,5 +471,29 @@ body.dashboard { .new-course-cancel { @include white-button; } + + .item-details { + padding-bottom: 0; + } + + .wrap-error { + @include transition(all $tmg-f2 ease 0s); + height: 0; + overflow: hidden; + opacity: 0; + } + + .wrap-error.is-shown { + height: 65px; + opacity: 1; + } + + .message-status { + display: block; + margin-bottom: 0; + padding: ($baseline*.5) ($baseline*1.5) 8px ($baseline*1.5); + font-weight: bold; + } + } } diff --git a/cms/static/sass/views/_textbooks.scss b/cms/static/sass/views/_textbooks.scss index 8d2b2d9489..b83d22414b 100644 --- a/cms/static/sass/views/_textbooks.scss +++ b/cms/static/sass/views/_textbooks.scss @@ -30,7 +30,7 @@ body.course.textbooks { } .textbook { - @extend .window; + @extend .ui-window; position: relative; .view-textbook { @@ -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/static/sass/views/_users.scss b/cms/static/sass/views/_users.scss index ecaa319707..7e88edd38c 100644 --- a/cms/static/sass/views/_users.scss +++ b/cms/static/sass/views/_users.scss @@ -3,80 +3,227 @@ body.course.users { - .new-user-form { - display: none; - padding: 15px 20px; - background-color: $lightBluishGrey2; + // LAYOUT: page + .content-primary, .content-supplementary { + @include box-sizing(border-box); + float: left; + } - #result { - display: none; - float: left; - margin-bottom: 15px; - padding: 3px 15px; - border-radius: 3px; - background: $error-red; - font-size: 14px; - color: #fff; - } + .content-primary { + width: flex-grid(9, 12); + margin-right: flex-gutter(); + } - .form-elements { - clear: both; - } + .content-supplementary { + width: flex-grid(3, 12); + } - label { - display: inline-block; - margin-right: 10px; - } + // ELEM: content + .content { - .email-input { - width: 350px; - padding: 8px 8px 10px; - border-color: $darkGrey; + .introduction { + @extend .t-copy-sub1; + margin: 0 0 ($baseline*2) 0; } + } - .add-button { - @include blue-button; - padding: 5px 20px 9px; - } + // ELEM: no users notice + .content .notice-create { + width: flexgrid(9, 9); + margin-top: $baseline; - .cancel-button { - @include white-button; - padding: 5px 20px 9px; + // CASE: notice has actions { + &.has-actions { + + .msg, .list-actions { + display: inline-block; + vertical-align: middle; + } + + .msg { + width: flex-grid(6, 9); + margin-right: flex-gutter(); + } + + .list-actions { + width: flex-grid(3, 9); + text-align: right; + margin-top: 0; + + .action-item { + + } + + .action-primary { + @include green-button(); // overwriting for the sake of syncing older green button styles for now + @extend .t-action3; + padding: ($baseline/2) $baseline; + } + } } } + + // ELEM: new user form + .wrapper-create-user { + + &.is-shown { + height: ($baseline*15); + } + } + + // ELEM: listing of users + .user-list, .user-item, .item-metadata, .item-actions { + @include box-sizing(border-box); + } + .user-list { - border: 1px solid $mediumGrey; - background: #fff; - li { + .user-item { + @extend .ui-window; + @include clearfix(); position: relative; - padding: 20px; - border-bottom: 1px solid $mediumGrey; + width: flex-grid(9, 9); + margin: 0 0 ($baseline/2) 0; + padding: ($baseline*1.25) ($baseline*1.5) $baseline ($baseline*1.5); &:last-child { - border-bottom: none; + margin-bottom: 0; } - span { + .item-metadata, .item-actions { display: inline-block; + vertical-align: middle; } - .user-name { - margin-right: 10px; - font-size: 24px; - font-weight: 300; + // ELEM: item - flag + .flag-role { + @extend .ui-badge; + color: $white; + + .msg-you { + margin-left: ($baseline/5); + text-transform: none; + font-weight: 500; + color: $pink-l3; + } + + &:after { + border-bottom-color: $pink-d4; + } + + &.flag-role-staff { + background: $pink-u3; + } + + &.flag-role-admin { + background: $pink; + } } - .user-email { - font-size: 14px; - font-style: italic; - color: $mediumGrey; + // ELEM: item - metadata + .item-metadata { + width: flex-grid(5, 9); + margin-right: flex-gutter(); + + .user-username, .user-email { + display: inline-block; + vertical-align: middle; + } + + .user-username { + @extend .t-title4; + @include transition(color $tmg-f2 ease-in-out 0s); + margin: 0 ($baseline/2) ($baseline/10) 0; + color: $gray-d4; + font-weight: 600; + } + + .user-email { + @extend .t-title6; + } } + // ELEM: item - actions .item-actions { - top: 24px; + width: flex-grid(4, 9); + position: static; // nasty reset needed due to base.scss + text-align: right; + + .action { + display: inline-block; + vertical-align: middle; + } + + .action-role { + width: flex-grid(3, 4); + margin-right: flex-gutter(); + } + + .action-delete { + width: flex-grid(1, 4); + + // STATE: disabled + &.is-disabled { + opacity: 0.0; + visibility: hidden; + pointer-events: none; + } + } + + .delete { + @extend .ui-btn-non; + } + + // HACK: nasty reset needed due to base.scss + .delete-button { + margin-right: 0; + float: none; + color: inherit; + } + + // ELEM: admin role controls + .toggle-admin-role { + + &.add-admin-role { + @include blue-button; + @extend .t-action2; + @include transition(all .15s); + display: inline-block; + padding: ($baseline/5) $baseline; + font-weight: 600; + } + + &.remove-admin-role { + @include grey-button; + @extend .t-action2; + @include transition(all .15s); + display: inline-block; + padding: ($baseline/5) $baseline; + font-weight: 600; + } + } + + .notoggleforyou { + @extend .t-copy-sub1; + color: $gray-l2; + } + } + + // STATE: hover + &:hover { + + .user-username { + } + + .user-email { + + } + + .item-actions { + + } } } } -} \ No newline at end of file +} diff --git a/cms/templates/activation_active.html b/cms/templates/activation_active.html index 9a4ebd7e4e..d7133062de 100644 --- a/cms/templates/activation_active.html +++ b/cms/templates/activation_active.html @@ -2,14 +2,31 @@ <%inherit file="base.html" /> <%block name="content"> - -
      -
      - -
      -

      ${_("Account already active!")}

      -

      ${_('This account has already been activated.')}${_("Log in here.")}

      +
      +
      +

      ${_("Studio Account Activation")}

      +
      -
      +
      +
      +
      +
      + +
      +
      +

      ${_("Your account is already active")}

      +
      +

      ${_("This account, set up using {0}, has already been activated. Please sign in to start working within edX Studio.".format(user.email))}

      +
      +
      + + +
      +
      +
      diff --git a/cms/templates/activation_complete.html b/cms/templates/activation_complete.html index d845c5153b..27efbdc34f 100644 --- a/cms/templates/activation_complete.html +++ b/cms/templates/activation_complete.html @@ -2,12 +2,31 @@ <%inherit file="base.html" /> <%block name="content"> - -
      -
      -

      ${_("Activation Complete!")}

      -

      ${_('Thanks for activating your account.')}${_("Log in here.")}

      +
      +
      +

      ${_("Studio Account Activation")}

      +
      -
      +
      +
      +
      +
      + +
      +
      +

      ${_("Your account activation is complete!")}

      +
      +

      ${_("Thank you for activating your account. You may now sign in and start using edX Studio to author courses.")}

      +
      +
      + + +
      +
      +
      diff --git a/cms/templates/activation_invalid.html b/cms/templates/activation_invalid.html index 3ee4e8ec4e..7f3fbed5a9 100644 --- a/cms/templates/activation_invalid.html +++ b/cms/templates/activation_invalid.html @@ -2,14 +2,32 @@ <%inherit file="base.html" /> <%block name="content"> -
      -
      -

      ${_("Activation Invalid")}

      - -

      ${_('Something went wrong. Check to make sure the URL you went to was correct -- e-mail programs will sometimes split it into two lines. If you still have issues, e-mail us to let us know what happened at {email}.').format(email='bugs@mitx.mit.edu')}

      - -

      ${_('Or you can go back to the {link_start}home page{link_end}.').format( - link_start='', link_end='')}

      +
      +
      +

      ${_("Studio Account Activation")}

      +
      +
      + +
      +
      +
      +
      + +
      +
      +

      ${_('Your account activation is invalid')}

      +
      +

      ${_("We're sorry. Something went wrong with your activation. Check to make sure the URL you went to was correct — e-mail programs will sometimes split it into two lines.")}

      +

      ${_("If you still have issues, contact edX Support. In the meatime, you can also return to")} {_('the Studio homepage.')}

      +
      +
      + + +
      +
      -
      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/base.html b/cms/templates/base.html index 44ebf59170..b53dc2657d 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -58,6 +58,18 @@ + % if context_course: + + % endif
      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/course_info.html b/cms/templates/course_info.html index dcfffd1d5a..03f4c35d14 100644 --- a/cms/templates/course_info.html +++ b/cms/templates/course_info.html @@ -6,9 +6,15 @@ <%block name="title">${_("Course Updates")} <%block name="bodyclass">is-signedin course course-info updates +<%block name="header_extras"> +% for template_name in ["course_info_update", "course_info_handouts"]: + +% endfor + <%block name="jsextra"> - diff --git a/cms/templates/dev/dev_mode.html b/cms/templates/dev/dev_mode.html new file mode 100644 index 0000000000..9ee409d5de --- /dev/null +++ b/cms/templates/dev/dev_mode.html @@ -0,0 +1,4 @@ +<%inherit file="../base.html" /> +<%block name="content"> +You're in dev mode! + 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/emails/course_creator_denied.txt b/cms/templates/emails/course_creator_denied.txt new file mode 100644 index 0000000000..739ece6b6f --- /dev/null +++ b/cms/templates/emails/course_creator_denied.txt @@ -0,0 +1,5 @@ +<%! from django.utils.translation import ugettext as _ %> + +${_("Your request for course creation rights to edX Studio have been denied. If you believe this was in error, please contact: ")} + +${ studio_request_email } diff --git a/cms/templates/emails/course_creator_granted.txt b/cms/templates/emails/course_creator_granted.txt new file mode 100644 index 0000000000..a867f94334 --- /dev/null +++ b/cms/templates/emails/course_creator_granted.txt @@ -0,0 +1,9 @@ +<%! from django.utils.translation import ugettext as _ %> + +${_("Your request for course creation rights to edX Studio have been granted. To create your first course, visit:")} + +% if is_secure: +https://${ site } +% else: +http://${ site } +% endif diff --git a/cms/templates/emails/course_creator_revoked.txt b/cms/templates/emails/course_creator_revoked.txt new file mode 100644 index 0000000000..839c5a0d78 --- /dev/null +++ b/cms/templates/emails/course_creator_revoked.txt @@ -0,0 +1,5 @@ +<%! from django.utils.translation import ugettext as _ %> + +${_("Your course creation rights to edX Studio have been revoked. If you believe this was in error, please contact: ")} + +${ studio_request_email } diff --git a/cms/templates/emails/course_creator_subject.txt b/cms/templates/emails/course_creator_subject.txt new file mode 100644 index 0000000000..35ec0ecc48 --- /dev/null +++ b/cms/templates/emails/course_creator_subject.txt @@ -0,0 +1,2 @@ +<%! from django.utils.translation import ugettext as _ %> +${_("Your course creator status for edX Studio")} diff --git a/cms/templates/index.html b/cms/templates/index.html index f0baef4f09..9702eedada 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -5,89 +5,347 @@ <%block name="title">${_("My Courses")} <%block name="bodyclass">is-signedin index dashboard -<%block name="header_extras"> - + + + +<%block name="jsextra"> + <%block name="content"> -
      -
      -

      ${_("My Courses")}

      +
      +
      +

      ${_("My Courses")}

      - % if user.is_active: - - % endif -
      -
      + % if user.is_active: + + % endif +
      +
      + +
      + % if user.is_active: +
      +
      -
      -
      -

      - ${_("Welcome, %(name)s") % dict(name= user.username)}. - ${_("Here are all of the courses you are currently authoring in Studio:")}

      -
      -
      -
      +

      ${_("Welcome, {0}!".format(user.username))}

      -
      -
      -
      - % if user.is_active: - - % else: -
      -

      - ${_("In order to start authoring courses using edX Studio, please click on the activation link in your email.")} -

      + %if len(courses) > 0: +
      +

      ${_("Here are all of the courses you currently have access to in Studio:")}

      +
      + + %else: +
      +

      ${_("You currently aren't associated with any Studio Courses.")}

      +
      + %endif +
      + + % if course_creator_status=='granted': +
      +
      +
      +
      + +
      +

      ${_("Create a New Course")}

      + +
      + ${_("Required Information to Create a New Course")} + +
        +
      1. + + + ${_("The public display name for your course.")} +
        2. +
      2. + + + ${_("The name of the organization sponsoring the course")} - ${_("Note: No spaces or special characters are allowed. This cannot be changed.")} +
        3. + +
      3. + + + ${_("The unique number that identifies your course within your organization")} - ${_("Note: No spaces or special characters are allowed. This cannot be changed.")} +
        4. + +
      4. + + + ${_("The term in which your course will run")} - ${_("Note: No spaces or special characters are allowed. This cannot be changed.")} +
        5. +
      + +
      +
      + +
      + + +
      +
      +
      + % endif + + %if len(courses) > 0: +
      + +
      + + %else: +
      +
      + +
      +
      +
      +

      ${_("Are you staff on an existing Studio course?")}

      +
      +

      ${_('You will need to be added to the course in Studio by the course creator. Please get in touch with the course creator or administrator for the specific course you are helping to author.')}

      +
      +
      +
      + + %if course_creator_status == "granted": +
      +
      +

      ${_('Create Your First Course')}

      +
      +

      ${_('Your new course is just a click away!')}

      +
      +
      + + +
      % endif -
      -
      -
      + +
      + % endif + + + %if course_creator_status == "unrequested": +
      +

      + ${_('Becoming a Course Creator in Studio')} +

      + +
      +
      +

      ${_('edX Studio is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while course creator privileges are granted by edX. Our team will evaluate your request and provide you feedback within 24 hours during the work week.')}

      +
      + +
      +

      ${_('Your Course Creator Request Status:')}

      + +
      + +
      + +
      +
      +
      +
      +
      + + %elif course_creator_status == "denied": +
      +

      + ${_('Your Course Creator Request Status')} +

      + +
      +
      +

      ${_('edX Studio is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while course creator privileges are granted by edX. Our team is has completed evaluating your request.')}

      +
      + +
      +

      ${_('Your Course Creator Request Status:')}

      + +
      +
      ${_('Your Course Creator request is:')}
      +
      + + ${_('Denied')} + ${_('Your request did not meet the criteria/guidelines specified by edX Staff.')} +
      +
      +
      +
      +
      + + %elif course_creator_status == "pending": +
      +

      + ${_('Your Course Creator Request Status')} +

      + +
      +
      +

      ${_('edX Studio is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while course creator privileges are granted by edX. Our team is currently evaluating your request.')}

      +
      + +
      +

      ${_('Your Course Creator Request Status:')}

      + +
      +
      ${_('Your Course Creator request is:')}
      +
      + + ${_('Pending')} + ${_('Your request is currently being reviewed by edX staff and should be updated shortly.')} +
      +
      +
      +
      +
      + % endif + + + + +
      + + + % else: +
      +
      +
      +

      ${_("Thanks for signing up, %(name)s!") % dict(name= user.username)}

      +
      + +
      +
      +

      ${_('We need to verify your email address')}

      +
      +

      ${_('Almost there! In order to complete your sign up we need you to verify your email address (%(email)s). An activation message and next steps should be waiting for you there.') % dict(email=user.email)}

      +
      +
      +
      +
      + + +
      + + %endif + diff --git a/cms/templates/js/advanced_entry.underscore b/cms/templates/js/advanced_entry.underscore new file mode 100644 index 0000000000..26b1a386f6 --- /dev/null +++ b/cms/templates/js/advanced_entry.underscore @@ -0,0 +1,11 @@ +
    3. +
      + + +
      + +
      + + +
      +
      4. diff --git a/cms/static/client_templates/course_info_handouts.html b/cms/templates/js/course_info_handouts.underscore similarity index 100% rename from cms/static/client_templates/course_info_handouts.html rename to cms/templates/js/course_info_handouts.underscore diff --git a/cms/static/client_templates/course_info_update.html b/cms/templates/js/course_info_update.underscore similarity index 100% rename from cms/static/client_templates/course_info_update.html rename to cms/templates/js/course_info_update.underscore 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/login.html b/cms/templates/login.html index 1997fd23fe..3b41be1a7d 100644 --- a/cms/templates/login.html +++ b/cms/templates/login.html @@ -79,7 +79,7 @@ function(json) { if(json.success) { var next = /next=([^&]*)/g.exec(decodeURIComponent(window.location.search)); - if (next && next.length > 1) { + if (next && next.length > 1 && !isExternal(next[1])) { location.href = next[1]; } else location.href = "${reverse('homepage')}"; diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index 22d57be41d..e8026677e8 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -1,14 +1,17 @@ <%! from django.utils.translation import ugettext as _ %> +<%! from django.core.urlresolvers import reverse %> +<%! from auth.authz import is_user_in_course_group_role %> +<%! import json %> <%inherit file="base.html" /> <%block name="title">${_("Course Team Settings")} -<%block name="bodyclass">is-signedin course users settings team +<%block name="bodyclass">is-signedin course users team <%block name="content">

      - ${_("Course Settings")} + ${_("Settings")} > ${_("Course Team")}

      @@ -17,7 +20,7 @@ @@ -25,111 +28,348 @@
      -
      -
      - -
      -

      ${_("The following list of users have been designated as course staff. This means that these users will have permissions to modify course content. You may add additional course staff below, if you are the course instructor. Please note that they must have already registered and verified their account.")}

      -
      - -
      +
      +
      +
      %if allow_actions: -
      -
      -
      - - - -
      -
      - %endif -
      -
        - % for user in staff: -
      1. - ${user.username} - ${user.email} - %if allow_actions : -
        - %if request_user_id != user.id: - - %endif -
        - %endif -
        2. - % endfor -
      +
      +
      +
      +

      ${_("Add a User to Your Course's Team")}

      + +
      + ${_("New Team Member Information")} + +
        +
      1. + + + ${_("Please provide the email address of the course staff member you'd like to add")} +
        2. +
      +
      +
      + +
      + + +
      +
      + %endif + +
        + % for user in staff: + <% api_url = reverse('course_team_user', kwargs=dict( + org=context_course.location.org, + course=context_course.location.course, + name=context_course.location.name, + email=user.email, + )) + %> +
      1. + + <% is_instuctor = is_user_in_course_group_role(user, context_course.location, 'instructor', check_staff=False) %> + % if is_instuctor: + + + ${_("Current Role:")} + + ${_("Admin")} + % if request.user.id == user.id: + ${_("You!")} + % endif + + + + % else: + + + ${_("Current Role:")} + + ${_("Staff")} + % if request.user.id == user.id: + ${_("You!")} + % endif + + + + % endif + +
        +

        + ${user.username} + + ${user.email} + +

        +
        + + % if allow_actions: + + % endif + +
        2. + % endfor +
      + + <% user_is_instuctor = is_user_in_course_group_role(request.user, context_course.location, 'instructor', check_staff=False) %> + % if user_is_instuctor and len(staff) == 1: +
      +
      +

      ${_('Add Team Members to This Course')}

      +
      +

      ${_('Adding team members makes course authoring collaborative. Users must be signed up for Studio and have an active account. ')}

      +
      +
      + + +
      + %endif
      -
      + + +
      <%block name="jsextra"> 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/settings.html b/cms/templates/settings.html index 1dde9b6c0d..1f5d89b2b9 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -262,7 +262,7 @@ from contentstore import utils diff --git a/cms/templates/settings_advanced.html b/cms/templates/settings_advanced.html index e1b1913c87..d87f3586b6 100644 --- a/cms/templates/settings_advanced.html +++ b/cms/templates/settings_advanced.html @@ -1,15 +1,17 @@ -<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> +<%namespace name='static' file='static_content.html'/> <%! from django.core.urlresolvers import reverse %> +<%! from django.utils.translation import ugettext as _ %> +<%! from contentstore import utils %> <%block name="title">${_("Advanced Settings")} <%block name="bodyclass">is-signedin course advanced settings -<%namespace name='static' file='static_content.html'/> -<%! -from contentstore import utils -%> - <%block name="jsextra"> +% for template_name in ["advanced_entry"]: + +% endfor @@ -96,7 +98,7 @@ editor.render(); % endif diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html index d9040009cc..f3a4584a26 100644 --- a/cms/templates/settings_graders.html +++ b/cms/templates/settings_graders.html @@ -140,7 +140,7 @@ from contentstore import utils 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 f001611b67..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}

      @@ -60,7 +60,7 @@ ${_("Grading")}
    4. - ${_("Course Team")} + ${_("Course Team")}
    5. ${_("Advanced Settings")} 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 711742d89f..8f396d3742 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -6,12 +6,13 @@ 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 url(r'^$', 'contentstore.views.howitworks', name='homepage'), url(r'^listing', 'contentstore.views.index', name='index'), + url(r'^request_course_creator$', 'contentstore.views.request_course_creator', name='request_course_creator'), url(r'^edit/(?P.*?)$', 'contentstore.views.edit_unit', name='edit_unit'), url(r'^subsection/(?P.*?)$', 'contentstore.views.edit_subsection', name='edit_subsection'), url(r'^preview_component/(?P.*?)$', 'contentstore.views.preview_component', name='preview_component'), @@ -39,14 +40,12 @@ urlpatterns = ('', # nopep8 url(r'^(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)/upload_asset$', 'contentstore.views.upload_asset', name='upload_asset'), + url(r'^(?P[^/]+)/(?P[^/]+)/team/(?P[^/]+)$', + 'contentstore.views.manage_users', name='manage_users'), + url(r'^(?P[^/]+)/(?P[^/]+)/team/(?P[^/]+)/(?P[^/]+)$', + 'contentstore.views.course_team_user', name='course_team_user'), + - url(r'^manage_users/(?P.*?)$', 'contentstore.views.manage_users', name='manage_users'), - url(r'^add_user/(?P.*?)$', - 'contentstore.views.add_user', name='add_user'), - url(r'^remove_user/(?P.*?)$', - 'contentstore.views.remove_user', name='remove_user'), - url(r'^(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)/remove_user$', - 'contentstore.views.remove_user', name='remove_user'), url(r'^(?P[^/]+)/(?P[^/]+)/info/(?P[^/]+)$', 'contentstore.views.course_info', name='course_info'), url(r'^(?P[^/]+)/(?P[^/]+)/course_info/updates/(?P.*)$', @@ -138,9 +137,7 @@ urlpatterns += ( if settings.ENABLE_JASMINE: - # # Jasmine - urlpatterns = urlpatterns + (url(r'^_jasmine/', include('django_jasmine.urls')),) - + urlpatterns += (url(r'^_jasmine/', include('django_jasmine.urls')),) if settings.MITX_FEATURES.get('ENABLE_SERVICE_STATUS'): urlpatterns += ( @@ -149,6 +146,19 @@ 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_TESTING'): + urlpatterns += ( + url(r'^auto_auth$', 'student.views.auto_auth'), + ) + +if settings.DEBUG: + try: + from .urls_dev import urlpatterns as dev_urlpatterns + urlpatterns += dev_urlpatterns + except ImportError: + pass + urlpatterns = patterns(*urlpatterns) # Custom error pages diff --git a/cms/urls_dev.py b/cms/urls_dev.py new file mode 100644 index 0000000000..cb31fc8b47 --- /dev/null +++ b/cms/urls_dev.py @@ -0,0 +1,10 @@ +""" +URLconf for development-only views. +This gets imported by urls.py and added to its URLconf if we are running in +development mode; otherwise, it is ignored. +""" +from django.conf.urls import url + +urlpatterns = ( + url(r'^dev_mode$', 'contentstore.views.dev.dev_mode', name='dev_mode'), +) 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/tests/test_shib.py b/common/djangoapps/external_auth/tests/test_shib.py index e46c9eda8f..428119b886 100644 --- a/common/djangoapps/external_auth/tests/test_shib.py +++ b/common/djangoapps/external_auth/tests/test_shib.py @@ -3,6 +3,7 @@ Tests for Shibboleth Authentication @jbau """ import unittest +from mock import patch from django.conf import settings from django.http import HttpResponseRedirect @@ -10,7 +11,6 @@ from django.test.client import RequestFactory, Client as DjangoTestClient from django.test.utils import override_settings from django.core.urlresolvers import reverse from django.contrib.auth.models import AnonymousUser, User -from django.contrib.sessions.backends.base import SessionBase from django.utils.importlib import import_module from xmodule.modulestore.tests.factories import CourseFactory @@ -27,11 +27,11 @@ from student.views import create_account, change_enrollment from student.models import UserProfile, Registration, CourseEnrollment from student.tests.factories import UserFactory -#Shib is supposed to provide 'REMOTE_USER', 'givenName', 'sn', 'mail', 'Shib-Identity-Provider' -#attributes via request.META. We can count on 'Shib-Identity-Provider', and 'REMOTE_USER' being present -#b/c of how mod_shib works but should test the behavior with the rest of the attributes present/missing +# Shib is supposed to provide 'REMOTE_USER', 'givenName', 'sn', 'mail', 'Shib-Identity-Provider' +# attributes via request.META. We can count on 'Shib-Identity-Provider', and 'REMOTE_USER' being present +# b/c of how mod_shib works but should test the behavior with the rest of the attributes present/missing -#For the sake of python convention we'll make all of these variable names ALL_CAPS +# For the sake of python convention we'll make all of these variable names ALL_CAPS IDP = 'https://idp.stanford.edu/' REMOTE_USER = 'test_user@stanford.edu' MAILS = [None, '', 'test_user@stanford.edu'] @@ -93,6 +93,13 @@ class ShibSPTest(ModuleStoreTestCase): self.assertEqual(no_idp_response.status_code, 403) self.assertIn("identity server did not return your ID information", no_idp_response.content) + def _assert_shib_login_is_logged(self, audit_log_call, remote_user): + """Asserts that shibboleth login attempt is being logged""" + method_name, args, _kwargs = audit_log_call + self.assertEquals(method_name, 'info') + self.assertEquals(len(args), 2) + self.assertIn(u'logged in via Shibboleth', args[0]) + self.assertEquals(remote_user, args[1]) @unittest.skipUnless(settings.MITX_FEATURES.get('AUTH_USE_SHIB'), True) def test_shib_login(self): @@ -140,26 +147,57 @@ class ShibSPTest(ModuleStoreTestCase): 'REMOTE_USER': remote_user, 'mail': remote_user}) request.user = AnonymousUser() - response = shib_login(request) + with patch('external_auth.views.AUDIT_LOG') as mock_audit_log: + response = shib_login(request) + audit_log_calls = mock_audit_log.method_calls + if idp == "https://idp.stanford.edu/" and remote_user == 'withmap@stanford.edu': self.assertIsInstance(response, HttpResponseRedirect) self.assertEqual(request.user, user_w_map) self.assertEqual(response['Location'], '/') + # verify logging: + self.assertEquals(len(audit_log_calls), 2) + self._assert_shib_login_is_logged(audit_log_calls[0], remote_user) + method_name, args, _kwargs = audit_log_calls[1] + self.assertEquals(method_name, 'info') + self.assertEquals(len(args), 3) + self.assertIn(u'Login success', args[0]) + self.assertEquals(remote_user, args[2]) elif idp == "https://idp.stanford.edu/" and remote_user == 'inactive@stanford.edu': self.assertEqual(response.status_code, 403) self.assertIn("Account not yet activated: please look for link in your email", response.content) + # verify logging: + self.assertEquals(len(audit_log_calls), 2) + self._assert_shib_login_is_logged(audit_log_calls[0], remote_user) + method_name, args, _kwargs = audit_log_calls[1] + self.assertEquals(method_name, 'warning') + self.assertEquals(len(args), 2) + self.assertIn(u'is not active after external login', args[0]) + # self.assertEquals(remote_user, args[1]) elif idp == "https://idp.stanford.edu/" and remote_user == 'womap@stanford.edu': self.assertIsNotNone(ExternalAuthMap.objects.get(user=user_wo_map)) self.assertIsInstance(response, HttpResponseRedirect) self.assertEqual(request.user, user_wo_map) self.assertEqual(response['Location'], '/') + # verify logging: + self.assertEquals(len(audit_log_calls), 2) + self._assert_shib_login_is_logged(audit_log_calls[0], remote_user) + method_name, args, _kwargs = audit_log_calls[1] + self.assertEquals(method_name, 'info') + self.assertEquals(len(args), 3) + self.assertIn(u'Login success', args[0]) + self.assertEquals(remote_user, args[2]) elif idp == "https://someother.idp.com/" and remote_user in \ ['withmap@stanford.edu', 'womap@stanford.edu', 'inactive@stanford.edu']: self.assertEqual(response.status_code, 403) self.assertIn("You have already created an account using an external login", response.content) + # no audit logging calls + self.assertEquals(len(audit_log_calls), 0) else: self.assertEqual(response.status_code, 200) self.assertContains(response, "Register for") + # no audit logging calls + self.assertEquals(len(audit_log_calls), 0) @unittest.skipUnless(settings.MITX_FEATURES.get('AUTH_USE_SHIB'), True) def test_registration_form(self): @@ -187,7 +225,7 @@ class ShibSPTest(ModuleStoreTestCase): else: self.assertNotContains(response, fullname_input_HTML) - #clean up b/c we don't want existing ExternalAuthMap for the next run + # clean up b/c we don't want existing ExternalAuthMap for the next run client.session['ExternalAuthMap'].delete() @unittest.skipUnless(settings.MITX_FEATURES.get('AUTH_USE_SHIB'), True) @@ -200,25 +238,47 @@ class ShibSPTest(ModuleStoreTestCase): Uses django test client for its session support """ for identity in gen_all_identities(): - #First we pop the registration form + # First we pop the registration form client = DjangoTestClient() response1 = client.get(path='/shib-login/', data={}, follow=False, **identity) - #Then we have the user answer the registration form + # Then we have the user answer the registration form postvars = {'email': 'post_email@stanford.edu', 'username': 'post_username', 'password': 'post_password', 'name': 'post_name', 'terms_of_service': 'true', 'honor_code': 'true'} - #use RequestFactory instead of TestClient here because we want access to request.user + # use RequestFactory instead of TestClient here because we want access to request.user request2 = self.request_factory.post('/create_account', data=postvars) request2.session = client.session request2.user = AnonymousUser() - response2 = create_account(request2) + with patch('student.views.AUDIT_LOG') as mock_audit_log: + _response2 = create_account(request2) user = request2.user mail = identity.get('mail') - #check that the created user has the right email, either taken from shib or user input + + # verify logging of login happening during account creation: + audit_log_calls = mock_audit_log.method_calls + self.assertEquals(len(audit_log_calls), 3) + method_name, args, _kwargs = audit_log_calls[0] + self.assertEquals(method_name, 'info') + self.assertEquals(len(args), 1) + self.assertIn(u'Login success on new account creation', args[0]) + self.assertIn(u'post_username', args[0]) + method_name, args, _kwargs = audit_log_calls[1] + self.assertEquals(method_name, 'info') + self.assertEquals(len(args), 2) + self.assertIn(u'User registered with external_auth', args[0]) + self.assertEquals(u'post_username', args[1]) + method_name, args, _kwargs = audit_log_calls[2] + self.assertEquals(method_name, 'info') + self.assertEquals(len(args), 3) + self.assertIn(u'Updated ExternalAuthMap for ', args[0]) + self.assertEquals(u'post_username', args[1]) + self.assertEquals(u'test_user@stanford.edu', args[2].external_id) + + # check that the created user has the right email, either taken from shib or user input if mail: self.assertEqual(user.email, mail) self.assertEqual(list(User.objects.filter(email=postvars['email'])), []) @@ -228,7 +288,7 @@ class ShibSPTest(ModuleStoreTestCase): self.assertEqual(list(User.objects.filter(email=mail)), []) self.assertIsNotNone(User.objects.get(email=postvars['email'])) # get enforces only 1 such user - #check that the created user profile has the right name, either taken from shib or user input + # check that the created user profile has the right name, either taken from shib or user input profile = UserProfile.objects.get(user=user) sn_empty = not identity.get('sn') given_name_empty = not identity.get('givenName') @@ -236,7 +296,7 @@ class ShibSPTest(ModuleStoreTestCase): self.assertEqual(profile.name, postvars['name']) else: self.assertEqual(profile.name, request2.session['ExternalAuthMap'].external_name) - #clean up for next loop + # clean up for next loop request2.session['ExternalAuthMap'].delete() UserProfile.objects.filter(user=user).delete() Registration.objects.filter(user=user).delete() @@ -251,17 +311,17 @@ class ShibSPTest(ModuleStoreTestCase): # Test for cases where course is found for domain in ["", "shib:https://idp.stanford.edu/"]: - #set domains + # set domains course.enrollment_domain = domain metadata = own_metadata(course) metadata['enrollment_domain'] = domain self.store.update_metadata(course.location.url(), metadata) - #setting location to test that GET params get passed through + # setting location to test that GET params get passed through login_request = self.request_factory.get('/course_specific_login/MITx/999/Robot_Super_Course' + '?course_id=MITx/999/Robot_Super_Course' + '&enrollment_action=enroll') - reg_request = self.request_factory.get('/course_specific_register/MITx/999/Robot_Super_Course' + + _reg_request = self.request_factory.get('/course_specific_register/MITx/999/Robot_Super_Course' + '?course_id=MITx/999/course/Robot_Super_Course' + '&enrollment_action=enroll') @@ -292,11 +352,11 @@ class ShibSPTest(ModuleStoreTestCase): '&enrollment_action=enroll') # Now test for non-existent course - #setting location to test that GET params get passed through + # setting location to test that GET params get passed through login_request = self.request_factory.get('/course_specific_login/DNE/DNE/DNE' + '?course_id=DNE/DNE/DNE' + '&enrollment_action=enroll') - reg_request = self.request_factory.get('/course_specific_register/DNE/DNE/DNE' + + _reg_request = self.request_factory.get('/course_specific_register/DNE/DNE/DNE' + '?course_id=DNE/DNE/DNE/Robot_Super_Course' + '&enrollment_action=enroll') @@ -321,7 +381,7 @@ class ShibSPTest(ModuleStoreTestCase): the proper external auth """ - #create 2 course, one with limited enrollment one without + # create 2 course, one with limited enrollment one without shib_course = CourseFactory.create(org='Stanford', number='123', display_name='Shib Only') shib_course.enrollment_domain = 'shib:https://idp.stanford.edu/' metadata = own_metadata(shib_course) @@ -360,7 +420,7 @@ class ShibSPTest(ModuleStoreTestCase): int_student.email = "teststudent3@gmail.com" int_student.save() - #Tests the two case for courses, limited and not + # Tests the two case for courses, limited and not for course in [shib_course, open_enroll_course]: for student in [shib_student, other_ext_student, int_student]: request = self.request_factory.post('/change_enrollment') @@ -368,11 +428,11 @@ class ShibSPTest(ModuleStoreTestCase): 'course_id': course.id}) request.user = student response = change_enrollment(request) - #if course is not limited or student has correct shib extauth then enrollment should be allowed + # If course is not limited or student has correct shib extauth then enrollment should be allowed if course is open_enroll_course or student is shib_student: self.assertEqual(response.status_code, 200) self.assertEqual(CourseEnrollment.objects.filter(user=student, course_id=course.id).count(), 1) - #clean up + # Clean up CourseEnrollment.objects.filter(user=student, course_id=course.id).delete() else: self.assertEqual(response.status_code, 400) @@ -383,9 +443,6 @@ class ShibSPTest(ModuleStoreTestCase): """ A functionality test that a student with an existing shib login can auto-enroll in a class with GET params """ - if not settings.MITX_FEATURES.get('AUTH_USE_SHIB'): - return - student = UserFactory.create() extauth = ExternalAuthMap(external_id='testuser@stanford.edu', external_email='', @@ -403,8 +460,8 @@ class ShibSPTest(ModuleStoreTestCase): metadata['enrollment_domain'] = course.enrollment_domain self.store.update_metadata(course.location.url(), metadata) - #use django test client for sessions and url processing - #no enrollment before trying + # use django test client for sessions and url processing + # no enrollment before trying self.assertEqual(CourseEnrollment.objects.filter(user=student, course_id=course.id).count(), 0) self.client.logout() request_kwargs = {'path': '/shib-login/', @@ -413,8 +470,8 @@ class ShibSPTest(ModuleStoreTestCase): 'REMOTE_USER': 'testuser@stanford.edu', 'Shib-Identity-Provider': 'https://idp.stanford.edu/'} response = self.client.get(**request_kwargs) - #successful login is a redirect to "/" + # successful login is a redirect to "/" self.assertEqual(response.status_code, 302) self.assertEqual(response['location'], 'http://testserver/') - #now there is enrollment + # now there is enrollment self.assertEqual(CourseEnrollment.objects.filter(user=student, course_id=course.id).count(), 1) diff --git a/common/djangoapps/external_auth/views.py b/common/djangoapps/external_auth/views.py index 059a915168..37dcd5313a 100644 --- a/common/djangoapps/external_auth/views.py +++ b/common/djangoapps/external_auth/views.py @@ -17,9 +17,9 @@ from django.core.urlresolvers import reverse from django.core.validators import validate_email from django.core.exceptions import ValidationError -from student.models import UserProfile, TestCenterUser, TestCenterRegistration +from student.models import TestCenterUser, TestCenterRegistration -from django.http import HttpResponse, HttpResponseRedirect, HttpRequest +from django.http import HttpResponse, HttpResponseRedirect, HttpRequest, HttpResponseForbidden from django.utils.http import urlquote from django.shortcuts import redirect from django.utils.translation import ugettext as _ @@ -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 @@ -50,7 +51,10 @@ from xmodule.modulestore import Location from xmodule.modulestore.exceptions import ItemNotFoundError log = logging.getLogger("mitx.external_auth") +AUDIT_LOG = logging.getLogger("audit") +SHIBBOLETH_DOMAIN_PREFIX = 'shib:' +OPENID_DOMAIN_PREFIX = 'openid:' # ----------------------------------------------------------------------------- # OpenID Common @@ -81,7 +85,7 @@ def default_render_failure(request, def generate_password(length=12, chars=string.letters + string.digits): """Generate internal password for externally authenticated user""" choice = random.SystemRandom().choice - return ''.join([choice(chars) for i in range(length)]) + return ''.join([choice(chars) for _i in range(length)]) @csrf_exempt @@ -105,27 +109,29 @@ def openid_login_complete(request, log.debug('openid success, details=%s', details) url = getattr(settings, 'OPENID_SSO_SERVER_URL', None) - external_domain = "openid:%s" % url + external_domain = "{0}{1}".format(OPENID_DOMAIN_PREFIX, url) fullname = '%s %s' % (details.get('first_name', ''), details.get('last_name', '')) - return external_login_or_signup(request, - external_id, - external_domain, - details, - details.get('email', ''), - fullname) + return _external_login_or_signup( + request, + external_id, + external_domain, + details, + details.get('email', ''), + fullname + ) return render_failure(request, 'Openid failure') -def external_login_or_signup(request, - external_id, - external_domain, - credentials, - email, - fullname, - retfun=None): +def _external_login_or_signup(request, + external_id, + external_domain, + credentials, + email, + fullname, + retfun=None): """Generic external auth login or signup""" # see if we have a map from this external_id to an edX username @@ -142,13 +148,13 @@ def external_login_or_signup(request, eamap.external_name = fullname eamap.internal_password = generate_password() log.debug('Created eamap=%s', eamap) - eamap.save() log.info(u"External_Auth login_or_signup for %s : %s : %s : %s", external_domain, external_id, email, fullname) + uses_shibboleth = settings.MITX_FEATURES.get('AUTH_USE_SHIB') and external_domain.startswith(SHIBBOLETH_DOMAIN_PREFIX) internal_user = eamap.user if internal_user is None: - if settings.MITX_FEATURES.get('AUTH_USE_SHIB'): + if uses_shibboleth: # if we are using shib, try to link accounts using email try: link_user = User.objects.get(email=eamap.external_email) @@ -169,14 +175,14 @@ def external_login_or_signup(request, return default_render_failure(request, failure_msg) except User.DoesNotExist: log.info('SHIB: No user for %s yet, doing signup', eamap.external_email) - return signup(request, eamap) + return _signup(request, eamap) else: log.info('No user for %s yet. doing signup', eamap.external_email) - return signup(request, eamap) + return _signup(request, eamap) # We trust shib's authentication, so no need to authenticate using the password again - if settings.MITX_FEATURES.get('AUTH_USE_SHIB'): - uname = internal_user.username + uname = internal_user.username + if uses_shibboleth: user = internal_user # Assuming this 'AUTHENTICATION_BACKENDS' is set in settings, which I think is safe if settings.AUTHENTICATION_BACKENDS: @@ -184,32 +190,32 @@ def external_login_or_signup(request, else: auth_backend = 'django.contrib.auth.backends.ModelBackend' user.backend = auth_backend - log.info('SHIB: Logging in linked user %s', user.email) + AUDIT_LOG.info('Linked user "%s" logged in via Shibboleth', user.email) else: - uname = internal_user.username - user = authenticate(username=uname, password=eamap.internal_password) + user = authenticate(username=uname, password=eamap.internal_password, request=request) if user is None: - log.warning("External Auth Login failed for %s / %s", - uname, eamap.internal_password) - return signup(request, eamap) + # 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) + return _signup(request, eamap) if not user.is_active: - log.warning("User %s is not active", uname) + AUDIT_LOG.warning('User "%s" is not active after external login', uname) # TODO: improve error page msg = 'Account not yet activated: please look for link in your email' return default_render_failure(request, msg) + login(request, user) request.session.set_expiry(0) # Now to try enrollment # Need to special case Shibboleth here because it logs in via a GET. # testing request.method for extra paranoia - if settings.MITX_FEATURES.get('AUTH_USE_SHIB') and 'shib:' in external_domain and request.method == 'GET': - enroll_request = make_shib_enrollment_request(request) + if uses_shibboleth and request.method == 'GET': + enroll_request = _make_shib_enrollment_request(request) student_views.try_change_enrollment(enroll_request) else: student_views.try_change_enrollment(request) - log.info("Login success - %s (%s)", user.username, user.email) + AUDIT_LOG.info("Login success - %s (%s)", user.username, user.email) if retfun is None: return redirect('/') return retfun() @@ -217,20 +223,16 @@ def external_login_or_signup(request, @ensure_csrf_cookie @cache_if_anonymous -def signup(request, eamap=None): +def _signup(request, eamap): """ Present form to complete for signup via external authentication. Even though the user has external credentials, he/she still needs to create an account on the edX system, and fill in the user registration form. - eamap is an ExteralAuthMap object, specifying the external user + eamap is an ExternalAuthMap object, specifying the external user for which to complete the signup. """ - - if eamap is None: - pass - # save this for use by student.views.create_account request.session['ExternalAuthMap'] = eamap @@ -248,8 +250,9 @@ def signup(request, eamap=None): # Some openEdX instances can't have terms of service for shib users, like # according to Stanford's Office of General Counsel - if settings.MITX_FEATURES.get('AUTH_USE_SHIB') and settings.MITX_FEATURES.get('SHIB_DISABLE_TOS') and \ - ('shib' in eamap.external_domain): + uses_shibboleth = (settings.MITX_FEATURES.get('AUTH_USE_SHIB') and + eamap.external_domain.startswith(SHIBBOLETH_DOMAIN_PREFIX)) + if uses_shibboleth and settings.MITX_FEATURES.get('SHIB_DISABLE_TOS'): context['ask_for_tos'] = False # detect if full name is blank and ask for it from user @@ -272,19 +275,19 @@ def signup(request, eamap=None): # ----------------------------------------------------------------------------- -def ssl_dn_extract_info(dn): +def _ssl_dn_extract_info(dn_string): """ Extract username, email address (may be anyuser@anydomain.com) and full name from the SSL DN string. Return (user,email,fullname) if successful, and None otherwise. """ - ss = re.search('/emailAddress=(.*)@([^/]+)', dn) + ss = re.search('/emailAddress=(.*)@([^/]+)', dn_string) if ss: user = ss.group(1) email = "%s@%s" % (user, ss.group(2)) else: return None - ss = re.search('/CN=([^/]+)/', dn) + ss = re.search('/CN=([^/]+)/', dn_string) if ss: fullname = ss.group(1) else: @@ -292,7 +295,7 @@ def ssl_dn_extract_info(dn): return (user, email, fullname) -def ssl_get_cert_from_request(request): +def _ssl_get_cert_from_request(request): """ Extract user information from certificate, if it exists, returning (user, email, fullname). Else return None. @@ -311,9 +314,6 @@ def ssl_get_cert_from_request(request): return cert - (user, email, fullname) = ssl_dn_extract_info(cert) - return (user, email, fullname) - def ssl_login_shortcut(fn): """ @@ -324,24 +324,26 @@ def ssl_login_shortcut(fn): if not settings.MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES']: return fn(*args, **kwargs) request = args[0] - cert = ssl_get_cert_from_request(request) + cert = _ssl_get_cert_from_request(request) if not cert: # no certificate information - show normal login window return fn(*args, **kwargs) - (user, email, fullname) = ssl_dn_extract_info(cert) - return external_login_or_signup(request, - external_id=email, - external_domain="ssl:MIT", - credentials=cert, - email=email, - fullname=fullname) + (_user, email, fullname) = _ssl_dn_extract_info(cert) + return _external_login_or_signup( + request, + external_id=email, + external_domain="ssl:MIT", + credentials=cert, + email=email, + fullname=fullname + ) return wrapped @csrf_exempt def ssl_login(request): """ - This is called by student.views.index when + This is called by branding.views.index when MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES'] = True Used for MIT user authentication. This presumes the web server @@ -355,22 +357,28 @@ def ssl_login(request): Else continues on with student.views.index, and no authentication. """ - cert = ssl_get_cert_from_request(request) + # Just to make sure we're calling this only at MIT: + if not settings.MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES']: + return HttpResponseForbidden() + + cert = _ssl_get_cert_from_request(request) if not cert: # no certificate information - go onward to main index return student_views.index(request) - (user, email, fullname) = ssl_dn_extract_info(cert) + (_user, email, fullname) = _ssl_dn_extract_info(cert) retfun = functools.partial(student_views.index, request) - return external_login_or_signup(request, - external_id=email, - external_domain="ssl:MIT", - credentials=cert, - email=email, - fullname=fullname, - retfun=retfun) + return _external_login_or_signup( + request, + external_id=email, + external_domain="ssl:MIT", + credentials=cert, + email=email, + fullname=fullname, + retfun=retfun + ) # ----------------------------------------------------------------------------- @@ -396,28 +404,30 @@ def shib_login(request): log.error("SHIB: no Shib-Identity-Provider in request.META") return default_render_failure(request, shib_error_msg) else: - #if we get here, the user has authenticated properly + # If we get here, the user has authenticated properly shib = {attr: request.META.get(attr, '') for attr in ['REMOTE_USER', 'givenName', 'sn', 'mail', 'Shib-Identity-Provider']} - #Clean up first name, last name, and email address - #TODO: Make this less hardcoded re: format, but split will work - #even if ";" is not present since we are accessing 1st element + # Clean up first name, last name, and email address + # TODO: Make this less hardcoded re: format, but split will work + # even if ";" is not present, since we are accessing 1st element shib['sn'] = shib['sn'].split(";")[0].strip().capitalize().decode('utf-8') shib['givenName'] = shib['givenName'].split(";")[0].strip().capitalize().decode('utf-8') + # TODO: should we be logging creds here, at info level? log.info("SHIB creds returned: %r", shib) - return external_login_or_signup(request, - external_id=shib['REMOTE_USER'], - external_domain="shib:" + shib['Shib-Identity-Provider'], - credentials=shib, - email=shib['mail'], - fullname=u'%s %s' % (shib['givenName'], shib['sn']), - ) + return _external_login_or_signup( + request, + external_id=shib['REMOTE_USER'], + external_domain=SHIBBOLETH_DOMAIN_PREFIX + shib['Shib-Identity-Provider'], + credentials=shib, + email=shib['mail'], + fullname=u'%s %s' % (shib['givenName'], shib['sn']), + ) -def make_shib_enrollment_request(request): +def _make_shib_enrollment_request(request): """ Need this hack function because shibboleth logins don't happen over POST but change_enrollment expects its request to be a POST, with @@ -452,14 +462,14 @@ def course_specific_login(request, course_id): try: course = course_from_id(course_id) except ItemNotFoundError: - #couldn't find the course, will just return vanilla signin page + # couldn't find the course, will just return vanilla signin page return redirect_with_querystring('signin_user', query_string) - #now the dispatching conditionals. Only shib for now - if settings.MITX_FEATURES.get('AUTH_USE_SHIB') and 'shib:' in course.enrollment_domain: + # now the dispatching conditionals. Only shib for now + if settings.MITX_FEATURES.get('AUTH_USE_SHIB') and course.enrollment_domain.startswith(SHIBBOLETH_DOMAIN_PREFIX): return redirect_with_querystring('shib-login', query_string) - #Default fallthrough to normal signin page + # Default fallthrough to normal signin page return redirect_with_querystring('signin_user', query_string) @@ -473,15 +483,15 @@ def course_specific_register(request, course_id): try: course = course_from_id(course_id) except ItemNotFoundError: - #couldn't find the course, will just return vanilla registration page + # couldn't find the course, will just return vanilla registration page return redirect_with_querystring('register_user', query_string) - #now the dispatching conditionals. Only shib for now - if settings.MITX_FEATURES.get('AUTH_USE_SHIB') and 'shib:' in course.enrollment_domain: - #shib-login takes care of both registration and login flows + # now the dispatching conditionals. Only shib for now + if settings.MITX_FEATURES.get('AUTH_USE_SHIB') and course.enrollment_domain.startswith(SHIBBOLETH_DOMAIN_PREFIX): + # shib-login takes care of both registration and login flows return redirect_with_querystring('shib-login', query_string) - #Default fallthrough to normal registration page + # Default fallthrough to normal registration page return redirect_with_querystring('register_user', query_string) @@ -702,18 +712,23 @@ def provider_login(request): except User.DoesNotExist: request.session['openid_error'] = True msg = "OpenID login failed - Unknown user email: %s" - log.warning(msg, email) + AUDIT_LOG.warning(msg, email) return HttpResponseRedirect(openid_request_url) # attempt to authenticate user (but not actually log them in...) # 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" - log.warning(msg, email) + AUDIT_LOG.warning(msg, email) return HttpResponseRedirect(openid_request_url) # authentication succeeded, so fetch user information @@ -723,8 +738,8 @@ def provider_login(request): if 'openid_error' in request.session: del request.session['openid_error'] - log.info("OpenID login success - %s (%s)", - user.username, user.email) + AUDIT_LOG.info("OpenID login success - %s (%s)", + user.username, user.email) # redirect user to return_to location url = endpoint + urlquote(user.username) @@ -755,7 +770,7 @@ def provider_login(request): # the account is not active, so redirect back to the login page: request.session['openid_error'] = True msg = "Login failed - Account not active for user %s" - log.warning(msg, username) + AUDIT_LOG.warning(msg, username) return HttpResponseRedirect(openid_request_url) # determine consumer domain if applicable @@ -856,9 +871,11 @@ def test_center_login(request): try: testcenteruser = TestCenterUser.objects.get(client_candidate_id=client_candidate_id) except TestCenterUser.DoesNotExist: - log.error("not able to find demographics for cand ID {}".format(client_candidate_id)) + AUDIT_LOG.error("not able to find demographics for cand ID {}".format(client_candidate_id)) return HttpResponseRedirect(makeErrorURL(error_url, "invalidClientCandidateID")) + AUDIT_LOG.info("Attempting to log in test-center user '{}' for test of cand {}".format(testcenteruser.user.username, client_candidate_id)) + # find testcenter_registration that matches the provided exam code: # Note that we could rely in future on either the registrationId or the exam code, # or possibly both. But for now we know what to do with an ExamSeriesCode, @@ -867,13 +884,13 @@ def test_center_login(request): # we are not allowed to make up a new error code, according to Pearson, # so instead of "missingExamSeriesCode", we use a valid one that is # inaccurate but at least distinct. (Sigh.) - log.error("missing exam series code for cand ID {}".format(client_candidate_id)) + AUDIT_LOG.error("missing exam series code for cand ID {}".format(client_candidate_id)) return HttpResponseRedirect(makeErrorURL(error_url, "missingPartnerID")) exam_series_code = request.POST.get('vueExamSeriesCode') registrations = TestCenterRegistration.objects.filter(testcenter_user=testcenteruser, exam_series_code=exam_series_code) if not registrations: - log.error("not able to find exam registration for exam {} and cand ID {}".format(exam_series_code, client_candidate_id)) + AUDIT_LOG.error("not able to find exam registration for exam {} and cand ID {}".format(exam_series_code, client_candidate_id)) return HttpResponseRedirect(makeErrorURL(error_url, "noTestsAssigned")) # TODO: figure out what to do if there are more than one registrations.... @@ -883,14 +900,14 @@ def test_center_login(request): course_id = registration.course_id course = course_from_id(course_id) # assume it will be found.... if not course: - log.error("not able to find course from ID {} for cand ID {}".format(course_id, client_candidate_id)) + AUDIT_LOG.error("not able to find course from ID {} for cand ID {}".format(course_id, client_candidate_id)) return HttpResponseRedirect(makeErrorURL(error_url, "incorrectCandidateTests")) exam = course.get_test_center_exam(exam_series_code) if not exam: - log.error("not able to find exam {} for course ID {} and cand ID {}".format(exam_series_code, course_id, client_candidate_id)) + AUDIT_LOG.error("not able to find exam {} for course ID {} and cand ID {}".format(exam_series_code, course_id, client_candidate_id)) return HttpResponseRedirect(makeErrorURL(error_url, "incorrectCandidateTests")) location = exam.exam_url - log.info("proceeding with test of cand {} on exam {} for course {}: URL = {}".format(client_candidate_id, exam_series_code, course_id, location)) + log.info("Proceeding with test of cand {} on exam {} for course {}: URL = {}".format(client_candidate_id, exam_series_code, course_id, location)) # check if the test has already been taken timelimit_descriptor = modulestore().get_instance(course_id, Location(location)) @@ -907,7 +924,7 @@ def test_center_login(request): return HttpResponseRedirect(makeErrorURL(error_url, "missingClientProgram")) if timelimit_module and timelimit_module.has_ended: - log.warning("cand {} on exam {} for course {}: test already over at {}".format(client_candidate_id, exam_series_code, course_id, timelimit_module.ending_at)) + AUDIT_LOG.warning("cand {} on exam {} for course {}: test already over at {}".format(client_candidate_id, exam_series_code, course_id, timelimit_module.ending_at)) return HttpResponseRedirect(makeErrorURL(error_url, "allTestsTaken")) # check if we need to provide an accommodation: @@ -922,7 +939,7 @@ def test_center_login(request): if time_accommodation_code: timelimit_module.accommodation_code = time_accommodation_code - log.info("cand {} on exam {} for course {}: receiving accommodation {}".format(client_candidate_id, exam_series_code, course_id, time_accommodation_code)) + AUDIT_LOG.info("cand {} on exam {} for course {}: receiving accommodation {}".format(client_candidate_id, exam_series_code, course_id, time_accommodation_code)) # UGLY HACK!!! # Login assumes that authentication has occurred, and that there is a @@ -936,6 +953,7 @@ def test_center_login(request): # testcenteruser.user.backend = "%s.%s" % (backend.__module__, backend.__class__.__name__) testcenteruser.user.backend = "%s.%s" % ("TestcenterAuthenticationModule", "TestcenterAuthenticationClass") login(request, testcenteruser.user) + AUDIT_LOG.info("Logged in user '{}' for test of cand {} on exam {} for course {}: URL = {}".format(testcenteruser.user.username, client_candidate_id, exam_series_code, course_id, location)) # And start the test: return jump_to(request, course_id, location) diff --git a/common/djangoapps/mitxmako/shortcuts.py b/common/djangoapps/mitxmako/shortcuts.py index 7f7c3f9ebe..3c68fa85be 100644 --- a/common/djangoapps/mitxmako/shortcuts.py +++ b/common/djangoapps/mitxmako/shortcuts.py @@ -92,9 +92,10 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'): return template.render_unicode(**context_dictionary) -def render_to_response(template_name, dictionary, context_instance=None, namespace='main', **kwargs): +def render_to_response(template_name, dictionary=None, context_instance=None, namespace='main', **kwargs): """ Returns a HttpResponse whose content is filled with the result of calling lookup.get_template(args[0]).render with the passed arguments. """ + dictionary = dictionary or {} return HttpResponse(render_to_string(template_name, dictionary, context_instance, namespace), **kwargs) 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/models.py b/common/djangoapps/student/models.py index 97d7e8b028..4c41427ca6 100644 --- a/common/djangoapps/student/models.py +++ b/common/djangoapps/student/models.py @@ -20,6 +20,7 @@ from random import randint from django.conf import settings from django.contrib.auth.models import User +from django.contrib.auth.signals import user_logged_in, user_logged_out from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver @@ -30,6 +31,7 @@ from pytz import UTC log = logging.getLogger(__name__) +AUDIT_LOG = logging.getLogger("audit") class UserProfile(models.Model): @@ -779,3 +781,20 @@ def update_user_information(sender, instance, created, **kwargs): log = logging.getLogger("mitx.discussion") log.error(unicode(e)) log.error("update user info to discussion failed for user with id: " + str(instance.id)) + +# Define login and logout handlers here in the models file, instead of the views file, +# so that they are more likely to be loaded when a Studio user brings up the Studio admin +# page to login. These are currently the only signals available, so we need to continue +# identifying and logging failures separately (in views). + + +@receiver(user_logged_in) +def log_successful_login(sender, request, user, **kwargs): + """Handler to log when logins have occurred successfully.""" + AUDIT_LOG.info(u"Login success - {0} ({1})".format(user.username, user.email)) + + +@receiver(user_logged_out) +def log_successful_logout(sender, request, user, **kwargs): + """Handler to log when logouts have occurred successfully.""" + AUDIT_LOG.info(u"Logout - {0}".format(request.user)) diff --git a/common/djangoapps/student/tests/test_auto_auth.py b/common/djangoapps/student/tests/test_auto_auth.py new file mode 100644 index 0000000000..f9c4ae63de --- /dev/null +++ b/common/djangoapps/student/tests/test_auto_auth.py @@ -0,0 +1,136 @@ +from django.test import TestCase +from django.test.client import Client +from django.contrib.auth.models import User +from util.testing import UrlResetMixin +from mock import patch +from django.core.urlresolvers import reverse, NoReverseMatch + + +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_TESTING": True}) + def setUp(self): + # 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) + super(AutoAuthEnabledTestCase, self).setUp() + self.url = '/auto_auth' + self.cms_csrf_url = "signup" + self.lms_csrf_url = "signin_user" + self.client = Client() + + def test_create_user(self): + """ + Test that user gets created when visiting the page. + """ + + self.client.get(self.url) + + qset = User.objects.all() + + # assert user was created and is active + self.assertEqual(qset.count(), 1) + 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): + """ + Test to make sure multiple users are created. + """ + randint.return_value = 1 + self.client.get(self.url) + + randint.return_value = 2 + self.client.get(self.url) + + qset = User.objects.all() + + # 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): + """ + Test that when we have reached the limit for automatic users + a subsequent request results in an already existant one being + logged in. + """ + # auto-generate 1 user (the max) + url = '/auto_auth' + self.client.get(url) + + # go to the site again + self.client.get(url) + qset = User.objects.all() + + # make sure it is the same user + self.assertEqual(qset.count(), 1) + + +class AutoAuthDisabledTestCase(UrlResetMixin, TestCase): + """ + Test that the page is inaccessible with default settings + """ + + @patch.dict("django.conf.settings.MITX_FEATURES", {"AUTOMATIC_AUTH_FOR_TESTING": False}) + def setUp(self): + # 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) + super(AutoAuthDisabledTestCase, self).setUp() + self.url = '/auto_auth' + self.client = Client() + + def test_auto_auth_disabled(self): + """ + Make sure automatic authentication is disabled. + """ + response = self.client.get(self.url) + self.assertEqual(response.status_code, 404) + + def test_csrf_enabled(self): + """ + test that when not load testing, csrf protection is on + """ + cms_csrf_url = "signup" + lms_csrf_url = "signin_user" + self.client = Client(enforce_csrf_checks=True) + try: + csrf_protected_url = reverse(cms_csrf_url) + response = self.client.post(csrf_protected_url) + except NoReverseMatch: + csrf_protected_url = reverse(lms_csrf_url) + response = self.client.post(csrf_protected_url) + + self.assertEqual(response.status_code, 403) diff --git a/common/djangoapps/student/tests/test_login.py b/common/djangoapps/student/tests/test_login.py new file mode 100644 index 0000000000..e8def470c0 --- /dev/null +++ b/common/djangoapps/student/tests/test_login.py @@ -0,0 +1,166 @@ +''' +Tests for student activation and login +''' +import json +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 + + +class LoginTest(TestCase): + ''' + Test student.views.login_user() view + ''' + + def setUp(self): + # Create one user and save it to the database + self.user = UserFactory.build(username='test', email='test@edx.org') + self.user.set_password('test_password') + self.user.save() + + # Create a registration for the user + RegistrationFactory(user=self.user) + + # Create a profile for the user + UserProfileFactory(user=self.user) + + # Create the test client + self.client = Client() + cache.clear() + + # Store the login url + try: + self.url = reverse('login_post') + except NoReverseMatch: + self.url = reverse('login') + + def test_login_success(self): + response, mock_audit_log = self._login_response('test@edx.org', 'test_password', patched_audit_log='student.models.AUDIT_LOG') + self._assert_response(response, success=True) + self._assert_audit_log(mock_audit_log, 'info', [u'Login success', u'test@edx.org']) + + def test_login_success_unicode_email(self): + unicode_email = u'test' + unichr(40960) + u'@edx.org' + self.user.email = unicode_email + self.user.save() + + response, mock_audit_log = self._login_response(unicode_email, 'test_password', patched_audit_log='student.models.AUDIT_LOG') + self._assert_response(response, success=True) + self._assert_audit_log(mock_audit_log, 'info', [u'Login success', unicode_email]) + + def test_login_fail_no_user_exists(self): + nonexistent_email = u'not_a_user@edx.org' + response, mock_audit_log = self._login_response(nonexistent_email, 'test_password') + self._assert_response(response, success=False, + value='Email or password is incorrect') + self._assert_audit_log(mock_audit_log, 'warning', [u'Login failed', u'Unknown user email', nonexistent_email]) + + def test_login_fail_wrong_password(self): + response, mock_audit_log = self._login_response('test@edx.org', 'wrong_password') + self._assert_response(response, success=False, + value='Email or password is incorrect') + self._assert_audit_log(mock_audit_log, 'warning', [u'Login failed', u'password for', u'test@edx.org', u'invalid']) + + def test_login_not_activated(self): + # De-activate the user + self.user.is_active = False + self.user.save() + + # Should now be unable to login + response, mock_audit_log = self._login_response('test@edx.org', 'test_password') + self._assert_response(response, success=False, + value="This account has not been activated") + self._assert_audit_log(mock_audit_log, 'warning', [u'Login failed', u'Account not active for user']) + + def test_login_unicode_email(self): + unicode_email = u'test@edx.org' + unichr(40960) + response, mock_audit_log = self._login_response(unicode_email, 'test_password') + self._assert_response(response, success=False) + self._assert_audit_log(mock_audit_log, 'warning', [u'Login failed', unicode_email]) + + def test_login_unicode_password(self): + unicode_password = u'test_password' + unichr(1972) + response, mock_audit_log = self._login_response('test@edx.org', unicode_password) + self._assert_response(response, success=False) + self._assert_audit_log(mock_audit_log, 'warning', [u'Login failed', u'password for', u'test@edx.org', u'invalid']) + + def test_logout_logging(self): + response, _ = self._login_response('test@edx.org', 'test_password') + self._assert_response(response, success=True) + logout_url = reverse('logout') + with patch('student.models.AUDIT_LOG') as mock_audit_log: + response = self.client.post(logout_url) + 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} + with patch(patched_audit_log) as mock_audit_log: + result = self.client.post(self.url, post_params) + return result, mock_audit_log + + def _assert_response(self, response, success=None, value=None): + ''' + Assert that the response had status 200 and returned a valid + JSON-parseable dict. + + If success is provided, assert that the response had that + value for 'success' in the JSON dict. + + If value is provided, assert that the response contained that + value for 'value' in the JSON dict. + ''' + self.assertEqual(response.status_code, 200) + + try: + response_dict = json.loads(response.content) + except ValueError: + self.fail("Could not parse response content as JSON: %s" + % str(response.content)) + + if success is not None: + self.assertEqual(response_dict['success'], success) + + if value is not None: + msg = ("'%s' did not contain '%s'" % + (str(response_dict['value']), str(value))) + self.assertTrue(value in response_dict['value'], msg) + + def _assert_audit_log(self, mock_audit_log, level, log_strings): + """ + Check that the audit log has received the expected call. + """ + method_calls = mock_audit_log.method_calls + self.assertEquals(len(method_calls), 1) + name, args, _kwargs = method_calls[0] + self.assertEquals(name, level) + self.assertEquals(len(args), 1) + format_string = args[0] + for log_string in log_strings: + self.assertIn(log_string, format_string) 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 553643bde7..0b061f5a94 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -19,6 +19,7 @@ from django.core.context_processors import csrf from django.core.mail import send_mail from django.core.urlresolvers import reverse from django.core.validators import validate_email, validate_slug, ValidationError +from django.core.exceptions import ObjectDoesNotExist from django.db import IntegrityError, transaction from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseNotAllowed, Http404 from django.shortcuts import redirect @@ -27,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 @@ -55,6 +58,8 @@ from statsd import statsd from pytz import UTC log = logging.getLogger("mitx.student") +AUDIT_LOG = logging.getLogger("audit") + Article = namedtuple('Article', 'title url author image deck publication publish_date') @@ -89,10 +94,7 @@ def index(request, extra_context={}, user=None): courses = get_courses(None, domain=domain) courses = sort_by_announcement(courses) - # Get the 3 most recent news - top_news = _get_news(top=3) - - context = {'courses': courses, 'news': top_news} + context = {'courses': courses} context.update(extra_context) return render_to_response('index.html', context) @@ -106,8 +108,7 @@ day_pattern = re.compile(r'\s\d+,\s') multimonth_pattern = re.compile(r'\s?\-\s?\S+\s') -def get_date_for_press(publish_date): - import datetime +def _get_date_for_press(publish_date): # strip off extra months, and just use the first: date = re.sub(multimonth_pattern, ", ", publish_date) if re.search(day_pattern, date): @@ -128,7 +129,7 @@ def press(request): json_articles = json.loads(content) cache.set("student_press_json_articles", json_articles) articles = [Article(**article) for article in json_articles] - articles.sort(key=lambda item: get_date_for_press(item.publish_date), reverse=True) + articles.sort(key=lambda item: _get_date_for_press(item.publish_date), reverse=True) return render_to_response('static_templates/press.html', {'articles': articles}) @@ -232,7 +233,7 @@ def signin_user(request): @ensure_csrf_cookie -def register_user(request, extra_context={}): +def register_user(request, extra_context=None): """ This view will display the non-modal registration form """ @@ -243,7 +244,8 @@ def register_user(request, extra_context={}): 'course_id': request.GET.get('course_id'), 'enrollment_action': request.GET.get('enrollment_action') } - context.update(extra_context) + if extra_context is not None: + context.update(extra_context) return render_to_response('register.html', context) @@ -284,9 +286,6 @@ def dashboard(request): exam_registrations = {course.id: exam_registration_info(request.user, course) for course in courses} - # Get the 3 most recent news - top_news = _get_news(top=3) if not settings.MITX_FEATURES.get('ENABLE_MKTG_SITE', False) else None - # get info w.r.t ExternalAuthMap external_auth_map = None try: @@ -301,7 +300,6 @@ def dashboard(request): 'errored_courses': errored_courses, 'show_courseware_links_for': show_courseware_links_for, 'cert_statuses': cert_statuses, - 'news': top_news, 'exam_registrations': exam_registrations, } @@ -380,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 @@ -405,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=""): @@ -424,19 +439,31 @@ def login_user(request, error=""): try: user = User.objects.get(email=email) except User.DoesNotExist: - 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 + AUDIT_LOG.warning(u"Login failed - Unknown user email: {0}".format(email)) + 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: - 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.')})) if user is not None and user.is_active: try: + # We do not log here, because we have a handler registered + # to perform logging on successful logins. login(request, user) if request.POST.get('remember') == 'true': request.session.set_expiry(604800) @@ -444,14 +471,14 @@ def login_user(request, error=""): else: request.session.set_expiry(0) except Exception as e: + AUDIT_LOG.critical("Login failed - Could not create session. Is memcached running?") log.critical("Login failed - Could not create session. Is memcached running?") log.exception(e) - - log.info(u"Login success - {0} ({1})".format(username, email)) + raise try_change_enrollment(request) - statsd.increment(_("common.student.successful_login")) + statsd.increment("common.student.successful_login") response = HttpResponse(json.dumps({'success': True})) # set the login cookie for the edx marketing site @@ -475,7 +502,7 @@ def login_user(request, error=""): return response - log.warning(u"Login failed - Account not active for user {0}, resending activation".format(username)) + AUDIT_LOG.warning(u"Login failed - Account not active for user {0}, resending activation".format(username)) reactivation_email_for_user(user) not_activated_msg = _("This account has not been activated. We have sent another activation message. Please check your e-mail for the activation instructions.") @@ -490,7 +517,8 @@ def logout_user(request): Deletes both the CSRF and sessionid cookies so the marketing site can determine the logged in state of the user ''' - + # We do not log here, because we have a handler registered + # to perform logging on successful logouts. logout(request) response = redirect('/') response.delete_cookie(settings.EDXMKTG_COOKIE_NAME, @@ -597,7 +625,7 @@ def create_account(request, post_override=None): password = eamap.internal_password post_vars = dict(post_vars.items()) post_vars.update(dict(email=email, name=name, password=password)) - log.info('In create_account with external_auth: post_vars = %s' % post_vars) + log.debug(u'In create_account with external_auth: user = %s, email=%s', name, email) # Confirm we have a properly formed request for a in ['username', 'email', 'password', 'name']: @@ -630,7 +658,7 @@ def create_account(request, post_override=None): required_post_vars = ['username', 'email', 'name', 'password', 'terms_of_service', 'honor_code'] if tos_not_required: - required_post_vars = ['username', 'email', 'name', 'password', 'honor_code'] + required_post_vars = ['username', 'email', 'name', 'password', 'honor_code'] for a in required_post_vars: if len(post_vars[a]) < 2: @@ -674,18 +702,20 @@ def create_account(request, post_override=None): subject = ''.join(subject.splitlines()) message = render_to_string('emails/activation_email.txt', d) - try: - if settings.MITX_FEATURES.get('REROUTE_ACTIVATION_EMAIL'): - dest_addr = settings.MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] - message = ("Activation for %s (%s): %s\n" % (user, user.email, profile.name) + - '-' * 80 + '\n\n' + message) - send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [dest_addr], fail_silently=False) - elif not settings.GENERATE_RANDOM_USER_CREDENTIALS: - res = user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL) - except: - log.warning('Unable to send activation email to user', exc_info=True) - js['value'] = _('Could not send activation e-mail.') - return HttpResponse(json.dumps(js)) + # 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_TESTING')): + try: + if settings.MITX_FEATURES.get('REROUTE_ACTIVATION_EMAIL'): + dest_addr = settings.MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] + message = ("Activation for %s (%s): %s\n" % (user, user.email, profile.name) + + '-' * 80 + '\n\n' + message) + send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [dest_addr], fail_silently=False) + else: + _res = user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL) + except: + log.warning('Unable to send activation email to user', exc_info=True) + js['value'] = _('Could not send activation e-mail.') + return HttpResponse(json.dumps(js)) # Immediately after a user creates an account, we log them in. They are only # logged in until they close the browser. They can't log in again until they click @@ -694,17 +724,23 @@ def create_account(request, post_override=None): login(request, login_user) request.session.set_expiry(0) + # TODO: there is no error checking here to see that the user actually logged in successfully, + # and is not yet an active user. + if login_user is not None: + AUDIT_LOG.info(u"Login success on new account creation - {0}".format(login_user.username)) + if DoExternalAuth: eamap.user = login_user eamap.dtsignup = datetime.datetime.now(UTC) eamap.save() - log.info("User registered with external_auth %s" % post_vars['username']) - log.info('Updated ExternalAuthMap for %s to be %s' % (post_vars['username'], eamap)) + AUDIT_LOG.info("User registered with external_auth %s", post_vars['username']) + AUDIT_LOG.info('Updated ExternalAuthMap for %s to be %s', post_vars['username'], eamap) if settings.MITX_FEATURES.get('BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH'): log.info('bypassing activation email') login_user.is_active = True login_user.save() + AUDIT_LOG.info(u"Login activated on extauth account - {0} ({1})".format(login_user.username, login_user.email)) try_change_enrollment(request) @@ -902,32 +938,56 @@ def create_exam_registration(request, post_override=None): return HttpResponse(json.dumps(js), mimetype="application/json") -def get_random_post_override(): +def auto_auth(request): """ - Return a dictionary suitable for passing to post_vars of _do_create_account or post_override - of create_account, with random user info. + Automatically logs the user in with a generated random credentials + This view is only accessible when + settings.MITX_SETTINGS['AUTOMATIC_AUTH_FOR_TESTING'] is true. """ - def id_generator(size=6, chars=string.ascii_uppercase + string.ascii_lowercase + string.digits): - return ''.join(random.choice(chars) for x in range(size)) - return {'username': "random_" + id_generator(), - 'email': id_generator(size=10, chars=string.ascii_lowercase) + "_dummy_test@mitx.mit.edu", - 'password': id_generator(), - 'name': (id_generator(size=5, chars=string.ascii_lowercase) + " " + - id_generator(size=7, chars=string.ascii_lowercase)), - 'honor_code': u'true', - 'terms_of_service': u'true', } + 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 values. + """ + return {'username': username, + 'email': email, + 'password': password, + 'name': name, + 'honor_code': u'true', + 'terms_of_service': u'true', } + # generate random user credentials from a small name space (determined by settings) + name_base = 'USER_' + pass_base = 'PASS_' -def create_random_account(create_account_function): - def inner_create_random_account(request): - return create_account_function(request, post_override=get_random_post_override()) + max_users = settings.MITX_FEATURES.get('MAX_AUTO_AUTH_USERS', 200) + number = random.randint(1, max_users) - return inner_create_random_account + # Get the params from the request to override default user attributes if specified + qdict = request.GET -# TODO (vshnayder): do we need GENERATE_RANDOM_USER_CREDENTIALS for anything? -if settings.GENERATE_RANDOM_USER_CREDENTIALS: - create_account = create_random_account(create_account) + # 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, request=request) + login(request, user) + + # else create and activate account info + except ObjectDoesNotExist: + 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() + + # return empty success + return HttpResponse('') @ensure_csrf_cookie @@ -942,14 +1002,14 @@ def activate_account(request, key): r[0].activate() already_active = False - #Enroll student in any pending courses he/she may have if auto_enroll flag is set + # Enroll student in any pending courses he/she may have if auto_enroll flag is set student = User.objects.filter(id=r[0].user_id) if student: ceas = CourseEnrollmentAllowed.objects.filter(email=student[0].email) for cea in ceas: if cea.auto_enroll: course_id = cea.course_id - enrollment, created = CourseEnrollment.objects.get_or_create(user_id=student[0].id, course_id=course_id) + _enrollment, _created = CourseEnrollment.objects.get_or_create(user_id=student[0].id, course_id=course_id) resp = render_to_response("registration/activation_complete.html", {'user_logged_in': user_logged_in, 'already_active': already_active}) return resp @@ -981,7 +1041,7 @@ def password_reset_confirm_wrapper(request, uidb36=None, token=None): ''' A wrapper around django.contrib.auth.views.password_reset_confirm. Needed because we want to set the user as active at this step. ''' - #cribbed from django.contrib.auth.views.password_reset_confirm + # cribbed from django.contrib.auth.views.password_reset_confirm try: uid_int = base36_to_int(uidb36) user = User.objects.get(id=uid_int) @@ -1007,7 +1067,7 @@ def reactivation_email_for_user(user): message = render_to_string('emails/activation_email.txt', d) try: - res = user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL) + _res = user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL) except: log.warning('Unable to send reactivation email', exc_info=True) return HttpResponse(json.dumps({'success': False, 'error': _('Unable to send reactivation email')})) @@ -1065,7 +1125,7 @@ def change_email_request(request): subject = ''.join(subject.splitlines()) message = render_to_string('emails/email_change.txt', d) - res = send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [pec.new_email]) + _res = send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [pec.new_email]) return HttpResponse(json.dumps({'success': True})) @@ -1220,28 +1280,3 @@ def accept_name_change(request): raise Http404 return accept_name_change_by_id(int(request.POST['id'])) - - -def _get_news(top=None): - "Return the n top news items on settings.RSS_URL" - - # Don't return anything if we're in a themed site - if settings.MITX_FEATURES["USE_CUSTOM_THEME"]: - return None - - feed_data = cache.get("students_index_rss_feed_data") - if feed_data is None: - if hasattr(settings, 'RSS_URL'): - feed_data = urllib.urlopen(settings.RSS_URL).read() - else: - feed_data = render_to_string("feed.rss", None) - cache.set("students_index_rss_feed_data", feed_data, settings.RSS_TIMEOUT) - - feed = feedparser.parse(feed_data) - entries = feed['entries'][0:top] # all entries if top is None - for entry in entries: - soup = BeautifulSoup(entry.description) - entry.image = soup.img['src'] if soup.img else None - entry.summary = soup.getText() - - return entries diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py index ec361a9aff..c2bf2bbbf3 100644 --- a/common/djangoapps/terrain/browser.py +++ b/common/djangoapps/terrain/browser.py @@ -75,7 +75,7 @@ def initial_setup(server): # If we were unable to get a valid session within the limit of attempts, # then we cannot run the tests. if not success: - raise IOError("Could not acquire valid ChromeDriver browser session.") + raise IOError("Could not acquire valid {driver} browser session.".format(driver=browser_driver)) # Set the browser size to 1280x1024 world.browser.driver.set_window_size(1280, 1024) diff --git a/common/djangoapps/terrain/course_helpers.py b/common/djangoapps/terrain/course_helpers.py index c62b1a1e79..afef8bf2e1 100644 --- a/common/djangoapps/terrain/course_helpers.py +++ b/common/djangoapps/terrain/course_helpers.py @@ -34,38 +34,22 @@ 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 def register_by_course_id(course_id, is_staff=False): - create_user('robot') + create_user('robot', 'password') u = User.objects.get(username='robot') if is_staff: u.is_staff = True diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py index cfa8de15b7..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'), []) @@ -168,6 +168,11 @@ def dialogs_are_closed(step): assert world.dialogs_closed() +@step(u'visit the url "([^"]*)"') +def visit_url(step, url): + world.browser.visit(django_url(url)) + + @step('I will confirm all alerts') def i_confirm_all_alerts(step): """ diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py index e69f53a5dc..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 @@ -216,28 +216,32 @@ def save_the_html(path='/tmp'): @world.absorb def click_course_content(): course_content_css = 'li.nav-course-courseware' - if world.browser.is_element_present_by_css(course_content_css): - world.css_click(course_content_css) + world.css_click(course_content_css) @world.absorb def click_course_settings(): course_settings_css = 'li.nav-course-settings' - if world.browser.is_element_present_by_css(course_settings_css): - world.css_click(course_settings_css) + world.css_click(course_settings_css) @world.absorb def click_tools(): tools_css = 'li.nav-course-tools' - if world.browser.is_element_present_by_css(tools_css): - world.css_click(tools_css) + world.css_click(tools_css) @world.absorb 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.mp4 b/common/lib/xmodule/test_files/test.mp4 new file mode 100644 index 0000000000..81d11df5f2 Binary files /dev/null and b/common/lib/xmodule/test_files/test.mp4 differ diff --git a/common/lib/xmodule/test_files/test.ogv b/common/lib/xmodule/test_files/test.ogv new file mode 100644 index 0000000000..e128d82b5c Binary files /dev/null and b/common/lib/xmodule/test_files/test.ogv differ diff --git a/common/lib/xmodule/test_files/test.webm b/common/lib/xmodule/test_files/test.webm new file mode 100644 index 0000000000..42e2130ca4 Binary files /dev/null and b/common/lib/xmodule/test_files/test.webm differ 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 + "</div>" - # 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/gst/display.scss b/common/lib/xmodule/xmodule/css/gst/display.scss new file mode 100644 index 0000000000..83ca4650f0 --- /dev/null +++ b/common/lib/xmodule/xmodule/css/gst/display.scss @@ -0,0 +1,44 @@ +// In the LMS sliders use built-in styles from jquery-ui-1.8.22.custom.css. +// CMS uses its own sliders styles. +// These styles we use only to sure, that slider in GST module +// will be render correctly (just like a duplication some from jquery-ui-1.8.22.custom.css). +// Cause, for example, CMS overwrites many jquery-ui-1.8.22.custom.css styles, +// and we must overwrite them again. + +.ui-widget-content { + border: 1px solid #dddddd; + color: #333333; +} + +.ui-widget { + font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; + font-size: 1.1em; +} + +.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + -khtml-border-top-left-radius: 4px; + border-top-left-radius: 4px; +} + +.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { + -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius: 4px; + -khtml-border-top-right-radius: 4px; + border-top-right-radius: 4px; +} + +.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + -khtml-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; +} + +.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + -khtml-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; +} \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index 1e82b31f10..7d611e5bad 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -266,6 +266,7 @@ nav.sequence-nav { border: 1px solid #ccc; @include linear-gradient(top, #eee, #ddd); box-shadow: 0 1px 0 rgba(255, 255, 255, .7) inset; + z-index: 1; &.prev, &.next { @@ -273,7 +274,7 @@ nav.sequence-nav { background-position: center; background-repeat: no-repeat; display: block; - height: 34px; + height: 100%; width: 40px; text-indent: -9999px; @include transition(all .2s $ease-in-out-quad 0s); 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 879aee3f72..3b40809fa3 100644 --- a/common/lib/xmodule/xmodule/css/videoalpha/display.scss +++ b/common/lib/xmodule/xmodule/css/videoalpha/display.scss @@ -2,7 +2,7 @@ margin-bottom: 30px; } -div.video { +div.videoalpha { @include clearfix(); background: #f3f3f3; display: block; @@ -10,11 +10,30 @@ div.video { padding: 12px; border-radius: 5px; + div.tc-wrapper { + position: relative; + @include clearfix; + } + article.video-wrapper { float: left; margin-right: flex-gutter(9); width: flex-grid(6, 9); + background-color: black; + + position: relative; + + div.video-player-pre { + height: 50px; + background-color: black; + } + + div.video-player-post { + height: 50px; + background-color: black; + } + section.video-player { height: 0; overflow: hidden; @@ -52,10 +71,19 @@ div.video { border-radius: 0; border-top: 1px solid #000; box-shadow: inset 0 1px 0 #eee, 0 1px 0 #555; - height: 7px; + position: absolute; + z-index: 1; + bottom: 100%; + left: 0; + right: 0; + height: 14px; margin-left: -1px; margin-right: -1px; - @include transition(height 2.0s ease-in-out 0s); + -webkit-transition: -webkit-transform 0.7s ease-in-out; + -moz-transition: -moz-transform 0.7s ease-in-out; + -ms-transition: -ms-transform 0.7s ease-in-out; + transition: transform 0.7s ease-in-out; + @include transform(scaleY(0.5) translate3d(0, 50%, 0)); div.ui-widget-header { background: #777; @@ -66,14 +94,18 @@ div.video { background: $pink url(../images/slider-handle.png) center center no-repeat; background-size: 50%; border: 1px solid darken($pink, 20%); - border-radius: 15px; + border-radius: 50%; box-shadow: inset 0 1px 0 lighten($pink, 10%); cursor: pointer; - height: 15px; - margin-left: -7px; - top: -4px; - @include transition(height 2.0s ease-in-out 0s, width 2.0s ease-in-out 0s); - width: 15px; + height: 20px; + margin-left: 0; + top: 0; + -webkit-transition: -webkit-transform 0.7s ease-in-out; + -moz-transition: -moz-transform 0.7s ease-in-out; + -ms-transition: -ms-transform 0.7s ease-in-out; + transition: transform 0.7s ease-in-out; + @include transform(scale(.7, 1.3) translate3d(-80%, -15%, 0)); + width: 20px; &:focus, &:hover { background-color: lighten($pink, 10%); @@ -213,7 +245,7 @@ div.video { // fix for now ol.video_speeds { - box-shadow: inset 1px 0 0 #555, 0 3px 0 #444; + box-shadow: inset 1px 0 0 #555, 0 4px 0 #444; @include transition(none); background-color: #444; border: 1px solid #000; @@ -221,7 +253,7 @@ div.video { display: none; opacity: 0.0; position: absolute; - width: 133px; + width: 131px; z-index: 10; li { @@ -362,7 +394,7 @@ div.video { border-right: 1px solid #000; box-shadow: 1px 0 0 #555, inset 1px 0 0 #555; color: #797979; - display: block; + display: none; float: left; line-height: 46px; //height of play pause buttons margin-left: 0; @@ -387,7 +419,6 @@ div.video { a.hide-subtitles { background: url('../images/cc.png') center no-repeat; - color: #797979; display: block; float: left; font-weight: 800; @@ -410,6 +441,10 @@ div.video { &.off { opacity: 0.7; } + + background-color: #444; + color: #fff; + text-decoration: none; } } } @@ -420,15 +455,10 @@ div.video { } div.slider { - height: 14px; - margin-top: -7px; + @include transform(scaleY(1) translate3d(0, 0, 0)); a.ui-slider-handle { - border-radius: 20px; - height: 20px; - margin-left: -10px; - top: -4px; - width: 20px; + @include transform(scale(1) translate3d(-50%, -15%, 0)); } } } @@ -471,22 +501,53 @@ div.video { article.video-wrapper { width: flex-grid(9,9); + + background-color: inherit; + } + + article.video-wrapper section.video-controls.html5 { + bottom: 0px; + left: 0px; + right: 0px; + position: absolute; + 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; } ol.subtitles { - width: 0; - height: 0; + width: 0; + height: 0; + } + + ol.subtitles.html5 { + background-color: rgba(243, 243, 243, 0.8); + height: 100%; + position: absolute; + right: 0; + bottom: 0; + top: 0; + width: 275px; + padding: 0 20px; + z-index: 0; } } - &.fullscreen { + &.video-fullscreen { background: rgba(#000, .95); border: 0; bottom: 0; height: 100%; left: 0; margin: 0; - overflow: hidden; padding: 0; position: fixed; top: 0; @@ -501,12 +562,22 @@ div.video { } } + article.video-wrapper div.video-player-pre, article.video-wrapper div.video-player-post { + height: 0px; + } + + article.video-wrapper { + position: static; + } + div.tc-wrapper { @include clearfix; display: table; width: 100%; height: 100%; + position: static; + article.video-wrapper { width: 100%; display: table-cell; @@ -536,7 +607,7 @@ div.video { background: rgba(#000, .8); bottom: 0; height: 100%; - max-height: 100%; + max-height: 460px; max-width: flex-grid(3); padding: lh(); position: fixed; 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/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py index 5c902f48c2..d6516d92ef 100644 --- a/common/lib/xmodule/xmodule/gst_module.py +++ b/common/lib/xmodule/xmodule/gst_module.py @@ -9,17 +9,16 @@ from lxml import etree from lxml import html import xmltodict -from xmodule.mako_module import MakoModuleDescriptor +from xmodule.editing_module import XMLEditingDescriptor from xmodule.xml_module import XmlDescriptor from xmodule.x_module import XModule from xmodule.stringify import stringify_children from pkg_resources import resource_string from xblock.core import String, Scope - log = logging.getLogger(__name__) -DEFAULT_RENDER=""" +DEFAULT_RENDER = """ <h2>Graphic slider tool: Dynamic range and implicit functions.</h2> <p>You can make the range of the x axis (but not ticks of x axis) of @@ -33,13 +32,19 @@ DEFAULT_RENDER=""" </div> <plot style="margin-top:15px;margin-bottom:15px;"/> """ -DEFAULT_CONFIGURATION=""" + +DEFAULT_CONFIGURATION = """ <parameters> <param var="r" min="5" max="25" step="0.5" initial="12.5" /> </parameters> <functions> <function color="red">Math.sqrt(r * r - x * x)</function> <function color="red">-Math.sqrt(r * r - x * x)</function> + <function color="red">Math.sqrt(r * r / 20 - Math.pow(x-r/2.5, 2)) + r/8</function> + <function color="red">-Math.sqrt(r * r / 20 - Math.pow(x-r/2.5, 2)) + r/5.5</function> + <function color="red">Math.sqrt(r * r / 20 - Math.pow(x+r/2.5, 2)) + r/8</function> + <function color="red">-Math.sqrt(r * r / 20 - Math.pow(x+r/2.5, 2)) + r/5.5</function> + <function color="red">-Math.sqrt(r * r / 5 - x * x) - r/5.5</function> </functions> <plot> <xrange> @@ -54,10 +59,13 @@ DEFAULT_CONFIGURATION=""" """ - class GraphicalSliderToolFields(object): - render = String(scope=Scope.content, default=DEFAULT_RENDER) - configuration = String(scope=Scope.content, default=DEFAULT_CONFIGURATION) + data = String( + help="Html contents to display for this module", + default='<render>{}</render><configuration>{}</configuration>'.format( + DEFAULT_RENDER, DEFAULT_CONFIGURATION), + scope=Scope.content + ) class GraphicalSliderToolModule(GraphicalSliderToolFields, XModule): @@ -65,40 +73,54 @@ class GraphicalSliderToolModule(GraphicalSliderToolFields, XModule): ''' js = { - 'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')], - 'js': [ - # 3rd party libraries used by graphic slider tool. - # TODO - where to store them - outside xmodule? - resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/state.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/general_methods.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/sliders.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/inputs.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/el_output.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/g_label_el_output.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/gst.js') - - ] + 'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')], + 'js': [ + # 3rd party libraries used by graphic slider tool. + # TODO - where to store them - outside xmodule? + resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'), + resource_string(__name__, 'js/src/graphical_slider_tool/state.js'), + resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'), + resource_string(__name__, 'js/src/graphical_slider_tool/general_methods.js'), + resource_string(__name__, 'js/src/graphical_slider_tool/sliders.js'), + resource_string(__name__, 'js/src/graphical_slider_tool/inputs.js'), + resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'), + resource_string(__name__, 'js/src/graphical_slider_tool/el_output.js'), + resource_string(__name__, 'js/src/graphical_slider_tool/g_label_el_output.js'), + resource_string(__name__, 'js/src/graphical_slider_tool/gst.js') + ] } + css = {'scss': [resource_string(__name__, 'css/gst/display.scss')]} js_module_name = "GraphicalSliderTool" + @property + def configuration(self): + return stringify_children( + html.fromstring(self.data).xpath('configuration')[0] + ) + + @property + def render(self): + return stringify_children( + html.fromstring(self.data).xpath('render')[0] + ) + def get_html(self): """ Renders parameters to template. """ # these 3 will be used in class methods self.html_id = self.location.html_id() self.html_class = self.location.category + self.configuration_json = self.build_configuration_json() params = { - 'gst_html': self.substitute_controls(self.render), - 'element_id': self.html_id, - 'element_class': self.html_class, - 'configuration_json': self.configuration_json - } + 'gst_html': self.substitute_controls(self.render), + 'element_id': self.html_id, + 'element_class': self.html_class, + 'configuration_json': self.configuration_json + } content = self.system.render_template( - 'graphical_slider_tool.html', params) + 'graphical_slider_tool.html', params + ) return content def substitute_controls(self, html_string): @@ -126,9 +148,10 @@ class GraphicalSliderToolModule(GraphicalSliderToolFields, XModule): if plot_el: plot_el = plot_el[0] plot_el.getparent().replace(plot_el, html.fromstring( - plot_div.format(element_class=self.html_class, - element_id=self.html_id, - style=plot_el.get('style', "")))) + plot_div.format( + element_class=self.html_class, + element_id=self.html_id, + style=plot_el.get('style', "")))) # substitute sliders slider_div = '<div class="{element_class}_slider" \ @@ -139,10 +162,11 @@ class GraphicalSliderToolModule(GraphicalSliderToolFields, XModule): slider_els = xml.xpath('//slider') for slider_el in slider_els: slider_el.getparent().replace(slider_el, html.fromstring( - slider_div.format(element_class=self.html_class, - element_id=self.html_id, - var=slider_el.get('var', ""), - style=slider_el.get('style', "")))) + slider_div.format( + element_class=self.html_class, + element_id=self.html_id, + var=slider_el.get('var', ""), + style=slider_el.get('style', "")))) # substitute inputs aka textboxes input_div = '<input class="{element_class}_input" \ @@ -151,11 +175,12 @@ class GraphicalSliderToolModule(GraphicalSliderToolFields, XModule): input_els = xml.xpath('//textbox') for input_index, input_el in enumerate(input_els): input_el.getparent().replace(input_el, html.fromstring( - input_div.format(element_class=self.html_class, - element_id=self.html_id, - var=input_el.get('var', ""), - style=input_el.get('style', ""), - input_index=input_index))) + input_div.format( + element_class=self.html_class, + element_id=self.html_id, + var=input_el.get('var', ""), + style=input_el.get('style', ""), + input_index=input_index))) return html.tostring(xml) @@ -170,11 +195,13 @@ class GraphicalSliderToolModule(GraphicalSliderToolFields, XModule): """ # <root> added for interface compatibility with xmltodict.parse # class added for javascript's part purposes - return json.dumps(xmltodict.parse('<root class="' + self.html_class + - '">' + self.configuration + '</root>')) + root = '<root class="{}">{}</root>'.format( + self.html_class, + self.configuration) + return json.dumps(xmltodict.parse(root)) -class GraphicalSliderToolDescriptor(GraphicalSliderToolFields, MakoModuleDescriptor, XmlDescriptor): +class GraphicalSliderToolDescriptor(GraphicalSliderToolFields, XMLEditingDescriptor, XmlDescriptor): module_class = GraphicalSliderToolModule @classmethod @@ -202,24 +229,14 @@ class GraphicalSliderToolDescriptor(GraphicalSliderToolFields, MakoModuleDescrip exactly one '{0}' tag".format(child)) # finished - def parse(k): - """Assumes that xml_object has child k""" - return stringify_children(xml_object.xpath(k)[0]) return { - 'render': parse('render'), - 'configuration': parse('configuration') - }, [] + 'data': stringify_children(xml_object) + }, [] def definition_to_xml(self, resource_fs): '''Return an xml element representing this definition.''' - xml_object = etree.Element('graphical_slider_tool') - - def add_child(k): - child_str = '<{tag}>{body}</{tag}>'.format(tag=k, body=getattr(self, k)) - child_node = etree.fromstring(child_str) - xml_object.append(child_node) - - for child in ['render', 'configuration']: - add_child(child) - + data = '<{tag}>{body}</{tag}>'.format( + tag='graphical_slider_tool', + body=self.data) + xml_object = etree.fromstring(data) return xml_object 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 @@ +<section class="html-edit"> + <ul class="editor-tabs"> + <li><a href="#" class="visual-tab tab current" data-tab="visual">Visual</a></li> + <li><a href="#" class="html-tab tab" data-tab="advanced">HTML</a></li> + </ul> + <div class="row"> + <textarea class="tiny-mce">dummy text</textarea> + <textarea name="" class="edit-box">Advanced Editor Text with link /static/dummy.jpg</textarea> + </div> +</section> \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/js/fixtures/videoalpha.html b/common/lib/xmodule/xmodule/js/fixtures/videoalpha.html index bccf5df2cc..049f60c9b1 100644 --- a/common/lib/xmodule/xmodule/js/fixtures/videoalpha.html +++ b/common/lib/xmodule/xmodule/js/fixtures/videoalpha.html @@ -3,19 +3,51 @@ <div id="example"> <div id="video_id" - class="video" + class="videoalpha" data-streams="0.75:slowerSpeedYoutubeId,1.0:normalSpeedYoutubeId" data-show-captions="true" data-start="" data-end="" - data-caption-asset-path="/static/subs/"> + data-caption-asset-path="/static/subs/" + data-autoplay="False" + > <div class="tc-wrapper"> <article class="video-wrapper"> + <div class="video-player-pre"></div> <section class="video-player"> <div id="id"></div> </section> - <section class="video-controls"></section> + <div class="video-player-post"></div> + <section class="video-controls"> + <div class="slider"></div> + <div> + <ul class="vcr"> + <li><a class="video_control" href="#" title="Play"></a></li> + <li><div class="vidtime">0:00 / 0:00</div></li> + </ul> + <div class="secondary-controls"> + <div class="speeds"> + <a href="#"> + <h3>Speed</h3> + <p class="active"></p> + </a> + <ol class="video_speeds"></ol> + </div> + <div class="volume"> + <a href="#"></a> + <div class="volume-slider-container"> + <div class="volume-slider"></div> + </div> + </div> + <a href="#" class="add-fullscreen" title="Fill browser">Fill Browser</a> + <a href="#" class="quality_control" title="HD">HD</a> + <a href="#" class="hide-subtitles" title="Turn off captions">Captions</a> + </div> + </div> + </section> </article> + + <ol class="subtitles"><li></li></ol> </div> </div> </div> diff --git a/common/lib/xmodule/xmodule/js/fixtures/videoalpha_all.html b/common/lib/xmodule/xmodule/js/fixtures/videoalpha_all.html new file mode 100644 index 0000000000..f26cbde151 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/fixtures/videoalpha_all.html @@ -0,0 +1,58 @@ +<div class="course-content"> + <div id="video_example"> + <div id="example"> + <div + id="video_id" + class="videoalpha" + data-show-captions="true" + data-start="" + data-end="" + data-caption-asset-path="/static/subs/" + data-sub="test_name_of_the_subtitles" + data-mp4-source="test_files/test.mp4" + data-webm-source="test_files/test.webm" + data-ogg-source="test_files/test.ogv" + data-autoplay="False" + > + <div class="tc-wrapper"> + <article class="video-wrapper"> + <div class="video-player-pre"></div> + <section class="video-player"> + <div id="id"></div> + </section> + <div class="video-player-post"></div> + <section class="video-controls"> + <div class="slider"></div> + <div> + <ul class="vcr"> + <li><a class="video_control" href="#" title="Play"></a></li> + <li><div class="vidtime">0:00 / 0:00</div></li> + </ul> + <div class="secondary-controls"> + <div class="speeds"> + <a href="#"> + <h3>Speed</h3> + <p class="active"></p> + </a> + <ol class="video_speeds"></ol> + </div> + <div class="volume"> + <a href="#"></a> + <div class="volume-slider-container"> + <div class="volume-slider"></div> + </div> + </div> + <a href="#" class="add-fullscreen" title="Fill browser">Fill Browser</a> + <a href="#" class="quality_control" title="HD">HD</a> + <a href="#" class="hide-subtitles" title="Turn off captions">Captions</a> + </div> + </div> + </section> + </article> + + <ol class="subtitles"><li></li></ol> + </div> + </div> + </div> + </div> +</div> \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/js/fixtures/videoalpha_html5.html b/common/lib/xmodule/xmodule/js/fixtures/videoalpha_html5.html index 6088d07f2b..f44e0ca66e 100644 --- a/common/lib/xmodule/xmodule/js/fixtures/videoalpha_html5.html +++ b/common/lib/xmodule/xmodule/js/fixtures/videoalpha_html5.html @@ -3,16 +3,17 @@ <div id="example"> <div id="video_id" - class="video" + class="videoalpha" data-show-captions="true" data-start="" data-end="" data-caption-asset-path="/static/subs/" data-sub="test_name_of_the_subtitles" - data-mp4-source="test.mp4" - data-webm-source="test.webm" - data-ogg-source="test.ogv" - > + data-mp4-source="test_files/test.mp4" + data-webm-source="test_files/test.webm" + data-ogg-source="test_files/test.ogv" + data-autoplay="False" + > <div class="tc-wrapper"> <article class="video-wrapper"> <section class="video-player"> @@ -20,6 +21,8 @@ </section> <section class="video-controls"></section> </article> + + <ol class="subtitles"><li></li></ol> </div> </div> </div> diff --git a/common/lib/xmodule/xmodule/js/fixtures/videoalpha_no_captions.html b/common/lib/xmodule/xmodule/js/fixtures/videoalpha_no_captions.html new file mode 100644 index 0000000000..aeb5a1108a --- /dev/null +++ b/common/lib/xmodule/xmodule/js/fixtures/videoalpha_no_captions.html @@ -0,0 +1,25 @@ +<div class="course-content"> + <div id="video_example"> + <div id="example"> + <div + id="video_id" + class="videoalpha" + data-streams="0.75:slowerSpeedYoutubeId,1.0:normalSpeedYoutubeId" + data-show-captions="false" + data-start="" + data-end="" + data-caption-asset-path="/static/subs/" + data-autoplay="False" + > + <div class="tc-wrapper"> + <article class="video-wrapper"> + <section class="video-player"> + <div id="id"></div> + </section> + <section class="video-controls"></section> + </article> + </div> + </div> + </div> + </div> +</div> \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/js/spec/.gitignore b/common/lib/xmodule/xmodule/js/spec/.gitignore index 03534687ca..a8db2aae70 100644 --- a/common/lib/xmodule/xmodule/js/spec/.gitignore +++ b/common/lib/xmodule/xmodule/js/spec/.gitignore @@ -1,2 +1,4 @@ *.js +# Tests for videoalpha are written in pure JavaScript. +!videoalpha/*.js diff --git a/common/lib/xmodule/xmodule/js/spec/helper.coffee b/common/lib/xmodule/xmodule/js/spec/helper.coffee index 5f7fc27be0..8f2135083d 100644 --- a/common/lib/xmodule/xmodule/js/spec/helper.coffee +++ b/common/lib/xmodule/xmodule/js/spec/helper.coffee @@ -8,6 +8,55 @@ window.YT = BUFFERING: 3 CUED: 5 +window.STATUS = window.YT.PlayerState + +oldAjaxWithPrefix = window.jQuery.ajaxWithPrefix + +jasmine.stubbedCaption = + end: [3120, 6270, 8490, 21620, 24920, 25750, 27900, 34380, 35550, 40250] + start: [1180, 3120, 6270, 14910, 21620, 24920, 25750, 27900, 34380, 35550] + text: [ + "MICHAEL CIMA: So let's do the first one here.", + "Vacancies, where do they come from?", + "Well, imagine a perfect crystal.", + "Now we know at any temperature other than absolute zero there's enough", + "energy going around that some atoms will have more energy", + "than others, right?", + "There's a distribution.", + "If I plot energy here and number, these atoms in the crystal will have a", + "distribution of energy.", + "And some will have quite a bit of energy, just for a moment." + ] + +# For our purposes, we need to make sure that the function $.ajaxWithPrefix +# does not fail when during tests a captions file is requested. +# It is originally defined in +# +# common/static/coffee/src/ajax_prefix.js +# +# 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'. +# 2.) Behaves the same a as the origianl in all other cases. + +window.jQuery.ajaxWithPrefix = (url, settings) -> + if not settings + settings = url + url = settings.url + 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 window.jQuery.isFunction(success) is true + success jasmine.stubbedCaption + else if window.jQuery.isFunction(data) is true + data jasmine.stubbedCaption + else + oldAjaxWithPrefix.apply @, arguments + +# Time waitsFor() should wait for before failing a test. +window.WAIT_TIMEOUT = 1000 + jasmine.getFixtures().fixturesPath = 'xmodule/js/fixtures' jasmine.stubbedMetadata = @@ -33,10 +82,6 @@ jasmine.fireEvent = (el, eventName) -> else el.fireEvent("on" + event.eventType, event) -jasmine.stubbedCaption = - start: [0, 10000, 20000, 30000] - text: ['Caption at 0', 'Caption at 10000', 'Caption at 20000', 'Caption at 30000'] - jasmine.stubbedHtml5Speeds = ['0.75', '1.0', '1.25', '1.50'] jasmine.stubRequests = -> @@ -78,7 +123,8 @@ jasmine.stubVideoPlayer = (context, enableParts, createPlayer=true) -> if createPlayer return new VideoPlayer(video: context.video) -jasmine.stubVideoPlayerAlpha = (context, enableParts, createPlayer=true, html5=false) -> +jasmine.stubVideoPlayerAlpha = (context, enableParts, html5=false) -> + console.log('stubVideoPlayerAlpha called') suite = context.suite currentPartName = suite.description while suite = suite.parentSuite if html5 == false @@ -88,10 +134,8 @@ jasmine.stubVideoPlayerAlpha = (context, enableParts, createPlayer=true, html5=f jasmine.stubRequests() YT.Player = undefined window.OldVideoPlayerAlpha = undefined - context.video = new VideoAlpha '#example', '.75:slowerSpeedYoutubeId,1.0:normalSpeedYoutubeId' jasmine.stubYoutubePlayer() - if createPlayer - return new VideoPlayerAlpha(video: context.video) + return new VideoAlpha '#example', '.75:slowerSpeedYoutubeId,1.0:normalSpeedYoutubeId' # 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 8c63751f07..7f4f6073cb 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 @@ -163,11 +163,11 @@ describe 'VideoCaption', -> it 'return a correct caption index', -> expect(@caption.search(0)).toEqual 0 - expect(@caption.search(9999)).toEqual 0 - expect(@caption.search(10000)).toEqual 1 - expect(@caption.search(15000)).toEqual 1 - expect(@caption.search(30000)).toEqual 3 - expect(@caption.search(30001)).toEqual 3 + expect(@caption.search(9999)).toEqual 2 + expect(@caption.search(10000)).toEqual 2 + expect(@caption.search(15000)).toEqual 3 + expect(@caption.search(30000)).toEqual 7 + expect(@caption.search(30001)).toEqual 7 describe 'play', -> describe 'when the caption was not rendered', -> @@ -220,7 +220,7 @@ describe 'VideoCaption', -> @caption.updatePlayTime 25.000 it 'search the caption based on time', -> - expect(@caption.currentIndex).toEqual 2 + expect(@caption.currentIndex).toEqual 5 describe 'when the video speed is not 1.0x', -> beforeEach -> @@ -228,7 +228,7 @@ describe 'VideoCaption', -> @caption.updatePlayTime 25.000 it 'search the caption based on 1.0x speed', -> - expect(@caption.currentIndex).toEqual 1 + expect(@caption.currentIndex).toEqual 3 describe 'when the index is not the same', -> beforeEach -> @@ -240,10 +240,10 @@ describe 'VideoCaption', -> expect($('.subtitles li[data-index=1]')).not.toHaveClass 'current' it 'activate new caption', -> - expect($('.subtitles li[data-index=2]')).toHaveClass 'current' + expect($('.subtitles li[data-index=5]')).toHaveClass 'current' it 'save new index', -> - expect(@caption.currentIndex).toEqual 2 + expect(@caption.currentIndex).toEqual 5 it 'scroll caption to new position', -> expect($.fn.scrollTo).toHaveBeenCalled() @@ -251,11 +251,11 @@ describe 'VideoCaption', -> describe 'when the index is the same', -> beforeEach -> @caption.currentIndex = 1 - $('.subtitles li[data-index=1]').addClass 'current' + $('.subtitles li[data-index=3]').addClass 'current' @caption.updatePlayTime 15.000 it 'does not change current subtitle', -> - expect($('.subtitles li[data-index=1]')).toHaveClass 'current' + expect($('.subtitles li[data-index=3]')).toHaveClass 'current' describe 'resize', -> @@ -322,18 +322,18 @@ describe 'VideoCaption', -> describe 'when the video speed is 1.0x', -> beforeEach -> @caption.currentSpeed = '1.0' - $('.subtitles li[data-start="30000"]').trigger('click') + $('.subtitles li[data-start="27900"]').trigger('click') it 'trigger seek event with the correct time', -> - expect(@time).toEqual 30.000 + expect(@time).toEqual 28.000 describe 'when the video speed is not 1.0x', -> beforeEach -> @caption.currentSpeed = '0.75' - $('.subtitles li[data-start="30000"]').trigger('click') + $('.subtitles li[data-start="27900"]').trigger('click') it 'trigger seek event with the correct time', -> - expect(@time).toEqual 40.000 + expect(@time).toEqual 37.000 describe 'toggle', -> beforeEach -> diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/html5_video.coffee b/common/lib/xmodule/xmodule/js/spec/videoalpha/display/html5_video.coffee deleted file mode 100644 index 176ceb7827..0000000000 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/html5_video.coffee +++ /dev/null @@ -1,311 +0,0 @@ -describe 'VideoAlpha HTML5Video', -> - playbackRates = [0.75, 1.0, 1.25, 1.5] - STATUS = window.YT.PlayerState - playerVars = - controls: 0 - wmode: 'transparent' - rel: 0 - showinfo: 0 - enablejsapi: 1 - modestbranding: 1 - html5: 1 - file = window.location.href.replace(/\/common(.*)$/, '') + '/test_root/data/videoalpha/gizmo' - html5Sources = - mp4: "#{file}.mp4" - webm: "#{file}.webm" - ogg: "#{file}.ogv" - onReady = jasmine.createSpy 'onReady' - onStateChange = jasmine.createSpy 'onStateChange' - - beforeEach -> - loadFixtures 'videoalpha_html5.html' - @el = $('#example').find('.video') - @player = new window.HTML5Video.Player @el, - playerVars: playerVars, - videoSources: html5Sources, - events: - onReady: onReady - onStateChange: onStateChange - - @videoEl = @el.find('.video-player video').get(0) - - it 'PlayerState', -> - expect(HTML5Video.PlayerState).toEqual STATUS - - describe 'constructor', -> - it 'create an html5 video element', -> - expect(@el.find('.video-player div')).toContain 'video' - - it 'check if sources are created in correct way', -> - sources = $(@videoEl).find('source') - videoTypes = [] - videoSources = [] - $.each html5Sources, (index, source) -> - videoTypes.push index - videoSources.push source - $.each sources, (index, source) -> - s = $(source) - expect($.inArray(s.attr('src'), videoSources)).not.toEqual -1 - expect($.inArray(s.attr('type').replace('video/', ''), videoTypes)) - .not.toEqual -1 - - it 'check if click event is handled on the player', -> - expect(@videoEl).toHandle 'click' - - # NOTE: According to - # - # https://github.com/ariya/phantomjs/wiki/Supported-Web-Standards#unsupported-features - # - # Video and Audio (due to the nature of PhantomJS) are not supported. After discussion - # with William Daly, some tests are disabled (Jenkins uses phantomjs for running tests - # and those tests fail). - # - # During code review, please enable the test below (change "xdescribe" to "describe" - # to enable the test). - xdescribe 'events:', -> - - beforeEach -> - spyOn(@player, 'callStateChangeCallback').andCallThrough() - - describe 'click', -> - describe 'when player is paused', -> - beforeEach -> - spyOn(@videoEl, 'play').andCallThrough() - @player.playerState = STATUS.PAUSED - $(@videoEl).trigger('click') - - it 'native play event was called', -> - expect(@videoEl.play).toHaveBeenCalled() - - it 'player state was changed', -> - expect(@player.playerState).toBe STATUS.PLAYING - - it 'callback was called', -> - expect(@player.callStateChangeCallback).toHaveBeenCalled() - - describe 'when player is played', -> - - beforeEach -> - spyOn(@videoEl, 'pause').andCallThrough() - @player.playerState = STATUS.PLAYING - $(@videoEl).trigger('click') - - it 'native pause event was called', -> - expect(@videoEl.pause).toHaveBeenCalled() - - it 'player state was changed', -> - expect(@player.playerState).toBe STATUS.PAUSED - - it 'callback was called', -> - expect(@player.callStateChangeCallback).toHaveBeenCalled() - - describe 'play', -> - - beforeEach -> - spyOn(@videoEl, 'play').andCallThrough() - @player.playerState = STATUS.PAUSED - @videoEl.play() - - it 'native event was called', -> - expect(@videoEl.play).toHaveBeenCalled() - - it 'player state was changed', -> - waitsFor ( -> - @player.playerState != HTML5Video.PlayerState.PAUSED - ), 'Player state should be changed', 1000 - - runs -> - expect(@player.playerState).toBe STATUS.PLAYING - - it 'callback was called', -> - waitsFor ( -> - @player.playerState != STATUS.PAUSED - ), 'Player state should be changed', 1000 - - runs -> - expect(@player.callStateChangeCallback).toHaveBeenCalled() - - describe 'pause', -> - - beforeEach -> - spyOn(@videoEl, 'pause').andCallThrough() - @videoEl.play() - @videoEl.pause() - - it 'native event was called', -> - expect(@videoEl.pause).toHaveBeenCalled() - - it 'player state was changed', -> - waitsFor ( -> - @player.playerState != STATUS.UNSTARTED - ), 'Player state should be changed', 1000 - - runs -> - expect(@player.playerState).toBe STATUS.PAUSED - - it 'callback was called', -> - waitsFor ( -> - @player.playerState != HTML5Video.PlayerState.UNSTARTED - ), 'Player state should be changed', 1000 - - runs -> - expect(@player.callStateChangeCallback).toHaveBeenCalled() - - describe 'canplay', -> - - beforeEach -> - waitsFor ( -> - @player.playerState != STATUS.UNSTARTED - ), 'Video cannot be played', 1000 - - it 'player state was changed', -> - runs -> - expect(@player.playerState).toBe STATUS.PAUSED - - it 'end property was defined', -> - runs -> - expect(@player.end).not.toBeNull() - - it 'start position was defined', -> - runs -> - expect(@videoEl.currentTime).toBe(@player.start) - - it 'callback was called', -> - runs -> - expect(@player.config.events.onReady).toHaveBeenCalled() - - describe 'ended', -> - beforeEach -> - waitsFor ( -> - @player.playerState != STATUS.UNSTARTED - ), 'Video cannot be played', 1000 - - it 'player state was changed', -> - runs -> - jasmine.fireEvent @videoEl, "ended" - expect(@player.playerState).toBe STATUS.ENDED - - it 'callback was called', -> - jasmine.fireEvent @videoEl, "ended" - expect(@player.callStateChangeCallback).toHaveBeenCalled() - - describe 'timeupdate', -> - - beforeEach -> - spyOn(@videoEl, 'pause').andCallThrough() - waitsFor ( -> - @player.playerState != STATUS.UNSTARTED - ), 'Video cannot be played', 1000 - - it 'player should be paused', -> - runs -> - @player.end = 3 - @videoEl.currentTime = 5 - jasmine.fireEvent @videoEl, "timeupdate" - expect(@videoEl.pause).toHaveBeenCalled() - - it 'end param should be re-defined', -> - runs -> - @player.end = 3 - @videoEl.currentTime = 5 - jasmine.fireEvent @videoEl, "timeupdate" - expect(@player.end).toBe @videoEl.duration - - # NOTE: According to - # - # https://github.com/ariya/phantomjs/wiki/Supported-Web-Standards#unsupported-features - # - # Video and Audio (due to the nature of PhantomJS) are not supported. After discussion - # with William Daly, some tests are disabled (Jenkins uses phantomjs for running tests - # and those tests fail). - # - # During code review, please enable the test below (change "xdescribe" to "describe" - # to enable the test). - xdescribe 'methods:', -> - - beforeEach -> - waitsFor ( -> - @volume = @videoEl.volume - @seek = @videoEl.currentTime - @player.playerState == STATUS.PAUSED - ), 'Video cannot be played', 1000 - - - it 'pauseVideo', -> - spyOn(@videoEl, 'pause').andCallThrough() - @player.pauseVideo() - expect(@videoEl.pause).toHaveBeenCalled() - - describe 'seekTo', -> - - it 'set new correct value', -> - runs -> - @player.seekTo(2) - expect(@videoEl.currentTime).toBe 2 - - it 'set new inccorrect values', -> - runs -> - @player.seekTo(-50) - expect(@videoEl.currentTime).toBe @seek - @player.seekTo('5') - expect(@videoEl.currentTime).toBe @seek - @player.seekTo(500000) - expect(@videoEl.currentTime).toBe @seek - - describe 'setVolume', -> - - it 'set new correct value', -> - runs -> - @player.setVolume(50) - expect(@videoEl.volume).toBe 50*0.01 - - it 'set new inccorrect values', -> - runs -> - @player.setVolume(-50) - expect(@videoEl.volume).toBe @volume - @player.setVolume('5') - expect(@videoEl.volume).toBe @volume - @player.setVolume(500000) - expect(@videoEl.volume).toBe @volume - - it 'getCurrentTime', -> - runs -> - @videoEl.currentTime = 3 - expect(@player.getCurrentTime()).toBe @videoEl.currentTime - - it 'playVideo', -> - runs -> - spyOn(@videoEl, 'play').andCallThrough() - @player.playVideo() - expect(@videoEl.play).toHaveBeenCalled() - - it 'getPlayerState', -> - runs -> - @player.playerState = STATUS.PLAYING - expect(@player.getPlayerState()).toBe STATUS.PLAYING - @player.playerState = STATUS.ENDED - expect(@player.getPlayerState()).toBe STATUS.ENDED - - it 'getVolume', -> - runs -> - @volume = @videoEl.volume = 0.5 - expect(@player.getVolume()).toBe @volume - - it 'getDuration', -> - runs -> - @duration = @videoEl.duration - expect(@player.getDuration()).toBe @duration - - describe 'setPlaybackRate', -> - it 'set a correct value', -> - @playbackRate = 1.5 - @player.setPlaybackRate @playbackRate - expect(@videoEl.playbackRate).toBe @playbackRate - - it 'set NaN value', -> - @playbackRate = NaN - @player.setPlaybackRate @playbackRate - expect(@videoEl.playbackRate).toBe 1.0 - - it 'getAvailablePlaybackRates', -> - expect(@player.getAvailablePlaybackRates()).toEqual playbackRates diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_caption_spec.coffee b/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_caption_spec.coffee deleted file mode 100644 index 4bd237b81d..0000000000 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_caption_spec.coffee +++ /dev/null @@ -1,373 +0,0 @@ -describe 'VideoCaptionAlpha', -> - - beforeEach -> - spyOn(VideoCaptionAlpha.prototype, 'fetchCaption').andCallThrough() - spyOn($, 'ajaxWithPrefix').andCallThrough() - window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn false - - afterEach -> - YT.Player = undefined - $.fn.scrollTo.reset() - $('.subtitles').remove() - - describe 'constructor', -> - - describe 'always', -> - - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - - it 'set the youtube id', -> - expect(@caption.youtubeId).toEqual 'normalSpeedYoutubeId' - - it 'create the caption element', -> - expect($('.video')).toContain 'ol.subtitles' - - it 'add caption control to video player', -> - expect($('.video')).toContain 'a.hide-subtitles' - - it 'fetch the caption', -> - expect(@caption.loaded).toBeTruthy() - expect(@caption.fetchCaption).toHaveBeenCalled() - expect($.ajaxWithPrefix).toHaveBeenCalledWith - url: @caption.captionURL() - notifyOnError: false - success: jasmine.any(Function) - - it 'bind window resize event', -> - expect($(window)).toHandleWith 'resize', @caption.resize - - it 'bind the hide caption button', -> - expect($('.hide-subtitles')).toHandleWith 'click', @caption.toggle - - it 'bind the mouse movement', -> - expect($('.subtitles')).toHandleWith 'mouseover', @caption.onMouseEnter - expect($('.subtitles')).toHandleWith 'mouseout', @caption.onMouseLeave - expect($('.subtitles')).toHandleWith 'mousemove', @caption.onMovement - expect($('.subtitles')).toHandleWith 'mousewheel', @caption.onMovement - expect($('.subtitles')).toHandleWith 'DOMMouseScroll', @caption.onMovement - - describe 'when on a non touch-based device', -> - - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - - it 'render the caption', -> - captionsData = jasmine.stubbedCaption - $('.subtitles li[data-index]').each (index, link) => - expect($(link)).toHaveData 'index', index - expect($(link)).toHaveData 'start', captionsData.start[index] - expect($(link)).toHaveText captionsData.text[index] - - it 'add a padding element to caption', -> - expect($('.subtitles li:first')).toBe '.spacing' - expect($('.subtitles li:last')).toBe '.spacing' - - it 'bind all the caption link', -> - $('.subtitles li[data-index]').each (index, link) => - expect($(link)).toHandleWith 'click', @caption.seekPlayer - - it 'set rendered to true', -> - expect(@caption.rendered).toBeTruthy() - - describe 'when on a touch-based device', -> - - beforeEach -> - window.onTouchBasedDevice.andReturn true - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - - it 'show explaination message', -> - expect($('.subtitles li')).toHaveHtml "Caption will be displayed when you start playing the video." - - it 'does not set rendered to true', -> - expect(@caption.rendered).toBeFalsy() - - describe 'mouse movement', -> - - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - window.setTimeout.andReturn(100) - spyOn window, 'clearTimeout' - - describe 'when cursor is outside of the caption box', -> - - beforeEach -> - $(window).trigger jQuery.Event 'mousemove' - - it 'does not set freezing timeout', -> - expect(@caption.frozen).toBeFalsy() - - describe 'when cursor is in the caption box', -> - - beforeEach -> - $('.subtitles').trigger jQuery.Event 'mouseenter' - - it 'set the freezing timeout', -> - expect(@caption.frozen).toEqual 100 - - describe 'when the cursor is moving', -> - beforeEach -> - $('.subtitles').trigger jQuery.Event 'mousemove' - - it 'reset the freezing timeout', -> - expect(window.clearTimeout).toHaveBeenCalledWith 100 - - describe 'when the mouse is scrolling', -> - beforeEach -> - $('.subtitles').trigger jQuery.Event 'mousewheel' - - it 'reset the freezing timeout', -> - expect(window.clearTimeout).toHaveBeenCalledWith 100 - - describe 'when cursor is moving out of the caption box', -> - beforeEach -> - @caption.frozen = 100 - $.fn.scrollTo.reset() - - describe 'always', -> - beforeEach -> - $('.subtitles').trigger jQuery.Event 'mouseout' - - it 'reset the freezing timeout', -> - expect(window.clearTimeout).toHaveBeenCalledWith 100 - - it 'unfreeze the caption', -> - expect(@caption.frozen).toBeNull() - - describe 'when the player is playing', -> - beforeEach -> - @caption.playing = true - $('.subtitles li[data-index]:first').addClass 'current' - $('.subtitles').trigger jQuery.Event 'mouseout' - - it 'scroll the caption', -> - expect($.fn.scrollTo).toHaveBeenCalled() - - describe 'when the player is not playing', -> - beforeEach -> - @caption.playing = false - $('.subtitles').trigger jQuery.Event 'mouseout' - - it 'does not scroll the caption', -> - expect($.fn.scrollTo).not.toHaveBeenCalled() - - describe 'search', -> - - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - - it 'return a correct caption index', -> - expect(@caption.search(0)).toEqual 0 - expect(@caption.search(9999)).toEqual 0 - expect(@caption.search(10000)).toEqual 1 - expect(@caption.search(15000)).toEqual 1 - expect(@caption.search(30000)).toEqual 3 - expect(@caption.search(30001)).toEqual 3 - - describe 'play', -> - describe 'when the caption was not rendered', -> - beforeEach -> - window.onTouchBasedDevice.andReturn true - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - @caption.play() - - it 'render the caption', -> - captionsData = jasmine.stubbedCaption - $('.subtitles li[data-index]').each (index, link) => - expect($(link)).toHaveData 'index', index - expect($(link)).toHaveData 'start', captionsData.start[index] - expect($(link)).toHaveText captionsData.text[index] - - it 'add a padding element to caption', -> - expect($('.subtitles li:first')).toBe '.spacing' - expect($('.subtitles li:last')).toBe '.spacing' - - it 'bind all the caption link', -> - $('.subtitles li[data-index]').each (index, link) => - expect($(link)).toHandleWith 'click', @caption.seekPlayer - - it 'set rendered to true', -> - expect(@caption.rendered).toBeTruthy() - - it 'set playing to true', -> - expect(@caption.playing).toBeTruthy() - - describe 'pause', -> - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - @caption.playing = true - @caption.pause() - - it 'set playing to false', -> - expect(@caption.playing).toBeFalsy() - - describe 'updatePlayTime', -> - - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - - describe 'when the video speed is 1.0x', -> - beforeEach -> - @caption.currentSpeed = '1.0' - @caption.updatePlayTime 25.000 - - it 'search the caption based on time', -> - expect(@caption.currentIndex).toEqual 2 - - describe 'when the video speed is not 1.0x', -> - beforeEach -> - @caption.currentSpeed = '0.75' - @caption.updatePlayTime 25.000 - - it 'search the caption based on 1.0x speed', -> - expect(@caption.currentIndex).toEqual 1 - - describe 'when the index is not the same', -> - beforeEach -> - @caption.currentIndex = 1 - $('.subtitles li[data-index=1]').addClass 'current' - @caption.updatePlayTime 25.000 - - it 'deactivate the previous caption', -> - expect($('.subtitles li[data-index=1]')).not.toHaveClass 'current' - - it 'activate new caption', -> - expect($('.subtitles li[data-index=2]')).toHaveClass 'current' - - it 'save new index', -> - expect(@caption.currentIndex).toEqual 2 - - it 'scroll caption to new position', -> - expect($.fn.scrollTo).toHaveBeenCalled() - - describe 'when the index is the same', -> - beforeEach -> - @caption.currentIndex = 1 - $('.subtitles li[data-index=1]').addClass 'current' - @caption.updatePlayTime 15.000 - - it 'does not change current subtitle', -> - expect($('.subtitles li[data-index=1]')).toHaveClass 'current' - - describe 'resize', -> - - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - $('.subtitles li[data-index=1]').addClass 'current' - @caption.resize() - - it 'set the height of caption container', -> - expect(parseInt($('.subtitles').css('maxHeight'))).toBeCloseTo $('.video-wrapper').height(), 2 - - it 'set the height of caption spacing', -> - firstSpacing = Math.abs(parseInt($('.subtitles .spacing:first').css('height'))) - lastSpacing = Math.abs(parseInt($('.subtitles .spacing:last').css('height'))) - - expect(firstSpacing - @caption.topSpacingHeight()).toBeLessThan 1 - expect(lastSpacing - @caption.bottomSpacingHeight()).toBeLessThan 1 - - it 'scroll caption to new position', -> - expect($.fn.scrollTo).toHaveBeenCalled() - - describe 'scrollCaption', -> - - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - - describe 'when frozen', -> - beforeEach -> - @caption.frozen = true - $('.subtitles li[data-index=1]').addClass 'current' - @caption.scrollCaption() - - it 'does not scroll the caption', -> - expect($.fn.scrollTo).not.toHaveBeenCalled() - - describe 'when not frozen', -> - beforeEach -> - @caption.frozen = false - - describe 'when there is no current caption', -> - beforeEach -> - @caption.scrollCaption() - - it 'does not scroll the caption', -> - expect($.fn.scrollTo).not.toHaveBeenCalled() - - describe 'when there is a current caption', -> - beforeEach -> - $('.subtitles li[data-index=1]').addClass 'current' - @caption.scrollCaption() - - it 'scroll to current caption', -> - offset = -0.5 * ($('.video-wrapper').height() - $('.subtitles .current:first').height()) - - expect($.fn.scrollTo).toHaveBeenCalledWith $('.subtitles .current:first', @caption.el), - offset: offset - - describe 'seekPlayer', -> - - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @caption = @player.caption - $(@caption).bind 'seek', (event, time) => @time = time - - describe 'when the video speed is 1.0x', -> - beforeEach -> - @caption.currentSpeed = '1.0' - $('.subtitles li[data-start="30000"]').trigger('click') - - it 'trigger seek event with the correct time', -> - expect(@player.currentTime).toEqual 30.000 - - describe 'when the video speed is not 1.0x', -> - beforeEach -> - @caption.currentSpeed = '0.75' - $('.subtitles li[data-start="30000"]').trigger('click') - - it 'trigger seek event with the correct time', -> - expect(@player.currentTime).toEqual 40.000 - - describe 'toggle', -> - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - spyOn @video, 'log' - @caption = @player.caption - $('.subtitles li[data-index=1]').addClass 'current' - - describe 'when the caption is visible', -> - beforeEach -> - @caption.el.removeClass 'closed' - @caption.toggle jQuery.Event('click') - - it 'log the hide_transcript event', -> - expect(@video.log).toHaveBeenCalledWith 'hide_transcript', - currentTime: @player.currentTime - - it 'hide the caption', -> - expect(@caption.el).toHaveClass 'closed' - - describe 'when the caption is hidden', -> - beforeEach -> - @caption.el.addClass 'closed' - @caption.toggle jQuery.Event('click') - - it 'log the show_transcript event', -> - expect(@video.log).toHaveBeenCalledWith 'show_transcript', - currentTime: @player.currentTime - - it 'show the caption', -> - expect(@caption.el).not.toHaveClass 'closed' - - it 'scroll the caption', -> - expect($.fn.scrollTo).toHaveBeenCalled() diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_control_spec.coffee b/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_control_spec.coffee deleted file mode 100644 index a4dc8739d8..0000000000 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_control_spec.coffee +++ /dev/null @@ -1,103 +0,0 @@ -describe 'VideoControlAlpha', -> - beforeEach -> - window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn false - loadFixtures 'videoalpha.html' - $('.video-controls').html '' - - describe 'constructor', -> - - it 'render the video controls', -> - @control = new window.VideoControlAlpha(el: $('.video-controls')) - expect($('.video-controls')).toContain - ['.slider', 'ul.vcr', 'a.play', '.vidtime', '.add-fullscreen'].join(',') - expect($('.video-controls').find('.vidtime')).toHaveText '0:00 / 0:00' - - it 'bind the playback button', -> - @control = new window.VideoControlAlpha(el: $('.video-controls')) - expect($('.video_control')).toHandleWith 'click', @control.togglePlayback - - describe 'when on a touch based device', -> - beforeEach -> - window.onTouchBasedDevice.andReturn true - @control = new window.VideoControlAlpha(el: $('.video-controls')) - - it 'does not add the play class to video control', -> - expect($('.video_control')).not.toHaveClass 'play' - expect($('.video_control')).not.toHaveHtml 'Play' - - - describe 'when on a non-touch based device', -> - - beforeEach -> - @control = new window.VideoControlAlpha(el: $('.video-controls')) - - it 'add the play class to video control', -> - expect($('.video_control')).toHaveClass 'play' - expect($('.video_control')).toHaveHtml 'Play' - - describe 'play', -> - - beforeEach -> - @control = new window.VideoControlAlpha(el: $('.video-controls')) - @control.play() - - it 'switch playback button to play state', -> - expect($('.video_control')).not.toHaveClass 'play' - expect($('.video_control')).toHaveClass 'pause' - expect($('.video_control')).toHaveHtml 'Pause' - - describe 'pause', -> - - beforeEach -> - @control = new window.VideoControlAlpha(el: $('.video-controls')) - @control.pause() - - it 'switch playback button to pause state', -> - expect($('.video_control')).not.toHaveClass 'pause' - expect($('.video_control')).toHaveClass 'play' - expect($('.video_control')).toHaveHtml 'Play' - - describe 'togglePlayback', -> - - beforeEach -> - @control = new window.VideoControlAlpha(el: $('.video-controls')) - - describe 'when the control does not have play or pause class', -> - beforeEach -> - $('.video_control').removeClass('play').removeClass('pause') - - describe 'when the video is playing', -> - beforeEach -> - $('.video_control').addClass('play') - spyOnEvent @control, 'pause' - @control.togglePlayback jQuery.Event('click') - - it 'does not trigger the pause event', -> - expect('pause').not.toHaveBeenTriggeredOn @control - - describe 'when the video is paused', -> - beforeEach -> - $('.video_control').addClass('pause') - spyOnEvent @control, 'play' - @control.togglePlayback jQuery.Event('click') - - it 'does not trigger the play event', -> - expect('play').not.toHaveBeenTriggeredOn @control - - describe 'when the video is playing', -> - beforeEach -> - spyOnEvent @control, 'pause' - $('.video_control').addClass 'pause' - @control.togglePlayback jQuery.Event('click') - - it 'trigger the pause event', -> - expect('pause').toHaveBeenTriggeredOn @control - - describe 'when the video is paused', -> - beforeEach -> - spyOnEvent @control, 'play' - $('.video_control').addClass 'play' - @control.togglePlayback jQuery.Event('click') - - it 'trigger the play event', -> - expect('play').toHaveBeenTriggeredOn @control diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_player_spec.coffee b/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_player_spec.coffee deleted file mode 100644 index e9a5ca30b4..0000000000 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_player_spec.coffee +++ /dev/null @@ -1,561 +0,0 @@ -describe 'VideoPlayerAlpha', -> - playerVars = - controls: 0 - wmode: 'transparent' - rel: 0 - showinfo: 0 - enablejsapi: 1 - modestbranding: 1 - html5: 1 - - beforeEach -> - window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn false - # It tries to call methods of VideoProgressSlider on Spy - for part in ['VideoCaptionAlpha', 'VideoSpeedControlAlpha', 'VideoVolumeControlAlpha', 'VideoProgressSliderAlpha', 'VideoControlAlpha'] - spyOn(window[part].prototype, 'initialize').andCallThrough() - - - afterEach -> - YT.Player = undefined - - describe 'constructor', -> - beforeEach -> - $.fn.qtip.andCallFake -> - $(this).data('qtip', true) - - describe 'always', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - - it 'instanticate current time to zero', -> - expect(@player.currentTime).toEqual 0 - - it 'set the element', -> - expect(@player.el).toHaveId 'video_id' - - it 'create video control', -> - expect(window.VideoControlAlpha.prototype.initialize).toHaveBeenCalled() - expect(@player.control).toBeDefined() - expect(@player.control.el).toBe $('.video-controls', @player.el) - - it 'create video caption', -> - expect(window.VideoCaptionAlpha.prototype.initialize).toHaveBeenCalled() - expect(@player.caption).toBeDefined() - expect(@player.caption.el).toBe @player.el - expect(@player.caption.youtubeId).toEqual 'normalSpeedYoutubeId' - expect(@player.caption.currentSpeed).toEqual '1.0' - expect(@player.caption.captionAssetPath).toEqual '/static/subs/' - - it 'create video speed control', -> - expect(window.VideoSpeedControlAlpha.prototype.initialize).toHaveBeenCalled() - expect(@player.speedControl).toBeDefined() - expect(@player.speedControl.el).toBe $('.secondary-controls', @player.el) - expect(@player.speedControl.speeds).toEqual ['0.75', '1.0'] - expect(@player.speedControl.currentSpeed).toEqual '1.0' - - it 'create video progress slider', -> - expect(window.VideoSpeedControlAlpha.prototype.initialize).toHaveBeenCalled() - expect(@player.progressSlider).toBeDefined() - expect(@player.progressSlider.el).toBe $('.slider', @player.el) - - it 'bind to video control play event', -> - expect($(@player.control)).toHandleWith 'play', @player.play - - it 'bind to video control pause event', -> - expect($(@player.control)).toHandleWith 'pause', @player.pause - - it 'bind to video caption seek event', -> - expect($(@player.caption)).toHandleWith 'caption_seek', @player.onSeek - - it 'bind to video speed control speedChange event', -> - expect($(@player.speedControl)).toHandleWith 'speedChange', @player.onSpeedChange - - it 'bind to video progress slider seek event', -> - expect($(@player.progressSlider)).toHandleWith 'slide_seek', @player.onSeek - - it 'bind to video volume control volumeChange event', -> - expect($(@player.volumeControl)).toHandleWith 'volumeChange', @player.onVolumeChange - - it 'bind to key press', -> - expect($(document.documentElement)).toHandleWith 'keyup', @player.bindExitFullScreen - - it 'bind to fullscreen switching button', -> - expect($('.add-fullscreen')).toHandleWith 'click', @player.toggleFullScreen - - it 'create Youtube player', -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - spyOn YT, 'Player' - @player = new VideoPlayerAlpha video: @video - expect(YT.Player).toHaveBeenCalledWith('id', { - playerVars: playerVars - videoId: 'normalSpeedYoutubeId' - events: - onReady: @player.onReady - onStateChange: @player.onStateChange - onPlaybackQualityChange: @player.onPlaybackQualityChange - }) - - it 'create HTML5 player', -> - jasmine.stubVideoPlayerAlpha @, [], false, true - spyOn HTML5Video, 'Player' - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - expect(HTML5Video.Player).toHaveBeenCalledWith @video.el, - playerVars: playerVars - videoSources: @video.html5Sources - events: - onReady: @player.onReady - onStateChange: @player.onStateChange - - describe 'when not on a touch based device', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - $('.add-fullscreen, .hide-subtitles').removeData 'qtip' - @player = new VideoPlayerAlpha video: @video - - it 'add the tooltip to fullscreen and subtitle button', -> - expect($('.add-fullscreen')).toHaveData 'qtip' - expect($('.hide-subtitles')).toHaveData 'qtip' - - it 'create video volume control', -> - expect(window.VideoVolumeControlAlpha.prototype.initialize).toHaveBeenCalled() - expect(@player.volumeControl).toBeDefined() - expect(@player.volumeControl.el).toBe $('.secondary-controls', @player.el) - - describe 'when on a touch based device', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - window.onTouchBasedDevice.andReturn true - $('.add-fullscreen, .hide-subtitles').removeData 'qtip' - @player = new VideoPlayerAlpha video: @video - - it 'does not add the tooltip to fullscreen and subtitle button', -> - expect($('.add-fullscreen')).not.toHaveData 'qtip' - expect($('.hide-subtitles')).not.toHaveData 'qtip' - - it 'does not create video volume control', -> - expect(window.VideoVolumeControlAlpha.prototype.initialize).not.toHaveBeenCalled() - expect(@player.volumeControl).not.toBeDefined() - - describe 'onReady', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - spyOn @video, 'log' - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @video.embed() - @player = @video.player - spyOnEvent @player, 'ready' - spyOnEvent @player, 'updatePlayTime' - @player.onReady() - - it 'log the load_video event', -> - expect(@video.log).toHaveBeenCalledWith 'load_video' - - describe 'when not on a touch based device', -> - beforeEach -> - spyOn @player, 'play' - @player.onReady() - - it 'autoplay the first video', -> - expect(@player.play).toHaveBeenCalled() - - describe 'when on a touch based device', -> - beforeEach -> - window.onTouchBasedDevice.andReturn true - spyOn @player, 'play' - @player.onReady() - - it 'does not autoplay the first video', -> - expect(@player.play).not.toHaveBeenCalled() - - describe 'onStateChange', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - - describe 'when the video is unstarted', -> - beforeEach -> - @player = new VideoPlayerAlpha video: @video - spyOn @player.control, 'pause' - @player.caption.pause = jasmine.createSpy('VideoCaptionAlpha.pause') - @player.onStateChange data: YT.PlayerState.UNSTARTED - - it 'pause the video control', -> - expect(@player.control.pause).toHaveBeenCalled() - - it 'pause the video caption', -> - expect(@player.caption.pause).toHaveBeenCalled() - - describe 'when the video is playing', -> - beforeEach -> - @anotherPlayer = jasmine.createSpyObj 'AnotherPlayer', ['onPause'] - window.OldVideoPlayerAlpha = @anotherPlayer - @player = new VideoPlayerAlpha video: @video - spyOn @video, 'log' - spyOn(window, 'setInterval').andReturn 100 - spyOn @player.control, 'play' - @player.caption.play = jasmine.createSpy('VideoCaptionAlpha.play') - @player.progressSlider.play = jasmine.createSpy('VideoProgressSliderAlpha.play') - @player.player.getVideoEmbedCode.andReturn 'embedCode' - @player.onStateChange data: YT.PlayerState.PLAYING - - it 'log the play_video event', -> - expect(@video.log).toHaveBeenCalledWith 'play_video', {currentTime: 0} - - it 'pause other video player', -> - expect(@anotherPlayer.onPause).toHaveBeenCalled() - - it 'set current video player as active player', -> - expect(window.OldVideoPlayerAlpha).toEqual @player - - it 'set update interval', -> - expect(window.setInterval).toHaveBeenCalledWith @player.update, 200 - expect(@player.player.interval).toEqual 100 - - it 'play the video control', -> - expect(@player.control.play).toHaveBeenCalled() - - it 'play the video caption', -> - expect(@player.caption.play).toHaveBeenCalled() - - it 'play the video progress slider', -> - expect(@player.progressSlider.play).toHaveBeenCalled() - - describe 'when the video is paused', -> - beforeEach -> - @player = new VideoPlayerAlpha video: @video - spyOn @video, 'log' - spyOn window, 'clearInterval' - spyOn @player.control, 'pause' - @player.caption.pause = jasmine.createSpy('VideoCaptionAlpha.pause') - @player.player.interval = 100 - @player.player.getVideoEmbedCode.andReturn 'embedCode' - @player.onStateChange data: YT.PlayerState.PAUSED - - it 'log the pause_video event', -> - expect(@video.log).toHaveBeenCalledWith 'pause_video', {currentTime: 0} - - it 'clear update interval', -> - expect(window.clearInterval).toHaveBeenCalledWith 100 - expect(@player.player.interval).toBeNull() - - it 'pause the video control', -> - expect(@player.control.pause).toHaveBeenCalled() - - it 'pause the video caption', -> - expect(@player.caption.pause).toHaveBeenCalled() - - describe 'when the video is ended', -> - beforeEach -> - @player = new VideoPlayerAlpha video: @video - spyOn @player.control, 'pause' - @player.caption.pause = jasmine.createSpy('VideoCaptionAlpha.pause') - @player.onStateChange data: YT.PlayerState.ENDED - - it 'pause the video control', -> - expect(@player.control.pause).toHaveBeenCalled() - - it 'pause the video caption', -> - expect(@player.caption.pause).toHaveBeenCalled() - - describe 'onSeek', -> - conf = [{ - desc : 'check if seek_video is logged with slide_seek type', - type: 'slide_seek', - obj: 'progressSlider' - },{ - desc : 'check if seek_video is logged with caption_seek type', - type: 'caption_seek', - obj: 'caption' - }] - - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - spyOn window, 'clearInterval' - @player.player.interval = 100 - spyOn @player, 'updatePlayTime' - spyOn @video, 'log' - - $.each conf, (key, value) -> - it value.desc, -> - type = value.type - old_time = 0 - new_time = 60 - $(@player[value.obj]).trigger value.type, new_time - expect(@video.log).toHaveBeenCalledWith 'seek_video', - old_time: old_time - new_time: new_time - type: value.type - - it 'seek the player', -> - $(@player.progressSlider).trigger 'slide_seek', 60 - expect(@player.player.seekTo).toHaveBeenCalledWith 60, true - - it 'call updatePlayTime on player', -> - $(@player.progressSlider).trigger 'slide_seek', 60 - expect(@player.updatePlayTime).toHaveBeenCalledWith 60 - - describe 'when the player is playing', -> - beforeEach -> - $(@player.progressSlider).trigger 'slide_seek', 60 - @player.player.getPlayerState.andReturn YT.PlayerState.PLAYING - @player.onSeek {}, 60 - - it 'reset the update interval', -> - expect(window.clearInterval).toHaveBeenCalledWith 100 - - describe 'when the player is not playing', -> - beforeEach -> - $(@player.progressSlider).trigger 'slide_seek', 60 - @player.player.getPlayerState.andReturn YT.PlayerState.PAUSED - @player.onSeek {}, 60 - - it 'set the current time', -> - expect(@player.currentTime).toEqual 60 - - describe 'onSpeedChange', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - @player.currentTime = 60 - spyOn @player, 'updatePlayTime' - spyOn(@video, 'setSpeed').andCallThrough() - spyOn(@video, 'log') - - describe 'always', -> - beforeEach -> - @player.onSpeedChange {}, '0.75', false - - it 'check if speed_change_video is logged', -> - expect(@video.log).toHaveBeenCalledWith 'speed_change_video', - currentTime: @player.currentTime - old_speed: '1.0' - new_speed: '0.75' - - it 'convert the current time to the new speed', -> - expect(@player.currentTime).toEqual '80.000' - - it 'set video speed to the new speed', -> - expect(@video.setSpeed).toHaveBeenCalledWith '0.75', false - - it 'tell video caption that the speed has changed', -> - expect(@player.caption.currentSpeed).toEqual '0.75' - - describe 'when the video is playing', -> - beforeEach -> - @player.player.getPlayerState.andReturn YT.PlayerState.PLAYING - @player.onSpeedChange {}, '0.75' - - it 'load the video', -> - expect(@player.player.loadVideoById).toHaveBeenCalledWith 'slowerSpeedYoutubeId', '80.000' - - it 'trigger updatePlayTime event', -> - expect(@player.updatePlayTime).toHaveBeenCalledWith '80.000' - - describe 'when the video is not playing', -> - beforeEach -> - @player.player.getPlayerState.andReturn YT.PlayerState.PAUSED - @player.onSpeedChange {}, '0.75' - - it 'cue the video', -> - expect(@player.player.cueVideoById).toHaveBeenCalledWith 'slowerSpeedYoutubeId', '80.000' - - it 'trigger updatePlayTime event', -> - expect(@player.updatePlayTime).toHaveBeenCalledWith '80.000' - - describe 'onVolumeChange', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - @player.onVolumeChange undefined, 60 - - it 'set the volume on player', -> - expect(@player.player.setVolume).toHaveBeenCalledWith 60 - - describe 'update', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - spyOn @player, 'updatePlayTime' - - describe 'when the current time is unavailable from the player', -> - beforeEach -> - @player.player.getCurrentTime.andReturn undefined - @player.update() - - it 'does not trigger updatePlayTime event', -> - expect(@player.updatePlayTime).not.toHaveBeenCalled() - - describe 'when the current time is available from the player', -> - beforeEach -> - @player.player.getCurrentTime.andReturn 60 - @player.update() - - it 'trigger updatePlayTime event', -> - expect(@player.updatePlayTime).toHaveBeenCalledWith(60) - - describe 'updatePlayTime', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - spyOn(@video, 'getDuration').andReturn 1800 - @player.caption.updatePlayTime = jasmine.createSpy('VideoCaptionAlpha.updatePlayTime') - @player.progressSlider.updatePlayTime = jasmine.createSpy('VideoProgressSliderAlpha.updatePlayTime') - @player.updatePlayTime 60 - - it 'update the video playback time', -> - expect($('.vidtime')).toHaveHtml '1:00 / 30:00' - - it 'update the playback time on caption', -> - expect(@player.caption.updatePlayTime).toHaveBeenCalledWith 60 - - it 'update the playback time on progress slider', -> - expect(@player.progressSlider.updatePlayTime).toHaveBeenCalledWith 60, 1800 - - describe 'toggleFullScreen', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - @player.caption.resize = jasmine.createSpy('VideoCaptionAlpha.resize') - - describe 'when the video player is not full screen', -> - beforeEach -> - spyOn @video, 'log' - @player.el.removeClass 'fullscreen' - @player.toggleFullScreen(jQuery.Event("click")) - - it 'log the fullscreen event', -> - expect(@video.log).toHaveBeenCalledWith 'fullscreen', - currentTime: @player.currentTime - - it 'replace the full screen button tooltip', -> - expect($('.add-fullscreen')).toHaveAttr 'title', 'Exit fill browser' - - it 'add the fullscreen class', -> - expect(@player.el).toHaveClass 'fullscreen' - - it 'tell VideoCaption to resize', -> - expect(@player.caption.resize).toHaveBeenCalled() - - describe 'when the video player already full screen', -> - beforeEach -> - spyOn @video, 'log' - @player.el.addClass 'fullscreen' - @player.toggleFullScreen(jQuery.Event("click")) - - it 'log the not_fullscreen event', -> - expect(@video.log).toHaveBeenCalledWith 'not_fullscreen', - currentTime: @player.currentTime - - it 'replace the full screen button tooltip', -> - expect($('.add-fullscreen')).toHaveAttr 'title', 'Fill browser' - - it 'remove exit full screen button', -> - expect(@player.el).not.toContain 'a.exit' - - it 'remove the fullscreen class', -> - expect(@player.el).not.toHaveClass 'fullscreen' - - it 'tell VideoCaption to resize', -> - expect(@player.caption.resize).toHaveBeenCalled() - - describe 'play', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - - describe 'when the player is not ready', -> - beforeEach -> - @player.player.playVideo = undefined - @player.play() - - it 'does nothing', -> - expect(@player.player.playVideo).toBeUndefined() - - describe 'when the player is ready', -> - beforeEach -> - @player.player.playVideo.andReturn true - @player.play() - - it 'delegate to the Youtube player', -> - expect(@player.player.playVideo).toHaveBeenCalled() - - describe 'isPlaying', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - - describe 'when the video is playing', -> - beforeEach -> - @player.player.getPlayerState.andReturn YT.PlayerState.PLAYING - - it 'return true', -> - expect(@player.isPlaying()).toBeTruthy() - - describe 'when the video is not playing', -> - beforeEach -> - @player.player.getPlayerState.andReturn YT.PlayerState.PAUSED - - it 'return false', -> - expect(@player.isPlaying()).toBeFalsy() - - describe 'pause', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - @player.pause() - - it 'delegate to the Youtube player', -> - expect(@player.player.pauseVideo).toHaveBeenCalled() - - describe 'duration', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - spyOn @video, 'getDuration' - @player.duration() - - it 'delegate to the video', -> - expect(@video.getDuration).toHaveBeenCalled() - - describe 'currentSpeed', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - @video.speed = '3.0' - - it 'delegate to the video', -> - expect(@player.currentSpeed()).toEqual '3.0' - - describe 'volume', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @, [], false - $('.video').append $('<div class="add-fullscreen" /><div class="hide-subtitles" />') - @player = new VideoPlayerAlpha video: @video - @player.player.getVolume.andReturn 42 - - describe 'without value', -> - it 'return current volume', -> - expect(@player.volume()).toEqual 42 - - describe 'with value', -> - it 'set player volume', -> - @player.volume(60) - expect(@player.player.setVolume).toHaveBeenCalledWith(60) diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_progress_slider_spec.coffee b/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_progress_slider_spec.coffee deleted file mode 100644 index dd787aefbb..0000000000 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_progress_slider_spec.coffee +++ /dev/null @@ -1,165 +0,0 @@ -describe 'VideoProgressSliderAlpha', -> - beforeEach -> - window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn false - - describe 'constructor', -> - describe 'on a non-touch based device', -> - beforeEach -> - spyOn($.fn, 'slider').andCallThrough() - @player = jasmine.stubVideoPlayerAlpha @ - @progressSlider = @player.progressSlider - - it 'build the slider', -> - expect(@progressSlider.slider).toBe '.slider' - expect($.fn.slider).toHaveBeenCalledWith - range: 'min' - change: @progressSlider.onChange - slide: @progressSlider.onSlide - stop: @progressSlider.onStop - - it 'build the seek handle', -> - expect(@progressSlider.handle).toBe '.slider .ui-slider-handle' - expect($.fn.qtip).toHaveBeenCalledWith - content: "0:00" - position: - my: 'bottom center' - at: 'top center' - container: @progressSlider.handle - hide: - delay: 700 - style: - classes: 'ui-tooltip-slider' - widget: true - - describe 'on a touch-based device', -> - beforeEach -> - window.onTouchBasedDevice.andReturn true - spyOn($.fn, 'slider').andCallThrough() - @player = jasmine.stubVideoPlayerAlpha @ - @progressSlider = @player.progressSlider - - it 'does not build the slider', -> - expect(@progressSlider.slider).toBeUndefined - expect($.fn.slider).not.toHaveBeenCalled() - - describe 'play', -> - beforeEach -> - spyOn(VideoProgressSliderAlpha.prototype, 'buildSlider').andCallThrough() - @player = jasmine.stubVideoPlayerAlpha @ - @progressSlider = @player.progressSlider - - describe 'when the slider was already built', -> - - beforeEach -> - @progressSlider.play() - - it 'does not build the slider', -> - expect(@progressSlider.buildSlider.calls.length).toEqual 1 - - describe 'when the slider was not already built', -> - beforeEach -> - spyOn($.fn, 'slider').andCallThrough() - @progressSlider.slider = null - @progressSlider.play() - - it 'build the slider', -> - expect(@progressSlider.slider).toBe '.slider' - expect($.fn.slider).toHaveBeenCalledWith - range: 'min' - change: @progressSlider.onChange - slide: @progressSlider.onSlide - stop: @progressSlider.onStop - - it 'build the seek handle', -> - expect(@progressSlider.handle).toBe '.ui-slider-handle' - expect($.fn.qtip).toHaveBeenCalledWith - content: "0:00" - position: - my: 'bottom center' - at: 'top center' - container: @progressSlider.handle - hide: - delay: 700 - style: - classes: 'ui-tooltip-slider' - widget: true - - describe 'updatePlayTime', -> - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @progressSlider = @player.progressSlider - - describe 'when frozen', -> - beforeEach -> - spyOn($.fn, 'slider').andCallThrough() - @progressSlider.frozen = true - @progressSlider.updatePlayTime 20, 120 - - it 'does not update the slider', -> - expect($.fn.slider).not.toHaveBeenCalled() - - describe 'when not frozen', -> - beforeEach -> - spyOn($.fn, 'slider').andCallThrough() - @progressSlider.frozen = false - @progressSlider.updatePlayTime 20, 120 - - it 'update the max value of the slider', -> - expect($.fn.slider).toHaveBeenCalledWith 'option', 'max', 120 - - it 'update current value of the slider', -> - expect($.fn.slider).toHaveBeenCalledWith 'value', 20 - - describe 'onSlide', -> - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @progressSlider = @player.progressSlider - spyOnEvent @progressSlider, 'slide_seek' - @progressSlider.onSlide {}, value: 20 - - it 'freeze the slider', -> - expect(@progressSlider.frozen).toBeTruthy() - - it 'update the tooltip', -> - expect($.fn.qtip).toHaveBeenCalled() - - it 'trigger seek event', -> - expect('slide_seek').toHaveBeenTriggeredOn @progressSlider - expect(@player.currentTime).toEqual 20 - - describe 'onChange', -> - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @progressSlider = @player.progressSlider - @progressSlider.onChange {}, value: 20 - - it 'update the tooltip', -> - expect($.fn.qtip).toHaveBeenCalled() - - describe 'onStop', -> - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @progressSlider = @player.progressSlider - spyOnEvent @progressSlider, 'slide_seek' - @progressSlider.onStop {}, value: 20 - - it 'freeze the slider', -> - expect(@progressSlider.frozen).toBeTruthy() - - it 'trigger seek event', -> - expect('slide_seek').toHaveBeenTriggeredOn @progressSlider - expect(@player.currentTime).toEqual 20 - - it 'set timeout to unfreeze the slider', -> - expect(window.setTimeout).toHaveBeenCalledWith jasmine.any(Function), 200 - window.setTimeout.mostRecentCall.args[0]() - expect(@progressSlider.frozen).toBeFalsy() - - describe 'updateTooltip', -> - beforeEach -> - @player = jasmine.stubVideoPlayerAlpha @ - @progressSlider = @player.progressSlider - @progressSlider.updateTooltip 90 - - it 'set the tooltip value', -> - expect($.fn.qtip).toHaveBeenCalledWith 'option', 'content.text', '1:30' diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_speed_control_spec.coffee b/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_speed_control_spec.coffee deleted file mode 100644 index ca4bfe815a..0000000000 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_speed_control_spec.coffee +++ /dev/null @@ -1,91 +0,0 @@ -describe 'VideoSpeedControlAlpha', -> - beforeEach -> - window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn false - jasmine.stubVideoPlayerAlpha @ - $('.speeds').remove() - - describe 'constructor', -> - describe 'always', -> - beforeEach -> - @speedControl = new VideoSpeedControlAlpha el: $('.secondary-controls'), speeds: @video.speeds, currentSpeed: '1.0' - - it 'add the video speed control to player', -> - secondaryControls = $('.secondary-controls') - li = secondaryControls.find('.video_speeds li') - expect(secondaryControls).toContain '.speeds' - expect(secondaryControls).toContain '.video_speeds' - expect(secondaryControls.find('p.active').text()).toBe '1.0x' - expect(li.filter('.active')).toHaveData 'speed', @speedControl.currentSpeed - expect(li.length).toBe @speedControl.speeds.length - $.each li.toArray().reverse(), (index, link) => - expect($(link)).toHaveData 'speed', @speedControl.speeds[index] - expect($(link).find('a').text()).toBe @speedControl.speeds[index] + 'x' - - it 'bind to change video speed link', -> - expect($('.video_speeds a')).toHandleWith 'click', @speedControl.changeVideoSpeed - - describe 'when running on touch based device', -> - beforeEach -> - window.onTouchBasedDevice.andReturn true - $('.speeds').removeClass 'open' - @speedControl = new VideoSpeedControlAlpha el: $('.secondary-controls'), speeds: @video.speeds, currentSpeed: '1.0' - - it 'open the speed toggle on click', -> - $('.speeds').click() - expect($('.speeds')).toHaveClass 'open' - $('.speeds').click() - expect($('.speeds')).not.toHaveClass 'open' - - describe 'when running on non-touch based device', -> - beforeEach -> - $('.speeds').removeClass 'open' - @speedControl = new VideoSpeedControlAlpha el: $('.secondary-controls'), speeds: @video.speeds, currentSpeed: '1.0' - - it 'open the speed toggle on hover', -> - $('.speeds').mouseenter() - expect($('.speeds')).toHaveClass 'open' - $('.speeds').mouseleave() - expect($('.speeds')).not.toHaveClass 'open' - - it 'close the speed toggle on mouse out', -> - $('.speeds').mouseenter().mouseleave() - expect($('.speeds')).not.toHaveClass 'open' - - it 'close the speed toggle on click', -> - $('.speeds').mouseenter().click() - expect($('.speeds')).not.toHaveClass 'open' - - describe 'changeVideoSpeed', -> - beforeEach -> - @speedControl = new VideoSpeedControlAlpha el: $('.secondary-controls'), speeds: @video.speeds, currentSpeed: '1.0' - @video.setSpeed '1.0' - - describe 'when new speed is the same', -> - beforeEach -> - spyOnEvent @speedControl, 'speedChange' - $('li[data-speed="1.0"] a').click() - - it 'does not trigger speedChange event', -> - expect('speedChange').not.toHaveBeenTriggeredOn @speedControl - - describe 'when new speed is not the same', -> - beforeEach -> - @newSpeed = null - $(@speedControl).bind 'speedChange', (event, newSpeed) => @newSpeed = newSpeed - spyOnEvent @speedControl, 'speedChange' - $('li[data-speed="0.75"] a').click() - - it 'trigger speedChange event', -> - expect('speedChange').toHaveBeenTriggeredOn @speedControl - expect(@newSpeed).toEqual 0.75 - - describe 'onSpeedChange', -> - beforeEach -> - @speedControl = new VideoSpeedControlAlpha el: $('.secondary-controls'), speeds: @video.speeds, currentSpeed: '1.0' - $('li[data-speed="1.0"] a').addClass 'active' - @speedControl.setSpeed '0.75' - - it 'set the new speed as active', -> - expect($('.video_speeds li[data-speed="1.0"]')).not.toHaveClass 'active' - expect($('.video_speeds li[data-speed="0.75"]')).toHaveClass 'active' - expect($('.speeds p.active')).toHaveHtml '0.75x' diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_volume_control_spec.coffee b/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_volume_control_spec.coffee deleted file mode 100644 index 4bb9f1cbf8..0000000000 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/video_volume_control_spec.coffee +++ /dev/null @@ -1,94 +0,0 @@ -describe 'VideoVolumeControlAlpha', -> - beforeEach -> - jasmine.stubVideoPlayerAlpha @ - $('.volume').remove() - - describe 'constructor', -> - beforeEach -> - spyOn($.fn, 'slider') - @volumeControl = new VideoVolumeControlAlpha el: $('.secondary-controls') - - it 'initialize currentVolume to 100', -> - expect(@volumeControl.currentVolume).toEqual 100 - - it 'render the volume control', -> - expect($('.secondary-controls').html()).toContain """ - <div class="volume"> - <a href="#"></a> - <div class="volume-slider-container"> - <div class="volume-slider"></div> - </div> - </div> - """ - - it 'create the slider', -> - expect($.fn.slider).toHaveBeenCalledWith - orientation: "vertical" - range: "min" - min: 0 - max: 100 - value: 100 - change: @volumeControl.onChange - slide: @volumeControl.onChange - - it 'bind the volume control', -> - expect($('.volume>a')).toHandleWith 'click', @volumeControl.toggleMute - - expect($('.volume')).not.toHaveClass 'open' - $('.volume').mouseenter() - expect($('.volume')).toHaveClass 'open' - $('.volume').mouseleave() - expect($('.volume')).not.toHaveClass 'open' - - describe 'onChange', -> - beforeEach -> - spyOnEvent @volumeControl, 'volumeChange' - @newVolume = undefined - @volumeControl = new VideoVolumeControlAlpha el: $('.secondary-controls') - $(@volumeControl).bind 'volumeChange', (event, volume) => @newVolume = volume - - describe 'when the new volume is more than 0', -> - beforeEach -> - @volumeControl.onChange undefined, value: 60 - - it 'set the player volume', -> - expect(@newVolume).toEqual 60 - - it 'remote muted class', -> - expect($('.volume')).not.toHaveClass 'muted' - - describe 'when the new volume is 0', -> - beforeEach -> - @volumeControl.onChange undefined, value: 0 - - it 'set the player volume', -> - expect(@newVolume).toEqual 0 - - it 'add muted class', -> - expect($('.volume')).toHaveClass 'muted' - - describe 'toggleMute', -> - beforeEach -> - @newVolume = undefined - @volumeControl = new VideoVolumeControlAlpha el: $('.secondary-controls') - $(@volumeControl).bind 'volumeChange', (event, volume) => @newVolume = volume - - describe 'when the current volume is more than 0', -> - beforeEach -> - @volumeControl.currentVolume = 60 - @volumeControl.toggleMute() - - it 'save the previous volume', -> - expect(@volumeControl.previousVolume).toEqual 60 - - it 'set the player volume', -> - expect(@newVolume).toEqual 0 - - describe 'when the current volume is 0', -> - beforeEach -> - @volumeControl.currentVolume = 0 - @volumeControl.previousVolume = 60 - @volumeControl.toggleMute() - - it 'set the player volume to previous volume', -> - expect(@newVolume).toEqual 60 diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/display_spec.coffee b/common/lib/xmodule/xmodule/js/spec/videoalpha/display_spec.coffee deleted file mode 100644 index 3715c3d813..0000000000 --- a/common/lib/xmodule/xmodule/js/spec/videoalpha/display_spec.coffee +++ /dev/null @@ -1,286 +0,0 @@ -describe 'VideoAlpha', -> - metadata = - slowerSpeedYoutubeId: - id: @slowerSpeedYoutubeId - duration: 300 - normalSpeedYoutubeId: - id: @normalSpeedYoutubeId - duration: 200 - - beforeEach -> - jasmine.stubRequests() - window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn false - @videosDefinition = '0.75:slowerSpeedYoutubeId,1.0:normalSpeedYoutubeId' - @slowerSpeedYoutubeId = 'slowerSpeedYoutubeId' - @normalSpeedYoutubeId = 'normalSpeedYoutubeId' - - afterEach -> - window.OldVideoPlayerAlpha = undefined - window.onYouTubePlayerAPIReady = undefined - window.onHTML5PlayerAPIReady = undefined - - describe 'constructor', -> - describe 'YT', -> - beforeEach -> - loadFixtures 'videoalpha.html' - @stubVideoPlayerAlpha = jasmine.createSpy('VideoPlayerAlpha') - $.cookie.andReturn '0.75' - - describe 'by default', -> - beforeEach -> - spyOn(window.VideoAlpha.prototype, 'fetchMetadata').andCallFake -> - @metadata = metadata - @video = new VideoAlpha '#example', @videosDefinition - - it 'check videoType', -> - expect(@video.videoType).toEqual('youtube') - - it 'reset the current video player', -> - expect(window.OldVideoPlayerAlpha).toBeUndefined() - - it 'set the elements', -> - expect(@video.el).toBe '#video_id' - - it 'parse the videos', -> - expect(@video.videos).toEqual - '0.75': @slowerSpeedYoutubeId - '1.0': @normalSpeedYoutubeId - - it 'fetch the video metadata', -> - expect(@video.fetchMetadata).toHaveBeenCalled - expect(@video.metadata).toEqual metadata - - it 'parse available video speeds', -> - expect(@video.speeds).toEqual ['0.75', '1.0'] - - it 'set current video speed via cookie', -> - expect(@video.speed).toEqual '0.75' - - it 'store a reference for this video player in the element', -> - expect($('.video').data('video')).toEqual @video - - describe 'when the Youtube API is already available', -> - beforeEach -> - @originalYT = window.YT - window.YT = { Player: true } - spyOn(window, 'VideoPlayerAlpha').andReturn(@stubVideoPlayerAlpha) - @video = new VideoAlpha '#example', @videosDefinition - - afterEach -> - window.YT = @originalYT - - it 'create the Video Player', -> - expect(window.VideoPlayerAlpha).toHaveBeenCalledWith(video: @video) - expect(@video.player).toEqual @stubVideoPlayerAlpha - - describe 'when the Youtube API is not ready', -> - beforeEach -> - @originalYT = window.YT - window.YT = {} - @video = new VideoAlpha '#example', @videosDefinition - - afterEach -> - window.YT = @originalYT - - it 'set the callback on the window object', -> - expect(window.onYouTubePlayerAPIReady).toEqual jasmine.any(Function) - - describe 'when the Youtube API becoming ready', -> - beforeEach -> - @originalYT = window.YT - window.YT = {} - spyOn(window, 'VideoPlayerAlpha').andReturn(@stubVideoPlayerAlpha) - @video = new VideoAlpha '#example', @videosDefinition - window.onYouTubePlayerAPIReady() - - afterEach -> - window.YT = @originalYT - - it 'create the Video Player for all video elements', -> - expect(window.VideoPlayerAlpha).toHaveBeenCalledWith(video: @video) - expect(@video.player).toEqual @stubVideoPlayerAlpha - - describe 'HTML5', -> - beforeEach -> - loadFixtures 'videoalpha_html5.html' - @stubVideoPlayerAlpha = jasmine.createSpy('VideoPlayerAlpha') - $.cookie.andReturn '0.75' - - describe 'by default', -> - beforeEach -> - @originalHTML5 = window.HTML5Video.Player - window.HTML5Video.Player = undefined - @video = new VideoAlpha '#example', @videosDefinition - - afterEach -> - window.HTML5Video.Player = @originalHTML5 - - it 'check videoType', -> - expect(@video.videoType).toEqual('html5') - - it 'reset the current video player', -> - expect(window.OldVideoPlayerAlpha).toBeUndefined() - - it 'set the elements', -> - expect(@video.el).toBe '#video_id' - - it 'parse the videos if subtitles exist', -> - sub = 'test_name_of_the_subtitles' - expect(@video.videos).toEqual - '0.75': sub - '1.0': sub - '1.25': sub - '1.5': sub - - it 'parse the videos if subtitles doesn\'t exist', -> - $('#example').find('.video').data('sub', '') - @video = new VideoAlpha '#example', @videosDefinition - sub = '' - expect(@video.videos).toEqual - '0.75': sub - '1.0': sub - '1.25': sub - '1.5': sub - - it 'parse Html5 sources', -> - html5Sources = - mp4: 'test.mp4' - webm: 'test.webm' - ogg: 'test.ogv' - expect(@video.html5Sources).toEqual html5Sources - - it 'parse available video speeds', -> - speeds = jasmine.stubbedHtml5Speeds - expect(@video.speeds).toEqual speeds - - it 'set current video speed via cookie', -> - expect(@video.speed).toEqual '0.75' - - it 'store a reference for this video player in the element', -> - expect($('.video').data('video')).toEqual @video - - describe 'when the HTML5 API is already available', -> - beforeEach -> - @originalHTML5Video = window.HTML5Video - window.HTML5Video = { Player: true } - spyOn(window, 'VideoPlayerAlpha').andReturn(@stubVideoPlayerAlpha) - @video = new VideoAlpha '#example', @videosDefinition - - afterEach -> - window.HTML5Video = @originalHTML5Video - - it 'create the Video Player', -> - expect(window.VideoPlayerAlpha).toHaveBeenCalledWith(video: @video) - expect(@video.player).toEqual @stubVideoPlayerAlpha - - describe 'when the HTML5 API is not ready', -> - beforeEach -> - @originalHTML5Video = window.HTML5Video - window.HTML5Video = {} - @video = new VideoAlpha '#example', @videosDefinition - - afterEach -> - window.HTML5Video = @originalHTML5Video - - it 'set the callback on the window object', -> - expect(window.onHTML5PlayerAPIReady).toEqual jasmine.any(Function) - - describe 'when the HTML5 API becoming ready', -> - beforeEach -> - @originalHTML5Video = window.HTML5Video - window.HTML5Video = {} - spyOn(window, 'VideoPlayerAlpha').andReturn(@stubVideoPlayerAlpha) - @video = new VideoAlpha '#example', @videosDefinition - window.onHTML5PlayerAPIReady() - - afterEach -> - window.HTML5Video = @originalHTML5Video - - it 'create the Video Player for all video elements', -> - expect(window.VideoPlayerAlpha).toHaveBeenCalledWith(video: @video) - expect(@video.player).toEqual @stubVideoPlayerAlpha - - describe 'youtubeId', -> - beforeEach -> - loadFixtures 'videoalpha.html' - $.cookie.andReturn '1.0' - @video = new VideoAlpha '#example', @videosDefinition - - 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 - - describe 'without speed', -> - it 'return the video id for current speed', -> - expect(@video.youtubeId()).toEqual @normalSpeedYoutubeId - - describe 'setSpeed', -> - describe 'YT', -> - beforeEach -> - loadFixtures 'videoalpha.html' - @video = new VideoAlpha '#example', @videosDefinition - - describe 'when new speed is available', -> - beforeEach -> - @video.setSpeed '0.75' - - it 'set new speed', -> - expect(@video.speed).toEqual '0.75' - - it 'save setting for new speed', -> - expect($.cookie).toHaveBeenCalledWith 'video_speed', '0.75', expires: 3650, path: '/' - - describe 'when new speed is not available', -> - beforeEach -> - @video.setSpeed '1.75' - - it 'set speed to 1.0x', -> - expect(@video.speed).toEqual '1.0' - - describe 'HTML5', -> - beforeEach -> - loadFixtures 'videoalpha_html5.html' - @video = new VideoAlpha '#example', @videosDefinition - - describe 'when new speed is available', -> - beforeEach -> - @video.setSpeed '0.75' - - it 'set new speed', -> - expect(@video.speed).toEqual '0.75' - - it 'save setting for new speed', -> - expect($.cookie).toHaveBeenCalledWith 'video_speed', '0.75', expires: 3650, path: '/' - - describe 'when new speed is not available', -> - beforeEach -> - @video.setSpeed '1.75' - - it 'set speed to 1.0x', -> - expect(@video.speed).toEqual '1.0' - - describe 'getDuration', -> - beforeEach -> - loadFixtures 'videoalpha.html' - @video = new VideoAlpha '#example', @videosDefinition - - it 'return duration for current video', -> - expect(@video.getDuration()).toEqual 200 - - describe 'log', -> - beforeEach -> - loadFixtures 'videoalpha.html' - @video = new VideoAlpha '#example', @videosDefinition - spyOn Logger, 'log' - @video.log 'someEvent', { - currentTime: 25, - speed: '1.0' - } - - it 'call the logger with valid extra parameters', -> - expect(Logger.log).toHaveBeenCalledWith 'someEvent', - id: 'id' - code: @normalSpeedYoutubeId - 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 new file mode 100644 index 0000000000..415ac440ad --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/general_spec.js @@ -0,0 +1,282 @@ +(function () { + xdescribe('VideoAlpha', function () { + var oldOTBD; + + beforeEach(function () { + 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'; + }); + + afterEach(function () { + window.OldVideoPlayerAlpha = undefined; + window.onYouTubePlayerAPIReady = undefined; + window.onHTML5PlayerAPIReady = undefined; + $('source').remove(); + window.onTouchBasedDevice = oldOTBD; + }); + + describe('constructor', function () { + describe('YT', function () { + beforeEach(function () { + loadFixtures('videoalpha.html'); + $.cookie.andReturn('0.75'); + }); + + describe('by default', function () { + beforeEach(function () { + this.state = new window.VideoAlpha('#example'); + }); + + it('check videoType', function () { + expect(this.state.videoType).toEqual('youtube'); + }); + + it('reset the current video player', function () { + expect(window.OldVideoPlayerAlpha).toBeUndefined(); + }); + + it('set the elements', function () { + expect(this.state.el).toBe('#video_id'); + }); + + it('parse the videos', function () { + expect(this.state.videos).toEqual({ + '0.75': this.slowerSpeedYoutubeId, + '1.0': this.normalSpeedYoutubeId + }); + }); + + it('parse available video speeds', function () { + expect(this.state.speeds).toEqual(['0.75', '1.0']); + }); + + it('set current video speed via cookie', function () { + expect(this.state.speed).toEqual('0.75'); + }); + }); + }); + + describe('HTML5', function () { + var state; + + beforeEach(function () { + loadFixtures('videoalpha_html5.html'); + this.stubVideoPlayerAlpha = jasmine.createSpy('VideoPlayerAlpha'); + $.cookie.andReturn('0.75'); + }); + + describe('by default', function () { + beforeEach(function () { + state = new window.VideoAlpha('#example'); + }); + + afterEach(function () { + state = undefined; + }); + + it('check videoType', function () { + expect(state.videoType).toEqual('html5'); + }); + + it('reset the current video player', function () { + expect(window.OldVideoPlayerAlpha).toBeUndefined(); + }); + + it('set the elements', function () { + expect(state.el).toBe('#video_id'); + }); + + it('parse the videos if subtitles exist', function () { + var sub = 'test_name_of_the_subtitles'; + + expect(state.videos).toEqual({ + '0.75': sub, + '1.0': sub, + '1.25': sub, + '1.5': sub + }); + }); + + it('parse the videos if subtitles do not exist', function () { + var sub = ''; + + $('#example').find('.videoalpha').data('sub', ''); + state = new window.VideoAlpha('#example'); + + expect(state.videos).toEqual({ + '0.75': sub, + '1.0': sub, + '1.25': sub, + '1.5': sub + }); + }); + + it('parse Html5 sources', function () { + var html5Sources = { + mp4: 'test_files/test.mp4', + webm: 'test_files/test.webm', + ogg: 'test_files/test.ogv' + }; + + expect(state.html5Sources).toEqual(html5Sources); + }); + + it('parse available video speeds', function () { + var speeds = jasmine.stubbedHtml5Speeds; + + expect(state.speeds).toEqual(speeds); + }); + + it('set current video speed via cookie', function () { + expect(state.speed).toEqual('0.75'); + }); + }); + + // Note that the loading of stand alone HTML5 player API is handled by + // Require JS. When state.videoPlayer is created, the stand alone HTML5 + // player object is already loaded, so no further testing in that case + // is required. + describe('HTML5 API is available', function () { + beforeEach(function () { + state = new VideoAlpha('#example'); + }); + + afterEach(function () { + state = null; + }); + + it('create the Video Player', function () { + expect(state.videoPlayer.player).not.toBeUndefined(); + }); + }); + }); + }); + + describe('youtubeId', function () { + beforeEach(function () { + loadFixtures('videoalpha.html'); + $.cookie.andReturn('1.0'); + state = new VideoAlpha('#example'); + }); + + 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); + }); + }); + + describe('without speed', function () { + it('return the video id for current speed', function () { + expect(state.youtubeId()).toEqual(this.normalSpeedYoutubeId); + }); + }); + }); + + describe('setSpeed', function () { + describe('YT', function () { + beforeEach(function () { + loadFixtures('videoalpha.html'); + state = new VideoAlpha('#example'); + }); + + describe('when new speed is available', function () { + beforeEach(function () { + state.setSpeed('0.75'); + }); + + it('set new speed', function () { + expect(state.speed).toEqual('0.75'); + }); + + it('save setting for new speed', function () { + expect($.cookie).toHaveBeenCalledWith('video_speed', '0.75', { + expires: 3650, + path: '/' + }); + }); + }); + + describe('when new speed is not available', function () { + beforeEach(function () { + state.setSpeed('1.75'); + }); + + it('set speed to 1.0x', function () { + expect(state.speed).toEqual('1.0'); + }); + }); + }); + + describe('HTML5', function () { + beforeEach(function () { + loadFixtures('videoalpha_html5.html'); + state = new VideoAlpha('#example'); + }); + + describe('when new speed is available', function () { + beforeEach(function () { + state.setSpeed('0.75'); + }); + + it('set new speed', function () { + expect(state.speed).toEqual('0.75'); + }); + + it('save setting for new speed', function () { + expect($.cookie).toHaveBeenCalledWith('video_speed', '0.75', { + expires: 3650, + path: '/' + }); + }); + }); + + describe('when new speed is not available', function () { + beforeEach(function () { + state.setSpeed('1.75'); + }); + + it('set speed to 1.0x', function () { + expect(state.speed).toEqual('1.0'); + }); + }); + }); + }); + + describe('getDuration', function () { + beforeEach(function () { + loadFixtures('videoalpha.html'); + state = new VideoAlpha('#example'); + }); + + it('return duration for current video', function () { + expect(state.getDuration()).toEqual(200); + }); + }); + + describe('log', function () { + beforeEach(function () { + loadFixtures('videoalpha_html5.html'); + state = new VideoAlpha('#example'); + spyOn(Logger, 'log'); + state.videoPlayer.log('someEvent', { + currentTime: 25, + speed: '1.0' + }); + }); + + it('call the logger with valid extra parameters', function () { + expect(Logger.log).toHaveBeenCalledWith('someEvent', { + id: 'id', + code: 'html5', + currentTime: 25, + speed: '1.0' + }); + }); + }); + }); +}).call(this); diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/html5_video_spec.js b/common/lib/xmodule/xmodule/js/spec/videoalpha/html5_video_spec.js new file mode 100644 index 0000000000..9a6c44052c --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/html5_video_spec.js @@ -0,0 +1,333 @@ +(function () { + xdescribe('VideoAlpha HTML5Video', function () { + var state, player, oldOTBD, playbackRates = [0.75, 1.0, 1.25, 1.5]; + + function initialize() { + loadFixtures('videoalpha_html5.html'); + state = new VideoAlpha('#example'); + player = state.videoPlayer.player; + } + + beforeEach(function () { + oldOTBD = window.onTouchBasedDevice; + window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn(false); + initialize(); + player.config.events.onReady = jasmine.createSpy('onReady'); + }); + + afterEach(function() { + YT.Player = void 0; + $.fn.scrollTo.reset(); + $('.subtitles').remove(); + $('source').remove(); + window.onTouchBasedDevice = oldOTBD; + }); + + describe('events:', function () { + beforeEach(function () { + spyOn(player, 'callStateChangeCallback').andCallThrough(); + }); + + describe('click', function () { + describe('when player is paused', function () { + beforeEach(function () { + spyOn(player.video, 'play').andCallThrough(); + player.playerState = STATUS.PAUSED; + $(player.videoEl).trigger('click'); + }); + + it('native play event was called', function () { + expect(player.video.play).toHaveBeenCalled(); + }); + + it('player state was changed', function () { + waitsFor(function () { + return player.getPlayerState() !== STATUS.PAUSED; + }, 'Player state should be changed', WAIT_TIMEOUT); + + runs(function () { + expect(player.getPlayerState()).toBe(STATUS.PLAYING); + }); + }); + + it('callback was called', function () { + waitsFor(function () { + return state.videoPlayer.player.getPlayerState() !== STATUS.PAUSED; + }, 'Player state should be changed', WAIT_TIMEOUT); + + runs(function () { + expect(player.callStateChangeCallback).toHaveBeenCalled(); + }); + }); + }); + }); + + describe('when player is played', function () { + beforeEach(function () { + spyOn(player.video, 'pause').andCallThrough(); + player.playerState = STATUS.PLAYING; + $(player.videoEl).trigger('click'); + }); + + it('native event was called', function () { + expect(player.video.pause).toHaveBeenCalled(); + }); + + it('player state was changed', function () { + waitsFor(function () { + return player.getPlayerState() !== STATUS.PLAYING; + }, 'Player state should be changed', WAIT_TIMEOUT); + + runs(function () { + expect(player.getPlayerState()).toBe(STATUS.PAUSED); + }); + }); + + it('callback was called', function () { + waitsFor(function () { + return player.getPlayerState() !== STATUS.PLAYING; + }, 'Player state should be changed', WAIT_TIMEOUT); + + runs(function () { + expect(player.callStateChangeCallback).toHaveBeenCalled(); + }); + }); + }); + + describe('play', function () { + beforeEach(function () { + spyOn(player.video, 'play').andCallThrough(); + player.playerState = STATUS.PAUSED; + player.playVideo(); + }); + + it('native event was called', function () { + expect(player.video.play).toHaveBeenCalled(); + }); + + it('player state was changed', function () { + waitsFor(function () { + return player.getPlayerState() !== STATUS.PAUSED; + }, 'Player state should be changed', WAIT_TIMEOUT); + + runs(function () { + expect(player.getPlayerState()).toBe(STATUS.PLAYING); + }); + }); + + it('callback was called', function () { + waitsFor(function () { + return player.getPlayerState() !== STATUS.PAUSED; + }, 'Player state should be changed', WAIT_TIMEOUT); + + runs(function () { + expect(player.callStateChangeCallback).toHaveBeenCalled(); + }); + }); + }); + + describe('pause', function () { + beforeEach(function () { + spyOn(player.video, 'pause').andCallThrough(); + player.playVideo(); + player.pauseVideo(); + }); + + it('native event was called', function () { + expect(player.video.pause).toHaveBeenCalled(); + }); + + it('player state was changed', function () { + waitsFor(function () { + return player.getPlayerState() !== STATUS.UNSTARTED; + }, 'Player state should be changed', WAIT_TIMEOUT); + + runs(function () { + expect(player.getPlayerState()).toBe(STATUS.PAUSED); + }); + }); + + it('callback was called', function () { + waitsFor(function () { + return player.getPlayerState() !== STATUS.UNSTARTED; + }, 'Player state should be changed', WAIT_TIMEOUT); + runs(function () { + expect(player.callStateChangeCallback).toHaveBeenCalled(); + }); + }); + }); + + describe('canplay', function () { + beforeEach(function () { + waitsFor(function () { + return player.getPlayerState() !== STATUS.UNSTARTED; + }, 'Video cannot be played', WAIT_TIMEOUT); + }); + + it('player state was changed', function () { + runs(function () { + expect(player.getPlayerState()).toBe(STATUS.PAUSED); + }); + }); + + it('end property was defined', function () { + runs(function () { + expect(player.end).not.toBeNull(); + }); + }); + + it('start position was defined', function () { + runs(function () { + expect(player.video.currentTime).toBe(player.start); + }); + }); + + it('onReady callback was called', function () { + runs(function () { + expect(player.config.events.onReady).toHaveBeenCalled(); + }); + }); + }); + + describe('ended', function () { + beforeEach(function () { + waitsFor(function () { + return player.getPlayerState() !== STATUS.UNSTARTED; + }, 'Video cannot be played', WAIT_TIMEOUT); + }); + + it('player state was changed', function () { + runs(function () { + jasmine.fireEvent(player.video, 'ended'); + expect(player.getPlayerState()).toBe(STATUS.ENDED); + }); + }); + + it('callback was called', function () { + jasmine.fireEvent(player.video, 'ended'); + expect(player.callStateChangeCallback).toHaveBeenCalled(); + }); + }); + }); + + describe('methods', function () { + var volume, seek, duration, playbackRate; + + beforeEach(function () { + waitsFor(function () { + volume = player.video.volume; + seek = player.video.currentTime; + return player.playerState === STATUS.PAUSED; + }, 'Video cannot be played', WAIT_TIMEOUT); + }); + + it('pauseVideo', function () { + runs(function () { + spyOn(player.video, 'pause').andCallThrough(); + player.pauseVideo(); + expect(player.video.pause).toHaveBeenCalled(); + }); + }); + + describe('seekTo', function () { + it('set new correct value', function () { + runs(function () { + player.seekTo(2); + expect(player.getCurrentTime()).toBe(2); + }); + }); + + it('set new inccorrect values', function () { + runs(function () { + player.seekTo(-50); + expect(player.getCurrentTime()).toBe(seek); + player.seekTo('5'); + expect(player.getCurrentTime()).toBe(seek); + player.seekTo(500000); + expect(player.getCurrentTime()).toBe(seek); + }); + }); + }); + + describe('setVolume', function () { + it('set new correct value', function () { + runs(function () { + player.setVolume(50); + expect(player.getVolume()).toBe(50 * 0.01); + }); + }); + + it('set new incorrect values', function () { + runs(function () { + player.setVolume(-50); + expect(player.getVolume()).toBe(volume); + player.setVolume('5'); + expect(player.getVolume()).toBe(volume); + player.setVolume(500000); + expect(player.getVolume()).toBe(volume); + }); + }); + }); + + it('getCurrentTime', function () { + runs(function () { + player.video.currentTime = 3; + expect(player.getCurrentTime()).toBe(player.video.currentTime); + }); + }); + + it('playVideo', function () { + runs(function () { + spyOn(player.video, 'play').andCallThrough(); + player.playVideo(); + expect(player.video.play).toHaveBeenCalled(); + }); + }); + + it('getPlayerState', function () { + runs(function () { + player.playerState = STATUS.PLAYING; + expect(player.getPlayerState()).toBe(STATUS.PLAYING); + player.playerState = STATUS.ENDED; + expect(player.getPlayerState()).toBe(STATUS.ENDED); + }); + }); + + it('getVolume', function () { + runs(function () { + volume = player.video.volume = 0.5; + expect(player.getVolume()).toBe(volume); + }); + }); + + it('getDuration', function () { + runs(function () { + duration = player.video.duration; + expect(player.getDuration()).toBe(duration); + }); + }); + + describe('setPlaybackRate', function () { + it('set a correct value', function () { + playbackRate = 1.5; + player.setPlaybackRate(playbackRate); + expect(player.video.playbackRate).toBe(playbackRate); + }); + + it('set NaN value', function () { + var oldPlaybackRate = player.video.playbackRate; + + // When we try setting the playback rate to some + // non-numerical value, nothing should happen. + playbackRate = NaN; + player.setPlaybackRate(playbackRate); + expect(player.video.playbackRate).toBe(oldPlaybackRate); + }); + }); + + it('getAvailablePlaybackRates', function () { + expect(player.getAvailablePlaybackRates()).toEqual(playbackRates); + }); + }); + }); +}).call(this); diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/readme.md b/common/lib/xmodule/xmodule/js/spec/videoalpha/readme.md new file mode 100644 index 0000000000..570827b910 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/readme.md @@ -0,0 +1,7 @@ +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(". + +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 new file mode 100644 index 0000000000..2c138a734c --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_caption_spec.js @@ -0,0 +1,527 @@ +(function() { + xdescribe('VideoCaptionAlpha', function() { + var state, videoPlayer, videoCaption, videoSpeedControl, oldOTBD; + + function initialize() { + loadFixtures('videoalpha_all.html'); + state = new VideoAlpha('#example'); + videoPlayer = state.videoPlayer; + videoCaption = state.videoCaption; + videoSpeedControl = state.videoSpeedControl; + videoControl = state.videoControl; + } + + beforeEach(function() { + oldOTBD = window.onTouchBasedDevice; + window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn(false); + initialize(); + }); + + afterEach(function() { + YT.Player = void 0; + $.fn.scrollTo.reset(); + $('.subtitles').remove(); + $('source').remove(); + window.onTouchBasedDevice = oldOTBD; + }); + + describe('constructor', function() { + describe('always', function() { + beforeEach(function() { + spyOn($, 'ajaxWithPrefix').andCallThrough(); + initialize(); + }); + + it('create the caption element', function() { + expect($('.videoalpha')).toContain('ol.subtitles'); + }); + + it('add caption control to video player', function() { + expect($('.videoalpha')).toContain('a.hide-subtitles'); + }); + + it('fetch the caption', function() { + waitsFor(function () { + if (videoCaption.loaded === true) { + return true; + } + + return false; + }, 'Expect captions to be loaded.', 1000); + + runs(function () { + expect($.ajaxWithPrefix).toHaveBeenCalledWith({ + url: videoCaption.captionURL(), + notifyOnError: false, + success: jasmine.any(Function) + }); + }); + }); + + it('bind window resize event', function() { + expect($(window)).toHandleWith('resize', videoCaption.resize); + }); + + it('bind the hide caption button', function() { + expect($('.hide-subtitles')).toHandleWith('click', videoCaption.toggle); + }); + + it('bind the mouse movement', function() { + expect($('.subtitles')).toHandleWith('mouseover', videoCaption.onMouseEnter); + expect($('.subtitles')).toHandleWith('mouseout', videoCaption.onMouseLeave); + expect($('.subtitles')).toHandleWith('mousemove', videoCaption.onMovement); + expect($('.subtitles')).toHandleWith('mousewheel', videoCaption.onMovement); + expect($('.subtitles')).toHandleWith('DOMMouseScroll', videoCaption.onMovement); + }); + + it('bind the scroll', function() { + expect($('.subtitles')).toHandleWith('scroll', videoCaption.autoShowCaptions); + expect($('.subtitles')).toHandleWith('scroll', videoControl.showControls); + }); + }); + + describe('when on a non touch-based device', function() { + beforeEach(function() { + initialize(); + }); + + it('render the caption', function() { + var captionsData; + + captionsData = jasmine.stubbedCaption; + $('.subtitles li[data-index]').each(function(index, link) { + expect($(link)).toHaveData('index', index); + expect($(link)).toHaveData('start', captionsData.start[index]); + expect($(link)).toHaveText(captionsData.text[index]); + }); + }); + + it('add a padding element to caption', function() { + expect($('.subtitles li:first').hasClass('spacing')).toBe(true); + expect($('.subtitles li:last').hasClass('spacing')).toBe(true); + }); + + it('bind all the caption link', function() { + $('.subtitles li[data-index]').each(function(index, link) { + expect($(link)).toHandleWith('click', videoCaption.seekPlayer); + }); + }); + + it('set rendered to true', function() { + expect(videoCaption.rendered).toBeTruthy(); + }); + }); + + describe('when on a touch-based device', function() { + beforeEach(function() { + window.onTouchBasedDevice.andReturn(true); + initialize(); + }); + + it('show explaination message', function() { + expect($('.subtitles li')).toHaveHtml("Caption will be displayed when you start playing the video."); + }); + + it('does not set rendered to true', function() { + expect(videoCaption.rendered).toBeFalsy(); + }); + }); + }); + + describe('mouse movement', function() { + beforeEach(function() { + //initialize(); + window.setTimeout.andReturn(100); + spyOn(window, 'clearTimeout'); + }); + + describe('when cursor is outside of the caption box', function() { + beforeEach(function() { + $(window).trigger(jQuery.Event('mousemove')); + }); + + it('does not set freezing timeout', function() { + expect(videoCaption.frozen).toBeFalsy(); + }); + }); + + describe('when cursor is in the caption box', function() { + beforeEach(function() { + $('.subtitles').trigger(jQuery.Event('mouseenter')); + }); + + it('set the freezing timeout', function() { + expect(videoCaption.frozen).toEqual(100); + }); + + describe('when the cursor is moving', function() { + beforeEach(function() { + $('.subtitles').trigger(jQuery.Event('mousemove')); + }); + + it('reset the freezing timeout', function() { + expect(window.clearTimeout).toHaveBeenCalledWith(100); + }); + }); + + describe('when the mouse is scrolling', function() { + beforeEach(function() { + $('.subtitles').trigger(jQuery.Event('mousewheel')); + }); + + it('reset the freezing timeout', function() { + expect(window.clearTimeout).toHaveBeenCalledWith(100); + }); + }); + }); + + describe('when cursor is moving out of the caption box', function() { + beforeEach(function() { + videoCaption.frozen = 100; + $.fn.scrollTo.reset(); + }); + + describe('always', function() { + beforeEach(function() { + $('.subtitles').trigger(jQuery.Event('mouseout')); + }); + + it('reset the freezing timeout', function() { + expect(window.clearTimeout).toHaveBeenCalledWith(100); + }); + + it('unfreeze the caption', function() { + expect(videoCaption.frozen).toBeNull(); + }); + }); + + describe('when the player is playing', function() { + beforeEach(function() { + videoCaption.playing = true; + $('.subtitles li[data-index]:first').addClass('current'); + $('.subtitles').trigger(jQuery.Event('mouseout')); + }); + + it('scroll the caption', function() { + expect($.fn.scrollTo).toHaveBeenCalled(); + }); + }); + + describe('when the player is not playing', function() { + beforeEach(function() { + videoCaption.playing = false; + $('.subtitles').trigger(jQuery.Event('mouseout')); + }); + + it('does not scroll the caption', function() { + expect($.fn.scrollTo).not.toHaveBeenCalled(); + }); + }); + }); + }); + + 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); + expect(videoCaption.search(6270)).toEqual(2); + expect(videoCaption.search(8490)).toEqual(2); + expect(videoCaption.search(21620)).toEqual(4); + expect(videoCaption.search(24920)).toEqual(5); + }); + }); + + describe('play', function() { + describe('when the caption was not rendered', function() { + beforeEach(function() { + window.onTouchBasedDevice.andReturn(true); + initialize(); + videoCaption.play(); + }); + + it('render the caption', function() { + var captionsData; + + captionsData = jasmine.stubbedCaption; + $('.subtitles li[data-index]').each(function(index, link) { + expect($(link)).toHaveData('index', index); + expect($(link)).toHaveData('start', captionsData.start[index]); + expect($(link)).toHaveText(captionsData.text[index]); + }); + }); + + it('add a padding element to caption', function() { + expect($('.subtitles li:first')).toBe('.spacing'); + expect($('.subtitles li:last')).toBe('.spacing'); + }); + + it('bind all the caption link', function() { + $('.subtitles li[data-index]').each(function(index, link) { + expect($(link)).toHandleWith('click', videoCaption.seekPlayer); + }); + }); + + it('set rendered to true', function() { + expect(videoCaption.rendered).toBeTruthy(); + }); + + it('set playing to true', function() { + expect(videoCaption.playing).toBeTruthy(); + }); + }); + }); + + describe('pause', function() { + beforeEach(function() { + //initialize(); + videoCaption.playing = true; + videoCaption.pause(); + }); + + it('set playing to false', function() { + expect(videoCaption.playing).toBeFalsy(); + }); + }); + + describe('updatePlayTime', function() { + /*beforeEach(function() { + initialize(); + });*/ + + describe('when the video speed is 1.0x', function() { + beforeEach(function() { + videoSpeedControl.currentSpeed = '1.0'; + videoCaption.updatePlayTime(25.000); + }); + + it('search the caption based on time', function() { + expect(videoCaption.currentIndex).toEqual(5); + }); + }); + + describe('when the video speed is not 1.0x', function() { + beforeEach(function() { + videoSpeedControl.currentSpeed = '0.75'; + videoCaption.updatePlayTime(25.000); + }); + + it('search the caption based on 1.0x speed', function() { + expect(videoCaption.currentIndex).toEqual(5); + }); + }); + + describe('when the index is not the same', function() { + beforeEach(function() { + videoCaption.currentIndex = 1; + $('.subtitles li[data-index=5]').addClass('current'); + videoCaption.updatePlayTime(25.000); + }); + + it('deactivate the previous caption', function() { + expect($('.subtitles li[data-index=1]')).not.toHaveClass('current'); + }); + + it('activate new caption', function() { + expect($('.subtitles li[data-index=5]')).toHaveClass('current'); + }); + + it('save new index', function() { + expect(videoCaption.currentIndex).toEqual(5); + }); + + it('scroll caption to new position', function() { + expect($.fn.scrollTo).toHaveBeenCalled(); + }); + }); + + describe('when the index is the same', function() { + beforeEach(function() { + videoCaption.currentIndex = 1; + $('.subtitles li[data-index=3]').addClass('current'); + videoCaption.updatePlayTime(15.000); + }); + + it('does not change current subtitle', function() { + expect($('.subtitles li[data-index=3]')).toHaveClass('current'); + }); + }); + }); + + describe('resize', function() { + beforeEach(function() { + initialize(); + $('.subtitles li[data-index=1]').addClass('current'); + videoCaption.resize(); + }); + + describe('set the height of caption container', function(){ + it('when CC button is enabled', function() { + var realHeight = parseInt($('.subtitles').css('maxHeight'), 10), + shouldBeHeight = $('.video-wrapper').height(); + + // Because of some problems with rounding on different enviroments: + // Linux * Mac * FF * Chrome + expect(realHeight).toBeCloseTo(shouldBeHeight, 2); + }); + + 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; + + state.captionsHidden = true; + videoCaption.setSubtitlesHeight(); + expect(realHeight).toBeCloseTo($('.video-wrapper').height(shouldBeHeight, 2)); + }); + }); + + it('set the height of caption spacing', function() { + var firstSpacing, lastSpacing; + firstSpacing = Math.abs(parseInt($('.subtitles .spacing:first').css('height'), 10)); + lastSpacing = Math.abs(parseInt($('.subtitles .spacing:last').css('height'), 10)); + expect(firstSpacing - videoCaption.topSpacingHeight()).toBeLessThan(1); + expect(lastSpacing - videoCaption.bottomSpacingHeight()).toBeLessThan(1); + }); + + it('scroll caption to new position', function() { + expect($.fn.scrollTo).toHaveBeenCalled(); + }); + }); + + describe('scrollCaption', function() { + beforeEach(function() { + initialize(); + }); + + describe('when frozen', function() { + beforeEach(function() { + videoCaption.frozen = true; + $('.subtitles li[data-index=1]').addClass('current'); + videoCaption.scrollCaption(); + }); + + it('does not scroll the caption', function() { + expect($.fn.scrollTo).not.toHaveBeenCalled(); + }); + }); + + describe('when not frozen', function() { + beforeEach(function() { + videoCaption.frozen = false; + }); + + describe('when there is no current caption', function() { + beforeEach(function() { + videoCaption.scrollCaption(); + }); + + it('does not scroll the caption', function() { + expect($.fn.scrollTo).not.toHaveBeenCalled(); + }); + }); + + describe('when there is a current caption', function() { + beforeEach(function() { + $('.subtitles li[data-index=1]').addClass('current'); + videoCaption.scrollCaption(); + }); + + 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(); + }); + }); + }); + }); + + 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'); + }); + + it('trigger seek event with the correct time', function() { + expect(videoPlayer.currentTime).toEqual(15); + }); + }); + + describe('when the video speed is not 1.0x', function() { + beforeEach(function() { + initialize(); + videoSpeedControl.currentSpeed = '0.75'; + $('.subtitles li[data-start="14910"]').trigger('click'); + }); + + it('trigger seek event with the correct time', function() { + expect(videoPlayer.currentTime).toEqual(15); + }); + }); + }); + + describe('toggle', function() { + beforeEach(function() { + initialize(); + spyOn(videoPlayer, 'log'); + $('.subtitles li[data-index=1]').addClass('current'); + }); + + describe('when the caption is visible', function() { + beforeEach(function() { + state.el.removeClass('closed'); + videoCaption.toggle(jQuery.Event('click')); + }); + + it('log the hide_transcript event', function() { + expect(videoPlayer.log).toHaveBeenCalledWith('hide_transcript', { + currentTime: videoPlayer.currentTime + }); + }); + + it('hide the caption', function() { + expect(state.el).toHaveClass('closed'); + }); + }); + + describe('when the caption is hidden', function() { + beforeEach(function() { + state.el.addClass('closed'); + videoCaption.toggle(jQuery.Event('click')); + }); + + it('log the show_transcript event', function() { + expect(videoPlayer.log).toHaveBeenCalledWith('show_transcript', { + currentTime: videoPlayer.currentTime + }); + }); + + it('show the caption', function() { + expect(state.el).not.toHaveClass('closed'); + }); + + it('scroll the caption', function() { + expect($.fn.scrollTo).toHaveBeenCalled(); + }); + }); + }); + }); + +}).call(this); diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/video_control_spec.js b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_control_spec.js new file mode 100644 index 0000000000..b98fd1e413 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_control_spec.js @@ -0,0 +1,124 @@ +(function() { + xdescribe('VideoControlAlpha', function() { + var state, videoControl, oldOTBD; + + function initialize() { + loadFixtures('videoalpha_all.html'); + state = new VideoAlpha('#example'); + videoControl = state.videoControl; + } + + beforeEach(function(){ + oldOTBD = window.onTouchBasedDevice; + window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn(false); + }); + + afterEach(function() { + $('source').remove(); + window.onTouchBasedDevice = oldOTBD; + }); + + describe('constructor', function() { + beforeEach(function() { + initialize(); + }); + + it('render the video controls', function() { + expect($('.video-controls')).toContain( + ['.slider', 'ul.vcr', 'a.play', '.vidtime', '.add-fullscreen'].join(',') + ); + expect($('.video-controls').find('.vidtime')).toHaveText('0:00 / 0:00'); + }); + + it('bind the playback button', function() { + expect($('.video_control')).toHandleWith('click', videoControl.togglePlayback); + }); + + describe('when on a non-touch based device', function() { + beforeEach(function() { + initialize(); + }); + + it('add the play class to video control', function() { + expect($('.video_control')).toHaveClass('play'); + expect($('.video_control')).toHaveAttr('title', 'Play'); + }); + }); + + describe('when on a touch based device', function() { + beforeEach(function() { + window.onTouchBasedDevice.andReturn(true); + initialize(); + }); + + it('does not add the play class to video control', function() { + expect($('.video_control')).not.toHaveClass('play'); + expect($('.video_control')).not.toHaveAttr('title', 'Play'); + }); + }); + }); + + describe('play', function() { + beforeEach(function() { + initialize(); + videoControl.play(); + }); + + it('switch playback button to play state', function() { + expect($('.video_control')).not.toHaveClass('play'); + expect($('.video_control')).toHaveClass('pause'); + expect($('.video_control')).toHaveAttr('title', 'Pause'); + }); + }); + + describe('pause', function() { + beforeEach(function() { + initialize(); + videoControl.pause(); + }); + + it('switch playback button to pause state', function() { + expect($('.video_control')).not.toHaveClass('pause'); + expect($('.video_control')).toHaveClass('play'); + expect($('.video_control')).toHaveAttr('title', 'Play'); + }); + }); + + describe('togglePlayback', function() { + beforeEach(function() { + initialize(); + }); + + describe('when the control does not have play or pause class', function() { + beforeEach(function() { + $('.video_control').removeClass('play').removeClass('pause'); + }); + + describe('when the video is playing', function() { + beforeEach(function() { + $('.video_control').addClass('play'); + spyOnEvent(videoControl, 'pause'); + videoControl.togglePlayback(jQuery.Event('click')); + }); + + it('does not trigger the pause event', function() { + expect('pause').not.toHaveBeenTriggeredOn(videoControl); + }); + }); + + describe('when the video is paused', function() { + beforeEach(function() { + $('.video_control').addClass('pause'); + spyOnEvent(videoControl, 'play'); + videoControl.togglePlayback(jQuery.Event('click')); + }); + + it('does not trigger the play event', function() { + expect('play').not.toHaveBeenTriggeredOn(videoControl); + }); + }); + }); + }); + }); + +}).call(this); 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 new file mode 100644 index 0000000000..467ecc75a2 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_player_spec.js @@ -0,0 +1,751 @@ +(function() { + xdescribe('VideoPlayerAlpha', function() { + var state, videoPlayer, player, videoControl, videoCaption, videoProgressSlider, videoSpeedControl, videoVolumeControl, oldOTBD; + + function initialize(fixture) { + if (typeof fixture === 'undefined') { + loadFixtures('videoalpha_all.html'); + } else { + loadFixtures(fixture); + } + + state = new VideoAlpha('#example'); + videoPlayer = state.videoPlayer; + player = videoPlayer.player; + videoControl = state.videoControl; + videoCaption = state.videoCaption; + videoProgressSlider = state.videoProgressSlider; + videoSpeedControl = state.videoSpeedControl; + videoVolumeControl = state.videoVolumeControl; + } + + function initializeYouTube() { + initialize('videoalpha.html'); + } + + beforeEach(function () { + oldOTBD = window.onTouchBasedDevice; + window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn(false); + }); + + afterEach(function() { + $('source').remove(); + window.onTouchBasedDevice = oldOTBD; + }); + + describe('constructor', function() { + beforeEach(function() { + $.fn.qtip.andCallFake(function() { + $(this).data('qtip', true); + }); + }); + + describe('always', function() { + beforeEach(function() { + initialize(); + }); + + it('instanticate current time to zero', function() { + expect(videoPlayer.currentTime).toEqual(0); + }); + + it('set the element', function() { + expect(state.el).toHaveId('video_id'); + }); + + it('create video control', function() { + expect(videoControl).toBeDefined(); + expect(videoControl.el).toHaveClass('video-controls'); + }); + + it('create video caption', function() { + expect(videoCaption).toBeDefined(); + expect(state.youtubeId()).toEqual('test_name_of_the_subtitles'); + expect(state.speed).toEqual('1.0'); + expect(state.config.caption_asset_path).toEqual('/static/subs/'); + }); + + it('create video speed control', function() { + expect(videoSpeedControl).toBeDefined(); + expect(videoSpeedControl.el).toHaveClass('speeds'); + expect(videoSpeedControl.speeds).toEqual([ '0.75', '1.0', '1.25', '1.50' ]); + expect(state.speed).toEqual('1.0'); + }); + + it('create video progress slider', function() { + expect(videoProgressSlider).toBeDefined(); + expect(videoProgressSlider.el).toHaveClass('slider'); + }); + + // 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() { + var oldYT = window.YT; + + window.YT = { + Player: function () { }, + PlayerState: oldYT.PlayerState + }; + + spyOn(window.YT, 'Player'); + + initializeYouTube(); + + expect(YT.Player).toHaveBeenCalledWith('id', { + playerVars: { + controls: 0, + wmode: 'transparent', + rel: 0, + showinfo: 0, + enablejsapi: 1, + modestbranding: 1, + html5: 1 + }, + videoId: 'normalSpeedYoutubeId', + events: { + onReady: videoPlayer.onReady, + onStateChange: videoPlayer.onStateChange, + onPlaybackQualityChange: videoPlayer.onPlaybackQualityChange + } + }); + + window.YT = oldYT; + }); + + // 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() { + window.onTouchBasedDevice.andReturn(true); + 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'); + }); + }); + + describe('when on a touch based device', function() { + var oldOTBD; + + beforeEach(function() { + 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); + }); + }); + }); + + describe('onReady', function() { + beforeEach(function() { + initialize(); + + spyOn(videoPlayer, 'log').andCallThrough(); + spyOn(videoPlayer, 'play').andCallThrough(); + videoPlayer.onReady(); + }); + + it('log the load_video event', function() { + expect(videoPlayer.log).toHaveBeenCalledWith('load_video'); + }); + + it('autoplay the first video', function() { + expect(videoPlayer.play).not.toHaveBeenCalled(); + }); + }); + + describe('onStateChange', function() { + describe('when the video is unstarted', function() { + beforeEach(function() { + initialize(); + + spyOn(videoControl, 'pause').andCallThrough(); + spyOn(videoCaption, 'pause').andCallThrough(); + + videoPlayer.onStateChange({ + data: YT.PlayerState.PAUSED + }); + }); + + it('pause the video control', function() { + expect(videoControl.pause).toHaveBeenCalled(); + }); + + it('pause the video caption', function() { + expect(videoCaption.pause).toHaveBeenCalled(); + }); + }); + + describe('when the video is playing', function() { + var oldState; + + beforeEach(function() { + // Create the first instance of the player. + initialize(); + oldState = state; + + spyOn(oldState.videoPlayer, 'onPause').andCallThrough(); + + // Now initialize a second instance. + initialize(); + + spyOn(videoPlayer, 'log').andCallThrough(); + spyOn(window, 'setInterval').andReturn(100); + spyOn(videoControl, 'play'); + spyOn(videoCaption, 'play'); + + videoPlayer.onStateChange({ + data: YT.PlayerState.PLAYING + }); + }); + + it('log the play_video event', function() { + expect(videoPlayer.log).toHaveBeenCalledWith('play_video', { + currentTime: 0 + }); + }); + + it('pause other video player', function() { + expect(oldState.videoPlayer.onPause).toHaveBeenCalled(); + }); + + it('set update interval', function() { + expect(window.setInterval).toHaveBeenCalledWith(videoPlayer.update, 200); + expect(videoPlayer.updateInterval).toEqual(100); + }); + + it('play the video control', function() { + expect(videoControl.play).toHaveBeenCalled(); + }); + + it('play the video caption', function() { + expect(videoCaption.play).toHaveBeenCalled(); + }); + }); + + describe('when the video is paused', function() { + var currentUpdateIntrval; + + beforeEach(function() { + initialize(); + + spyOn(videoPlayer, 'log').andCallThrough(); + spyOn(window, 'clearInterval').andCallThrough(); + spyOn(videoControl, 'pause').andCallThrough(); + spyOn(videoCaption, 'pause').andCallThrough(); + + videoPlayer.onStateChange({ + data: YT.PlayerState.PLAYING + }); + + currentUpdateIntrval = videoPlayer.updateInterval; + + videoPlayer.onStateChange({ + data: YT.PlayerState.PAUSED + }); + }); + + it('log the pause_video event', function() { + expect(videoPlayer.log).toHaveBeenCalledWith('pause_video', { + currentTime: 0 + }); + }); + + it('clear update interval', function() { + expect(window.clearInterval).toHaveBeenCalledWith(currentUpdateIntrval); + expect(videoPlayer.updateInterval).toBeUndefined(); + }); + + it('pause the video control', function() { + expect(videoControl.pause).toHaveBeenCalled(); + }); + + it('pause the video caption', function() { + expect(videoCaption.pause).toHaveBeenCalled(); + }); + }); + + describe('when the video is ended', function() { + beforeEach(function() { + initialize(); + + spyOn(videoControl, 'pause').andCallThrough(); + spyOn(videoCaption, 'pause').andCallThrough(); + + videoPlayer.onStateChange({ + data: YT.PlayerState.ENDED + }); + }); + + it('pause the video control', function() { + expect(videoControl.pause).toHaveBeenCalled(); + }); + + it('pause the video caption', function() { + expect(videoCaption.pause).toHaveBeenCalled(); + }); + }); + }); + + describe('onSeek', function() { + beforeEach(function() { + spyOn(window, 'clearInterval').andCallThrough(); + + initialize(); + + videoPlayer.updateInterval = 100; + + spyOn(videoPlayer, 'updatePlayTime'); + spyOn(videoPlayer, 'log'); + spyOn(videoPlayer.player, 'seekTo'); + }); + + it('Slider event causes log update', function () { + videoProgressSlider.onSlide(jQuery.Event('slide'), {value: 60}); + + expect(videoPlayer.log).toHaveBeenCalledWith( + 'seek_video', + { + old_time: 0, + new_time: 60, + type: 'onSlideSeek' + } + ); + }); + + it('seek the player', function() { + videoProgressSlider.onSlide(jQuery.Event('slide'), {value: 60}); + + expect(videoPlayer.player.seekTo).toHaveBeenCalledWith(60, true); + }); + + it('call updatePlayTime on player', function() { + videoProgressSlider.onSlide(jQuery.Event('slide'), {value: 60}); + + expect(videoPlayer.updatePlayTime).toHaveBeenCalledWith(60); + }); + + it('when the player is playing: reset the update interval', function() { + videoProgressSlider.onSlide(jQuery.Event('slide'), {value: 60}); + + expect(window.clearInterval).toHaveBeenCalledWith(100); + }); + + it('when the player is not playing: set the current time', function() { + videoProgressSlider.onSlide(jQuery.Event('slide'), {value: 60}); + videoPlayer.pause(); + + expect(videoPlayer.currentTime).toEqual(60); + }); + }); + + describe('onSpeedChange', function() { + beforeEach(function() { + initialize(); + + videoPlayer.currentTime = 60; + + spyOn(videoPlayer, 'updatePlayTime').andCallThrough(); + spyOn(state, 'setSpeed').andCallThrough(); + spyOn(videoPlayer, 'log').andCallThrough(); + spyOn(videoPlayer.player, 'setPlaybackRate').andCallThrough(); + }); + + describe('always', function() { + beforeEach(function() { + videoPlayer.onSpeedChange('0.75', false); + }); + + it('check if speed_change_video is logged', function() { + expect(videoPlayer.log).toHaveBeenCalledWith('speed_change_video', { + current_time: videoPlayer.currentTime, + old_speed: '1.0', + new_speed: '0.75' + }); + }); + + it('convert the current time to the new speed', function() { + expect(videoPlayer.currentTime).toEqual(60); + }); + + it('set video speed to the new speed', function() { + expect(state.setSpeed).toHaveBeenCalledWith('0.75', false); + }); + + // Not relevant any more. + // + // it('tell video caption that the speed has changed', function() { + // expect(this.player.caption.currentSpeed).toEqual('0.75'); + // }); + }); + + describe('when the video is playing', function() { + beforeEach(function() { + videoPlayer.play(); + + videoPlayer.onSpeedChange('0.75', false); + }); + + it('trigger updatePlayTime event', function() { + expect(videoPlayer.player.setPlaybackRate).toHaveBeenCalledWith('0.75'); + }); + }); + + describe('when the video is not playing', function() { + beforeEach(function() { + videoPlayer.pause(); + + videoPlayer.onSpeedChange('0.75', false); + }); + + it('trigger updatePlayTime event', function() { + expect(videoPlayer.player.setPlaybackRate).toHaveBeenCalledWith('0.75'); + }); + }); + }); + + describe('onVolumeChange', function() { + beforeEach(function() { + initialize(); + + spyOn(videoPlayer.player, 'setVolume'); + videoPlayer.onVolumeChange(60); + }); + + it('set the volume on player', function() { + expect(videoPlayer.player.setVolume).toHaveBeenCalledWith(60); + }); + }); + + describe('update', function() { + beforeEach(function() { + initialize(); + + spyOn(videoPlayer, 'updatePlayTime').andCallThrough(); + }); + + describe('when the current time is unavailable from the player', function() { + beforeEach(function() { + videoPlayer.player.getCurrentTime = function () { + return NaN; + }; + videoPlayer.update(); + }); + + it('does not trigger updatePlayTime event', function() { + expect(videoPlayer.updatePlayTime).not.toHaveBeenCalled(); + }); + }); + + describe('when the current time is available from the player', function() { + beforeEach(function() { + videoPlayer.player.getCurrentTime = function () { + return 60; + }; + videoPlayer.update(); + }); + + it('trigger updatePlayTime event', function() { + expect(videoPlayer.updatePlayTime).toHaveBeenCalledWith(60); + }); + }); + }); + + describe('updatePlayTime', function() { + beforeEach(function() { + initialize(); + + spyOn(videoCaption, 'updatePlayTime').andCallThrough(); + spyOn(videoProgressSlider, 'updatePlayTime').andCallThrough(); + }); + + it('update the video playback time', function() { + var duration = 0; + + waitsFor(function () { + duration = videoPlayer.duration(); + + if (duration > 0) { + return true; + } + + return false; + }, 'Video is fully loaded.', 1000); + + runs(function () { + var htmlStr; + + videoPlayer.updatePlayTime(60); + + htmlStr = $('.vidtime').html(); + + // We resort to this trickery because Firefox and Chrome + // round the total time a bit differently. + if (htmlStr.match('1:00 / 1:01') || htmlStr.match('1:00 / 1:00')) { + expect(true).toBe(true); + } else { + expect(true).toBe(false); + } + + // The below test has been replaced by above trickery. + // expect($('.vidtime')).toHaveHtml('1:00 / 1:01'); + }); + }); + + it('update the playback time on caption', function() { + var duration = 0; + + waitsFor(function () { + duration = videoPlayer.duration(); + + if (duration > 0) { + return true; + } + + return false; + }, 'Video is fully loaded.', 1000); + + runs(function () { + videoPlayer.updatePlayTime(60); + + expect(videoCaption.updatePlayTime).toHaveBeenCalledWith(60); + }); + }); + + it('update the playback time on progress slider', function() { + var duration = 0; + + waitsFor(function () { + duration = videoPlayer.duration(); + + if (duration > 0) { + return true; + } + + return false; + }, 'Video is fully loaded.', 1000); + + runs(function () { + videoPlayer.updatePlayTime(60); + + expect(videoProgressSlider.updatePlayTime).toHaveBeenCalledWith({ + time: 60, + duration: duration + }); + }); + }); + }); + + describe('toggleFullScreen', function() { + describe('when the video player is not full screen', function() { + beforeEach(function() { + initialize(); + spyOn(videoCaption, 'resize').andCallThrough(); + videoControl.toggleFullScreen(jQuery.Event("click")); + }); + + it('replace the full screen button tooltip', function() { + expect($('.add-fullscreen')).toHaveAttr('title', 'Exit fullscreen'); + }); + + it('add the video-fullscreen class', function() { + expect(state.el).toHaveClass('video-fullscreen'); + }); + + it('tell VideoCaption to resize', function() { + expect(videoCaption.resize).toHaveBeenCalled(); + }); + }); + + describe('when the video player already full screen', function() { + beforeEach(function() { + initialize(); + spyOn(videoCaption, 'resize').andCallThrough(); + + state.el.addClass('video-fullscreen'); + videoControl.fullScreenState = true; + isFullScreen = true; + videoControl.fullScreenEl.attr('title', 'Exit-fullscreen'); + + videoControl.toggleFullScreen(jQuery.Event("click")); + }); + + it('replace the full screen button tooltip', function() { + expect($('.add-fullscreen')).toHaveAttr('title', 'Fullscreen'); + }); + + it('remove the video-fullscreen class', function() { + expect(state.el).not.toHaveClass('video-fullscreen'); + }); + + it('tell VideoCaption to resize', function() { + expect(videoCaption.resize).toHaveBeenCalled(); + }); + }); + }); + + describe('play', function() { + beforeEach(function() { + initialize(); + spyOn(player, 'playVideo').andCallThrough(); + }); + + describe('when the player is not ready', function() { + beforeEach(function() { + player.playVideo = void 0; + videoPlayer.play(); + }); + it('does nothing', function() { + expect(player.playVideo).toBeUndefined(); + }); + }); + + describe('when the player is ready', function() { + beforeEach(function() { + player.playVideo.andReturn(true); + videoPlayer.play(); + }); + + it('delegate to the player', function() { + expect(player.playVideo).toHaveBeenCalled(); + }); + }); + }); + + describe('isPlaying', function() { + beforeEach(function() { + initialize(); + spyOn(player, 'getPlayerState').andCallThrough(); + }); + + describe('when the video is playing', function() { + beforeEach(function() { + player.getPlayerState.andReturn(YT.PlayerState.PLAYING); + }); + + it('return true', function() { + expect(videoPlayer.isPlaying()).toBeTruthy(); + }); + }); + + describe('when the video is not playing', function() { + beforeEach(function() { + player.getPlayerState.andReturn(YT.PlayerState.PAUSED); + }); + + it('return false', function() { + expect(videoPlayer.isPlaying()).toBeFalsy(); + }); + }); + }); + + describe('pause', function() { + beforeEach(function() { + initialize(); + spyOn(player, 'pauseVideo').andCallThrough(); + videoPlayer.pause(); + }); + + it('delegate to the player', function() { + expect(player.pauseVideo).toHaveBeenCalled(); + }); + }); + + describe('duration', function() { + beforeEach(function() { + initialize(); + spyOn(player, 'getDuration').andCallThrough(); + videoPlayer.duration(); + }); + + it('delegate to the player', function() { + expect(player.getDuration).toHaveBeenCalled(); + }); + }); + + describe('playback rate', function() { + beforeEach(function() { + initialize(); + player.setPlaybackRate(1.5); + }); + + it('set the player playback rate', function() { + expect(player.video.playbackRate).toEqual(1.5); + }); + }); + + describe('volume', function() { + beforeEach(function() { + initialize(); + spyOn(player, 'getVolume').andCallThrough(); + }); + + it('set the player volume', function() { + player.setVolume(60); + expect(player.getVolume()).toEqual(0.6); + }); + }); + }); + +}).call(this); 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 new file mode 100644 index 0000000000..93b839dedf --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_progress_slider_spec.js @@ -0,0 +1,245 @@ +(function() { + xdescribe('VideoProgressSliderAlpha', function() { + var state, videoPlayer, videoProgressSlider, oldOTBD; + + function initialize() { + loadFixtures('videoalpha_all.html'); + state = new VideoAlpha('#example'); + videoPlayer = state.videoPlayer; + videoProgressSlider = state.videoProgressSlider; + } + + beforeEach(function() { + oldOTBD = window.onTouchBasedDevice; + window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn(false); + }); + + + afterEach(function() { + $('source').remove(); + window.onTouchBasedDevice = oldOTBD; + }); + + describe('constructor', function() { + describe('on a non-touch based device', function() { + beforeEach(function() { + spyOn($.fn, 'slider').andCallThrough(); + initialize(); + }); + + 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('.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 + } + }); + }); + }); + + describe('on a touch-based device', function() { + beforeEach(function() { + window.onTouchBasedDevice.andReturn(true); + spyOn($.fn, 'slider').andCallThrough(); + initialize(); + }); + + it('does not build the slider', function() { + expect(videoProgressSlider.slider).toBeUndefined(); + + // 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(); + }); + }); + }); + + describe('play', function() { + beforeEach(function() { + initialize(); + }); + + describe('when the slider was already built', function() { + var spy; + + beforeEach(function() { + spy = spyOn(videoProgressSlider, 'buildSlider'); + spy.andCallThrough(); + videoPlayer.play(); + }); + + it('does not build the slider', function() { + expect(spy.callCount).toEqual(0); + }); + }); + + // 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() { + beforeEach(function() { + initialize(); + }); + + describe('when frozen', function() { + beforeEach(function() { + spyOn($.fn, 'slider').andCallThrough(); + videoProgressSlider.frozen = true; + videoProgressSlider.updatePlayTime(20, 120); + }); + + it('does not update the slider', function() { + expect($.fn.slider).not.toHaveBeenCalled(); + }); + }); + + describe('when not frozen', function() { + beforeEach(function() { + spyOn($.fn, 'slider').andCallThrough(); + videoProgressSlider.frozen = false; + videoProgressSlider.updatePlayTime({time:20, duration:120}); + }); + + it('update the max value of the slider', function() { + expect($.fn.slider).toHaveBeenCalledWith('option', 'max', 120); + }); + + it('update current value of the slider', function() { + expect($.fn.slider).toHaveBeenCalledWith('option', 'value', 20); + }); + }); + }); + + describe('onSlide', function() { + beforeEach(function() { + initialize(); + spyOn($.fn, 'slider').andCallThrough(); + spyOn(videoPlayer, 'onSlideSeek').andCallThrough(); + videoProgressSlider.onSlide({}, { + value: 20 + }); + }); + + it('freeze the slider', function() { + 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); + }); + }); + + describe('onChange', function() { + beforeEach(function() { + initialize(); + spyOn($.fn, 'slider').andCallThrough(); + videoProgressSlider.onChange({}, { + value: 20 + }); + }); + it('update the tooltip', function() { + expect($.fn.qtip).toHaveBeenCalled(); + }); + }); + + describe('onStop', function() { + beforeEach(function() { + initialize(); + spyOn(videoPlayer, 'onSlideSeek').andCallThrough(); + videoProgressSlider.onStop({}, { + value: 20 + }); + }); + + it('freeze the slider', function() { + expect(videoProgressSlider.frozen).toBeTruthy(); + }); + + it('trigger seek event', function() { + expect(videoPlayer.onSlideSeek).toHaveBeenCalled(); + expect(videoPlayer.currentTime).toEqual(20); + }); + + it('set timeout to unfreeze the slider', function() { + expect(window.setTimeout).toHaveBeenCalledWith(jasmine.any(Function), 200); + window.setTimeout.mostRecentCall.args[0](); + 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_quality_control_spec.js b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_quality_control_spec.js new file mode 100644 index 0000000000..7126dc5921 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_quality_control_spec.js @@ -0,0 +1,37 @@ +(function() { + xdescribe('VideoQualityControlAlpha', function() { + var state, videoControl, videoQualityControl, oldOTBD; + + function initialize() { + loadFixtures('videoalpha.html'); + state = new VideoAlpha('#example'); + videoControl = state.videoControl; + videoQualityControl = state.videoQualityControl; + } + + beforeEach(function() { + oldOTBD = window.onTouchBasedDevice; + window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn(false); + }); + + afterEach(function() { + $('source').remove(); + window.onTouchBasedDevice = oldOTBD; + }); + + describe('constructor', function() { + beforeEach(function() { + initialize(); + }); + + it('render the quality control', function() { + expect(videoControl.secondaryControlsEl.html()).toContain("<a href=\"#\" class=\"quality_control\" title=\"HD\">"); + }); + + it('bind the quality control', function() { + expect($('.quality_control')).toHandleWith('click', videoQualityControl.toggleQuality); + }); + }); + }); + +}).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 new file mode 100644 index 0000000000..c56375f6f7 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_speed_control_spec.js @@ -0,0 +1,138 @@ +(function() { + xdescribe('VideoSpeedControlAlpha', function() { + var state, videoPlayer, videoControl, videoSpeedControl; + + function initialize() { + loadFixtures('videoalpha_all.html'); + state = new VideoAlpha('#example'); + videoPlayer = state.videoPlayer; + videoControl = state.videoControl; + videoSpeedControl = state.videoSpeedControl; + } + + beforeEach(function() { + oldOTBD = window.onTouchBasedDevice; + window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn(false); + }); + + + afterEach(function() { + $('source').remove(); + window.onTouchBasedDevice = oldOTBD; + }); + + describe('constructor', function() { + describe('always', function() { + beforeEach(function() { + initialize(); + }); + + it('add the video speed control to player', function() { + var li, secondaryControls; + secondaryControls = $('.secondary-controls'); + li = secondaryControls.find('.video_speeds li'); + expect(secondaryControls).toContain('.speeds'); + expect(secondaryControls).toContain('.video_speeds'); + expect(secondaryControls.find('p.active').text()).toBe('1.0x'); + expect(li.filter('.active')).toHaveData('speed', videoSpeedControl.currentSpeed); + expect(li.length).toBe(videoSpeedControl.speeds.length); + $.each(li.toArray().reverse(), function(index, link) { + expect($(link)).toHaveData('speed', videoSpeedControl.speeds[index]); + expect($(link).find('a').text()).toBe(videoSpeedControl.speeds[index] + 'x'); + }); + }); + + it('bind to change video speed link', function() { + expect($('.video_speeds a')).toHandleWith('click', videoSpeedControl.changeVideoSpeed); + }); + }); + + describe('when running on touch based device', function() { + beforeEach(function() { + window.onTouchBasedDevice.andReturn(true); + initialize(); + }); + + it('open the speed toggle on click', function() { + $('.speeds').click(); + expect($('.speeds')).toHaveClass('open'); + $('.speeds').click(); + expect($('.speeds')).not.toHaveClass('open'); + }); + }); + + describe('when running on non-touch based device', function() { + beforeEach(function() { + initialize(); + }); + + it('open the speed toggle on hover', function() { + $('.speeds').mouseenter(); + expect($('.speeds')).toHaveClass('open'); + $('.speeds').mouseleave(); + expect($('.speeds')).not.toHaveClass('open'); + }); + + it('close the speed toggle on mouse out', function() { + $('.speeds').mouseenter().mouseleave(); + expect($('.speeds')).not.toHaveClass('open'); + }); + + it('close the speed toggle on click', function() { + $('.speeds').mouseenter().click(); + expect($('.speeds')).not.toHaveClass('open'); + }); + }); + }); + + describe('changeVideoSpeed', function() { + // This is an unnecessary test. The internal browser API, and YouTube API + // 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 not the same', function() { + beforeEach(function() { + initialize(); + videoSpeedControl.setSpeed(1.0); + spyOn(videoPlayer, 'onSpeedChange').andCallThrough(); + + $('li[data-speed="0.75"] a').click(); + }); + + it('trigger speedChange event', function() { + expect(videoPlayer.onSpeedChange).toHaveBeenCalled(); + expect(videoSpeedControl.currentSpeed).toEqual(0.75); + }); + }); + }); + + describe('onSpeedChange', function() { + beforeEach(function() { + initialize(); + $('li[data-speed="1.0"] a').addClass('active'); + videoSpeedControl.setSpeed(0.75); + }); + + it('set the new speed as active', function() { + expect($('.video_speeds li[data-speed="1.0"]')).not.toHaveClass('active'); + expect($('.video_speeds li[data-speed="0.75"]')).toHaveClass('active'); + expect($('.speeds p.active')).toHaveHtml('0.75x'); + }); + }); + }); + +}).call(this); 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 new file mode 100644 index 0000000000..f7f6c6c583 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/video_volume_control_spec.js @@ -0,0 +1,131 @@ +(function() { + xdescribe('VideoVolumeControlAlpha', function() { + var state, videoControl, videoVolumeControl, oldOTBD; + + function initialize() { + loadFixtures('videoalpha_all.html'); + state = new VideoAlpha('#example'); + videoControl = state.videoControl; + videoVolumeControl = state.videoVolumeControl; + } + + beforeEach(function() { + oldOTBD = window.onTouchBasedDevice; + window.onTouchBasedDevice = jasmine.createSpy('onTouchBasedDevice').andReturn(false); + }); + + afterEach(function() { + $('source').remove(); + window.onTouchBasedDevice = oldOTBD; + }); + + describe('constructor', function() { + beforeEach(function() { + spyOn($.fn, 'slider').andCallThrough(); + initialize(); + }); + + it('initialize currentVolume to 100', function() { + expect(state.videoVolumeControl.currentVolume).toEqual(1); + }); + + it('render the volume control', function() { + expect(videoControl.secondaryControlsEl.html()).toContain("<div class=\"volume\">\n"); + }); + + it('create the slider', function() { + expect($.fn.slider).toHaveBeenCalledWith({ + orientation: "vertical", + range: "min", + min: 0, + max: 100, + /* value: 100, */ + value: videoVolumeControl.currentVolume, + change: videoVolumeControl.onChange, + slide: videoVolumeControl.onChange + }); + }); + + it('bind the volume control', function() { + expect($('.volume>a')).toHandleWith('click', videoVolumeControl.toggleMute); + expect($('.volume')).not.toHaveClass('open'); + $('.volume').mouseenter(); + expect($('.volume')).toHaveClass('open'); + $('.volume').mouseleave(); + expect($('.volume')).not.toHaveClass('open'); + }); + }); + + describe('onChange', function() { + beforeEach(function() { + initialize(); + }); + + describe('when the new volume is more than 0', function() { + beforeEach(function() { + videoVolumeControl.onChange(void 0, { + value: 60 + }); + }); + + it('set the player volume', function() { + expect(videoVolumeControl.currentVolume).toEqual(60); + }); + + it('remote muted class', function() { + expect($('.volume')).not.toHaveClass('muted'); + }); + }); + + describe('when the new volume is 0', function() { + beforeEach(function() { + videoVolumeControl.onChange(void 0, { + value: 0 + }); + }); + + it('set the player volume', function() { + expect(videoVolumeControl.currentVolume).toEqual(0); + }); + + it('add muted class', function() { + expect($('.volume')).toHaveClass('muted'); + }); + }); + }); + + describe('toggleMute', function() { + beforeEach(function() { + initialize(); + }); + + describe('when the current volume is more than 0', function() { + beforeEach(function() { + videoVolumeControl.currentVolume = 60; + videoVolumeControl.buttonEl.trigger('click'); + }); + + it('save the previous volume', function() { + expect(videoVolumeControl.previousVolume).toEqual(60); + }); + + it('set the player volume', function() { + expect(videoVolumeControl.currentVolume).toEqual(0); + }); + }); + + describe('when the current volume is 0', function() { + beforeEach(function() { + videoVolumeControl.currentVolume = 0; + videoVolumeControl.previousVolume = 60; + videoVolumeControl.buttonEl.trigger('click'); + }); + + it('set the player volume to previous volume', function() { + expect(videoVolumeControl.currentVolume).toEqual(60); + }); + }); + }); + }); + +}).call(this); diff --git a/common/lib/xmodule/xmodule/js/src/.gitignore b/common/lib/xmodule/xmodule/js/src/.gitignore index 456e71bf8b..85b7a639d5 100644 --- a/common/lib/xmodule/xmodule/js/src/.gitignore +++ b/common/lib/xmodule/xmodule/js/src/.gitignore @@ -2,3 +2,7 @@ # For each of the xmodules subdirectories, add a .gitignore file that # will version any *.js file that is specifically written, not compiled. *.js + + +# Videoalpha are written in pure JavaScript. +!videoalpha/*.js \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee index 09a398dd7a..7263dde1f0 100644 --- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee @@ -42,7 +42,7 @@ class @Problem progress = "(#{detail} points)" if status == 'none' and detail? and detail.indexOf('/') > 0 a = detail.split('/') - possible = parseInt(a[1]) + possible = parseFloat(a[1]) if possible == 1 # i18n progress = "(#{possible} point possible)" 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/sequence/display.coffee b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee index bae1b89bab..9bce9d3022 100644 --- a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee @@ -87,6 +87,9 @@ class @Sequence modx_full_url = @modx_url + '/' + @id + '/goto_position' $.postWithPrefix modx_full_url, position: new_position + # On Sequence change, fire custom event "sequence:change" on element. + # Added for aborting video bufferization, see ../videoalpha/10_main.js + @el.trigger "sequence:change" @mark_active new_position @$('#seq_content').html @contents.eq(new_position - 1).text() XModule.loadModules(@$('#seq_content')) @@ -140,7 +143,7 @@ class @Sequence analytics.track "Accessed Next Sequential", sequence_id: @id current_sequential: @position - target_sequential: new_position + target_sequential: new_position @render new_position 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 new file mode 100644 index 0000000000..d5d7149ceb --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/01_initialize.js @@ -0,0 +1,399 @@ +/** + * @file Initialize module works with the JSON config, and sets up various settings, parameters, + * variables. After all setup actions are performed, it invokes the video player to play the + * specified video. This module must be invoked first. It provides several functions which do not + * fit in with other modules. + * + * @external VideoPlayer + * + * @module Initialize + */ + +(function (requirejs, require, define) { + +define( +'videoalpha/01_initialize.js', +['videoalpha/03_video_player.js'], +function (VideoPlayer) { + + if (typeof(window.gettext) == "undefined") { + window.gettext = function(s){return s;}; + } + + /** + * @function + * + * Initialize module exports this function. + * + * @param {Object} state A place for all properties, and methods of Video Alpha. + * @param {DOM element} element Container of the entire Video Alpha DOM element. + */ + return function (state, element) { + _makeFunctionsPublic(state); + _initialize(state, element); + _renderElements(state); + }; + + // *************************************************************** + // Private functions start here. Private functions start with underscore. + // *************************************************************** + + /** + * @function _makeFunctionsPublic + * + * Functions which will be accessible via 'state' object. When called, these functions will get the 'state' + * object as a context. + * + * @param {Object} state A place for all properties, and methods of Video Alpha. + */ + function _makeFunctionsPublic(state) { + state.setSpeed = _.bind(setSpeed, state); + state.youtubeId = _.bind(youtubeId, state); + state.getDuration = _.bind(getDuration, state); + state.trigger = _.bind(trigger, state); + state.stopBuffering = _.bind(stopBuffering, state); + + // Old private functions. Now also public so that can be + // tested by Jasmine. + + state.parseSpeed = _.bind(parseSpeed, state); + state.fetchMetadata = _.bind(fetchMetadata, state); + state.parseYoutubeStreams = _.bind(parseYoutubeStreams, state); + state.parseVideoSources = _.bind(parseVideoSources, state); + } + + // function _initialize(element) + // The function set initial configuration and preparation. + + function _initialize(state, element) { + // This is used in places where we instead would have to check if an element has a CSS class 'fullscreen'. + state.isFullScreen = false; + + // The parent element of the video, and the ID. + state.el = $(element).find('.videoalpha'); + state.id = state.el.attr('id').replace(/video_/, ''); + + // We store all settings passed to us by the server in one place. These are "read only", so don't + // modify them. All variable content lives in 'state' object. + state.config = { + element: element, + + start: state.el.data('start'), + end: state.el.data('end'), + + caption_data_dir: state.el.data('caption-data-dir'), + caption_asset_path: state.el.data('caption-asset-path'), + show_captions: (state.el.data('show-captions').toString().toLowerCase() === 'true'), + youtubeStreams: state.el.data('streams'), + + sub: state.el.data('sub'), + mp4Source: state.el.data('mp4-source'), + webmSource: state.el.data('webm-source'), + oggSource: state.el.data('ogg-source'), + + fadeOutTimeout: 1400, + + availableQualities: ['hd720', 'hd1080', 'highres'], + + qTipConfig: { + position: { + my: 'top right', + at: 'top center' + } + } + }; + + if (!(_parseYouTubeIDs(state))) { + // If we do not have YouTube ID's, try parsing HTML5 video sources. + _prepareHTML5Video(state); + } + + _configureCaptions(state); + _setPlayerMode(state); + + // Possible value are: 'visible', 'hiding', and 'invisible'. + state.controlState = 'visible'; + state.controlHideTimeout = null; + state.captionState = 'visible'; + state.captionHideTimeout = null; + } + + // 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. + function _renderElements(state) { + // Launch embedding of actual video content, or set it up so that it will be done as soon as the + // appropriate video player (YouTube or stand alone HTML5) is loaded, and can handle embedding. + // + // Note that the loading of stand alone HTML5 player API is handled by Require JS. At the time + // when we reach this code, the stand alone HTML5 player is already loaded, so no further testing + // in that case is required. + var onPlayerReadyFunc; + if ( + ((state.videoType === 'youtube') && (window.YT) && (window.YT.Player)) || + (state.videoType === 'html5') + ) { + VideoPlayer(state); + } else { + onPlayerReadyFunc = (state.videoType === 'youtube') ? 'onYouTubePlayerAPIReady' : 'onHTML5PlayerAPIReady'; + window[onPlayerReadyFunc] = _.bind(VideoPlayer, window, state); + } + } + + // function _configureCaptions(state) + // Configure displaying of captions. + // + // Option + // this.config.show_captions = true | false + // + // Defines whether or not captions are shown on first viewing. + // + // Option + // this.hide_captions = true | false + // + // represents the user's choice of having the subtitles shown or hidden. This choice is stored in cookies. + function _configureCaptions(state) { + if (state.config.show_captions) { + state.hide_captions = ($.cookie('hide_captions') === 'true'); + } else { + state.hide_captions = true; + + $.cookie('hide_captions', state.hide_captions, { + expires: 3650, + path: '/' + }); + + state.el.addClass('closed'); + } + } + + // function _setPlayerMode(state) + // By default we will be forcing HTML5 player mode. Only in the case when, after initializtion, we will + // get one available playback rate, we will change to Flash player mode. There is a need to store this + // setting in cookies because otherwise we will have to change from HTML5 to Flash on every page load + // in a browser that doesn't fully support HTML5. When we have this setting in cookies, we can select + // the proper mode from the start (not having to change mode later on). + function _setPlayerMode(state) { + (function (currentPlayerMode) { + if ((currentPlayerMode === 'html5') || (currentPlayerMode === 'flash')) { + state.currentPlayerMode = currentPlayerMode; + } else { + $.cookie('current_player_mode', 'html5', { + expires: 3650, + path: '/' + }); + state.currentPlayerMode = 'html5'; + } + }($.cookie('current_player_mode'))); + } + + // function _parseYouTubeIDs(state) + // The function parse YouTube stream ID's. + // @return + // false: We don't have YouTube video IDs to work with; most likely we have HTML5 video sources. + // true: Parsing of YouTube video IDs went OK, and we can proceed onwards to play YouTube videos. + function _parseYouTubeIDs(state) { + if (state.parseYoutubeStreams(state.config.youtubeStreams)) { + state.videoType = 'youtube'; + + state.fetchMetadata(); + state.parseSpeed(); + return true; + } + return false; + } + + // function _prepareHTML5Video(state) + // The function prepare HTML5 video, parse HTML5 + // video sources etc. + function _prepareHTML5Video(state) { + state.videoType = 'html5'; + + state.parseVideoSources( + { + mp4: state.config.mp4Source, + webm: state.config.webmSource, + ogg: state.config.oggSource + } + ); + + if (!state.config.sub || !state.config.sub.length) { + state.config.sub = ''; + state.config.show_captions = false; + } + + state.speeds = ['0.75', '1.0', '1.25', '1.50']; + state.videos = { + '0.75': state.config.sub, + '1.0': state.config.sub, + '1.25': state.config.sub, + '1.5': state.config.sub + }; + + state.setSpeed($.cookie('video_speed')); + } + + // *************************************************************** + // 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(). + // *************************************************************** + + // function parseYoutubeStreams(state, youtubeStreams) + // + // Take a string in the form: + // "iCawTYPtehk:0.75,KgpclqP-LBA:1.0,9-2670d5nvU:1.5" + // parse it, and make it available via the 'state' object. If we are not given a string, or + // it's length is zero, then we return false. + // + // @return + // false: We don't have YouTube video IDs to work with; most likely we have HTML5 video sources. + // true: Parsing of YouTube video IDs went OK, and we can proceed onwards to play YouTube videos. + function parseYoutubeStreams(youtubeStreams) { + var _this; + + if (typeof youtubeStreams === 'undefined' || youtubeStreams.length === 0) { + return false; + } + + _this = this; + this.videos = {}; + + $.each(youtubeStreams.split(/,/), function(index, video) { + var speed; + + video = video.split(/:/); + speed = parseFloat(video[0]).toFixed(2).replace(/\.00$/, '.0'); + + _this.videos[speed] = video[1]; + }); + + return true; + } + + // function parseVideoSources(, mp4Source, webmSource, oggSource) + // + // Take the HTML5 sources (URLs of videos), and make them available explictly for each type + // of video format (mp4, webm, ogg). + function parseVideoSources(sources) { + var _this = this; + + this.html5Sources = { + mp4: null, + webm: null, + ogg: null + }; + + $.each(sources, function (name, source) { + if (source && source.length) { + _this.html5Sources[name] = source; + } + }); + } + + // function fetchMetadata() + // + // When dealing with YouTube videos, we must fetch meta data that has certain key facts + // not available while the video is loading. For example the length of the video can be + // determined from the meta data. + function fetchMetadata() { + var _this = this; + + this.metadata = {}; + + $.each(this.videos, function (speed, url) { + $.get('https://gdata.youtube.com/feeds/api/videos/' + url + '?v=2&alt=jsonc', (function(data) { + _this.metadata[data.data.id] = data.data; + }), 'jsonp'); + }); + } + + // function parseSpeed() + // + // Create a separate array of available speeds. + function parseSpeed() { + this.speeds = ($.map(this.videos, function(url, speed) { + return speed; + })).sort(); + + this.setSpeed($.cookie('video_speed')); + } + + function setSpeed(newSpeed, updateCookie) { + if (_.indexOf(this.speeds, newSpeed) !== -1) { + this.speed = newSpeed; + } else { + this.speed = '1.0'; + } + + if (updateCookie) { + $.cookie('video_speed', this.speed, { + expires: 3650, + path: '/' + }); + } + } + + function stopBuffering() { + var video; + + if (this.videoType === 'html5'){ + // HTML5 player haven't default way to abort bufferization. + // In this case we simply resetting source and call load(). + video = this.videoPlayer.player.video; + video.src = ''; + video.load(); + } + } + + function youtubeId(speed) { + return this.videos[speed || this.speed]; + } + + function getDuration() { + return this.metadata[this.youtubeId()].duration; + } + + /* + * The trigger() function will assume that the @objChain is a complete chain with a method + * (function) at the end. It will call this function. So for example, when trigger() is + * called like so: + * + * state.trigger('videoPlayer.pause', {'param1': 10}); + * + * Then trigger() will execute: + * + * state.videoPlayer.pause({'param1': 10}); + */ + function trigger(objChain, extraParameters) { + var i, tmpObj, chain; + + // Remember that 'this' is the 'state' object. + tmpObj = this; + chain = objChain.split('.'); + + // At the end of the loop the variable 'tmpObj' will either be the correct + // object/function to trigger/invoke. If the 'chain' chain of object is + // incorrect (one of the link is non-existent), then the loop will immediately + // exit. + while (chain.length) { + i = chain.shift(); + + if (tmpObj.hasOwnProperty(i)) { + tmpObj = tmpObj[i]; + } else { + // An incorrect object chain was specified. + + return false; + } + } + + tmpObj(extraParameters); + + return true; + } +}); + +}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/html5_video.js b/common/lib/xmodule/xmodule/js/src/videoalpha/02_html5_video.js similarity index 70% rename from common/lib/xmodule/xmodule/js/src/videoalpha/display/html5_video.js rename to common/lib/xmodule/xmodule/js/src/videoalpha/02_html5_video.js index c3cc462ab8..6aa60b59bc 100644 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/html5_video.js +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/02_html5_video.js @@ -1,13 +1,29 @@ -this.HTML5Video = (function () { - var HTML5Video; +/** + * @file HTML5 video player module. Provides methods to control the in-browser HTML5 video player. + * + * The goal was to write this module so that it closely resembles the YouTube API. The main reason + * for this is because initially the edX video player supported only YouTube videos. When HTML5 + * support was added, for greater compatibility, and to reduce the amount of code that needed to + * be modified, it was decided to write a similar API as the one provided by YouTube. + * + * @external RequireJS + * + * @module HTML5Video + */ - HTML5Video = {}; +(function (requirejs, require, define) { + +define( +'videoalpha/02_html5_video.js', +[], +function () { + var HTML5Video = {}; HTML5Video.Player = (function () { Player.prototype.callStateChangeCallback = function () { - if ($.isFunction(this.config.events.onStateChange) === true) { + if ($.isFunction(this.config.events.onStateChange)) { this.config.events.onStateChange({ - 'data': this.playerState + data: this.playerState }); } }; @@ -48,7 +64,7 @@ this.HTML5Video = (function () { }; Player.prototype.getDuration = function () { - if (isFinite(this.video.duration) === false) { + if (isNaN(this.video.duration)) { return 0; } @@ -60,8 +76,10 @@ this.HTML5Video = (function () { newSpeed = parseFloat(value); - if (isFinite(newSpeed) === true) { - this.video.playbackRate = value; + if (isFinite(newSpeed)) { + if (this.video.playbackRate !== value) { + this.video.playbackRate = value; + } } }; @@ -74,76 +92,80 @@ this.HTML5Video = (function () { /* * Constructor function for HTML5 Video player. * - * @el - A DOM element where the HTML5 player will be inserted (as returned by jQuery(selector) function), + * @param {String|Object} el A DOM element where the HTML5 player will be inserted (as returned by jQuery(selector) function), * or a selector string which will be used to select an element. This is a required parameter. * - * @config - An object whose properties will be used as configuration options for the HTML5 video + * @param config - An object whose properties will be used as configuration options for the HTML5 video * player. This is an optional parameter. In the case if this parameter is missing, or some of the config * object's properties are missing, defaults will be used. The available options (and their defaults) are as * follows: * * config = { * - * 'videoSources': {}, // An object with properties being video sources. The property name is the + * videoSources: {}, // An object with properties being video sources. The property name is the * // video format of the source. Supported video formats are: 'mp4', 'webm', and * // 'ogg'. * - * 'playerVars': { // Object's properties identify player parameters. - * 'start': 0, // Possible values: positive integer. Position from which to start playing the + * playerVars: { // Object's properties identify player parameters. + * start: 0, // Possible values: positive integer. Position from which to start playing the * // video. Measured in seconds. If value is non-numeric, or 'start' property is * // not specified, the video will start playing from the beginning. * - * 'end': null // Possible values: positive integer. Position when to stop playing the + * end: null // Possible values: positive integer. Position when to stop playing the * // video. Measured in seconds. If value is null, or 'end' property is not * // specified, the video will end playing at the end. * * }, * - * 'events': { // Object's properties identify the events that the API fires, and the + * events: { // Object's properties identify the events that the API fires, and the * // functions (event listeners) that the API will call when those events occur. * // If value is null, or property is not specified, then no callback will be * // called for that event. * - * 'onReady': null, - * 'onStateChange': null + * onReady: null, + * onStateChange: null * } * } */ function Player(el, config) { - var sourceStr, _this; + var sourceStr, _this, errorMessage; - // If el is string, we assume it is an ID of a DOM element. Get the element, and check that the ID - // really belongs to an element. If we didn't get a DOM element, return. At this stage, nothing will - // break because other parts of the video player are waiting for 'onReady' callback to be called. - if (typeof el === 'string') { - this.el = $(el); + // Initially we assume that el is a DOM element. If jQuery selector fails to select something, we + // assume that el is an ID of a DOM element. We try to select by ID. If jQuery fails this time, + // we return. Nothing breaks because the player 'onReady' event will never be fired. + + this.el = $(el); + if (this.el.length === 0) { + this.el = $('#' + el); if (this.el.length === 0) { + errorMessage = 'VideoPlayer: Element corresponding to the given selector does not found.'; + if (window.console && console.log) { + console.log(errorMessage); + } else { + throw new Error(errorMessage); + } return; } - } else if (el instanceof jQuery) { - this.el = el; - } else { - return; } // A simple test to see that the 'config' is a normal object. - if ($.isPlainObject(config) === true) { + if ($.isPlainObject(config)) { this.config = config; } else { return; } // We should have at least one video source. Otherwise there is no point to continue. - if (config.hasOwnProperty('videoSources') === false) { + if (!config.videoSources) { return; } // From the start, all sources are empty. We will populate this object below. sourceStr = { - 'mp4': ' ', - 'webm': ' ', - 'ogg': ' ' + mp4: ' ', + webm: ' ', + ogg: ' ' }; // Will be used in inner functions to point to the current object. @@ -152,9 +174,8 @@ this.HTML5Video = (function () { // Create HTML markup for individual sources of the HTML5 <video> element. $.each(sourceStr, function (videoType, videoSource) { if ( - (_this.config.videoSources.hasOwnProperty(videoType) === true) && - (typeof _this.config.videoSources[videoType] === 'string') && - (_this.config.videoSources[videoType].length > 0) + (_this.config.videoSources[videoType]) && + (_this.config.videoSources[videoType].length) ) { sourceStr[videoType] = '<source ' + @@ -172,31 +193,33 @@ this.HTML5Video = (function () { // Determine the starting and ending time for the video. this.start = 0; this.end = null; - if (config.hasOwnProperty('playerVars') === true) { + if (config.playerVars) { this.start = parseFloat(config.playerVars.start); - if ((isFinite(this.start) !== true) || (this.start < 0)) { + if ((!isFinite(this.start)) || (this.start < 0)) { this.start = 0; } this.end = parseFloat(config.playerVars.end); - if ((isFinite(this.end) !== true) || (this.end < this.start)) { + if ((!isFinite(this.end)) || (this.end < this.start)) { this.end = null; } } // Create HTML markup for the <video> element, populating it with sources from previous step. - this.videoEl = $( - '<video style="width: 100%;">' + - sourceStr.mp4 + - sourceStr.webm + - sourceStr.ogg + - '</video>' - ); + // Because of problems with creating video element via jquery + // (http://bugs.jquery.com/ticket/9174) we create it using native JS. + this.video = document.createElement('video'); + this.video.innerHTML = _.values(sourceStr).join(''); - // Get the DOM element (to access the HTML5 video API), and set the player state to UNSTARTED. + // Get the jQuery object, and set the player state to UNSTARTED. // The player state is used by other parts of the VideoPlayer to detrermine what the video is // currently doing. - this.video = this.videoEl[0]; + this.videoEl = $(this.video); + + this.videoEl.css({ + 'width': '100%' + }); + this.playerState = HTML5Video.PlayerState.UNSTARTED; // this.callStateChangeCallback(); @@ -240,7 +263,7 @@ this.HTML5Video = (function () { } _this.video.currentTime = _this.start; - if ($.isFunction(_this.config.events.onReady) === true) { + if ($.isFunction(_this.config.events.onReady)) { _this.config.events.onReady(null); } }, false); @@ -281,14 +304,20 @@ this.HTML5Video = (function () { } }()); + // The YouTube API presents several constants which describe the player's state at a given moment. + // HTML5Video API will copy these constats so that code which uses both the YouTube API and this API + // doesn't have to change. HTML5Video.PlayerState = { - 'UNSTARTED': -1, - 'ENDED': 0, - 'PLAYING': 1, - 'PAUSED': 2, - 'BUFFERING': 3, - 'CUED': 5 + UNSTARTED: -1, + ENDED: 0, + PLAYING: 1, + PAUSED: 2, + BUFFERING: 3, + CUED: 5 }; + // HTML5Video object - what this module exports. return HTML5Video; -}()); +}) + +}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); 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 new file mode 100644 index 0000000000..be2287be6e --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/03_video_player.js @@ -0,0 +1,439 @@ +(function (requirejs, require, define) { + +// VideoPlayer module. +define( +'videoalpha/03_video_player.js', +['videoalpha/02_html5_video.js'], +function (HTML5Video) { + + // VideoPlayer() function - what this module "exports". + return function (state) { + state.videoPlayer = {}; + + _makeFunctionsPublic(state); + _initialize(state); + // No callbacks to DOM events (click, mousemove, etc.). + }; + + // *************************************************************** + // Private functions start here. + // *************************************************************** + + // function _makeFunctionsPublic(state) + // + // Functions which will be accessible via 'state' object. When called, these functions will + // get the 'state' object as a context. + function _makeFunctionsPublic(state) { + state.videoPlayer.pause = _.bind(pause, state); + state.videoPlayer.play = _.bind(play, state); + state.videoPlayer.update = _.bind(update, state); + state.videoPlayer.onSpeedChange = _.bind(onSpeedChange, state); + state.videoPlayer.onCaptionSeek = _.bind(onSeek, state); + state.videoPlayer.onSlideSeek = _.bind(onSeek, state); + state.videoPlayer.onEnded = _.bind(onEnded, state); + state.videoPlayer.onPause = _.bind(onPause, state); + state.videoPlayer.onPlay = _.bind(onPlay, state); + state.videoPlayer.onUnstarted = _.bind(onUnstarted, state); + state.videoPlayer.handlePlaybackQualityChange = _.bind(handlePlaybackQualityChange, state); + state.videoPlayer.onPlaybackQualityChange = _.bind(onPlaybackQualityChange, state); + state.videoPlayer.onStateChange = _.bind(onStateChange, state); + state.videoPlayer.onReady = _.bind(onReady, state); + state.videoPlayer.updatePlayTime = _.bind(updatePlayTime, state); + state.videoPlayer.isPlaying = _.bind(isPlaying, state); + state.videoPlayer.log = _.bind(log, state); + state.videoPlayer.duration = _.bind(duration, state); + state.videoPlayer.onVolumeChange = _.bind(onVolumeChange, state); + } + + // function _initialize(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. + function _initialize(state) { + var youTubeId; + + if (state.videoType === 'youtube') { + state.videoPlayer.PlayerState = YT.PlayerState; + state.videoPlayer.PlayerState.UNSTARTED = -1; + } else { // if (state.videoType === 'html5') { + state.videoPlayer.PlayerState = HTML5Video.PlayerState; + } + + state.videoPlayer.currentTime = 0; + + state.videoPlayer.playerVars = { + controls: 0, + wmode: 'transparent', + rel: 0, + showinfo: 0, + enablejsapi: 1, + modestbranding: 1 + }; + + if (state.currentPlayerMode !== 'flash') { + state.videoPlayer.playerVars.html5 = 1; + } + + if (state.config.start) { + state.videoPlayer.playerVars.start = state.config.start; + state.videoPlayer.playerVars.wmode = 'window'; + } + if (state.config.end) { + state.videoPlayer.playerVars.end = state.config.end; + } + + // There is a bug which prevents YouTube API to correctly set the speed + // to 1.0 from another speed in Firefox when in HTML5 mode. There is a + // fix which basically reloads the video at speed 1.0 when this change + // is requested (instead of simply requesting a speed change to 1.0). + // This has to be done only when the video is being watched in Firefox. + // We need to figure out what browser is currently executing this code. + // + // TODO: Check the status of + // http://code.google.com/p/gdata-issues/issues/detail?id=4654 + // When the YouTube team fixes the API bug, we can remove this temporary + // bug fix. + state.browserIsFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1; + + if (state.videoType === 'html5') { + state.videoPlayer.player = new HTML5Video.Player(state.el, { + playerVars: state.videoPlayer.playerVars, + videoSources: state.html5Sources, + events: { + onReady: state.videoPlayer.onReady, + onStateChange: state.videoPlayer.onStateChange + } + }); + } else { // if (state.videoType === 'youtube') { + if (state.currentPlayerMode === 'flash') { + youTubeId = state.youtubeId(); + } else { + youTubeId = state.youtubeId('1.0'); + } + state.videoPlayer.player = new YT.Player(state.id, { + playerVars: state.videoPlayer.playerVars, + videoId: youTubeId, + events: { + onReady: state.videoPlayer.onReady, + onStateChange: state.videoPlayer.onStateChange, + onPlaybackQualityChange: state.videoPlayer.onPlaybackQualityChange + } + }); + } + } + + // function _restartUsingFlash(state) + // + // When we are about to play a YouTube video in HTML5 mode and discover that we only + // have one available playback rate, we will switch to Flash mode. In Flash speed + // switching is done by reloading videos recorded at different frame rates. + function _restartUsingFlash(state) { + // Remove from the page current iFrame with HTML5 video. + state.videoPlayer.player.destroy(); + + // Remember for future page loads that we should use Flash mode. + $.cookie('current_player_mode', 'flash', { + 'expires': 3650, + 'path': '/' + }); + state.currentPlayerMode = 'flash'; + + // Removed configuration option that requests the HTML5 mode. + delete state.videoPlayer.playerVars.html5; + + // Request for the creation of a new Flash player + state.videoPlayer.player = new YT.Player(state.id, { + 'playerVars': state.videoPlayer.playerVars, + 'videoId': state.youtubeId(), + 'events': { + 'onReady': state.videoPlayer.onReady, + 'onStateChange': state.videoPlayer.onStateChange, + 'onPlaybackQualityChange': state.videoPlayer.onPlaybackQualityChange + } + }); + } + + // *************************************************************** + // 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(). + // *************************************************************** + + function pause() { + if (this.videoPlayer.player.pauseVideo) { + this.videoPlayer.player.pauseVideo(); + } + } + + function play() { + if (this.videoPlayer.player.playVideo) { + this.videoPlayer.player.playVideo(); + } + } + + // This function gets the video's current play position in time + // (currentTime) and its duration. + // It is called at a regular interval when the video is playing (see below). + function update() { + this.videoPlayer.currentTime = this.videoPlayer.player.getCurrentTime(); + + if (isFinite(this.videoPlayer.currentTime)) { + this.videoPlayer.updatePlayTime(this.videoPlayer.currentTime); + } + } + + function onSpeedChange(newSpeed, updateCookie) { + if (this.currentPlayerMode === 'flash') { + this.videoPlayer.currentTime = Time.convert( + this.videoPlayer.currentTime, + parseFloat(this.speed), + newSpeed + ); + } + newSpeed = parseFloat(newSpeed).toFixed(2).replace(/\.00$/, '.0'); + + this.videoPlayer.log( + 'speed_change_video', + { + current_time: this.videoPlayer.currentTime, + old_speed: this.speed, + new_speed: newSpeed + } + ); + + this.setSpeed(newSpeed, updateCookie); + + if ( + this.currentPlayerMode === 'html5' && + !(this.browserIsFirefox && newSpeed === '1.0' && this.videoType === 'youtube') + ) { + this.videoPlayer.player.setPlaybackRate(newSpeed); + } else { + // We request the reloading of the video in the case when YouTube is in + // Flash player mode, or when we are in Firefox, and the new speed is 1.0. + // The second case is necessary to avoid the bug where in Firefox speed + // switching to 1.0 in HTML5 player mode is handled incorrectly by YouTube + // API. + if (this.videoPlayer.isPlaying()) { + this.videoPlayer.player.loadVideoById(this.youtubeId(), this.videoPlayer.currentTime); + } else { + this.videoPlayer.player.cueVideoById(this.youtubeId(), this.videoPlayer.currentTime); + } + + this.videoPlayer.updatePlayTime(this.videoPlayer.currentTime); + } + } + + // Every 200 ms, if the video is playing, we call the function update, via + // clearInterval. This interval is called updateInterval. + // It is created on a onPlay event. Cleared on a onPause event. + // Reinitialized on a onSeek event. + function onSeek(params) { + this.videoPlayer.log( + 'seek_video', + { + old_time: this.videoPlayer.currentTime, + new_time: params.time, + type: params.type + } + ); + + this.videoPlayer.player.seekTo(params.time, true); + + if (this.videoPlayer.isPlaying()) { + clearInterval(this.videoPlayer.updateInterval); + this.videoPlayer.updateInterval = setInterval(this.videoPlayer.update, 200); + } else { + this.videoPlayer.currentTime = params.time; + } + + this.videoPlayer.updatePlayTime(params.time); + } + + function onEnded() { + this.trigger('videoControl.pause', null); + + if (this.config.show_captions) { + this.trigger('videoCaption.pause', null); + } + } + + function onPause() { + this.videoPlayer.log( + 'pause_video', + { + 'currentTime': this.videoPlayer.currentTime + } + ); + + clearInterval(this.videoPlayer.updateInterval); + delete this.videoPlayer.updateInterval; + + this.trigger('videoControl.pause', null); + + if (this.config.show_captions) { + this.trigger('videoCaption.pause', null); + } + } + + function onPlay() { + this.videoPlayer.log( + 'play_video', + { + 'currentTime': this.videoPlayer.currentTime + } + ); + + if (!this.videoPlayer.updateInterval) { + this.videoPlayer.updateInterval = setInterval(this.videoPlayer.update, 200); + } + + this.trigger('videoControl.play', null); + + if (this.config.show_captions) { + this.trigger('videoCaption.play', null); + } + } + + function onUnstarted() { } + + function handlePlaybackQualityChange(value) { + this.videoPlayer.player.setPlaybackQuality(value); + } + + function onPlaybackQualityChange() { + var quality; + + quality = this.videoPlayer.player.getPlaybackQuality(); + + this.trigger('videoQualityControl.onQualityChange', quality); + } + + function onReady() { + var availablePlaybackRates, baseSpeedSubs, _this; + + this.videoPlayer.log('load_video'); + + availablePlaybackRates = this.videoPlayer.player.getAvailablePlaybackRates(); + if ((this.currentPlayerMode === 'html5') && (this.videoType === 'youtube')) { + if (availablePlaybackRates.length === 1) { + // 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) { + // We need to synchronize available frame rates with the ones + // that the user specified. + + baseSpeedSubs = this.videos['1.0']; + _this = this; + // this.videos is a dictionary containing various frame rates + // and their associated subs. + + // First clear the dictionary. + $.each(this.videos, function(index, value) { + delete _this.videos[index]; + }); + this.speeds = []; + // Recreate it with the supplied frame rates. + $.each(availablePlaybackRates, function(index, value) { + _this.videos[value.toFixed(2).replace(/\.00$/, '.0')] = baseSpeedSubs; + + _this.speeds.push(value.toFixed(2).replace(/\.00$/, '.0')); + }); + + this.trigger('videoSpeedControl.reRender', {'newSpeeds': this.speeds, 'currentSpeed': this.speed}); + + this.setSpeed($.cookie('video_speed')); + } + } + + if (this.currentPlayerMode === 'html5') { + this.videoPlayer.player.setPlaybackRate(this.speed); + } + + if (!onTouchBasedDevice() && $('.videoalpha:first').data('autoplay') === 'True') { + this.videoPlayer.play(); + } + } + + function onStateChange(event) { + switch (event.data) { + case this.videoPlayer.PlayerState.UNSTARTED: + this.videoPlayer.onUnstarted(); + break; + case this.videoPlayer.PlayerState.PLAYING: + this.videoPlayer.onPlay(); + break; + case this.videoPlayer.PlayerState.PAUSED: + this.videoPlayer.onPause(); + break; + case this.videoPlayer.PlayerState.ENDED: + this.videoPlayer.onEnded(); + break; + } + } + + function updatePlayTime(time) { + var duration; + + duration = this.videoPlayer.duration(); + + this.trigger('videoProgressSlider.updatePlayTime', {'time': time, 'duration': duration}); + this.trigger('videoControl.updateVcrVidTime', {'time': time, 'duration': duration}); + this.trigger('videoCaption.updatePlayTime', time); + } + + function isPlaying() { + return this.videoPlayer.player.getPlayerState() === this.videoPlayer.PlayerState.PLAYING; + } + + function duration() { + var dur; + + dur = this.videoPlayer.player.getDuration(); + if (!isFinite(dur)) { + dur = this.getDuration(); + } + + return dur; + } + + function log(eventName, data) { + var logInfo; + + // Default parameters that always get logged. + logInfo = { + 'id': this.id, + 'code': this.youtubeId() + }; + + // If extra parameters were passed to the log. + if (data) { + $.each(data, function(paramName, value) { + logInfo[paramName] = value; + }); + } + + if (this.videoType === 'youtube') { + logInfo.code = this.youtubeId(); + } else if (this.videoType === 'html5') { + logInfo.code = 'html5'; + } + + Logger.log(eventName, logInfo); + } + + function onVolumeChange(volume) { + this.videoPlayer.player.setVolume(volume); + } +}); + +}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); 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 new file mode 100644 index 0000000000..c7a575046f --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/04_video_control.js @@ -0,0 +1,182 @@ +(function (requirejs, require, define) { + +// VideoControl module. +define( +'videoalpha/04_video_control.js', +[], +function () { + + // VideoControl() function - what this module "exports". + return function (state) { + state.videoControl = {}; + + _makeFunctionsPublic(state); + _renderElements(state); + _bindHandlers(state); + }; + + // *************************************************************** + // Private functions start here. + // *************************************************************** + + // function _makeFunctionsPublic(state) + // + // Functions which will be accessible via 'state' object. When called, these functions will + // get the 'state' object as a context. + function _makeFunctionsPublic(state) { + state.videoControl.showControls = _.bind(showControls,state); + state.videoControl.hideControls = _.bind(hideControls,state); + state.videoControl.play = _.bind(play,state); + state.videoControl.pause = _.bind(pause,state); + state.videoControl.togglePlayback = _.bind(togglePlayback,state); + state.videoControl.toggleFullScreen = _.bind(toggleFullScreen,state); + state.videoControl.exitFullScreen = _.bind(exitFullScreen,state); + state.videoControl.updateVcrVidTime = _.bind(updateVcrVidTime,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. + function _renderElements(state) { + state.videoControl.el = state.el.find('.video-controls'); + // state.videoControl.el.append(el); + + state.videoControl.sliderEl = state.videoControl.el.find('.slider'); + state.videoControl.playPauseEl = state.videoControl.el.find('.video_control'); + state.videoControl.secondaryControlsEl = state.videoControl.el.find('.secondary-controls'); + state.videoControl.fullScreenEl = state.videoControl.el.find('.add-fullscreen'); + state.videoControl.vidTimeEl = state.videoControl.el.find('.vidtime'); + + state.videoControl.fullScreenState = false; + + if (!onTouchBasedDevice()) { + state.videoControl.pause(); + + state.videoControl.playPauseEl.qtip(state.config.qTipConfig); + state.videoControl.fullScreenEl.qtip(state.config.qTipConfig); + } else { + state.videoControl.play(); + } + + if (state.videoType === 'html5') { + state.videoControl.fadeOutTimeout = state.config.fadeOutTimeout; + + state.videoControl.el.addClass('html5'); + state.controlHideTimeout = setTimeout(state.videoControl.hideControls, state.videoControl.fadeOutTimeout); + } + } + + // function _bindHandlers(state) + // + // Bind any necessary function callbacks to DOM events (click, mousemove, etc.). + function _bindHandlers(state) { + state.videoControl.playPauseEl.on('click', state.videoControl.togglePlayback); + state.videoControl.fullScreenEl.on('click', state.videoControl.toggleFullScreen); + $(document).on('keyup', state.videoControl.exitFullScreen); + + if (state.videoType === 'html5') { + state.el.on('mousemove', state.videoControl.showControls) + } + } + + // *************************************************************** + // 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(). + // *************************************************************** + function showControls(event) { + if (!this.controlShowLock) { + if (!this.captionsHidden) { + return; + } + + this.controlShowLock = true; + + if (this.controlState === 'invisible') { + this.videoControl.el.show(); + this.controlState = 'visible'; + } else if (this.controlState === 'hiding') { + this.videoControl.el.stop(true, false).css('opacity', 1).show(); + this.controlState = 'visible'; + } else if (this.controlState === 'visible') { + clearTimeout(this.controlHideTimeout); + } + + this.controlHideTimeout = setTimeout(this.videoControl.hideControls, this.videoControl.fadeOutTimeout); + + this.controlShowLock = false; + } + } + + function hideControls() { + var _this; + + this.controlHideTimeout = null; + + if (!this.captionsHidden) { + return; + } + + this.controlState = 'hiding'; + + _this = this; + + this.videoControl.el.fadeOut(this.videoControl.fadeOutTimeout, function () { + _this.controlState = 'invisible'; + }); + } + + function play() { + this.videoControl.playPauseEl.removeClass('play').addClass('pause').attr('title', gettext('Pause')); + this.videoControl.isPlaying = true; + } + + function pause() { + this.videoControl.playPauseEl.removeClass('pause').addClass('play').attr('title', gettext('Play')); + this.videoControl.isPlaying = false; + } + + function togglePlayback(event) { + event.preventDefault(); + + if (this.videoControl.isPlaying) { + this.trigger('videoPlayer.pause', null); + } else { + this.trigger('videoPlayer.play', null); + } + } + + function toggleFullScreen(event) { + event.preventDefault(); + var fullScreenClassNameEl = this.el.add(document.documentElement); + + if (this.videoControl.fullScreenState) { + this.videoControl.fullScreenState = false; + fullScreenClassNameEl.removeClass('video-fullscreen'); + this.isFullScreen = false; + this.videoControl.fullScreenEl.attr('title', gettext('Fullscreen')); + } else { + this.videoControl.fullScreenState = true; + fullScreenClassNameEl.addClass('video-fullscreen'); + this.isFullScreen = true; + this.videoControl.fullScreenEl.attr('title', gettext('Exit fullscreen')); + } + + this.trigger('videoCaption.resize', null); + } + + function exitFullScreen(event) { + if ((this.isFullScreen) && (event.keyCode === 27)) { + this.videoControl.toggleFullScreen(event); + } + } + + function updateVcrVidTime(params) { + this.videoControl.vidTimeEl.html(Time.format(params.time) + ' / ' + Time.format(params.duration)); + } + +}); + +}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); 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 new file mode 100644 index 0000000000..952d760610 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/05_video_quality_control.js @@ -0,0 +1,98 @@ +(function (requirejs, require, define) { + +// VideoQualityControl module. +define( +'videoalpha/05_video_quality_control.js', +[], +function () { + + // VideoQualityControl() function - what this module "exports". + return function (state) { + // Changing quality for now only works for YouTube videos. + if (state.videoType !== 'youtube') { + return; + } + + state.videoQualityControl = {}; + + _makeFunctionsPublic(state); + _renderElements(state); + _bindHandlers(state); + }; + + // *************************************************************** + // Private functions start here. + // *************************************************************** + + // function _makeFunctionsPublic(state) + // + // Functions which will be accessible via 'state' object. When called, these functions will + // get the 'state' object as a context. + function _makeFunctionsPublic(state) { + state.videoQualityControl.onQualityChange = _.bind(onQualityChange, state); + state.videoQualityControl.toggleQuality = _.bind(toggleQuality, 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. + function _renderElements(state) { + state.videoQualityControl.el = state.el.find('a.quality_control'); + + state.videoQualityControl.el.show(); + state.videoQualityControl.quality = null; + + if (!onTouchBasedDevice()) { + state.videoQualityControl.el.qtip(state.config.qTipConfig); + } + } + + // function _bindHandlers(state) + // + // Bind any necessary function callbacks to DOM events (click, mousemove, etc.). + function _bindHandlers(state) { + state.videoQualityControl.el.on('click', state.videoQualityControl.toggleQuality); + } + + // *************************************************************** + // 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(). + // *************************************************************** + + function onQualityChange(value) { + this.videoQualityControl.quality = value; + + if (_.indexOf(this.config.availableQualities, value) !== -1) { + this.videoQualityControl.el.addClass('active'); + } else { + this.videoQualityControl.el.removeClass('active'); + } + } + + // This function change quality of video. + // Right now we haven't ability to choose quality of HD video, + // 'hd720' will be played by default as HD video(this thing is hardcoded). + // If suggested quality level is not available for the video, + // then the quality will be set to the next lowest level that is available. + // (large -> medium) + function toggleQuality(event) { + var newQuality, + value = this.videoQualityControl.quality; + + event.preventDefault(); + + if (_.indexOf(this.config.availableQualities, value) !== -1) { + newQuality = 'large'; + } else { + newQuality = 'hd720'; + } + + this.trigger('videoPlayer.handlePlaybackQualityChange', newQuality); + } + +}); + +}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); 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 new file mode 100644 index 0000000000..4409446c2a --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/06_video_progress_slider.js @@ -0,0 +1,132 @@ +(function (requirejs, require, define) { + +/* +"This is as true in everyday life as it is in battle: we are given one life +and the decision is ours whether to wait for circumstances to make up our +mind, or whether to act, and in acting, to live." +— Omar N. Bradley + */ + +// VideoProgressSlider module. +define( +'videoalpha/06_video_progress_slider.js', +[], +function () { + + // VideoProgressSlider() function - what this module "exports". + return function (state) { + state.videoProgressSlider = {}; + + _makeFunctionsPublic(state); + _renderElements(state); + // No callbacks to DOM events (click, mousemove, etc.). + }; + + // *************************************************************** + // Private functions start here. + // *************************************************************** + + // function _makeFunctionsPublic(state) + // + // Functions which will be accessible via 'state' object. When called, these functions will + // 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); + } + + // 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. + function _renderElements(state) { + if (!onTouchBasedDevice()) { + state.videoProgressSlider.el = state.videoControl.sliderEl; + + buildSlider(state); + _buildHandle(state); + } + } + + 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 + } + }); + } + + // *************************************************************** + // 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(). + // *************************************************************** + + function buildSlider(state) { + state.videoProgressSlider.slider = state.videoProgressSlider.el.slider({ + range: 'min', + change: state.videoProgressSlider.onChange, + slide: state.videoProgressSlider.onSlide, + stop: state.videoProgressSlider.onStop + }); + } + + 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; + + this.videoProgressSlider.frozen = true; + + this.trigger('videoPlayer.onSlideSeek', {'type': 'onSlideSeek', 'time': ui.value}); + + setTimeout(function() { + _this.videoProgressSlider.frozen = false; + }, 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)) { + /*this.videoProgressSlider.slider + .slider('option', 'max', params.duration) + .slider('value', params.time);*/ + this.videoProgressSlider.slider.slider('option', 'max', params.duration); + this.videoProgressSlider.slider.slider('option', 'value', params.time); + } + } + +}); + +}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); 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 new file mode 100644 index 0000000000..b778a2cbd0 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/07_video_volume_control.js @@ -0,0 +1,113 @@ +(function (requirejs, require, define) { + +// VideoVolumeControl module. +define( +'videoalpha/07_video_volume_control.js', +[], +function () { + + // VideoVolumeControl() function - what this module "exports". + return function (state) { + state.videoVolumeControl = {}; + + _makeFunctionsPublic(state); + _renderElements(state); + _bindHandlers(state); + }; + + // *************************************************************** + // Private functions start here. + // *************************************************************** + + // function _makeFunctionsPublic(state) + // + // Functions which will be accessible via 'state' object. When called, these functions will + // get the 'state' object as a context. + function _makeFunctionsPublic(state) { + state.videoVolumeControl.onChange = _.bind(onChange, state); + state.videoVolumeControl.toggleMute = _.bind(toggleMute, 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. + function _renderElements(state) { + state.videoVolumeControl.el = state.el.find('div.volume'); + + state.videoVolumeControl.buttonEl = state.videoVolumeControl.el.find('a'); + state.videoVolumeControl.volumeSliderEl = state.videoVolumeControl.el.find('.volume-slider'); + + state.videoControl.secondaryControlsEl.prepend(state.videoVolumeControl.el); + + // Figure out what the current volume is. If no information about volume level could be retrieved, + // then we will use the default 100 level (full volume). + state.videoVolumeControl.currentVolume = parseInt($.cookie('video_player_volume_level'), 10); + if (!isFinite(state.videoVolumeControl.currentVolume)) { + state.videoVolumeControl.currentVolume = 100; + } + + // Set it up so that muting/unmuting works correctly. + state.videoVolumeControl.previousVolume = 100; + + state.videoVolumeControl.slider = state.videoVolumeControl.volumeSliderEl.slider({ + orientation: 'vertical', + range: 'min', + min: 0, + max: 100, + value: state.videoVolumeControl.currentVolume, + change: state.videoVolumeControl.onChange, + slide: state.videoVolumeControl.onChange + }); + + state.videoVolumeControl.el.toggleClass('muted', state.videoVolumeControl.currentVolume === 0); + } + + // function _bindHandlers(state) + // + // Bind any necessary function callbacks to DOM events (click, mousemove, etc.). + function _bindHandlers(state) { + state.videoVolumeControl.buttonEl.on('click', state.videoVolumeControl.toggleMute); + + state.videoVolumeControl.el.on('mouseenter', function() { + $(this).addClass('open'); + }); + + state.videoVolumeControl.el.on('mouseleave', function() { + $(this).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(). + // *************************************************************** + + function onChange(event, ui) { + this.videoVolumeControl.currentVolume = ui.value; + this.videoVolumeControl.el.toggleClass('muted', this.videoVolumeControl.currentVolume === 0); + + $.cookie('video_player_volume_level', ui.value, { + expires: 3650, + path: '/' + }); + + this.trigger('videoPlayer.onVolumeChange', ui.value); + } + + function toggleMute(event) { + event.preventDefault(); + + if (this.videoVolumeControl.currentVolume > 0) { + this.videoVolumeControl.previousVolume = this.videoVolumeControl.currentVolume; + this.videoVolumeControl.slider.slider('option', 'value', 0); + } else { + this.videoVolumeControl.slider.slider('option', 'value', this.videoVolumeControl.previousVolume); + } + } + +}); + +}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); 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 new file mode 100644 index 0000000000..a13aa03f4f --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/08_video_speed_control.js @@ -0,0 +1,139 @@ +(function (requirejs, require, define) { + +// VideoSpeedControl module. +define( +'videoalpha/08_video_speed_control.js', +[], +function () { + + // VideoSpeedControl() function - what this module "exports". + return function (state) { + state.videoSpeedControl = {}; + + _makeFunctionsPublic(state); + _renderElements(state); + _bindHandlers(state); + }; + + // *************************************************************** + // Private functions start here. + // *************************************************************** + + // function _makeFunctionsPublic(state) + // + // 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.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. + 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.videoControl.secondaryControlsEl.prepend(state.videoSpeedControl.el); + + $.each(state.videoSpeedControl.speeds, function(index, speed) { + + //var link = $('<a href="#">' + speed + 'x</a>'); + var link = '<a href="#">' + speed + 'x</a>'; + + state.videoSpeedControl.videoSpeedsEl.prepend($('<li data-speed="' + speed + '">' + link + '</li>')); + }); + + state.videoSpeedControl.setSpeed(state.speed); + } + + // function _bindHandlers(state) + // + // Bind any necessary function callbacks to DOM events (click, mousemove, etc.). + function _bindHandlers(state) { + state.videoSpeedControl.videoSpeedsEl.find('a').on('click', state.videoSpeedControl.changeVideoSpeed); + + if (onTouchBasedDevice()) { + state.videoSpeedControl.el.on('click', function(event) { + event.preventDefault(); + $(this).toggleClass('open'); + }); + } else { + state.videoSpeedControl.el + .on('mouseenter', function () { + $(this).addClass('open'); + }) + .on('mouseleave', function () { + $(this).removeClass('open'); + }) + .on('click', function (event) { + event.preventDefault(); + $(this).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(). + // *************************************************************** + + function setSpeed(speed) { + this.videoSpeedControl.videoSpeedsEl.find('li').removeClass('active'); + this.videoSpeedControl.videoSpeedsEl.find("li[data-speed='" + speed + "']").addClass('active'); + this.videoSpeedControl.el.find('p.active').html('' + speed + 'x'); + } + + function changeVideoSpeed(event) { + var parentEl = $(event.target).parent(); + + event.preventDefault(); + + if (!parentEl.hasClass('active')) { + this.videoSpeedControl.currentSpeed = parentEl.data('speed'); + + this.videoSpeedControl.setSpeed( + // To meet the API expected format. + parseFloat(this.videoSpeedControl.currentSpeed).toFixed(2).replace(/\.00$/, '.0') + ); + + this.trigger('videoPlayer.onSpeedChange', this.videoSpeedControl.currentSpeed); + } + } + + function reRender(params) { + var _this = this; + + this.videoSpeedControl.videoSpeedsEl.empty(); + this.videoSpeedControl.videoSpeedsEl.find('li').removeClass('active'); + this.videoSpeedControl.speeds = params.newSpeeds; + + $.each(this.videoSpeedControl.speeds, function(index, speed) { + var link, listItem; + + //link = $('<a href="#">' + speed + 'x</a>'); + link = '<a href="#">' + speed + 'x</a>'; + + listItem = $('<li data-speed="' + speed + '">' + link + '</li>'); + + if (speed === params.currentSpeed) { + listItem.addClass('active'); + } + + _this.videoSpeedControl.videoSpeedsEl.prepend(listItem); + }); + + this.videoSpeedControl.videoSpeedsEl.find('a').on('click', this.videoSpeedControl.changeVideoSpeed); + } + +}); + +}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); 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 new file mode 100644 index 0000000000..e95f99109e --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/09_video_caption.js @@ -0,0 +1,418 @@ +(function (requirejs, require, define) { + +// VideoCaption module. +define( +'videoalpha/09_video_caption.js', +[], +function () { + + // VideoCaption() function - what this module "exports". + return function (state) { + state.videoCaption = {}; + + _makeFunctionsPublic(state); + state.videoCaption.renderElements(); + state.videoCaption.bindHandlers(); + }; + + // *************************************************************** + // Private functions start here. + // *************************************************************** + + // function _makeFunctionsPublic(state) + // + // Functions which will be accessible via 'state' object. When called, these functions will + // get the 'state' object as a context. + function _makeFunctionsPublic(state) { + state.videoCaption.autoShowCaptions = _.bind(autoShowCaptions, state); + state.videoCaption.autoHideCaptions = _.bind(autoHideCaptions, state); + state.videoCaption.resize = _.bind(resize, state); + state.videoCaption.toggle = _.bind(toggle, state); + state.videoCaption.onMouseEnter = _.bind(onMouseEnter, state); + state.videoCaption.onMouseLeave = _.bind(onMouseLeave, state); + state.videoCaption.onMovement = _.bind(onMovement, state); + state.videoCaption.renderCaption = _.bind(renderCaption, state); + state.videoCaption.captionHeight = _.bind(captionHeight, state); + state.videoCaption.topSpacingHeight = _.bind(topSpacingHeight, state); + state.videoCaption.bottomSpacingHeight = _.bind(bottomSpacingHeight, state); + state.videoCaption.scrollCaption = _.bind(scrollCaption, state); + state.videoCaption.search = _.bind(search, state); + state.videoCaption.play = _.bind(play, state); + state.videoCaption.pause = _.bind(pause, state); + state.videoCaption.seekPlayer = _.bind(seekPlayer, state); + state.videoCaption.hideCaptions = _.bind(hideCaptions, state); + state.videoCaption.calculateOffset = _.bind(calculateOffset, state); + state.videoCaption.updatePlayTime = _.bind(updatePlayTime, state); + state.videoCaption.setSubtitlesHeight = _.bind(setSubtitlesHeight, state); + + state.videoCaption.renderElements = _.bind(renderElements, state); + state.videoCaption.bindHandlers = _.bind(bindHandlers, state); + state.videoCaption.fetchCaption = _.bind(fetchCaption, state); + state.videoCaption.captionURL = _.bind(captionURL, state); + } + + // *************************************************************** + // 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(). + // *************************************************************** + + // function renderElements() + // + // 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() { + this.videoCaption.loaded = false; + + this.videoCaption.subtitlesEl = this.el.find('ol.subtitles'); + this.videoCaption.hideSubtitlesEl = this.el.find('a.hide-subtitles'); + + this.el.find('.video-wrapper').after(this.videoCaption.subtitlesEl); + this.el.find('.video-controls .secondary-controls').append(this.videoCaption.hideSubtitlesEl); + + this.videoCaption.fetchCaption(); + this.videoCaption.setSubtitlesHeight(); + + if (this.videoType === 'html5') { + this.videoCaption.fadeOutTimeout = this.config.fadeOutTimeout; + + this.videoCaption.subtitlesEl.addClass('html5'); + this.captionHideTimeout = setTimeout(this.videoCaption.autoHideCaptions, this.videoCaption.fadeOutTimeout); + } + } + + // function bindHandlers() + // + // Bind any necessary function callbacks to DOM events (click, mousemove, etc.). + function bindHandlers() { + $(window).bind('resize', this.videoCaption.resize); + this.videoCaption.hideSubtitlesEl.on('click', this.videoCaption.toggle); + + this.videoCaption.subtitlesEl + .on( + 'mouseenter', + this.videoCaption.onMouseEnter + ).on( + 'mouseleave', + this.videoCaption.onMouseLeave + ).on( + 'mousemove', + this.videoCaption.onMovement + ).on( + 'mousewheel', + this.videoCaption.onMovement + ).on( + 'DOMMouseScroll', + this.videoCaption.onMovement + ); + + if (this.videoType === 'html5') { + this.el.on('mousemove', this.videoCaption.autoShowCaptions); + + // Moving slider on subtitles is not a mouse move, + // but captions and controls should be showed. + this.videoCaption.subtitlesEl.on('scroll', this.videoCaption.autoShowCaptions); + this.videoCaption.subtitlesEl.on('scroll', this.videoControl.showControls); + } + } + + function fetchCaption() { + var _this = this; + + this.videoCaption.hideCaptions(this.hide_captions); + + $.ajaxWithPrefix({ + url: _this.videoCaption.captionURL(), + notifyOnError: false, + success: function(captions) { + _this.videoCaption.captions = captions.text; + _this.videoCaption.start = captions.start; + _this.videoCaption.loaded = true; + + if (onTouchBasedDevice()) { + _this.videoCaption.subtitlesEl.find('li').html( + gettext('Caption will be displayed when you start playing the video.') + ); + } else { + _this.videoCaption.renderCaption(); + } + } + }); + } + + function captionURL() { + return '' + this.config.caption_asset_path + this.youtubeId('1.0') + '.srt.sjson'; + } + + function autoShowCaptions(event) { + if (!this.captionsShowLock) { + if (!this.captionsHidden) { + return; + } + + this.captionsShowLock = true; + + if (this.captionState === 'invisible') { + this.videoCaption.subtitlesEl.show(); + this.captionState = 'visible'; + } else if (this.captionState === 'hiding') { + this.videoCaption.subtitlesEl.stop(true, false).css('opacity', 1).show(); + this.captionState = 'visible'; + } else if (this.captionState === 'visible') { + clearTimeout(this.captionHideTimeout); + } + + this.captionHideTimeout = setTimeout(this.videoCaption.autoHideCaptions, this.videoCaption.fadeOutTimeout); + + this.captionsShowLock = false; + } + } + + function autoHideCaptions() { + var _this; + + this.captionHideTimeout = null; + + if (!this.captionsHidden) { + return; + } + + this.captionState = 'hiding'; + + _this = this; + + this.videoCaption.subtitlesEl.fadeOut(this.videoCaption.fadeOutTimeout, function () { + _this.captionState = 'invisible'; + }); + } + + function resize() { + this.videoCaption.subtitlesEl + .find('.spacing:first').height(this.videoCaption.topSpacingHeight()) + .find('.spacing:last').height(this.videoCaption.bottomSpacingHeight()); + + this.videoCaption.scrollCaption(); + + this.videoCaption.setSubtitlesHeight(); + } + + function onMouseEnter() { + if (this.videoCaption.frozen) { + clearTimeout(this.videoCaption.frozen); + } + + this.videoCaption.frozen = setTimeout(this.videoCaption.onMouseLeave, 10000); + } + + function onMouseLeave() { + if (this.videoCaption.frozen) { + clearTimeout(this.videoCaption.frozen); + } + + this.videoCaption.frozen = null; + + if (this.videoCaption.playing) { + this.videoCaption.scrollCaption(); + } + } + + function onMovement() { + this.videoCaption.onMouseEnter(); + } + + function renderCaption() { + var container, + _this = this; + container = $('<ol>'); + + $.each(this.videoCaption.captions, function(index, text) { + var liEl = $('<li>'); + + liEl.html(text); + + liEl.attr({ + 'data-index': index, + 'data-start': _this.videoCaption.start[index] + }); + + container.append(liEl); + }); + + this.videoCaption.subtitlesEl.html(container.html()); + + this.videoCaption.subtitlesEl.find('li[data-index]').on('click', this.videoCaption.seekPlayer); + + this.videoCaption.subtitlesEl.prepend($('<li class="spacing">').height(this.videoCaption.topSpacingHeight())); + this.videoCaption.subtitlesEl.append($('<li class="spacing">').height(this.videoCaption.bottomSpacingHeight())); + + this.videoCaption.rendered = true; + } + + function scrollCaption() { + var el = this.videoCaption.subtitlesEl.find('.current:first'); + + if (!this.videoCaption.frozen && el.length) { + this.videoCaption.subtitlesEl.scrollTo( + el, + { + offset: -this.videoCaption.calculateOffset(el) + } + ); + } + } + + function search(time) { + var index, max, min; + + if (this.videoCaption.loaded) { + min = 0; + max = this.videoCaption.start.length - 1; + + while (min < max) { + index = Math.ceil((max + min) / 2); + + if (time < this.videoCaption.start[index]) { + max = index - 1; + } + + if (time >= this.videoCaption.start[index]) { + min = index; + } + } + + return min; + } + + return undefined; + } + + function play() { + if (this.videoCaption.loaded) { + if (!this.videoCaption.rendered) { + this.videoCaption.renderCaption(); + } + + this.videoCaption.playing = true; + } + } + + function pause() { + if (this.videoCaption.loaded) { + this.videoCaption.playing = false; + } + } + + function updatePlayTime(time) { + var newIndex; + + if (this.videoCaption.loaded) { + time = Math.round(Time.convert(time, this.speed, '1.0') * 1000 + 250); + newIndex = this.videoCaption.search(time); + + if (newIndex !== void 0 && this.videoCaption.currentIndex !== newIndex) { + if (this.videoCaption.currentIndex) { + this.videoCaption.subtitlesEl.find('li.current').removeClass('current'); + } + + this.videoCaption.subtitlesEl.find("li[data-index='" + newIndex + "']").addClass('current'); + + this.videoCaption.currentIndex = newIndex; + + this.videoCaption.scrollCaption(); + } + } + } + + function seekPlayer(event) { + var time; + + event.preventDefault(); + time = Math.round(Time.convert($(event.target).data('start'), '1.0', this.speed) / 1000); + + this.trigger('videoPlayer.onCaptionSeek', {'type': 'onCaptionSeek', 'time': time}); + } + + function calculateOffset(element) { + return this.videoCaption.captionHeight() / 2 - element.height() / 2; + } + + function topSpacingHeight() { + return this.videoCaption.calculateOffset(this.videoCaption.subtitlesEl.find('li:not(.spacing):first')); + } + + function bottomSpacingHeight() { + return this.videoCaption.calculateOffset(this.videoCaption.subtitlesEl.find('li:not(.spacing):last')); + } + + function toggle(event) { + event.preventDefault(); + + if (this.el.hasClass('closed')) { + this.videoCaption.hideCaptions(false); + } else { + this.videoCaption.hideCaptions(true); + } + } + + function hideCaptions(hide_captions) { + var type; + + if (hide_captions) { + type = 'hide_transcript'; + this.captionsHidden = true; + this.videoCaption.hideSubtitlesEl.attr('title', gettext('Turn on captions')); + this.el.addClass('closed'); + } else { + type = 'show_transcript'; + this.captionsHidden = false; + this.videoCaption.hideSubtitlesEl.attr('title', gettext('Turn off captions')); + this.el.removeClass('closed'); + this.videoCaption.scrollCaption(); + } + + if (this.videoPlayer) { + this.videoPlayer.log(type, { + currentTime: this.videoPlayer.currentTime + }); + } + + this.videoCaption.setSubtitlesHeight(); + + $.cookie('hide_captions', hide_captions, { + expires: 3650, + path: '/' + }); + } + + function captionHeight() { + if (this.isFullScreen) { + return $(window).height() - this.el.find('.video-controls').height() - + 0.5 * this.videoControl.sliderEl.height() - + 2 * parseInt(this.videoCaption.subtitlesEl.css('padding-top'), 10); + } else { + return this.el.find('.video-wrapper').height(); + } + } + + function setSubtitlesHeight() { + var height = 0; + if (this.videoType === 'html5'){ + // on page load captionHidden = undefined + if ( + (this.captionsHidden === undefined && this.hide_captions === true ) || + (this.captionsHidden === true) ) { + // In case of html5 autoshowing subtitles, + // we ajdust height of subs, by height of scrollbar + height = this.videoControl.el.height() + 0.5 * this.videoControl.sliderEl.height(); + // height of videoControl does not contain height of slider. + // (css is set to absolute, to avoid yanking when slider autochanges its height) + } + } + this.videoCaption.subtitlesEl.css({ + maxHeight: this.videoCaption.captionHeight() - height + }); + } +}); + +}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/10_main.js b/common/lib/xmodule/xmodule/js/src/videoalpha/10_main.js new file mode 100644 index 0000000000..b5f647f563 --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/videoalpha/10_main.js @@ -0,0 +1,72 @@ +(function (requirejs, require, define) { + +// Main module. +require( +[ + 'videoalpha/01_initialize.js', + 'videoalpha/04_video_control.js', + 'videoalpha/05_video_quality_control.js', + 'videoalpha/06_video_progress_slider.js', + 'videoalpha/07_video_volume_control.js', + 'videoalpha/08_video_speed_control.js', + 'videoalpha/09_video_caption.js' +], +function ( + Initialize, + VideoControl, + VideoQualityControl, + VideoProgressSlider, + VideoVolumeControl, + VideoSpeedControl, + VideoCaption +) { + var previousState; + + // Because this constructor can be called multiple times on a single page (when + // the user switches verticals, the page doesn't reload, but the content changes), we must + // will check each time if there is a previous copy of 'state' object. If there is, we + // will make sure that copy exists cleanly. We have to do this because when verticals switch, + // the code does not handle any Xmodule JS code that is running - it simply removes DOM + // elements from the page. Any functions that were running during this, and that will run + // afterwards (expecting the DOM elements to be present) must be stopped by hand. + previousState = null; + + window.VideoAlpha = function (element) { + var state; + + // Stop bufferization of previous video on sequence change. + // Problem: multiple video tags with the same src cannot + // play together. The second tag waiting when first video will be fully loaded. + // That's why we abort bufferization forcibly. + $(element).closest('.sequence').bind('sequence:change', function(e){ + if (previousState !== null && typeof previousState.videoPlayer !== 'undefined') { + previousState.stopBuffering(); + $(e.currentTarget).unbind('sequence:change'); + } + }); + + // Check for existance of previous state, uninitialize it if necessary, and create a new state. + // Store new state for future invocation of this module consturctor function. + if (previousState !== null && typeof previousState.videoPlayer !== 'undefined') { + previousState.videoPlayer.onPause(); + } + state = {}; + previousState = state; + + Initialize(state, element); + + VideoControl(state); + VideoQualityControl(state); + VideoProgressSlider(state); + VideoVolumeControl(state); + VideoSpeedControl(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 + // VideoAlpha with Jasmine. + return state; + }; +}); + +}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display.coffee deleted file mode 100644 index 5f68e63c98..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display.coffee +++ /dev/null @@ -1,108 +0,0 @@ -class @VideoAlpha - constructor: (element) -> - @el = $(element).find('.video') - @id = @el.attr('id').replace(/video_/, '') - @start = @el.data('start') - @end = @el.data('end') - @caption_data_dir = @el.data('caption-data-dir') - @caption_asset_path = @el.data('caption-asset-path') - @show_captions = @el.data('show-captions').toString() == "true" - @el = $("#video_#{@id}") - if @parseYoutubeId(@el.data("streams")) is true - @videoType = "youtube" - @fetchMetadata() - @parseSpeed() - else - @videoType = "html5" - @parseHtml5Sources @el.data('mp4-source'), @el.data('webm-source'), @el.data('ogg-source') - @speeds = ['0.75', '1.0', '1.25', '1.50'] - sub = @el.data('sub') - if (typeof sub isnt "string") or (sub.length is 0) - sub = "" - @show_captions = false - @videos = - "0.75": sub - "1.0": sub - "1.25": sub - "1.5": sub - @setSpeed $.cookie('video_speed') - $("#video_#{@id}").data('video', this).addClass('video-load-complete') - if @show_captions is true - @hide_captions = $.cookie('hide_captions') == 'true' - else - @hide_captions = true - $.cookie('hide_captions', @hide_captions, expires: 3650, path: '/') - @el.addClass 'closed' - if ((@videoType is "youtube") and (YT.Player)) or ((@videoType is "html5") and (HTML5Video.Player)) - @embed() - else - if @videoType is "youtube" - window.onYouTubePlayerAPIReady = => - @embed() - else if @videoType is "html5" - window.onHTML5PlayerAPIReady = => - @embed() - - youtubeId: (speed)-> - @videos[speed || @speed] - - parseYoutubeId: (videos)-> - return false if (typeof videos isnt "string") or (videos.length is 0) - @videos = {} - $.each videos.split(/,/), (index, video) => - speed = undefined - video = video.split(/:/) - speed = parseFloat(video[0]).toFixed(2).replace(/\.00$/, ".0") - @videos[speed] = video[1] - true - - parseHtml5Sources: (mp4Source, webmSource, oggSource)-> - @html5Sources = - mp4: null - webm: null - ogg: null - @html5Sources.mp4 = mp4Source if (typeof mp4Source is "string") and (mp4Source.length > 0) - @html5Sources.webm = webmSource if (typeof webmSource is "string") and (webmSource.length > 0) - @html5Sources.ogg = oggSource if (typeof oggSource is "string") and (oggSource.length > 0) - - parseSpeed: -> - @speeds = ($.map @videos, (url, speed) -> speed).sort() - @setSpeed $.cookie('video_speed') - - setSpeed: (newSpeed, updateCookie)-> - if @speeds.indexOf(newSpeed) isnt -1 - @speed = newSpeed - - if updateCookie isnt false - $.cookie "video_speed", "" + newSpeed, - expires: 3650 - path: "/" - else - @speed = "1.0" - - embed: -> - @player = new VideoPlayerAlpha video: this - - fetchMetadata: (url) -> - @metadata = {} - $.each @videos, (speed, url) => - $.get "https://gdata.youtube.com/feeds/api/videos/#{url}?v=2&alt=jsonc", ((data) => @metadata[data.data.id] = data.data) , 'jsonp' - - getDuration: -> - @metadata[@youtubeId()].duration - - log: (eventName, data)-> - # Default parameters that always get logged. - logInfo = - id: @id - code: @youtubeId() - - # If extra parameters were passed to the log. - if data - $.each data, (paramName, value) -> - logInfo[paramName] = value - - if @videoType is "youtube" - logInfo.code = @youtubeId() - else logInfo.code = "html5" if @videoType is "html5" - Logger.log eventName, logInfo diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/.gitignore b/common/lib/xmodule/xmodule/js/src/videoalpha/display/.gitignore deleted file mode 100644 index c7a88ce092..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/.gitignore +++ /dev/null @@ -1 +0,0 @@ -!html5_video.js diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/_subview.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display/_subview.coffee deleted file mode 100644 index 6b86296dfa..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/_subview.coffee +++ /dev/null @@ -1,14 +0,0 @@ -class @SubviewAlpha - constructor: (options) -> - $.each options, (key, value) => - @[key] = value - @initialize() - @render() - @bind() - - $: (selector) -> - $(selector, @el) - - initialize: -> - render: -> - bind: -> diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_caption.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_caption.coffee deleted file mode 100644 index 317979bb4d..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_caption.coffee +++ /dev/null @@ -1,159 +0,0 @@ -class @VideoCaptionAlpha extends SubviewAlpha - initialize: -> - @loaded = false - - bind: -> - $(window).bind('resize', @resize) - @$('.hide-subtitles').click @toggle - @$('.subtitles').mouseenter(@onMouseEnter).mouseleave(@onMouseLeave) - .mousemove(@onMovement).bind('mousewheel', @onMovement) - .bind('DOMMouseScroll', @onMovement) - - captionURL: -> - "#{@captionAssetPath}#{@youtubeId}.srt.sjson" - - render: -> - # TODO: make it so you can have a video with no captions. - #@$('.video-wrapper').after """ - # <ol class="subtitles"><li>Attempting to load captions...</li></ol> - # """ - @$('.video-wrapper').after """ - <ol class="subtitles"></ol> - """ - @$('.video-controls .secondary-controls').append """ - <a href="#" class="hide-subtitles" title="Turn off captions">Captions</a> - """#" - @$('.subtitles').css maxHeight: @$('.video-wrapper').height() - 5 - @fetchCaption() - - fetchCaption: -> - $.ajaxWithPrefix - url: @captionURL() - notifyOnError: false - success: (captions) => - @captions = captions.text - @start = captions.start - - @loaded = true - - if onTouchBasedDevice() - $('.subtitles').html "<li>Caption will be displayed when you start playing the video.</li>" - else - @renderCaption() - - renderCaption: -> - container = $('<ol>') - - $.each @captions, (index, text) => - container.append $('<li>').html(text).attr - 'data-index': index - 'data-start': @start[index] - - @$('.subtitles').html(container.html()) - @$('.subtitles li[data-index]').click @seekPlayer - - # prepend and append an empty <li> for cosmetic reason - @$('.subtitles').prepend($('<li class="spacing">').height(@topSpacingHeight())) - .append($('<li class="spacing">').height(@bottomSpacingHeight())) - - @rendered = true - - search: (time) -> - if @loaded - min = 0 - max = @start.length - 1 - - while min < max - index = Math.ceil((max + min) / 2) - if time < @start[index] - max = index - 1 - if time >= @start[index] - min = index - return min - - play: -> - if @loaded - @renderCaption() unless @rendered - @playing = true - - pause: -> - if @loaded - @playing = false - - updatePlayTime: (time) -> - if @loaded - # This 250ms offset is required to match the video speed - time = Math.round(Time.convert(time, @currentSpeed, '1.0') * 1000 + 250) - newIndex = @search time - - if newIndex != undefined && @currentIndex != newIndex - if @currentIndex - @$(".subtitles li.current").removeClass('current') - @$(".subtitles li[data-index='#{newIndex}']").addClass('current') - - @currentIndex = newIndex - @scrollCaption() - - resize: => - @$('.subtitles').css maxHeight: @captionHeight() - @$('.subtitles .spacing:first').height(@topSpacingHeight()) - @$('.subtitles .spacing:last').height(@bottomSpacingHeight()) - @scrollCaption() - - onMouseEnter: => - clearTimeout @frozen if @frozen - @frozen = setTimeout @onMouseLeave, 10000 - - onMovement: => - @onMouseEnter() - - onMouseLeave: => - clearTimeout @frozen if @frozen - @frozen = null - @scrollCaption() if @playing - - scrollCaption: -> - if !@frozen && @$('.subtitles .current:first').length - @$('.subtitles').scrollTo @$('.subtitles .current:first'), - offset: - @calculateOffset(@$('.subtitles .current:first')) - - seekPlayer: (event) => - event.preventDefault() - time = Math.round(Time.convert($(event.target).data('start'), '1.0', @currentSpeed) / 1000) - $(@).trigger('caption_seek', time) - - calculateOffset: (element) -> - @captionHeight() / 2 - element.height() / 2 - - topSpacingHeight: -> - @calculateOffset(@$('.subtitles li:not(.spacing):first')) - - bottomSpacingHeight: -> - @calculateOffset(@$('.subtitles li:not(.spacing):last')) - - toggle: (event) => - event.preventDefault() - if @el.hasClass('closed') # Captions are "closed" e.g. turned off - @hideCaptions(false) - else # Captions are on - @hideCaptions(true) - - hideCaptions: (hide_captions) => - if hide_captions - type = 'hide_transcript' - @$('.hide-subtitles').attr('title', 'Turn on captions') - @el.addClass('closed') - else - type = 'show_transcript' - @$('.hide-subtitles').attr('title', 'Turn off captions') - @el.removeClass('closed') - @scrollCaption() - @video.log type, - currentTime: @player.currentTime - $.cookie('hide_captions', hide_captions, expires: 3650, path: '/') - - captionHeight: -> - if @el.hasClass('fullscreen') - $(window).height() - @$('.video-controls').height() - else - @$('.video-wrapper').height() diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_control.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_control.coffee deleted file mode 100644 index 311b69dbbe..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_control.coffee +++ /dev/null @@ -1,35 +0,0 @@ -class @VideoControlAlpha extends SubviewAlpha - bind: -> - @$('.video_control').click @togglePlayback - - render: -> - @el.append """ - <div class="slider"></div> - <div> - <ul class="vcr"> - <li><a class="video_control" href="#"></a></li> - <li> - <div class="vidtime">0:00 / 0:00</div> - </li> - </ul> - <div class="secondary-controls"> - <a href="#" class="add-fullscreen" title="Fill browser">Fill Browser</a> - </div> - </div> - """#" - - unless onTouchBasedDevice() - @$('.video_control').addClass('play').html('Play') - - play: -> - @$('.video_control').removeClass('play').addClass('pause').html('Pause') - - pause: -> - @$('.video_control').removeClass('pause').addClass('play').html('Play') - - togglePlayback: (event) => - event.preventDefault() - if @$('.video_control').hasClass('play') - $(@).trigger('play') - else if @$('.video_control').hasClass('pause') - $(@).trigger('pause') diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee deleted file mode 100644 index 7019386e04..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_player.coffee +++ /dev/null @@ -1,323 +0,0 @@ -class @VideoPlayerAlpha extends SubviewAlpha - initialize: -> - # If we switch verticals while the video is playing, then HTML content is - # removed, but JS code is still executing (setInterval() method), and there will - # arise conflicts (no HTML content, but code tries to access it). Therefore - # we must pause the player (stop setInterval() method). - if (window.OldVideoPlayerAlpha) and (window.OldVideoPlayerAlpha.onPause) - window.OldVideoPlayerAlpha.onPause() - window.OldVideoPlayerAlpha = @ - - if @video.videoType is 'youtube' - @PlayerState = YT.PlayerState - # Define a missing constant of Youtube API - @PlayerState.UNSTARTED = -1 - else if @video.videoType is 'html5' - @PlayerState = HTML5Video.PlayerState - - @currentTime = 0 - @el = $("#video_#{@video.id}") - - bind: -> - $(@control).bind('play', @play) - .bind('pause', @pause) - if @video.videoType is 'youtube' - $(@qualityControl).bind('changeQuality', @handlePlaybackQualityChange) - if @video.show_captions is true - $(@caption).bind('caption_seek', @onSeek) - $(@speedControl).bind('speedChange', @onSpeedChange) - $(@progressSlider).bind('slide_seek', @onSeek) - if @volumeControl - $(@volumeControl).bind('volumeChange', @onVolumeChange) - $(document.documentElement).keyup @bindExitFullScreen - - @$('.add-fullscreen').click @toggleFullScreen - @addToolTip() unless onTouchBasedDevice() - - bindExitFullScreen: (event) => - if @el.hasClass('fullscreen') && event.keyCode == 27 - @toggleFullScreen(event) - - render: -> - @control = new VideoControlAlpha el: @$('.video-controls') - if @video.videoType is 'youtube' - @qualityControl = new VideoQualityControlAlpha el: @$('.secondary-controls') - if @video.show_captions is true - @caption = new VideoCaptionAlpha - el: @el - video: @video - player: @ - youtubeId: @video.youtubeId('1.0') - currentSpeed: @currentSpeed() - captionAssetPath: @video.caption_asset_path - unless onTouchBasedDevice() - @volumeControl = new VideoVolumeControlAlpha el: @$('.secondary-controls') - @speedControl = new VideoSpeedControlAlpha el: @$('.secondary-controls'), speeds: @video.speeds, currentSpeed: @currentSpeed() - @progressSlider = new VideoProgressSliderAlpha el: @$('.slider') - @playerVars = - controls: 0 - wmode: 'transparent' - rel: 0 - showinfo: 0 - enablejsapi: 1 - modestbranding: 1 - html5: 1 - if @video.start - @playerVars.start = @video.start - @playerVars.wmode = 'window' - if @video.end - # work in AS3, not HMLT5. but iframe use AS3 - @playerVars.end = @video.end - - # There is a bug which prevents YouTube API to correctly set the speed to 1.0 from another speed - # in Firefox when in HTML5 mode. There is a fix which basically reloads the video at speed 1.0 - # when this change is requested (instead of simply requesting a speed change to 1.0). This has to - # be done only when the video is being watched in Firefox. We need to figure out what browser is - # currently executing this code. - # - # TODO: Check the status of http://code.google.com/p/gdata-issues/issues/detail?id=4654 - # When the YouTube team fixes the API bug, we can remove this temporary bug fix. - @video.isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1 - - if @video.videoType is 'html5' - @video.playerType = 'browser' - @player = new HTML5Video.Player @video.el, - playerVars: @playerVars, - videoSources: @video.html5Sources, - events: - onReady: @onReady - onStateChange: @onStateChange - else if @video.videoType is 'youtube' - prev_player_type = $.cookie('prev_player_type') - if prev_player_type == 'html5' - youTubeId = @video.videos['1.0'] - else - youTubeId = @video.youtubeId() - @video.playerType = 'youtube' - @player = new YT.Player @video.id, - playerVars: @playerVars - videoId: youTubeId - events: - onReady: @onReady - onStateChange: @onStateChange - onPlaybackQualityChange: @onPlaybackQualityChange - if @video.show_captions is true - @caption.hideCaptions(@['video'].hide_captions) - - addToolTip: -> - @$('.add-fullscreen, .hide-subtitles').qtip - position: - my: 'top right' - at: 'top center' - - onReady: (event) => - @video.log 'load_video' - if @video.videoType is 'html5' - @player.setPlaybackRate @video.speed - if not onTouchBasedDevice() and $('.video:first').data('autoplay') isnt 'False' - $('.video-load-complete:first').data('video').player.play() - - onStateChange: (event) => - _this = this - switch event.data - when @PlayerState.UNSTARTED - # Before the video starts playing, let us see if we are in YouTube player, - # and if YouTube is in HTML5 mode. If both cases are true, then we can make - # it so that speed switching happens natively. - - if @video.videoType is "youtube" - # Because YouTube API does not have a direct method to determine the mode we - # are in (Flash or HTML5), we rely on an indirect method. Currently, when in - # Flash mode, YouTube player reports that there is only one (1.0) speed - # available. When in HTML5 mode, it reports multiple speeds available. We - # will use this fact. - # - # NOTE: It is my strong belief that in the future YouTube Flash player will - # not get speed changes. This is a dying technology. So we can safely use - # this indirect method to determine player mode. - availableSpeeds = @player.getAvailablePlaybackRates() - prev_player_type = $.cookie('prev_player_type') - if availableSpeeds.length > 1 - # If the user last accessed the page and watched a movie via YouTube - # player, and it was using Flash mode, then we must reset the current - # YouTube speed to 1.0 (by loading appropriate video that is encoded at - # 1.0 speed). - if prev_player_type == 'youtube' - $.cookie('prev_player_type', 'html5', expires: 3650, path: '/') - @onSpeedChange null, '1.0', false - else if prev_player_type != 'html5' - $.cookie('prev_player_type', 'html5', expires: 3650, path: '/') - - # Now we must update all the speeds to the ones available via the YouTube - # HTML5 API. The default speeds are not exactly the same as reported by - # YouTube, so we will remove the default speeds, and populate all the - # necessary data with correct available speeds. - baseSpeedSubs = @video.videos["1.0"] - $.each @video.videos, (index, value) -> - delete _this.video.videos[index] - @video.speeds = [] - $.each availableSpeeds, (index, value) -> - _this.video.videos[value.toFixed(2).replace(/\.00$/, ".0")] = baseSpeedSubs - _this.video.speeds.push value.toFixed(2).replace(/\.00$/, ".0") - - # We must update the Speed Control to reflect the new avialble speeds. - @speedControl.reRender @video.speeds, @video.speed - - # Now we set the videoType to 'HTML5'. This works because my HTML5Video - # class is fully compatible with YouTube HTML5 API. - @video.videoType = 'html5' - - @video.setSpeed $.cookie('video_speed') - - # Change the speed to the required one. - @player.setPlaybackRate @video.speed - else - # We are in YouTube player, and in Flash mode. Check previos mode. - if prev_player_type != 'youtube' - $.cookie('prev_player_type', 'youtube', expires: 3650, path: '/') - - # We need to set the proper speed when previous mode was not 'youtube'. - @onSpeedChange null, $.cookie('video_speed') - - @onUnstarted() - when @PlayerState.PLAYING - @onPlay() - when @PlayerState.PAUSED - @onPause() - when @PlayerState.ENDED - @onEnded() - - onPlaybackQualityChange: (event, value) => - quality = @player.getPlaybackQuality() - @qualityControl.onQualityChange(quality) - - handlePlaybackQualityChange: (event, value) => - @player.setPlaybackQuality(value) - - onUnstarted: => - @control.pause() - if @video.show_captions is true - @caption.pause() - - onPlay: => - @video.log 'play_video', - currentTime: @currentTime - unless @player.interval - @player.interval = setInterval(@update, 200) - if @video.show_captions is true - @caption.play() - @control.play() - @progressSlider.play() - - onPause: => - @video.log 'pause_video', - currentTime: @currentTime - clearInterval(@player.interval) - @player.interval = null - if @video.show_captions is true - @caption.pause() - @control.pause() - - onEnded: => - @control.pause() - if @video.show_captions is true - @caption.pause() - - onSeek: (event, time) => - @video.log 'seek_video', - old_time: @currentTime - new_time: time - type: event.type - @player.seekTo(time, true) - if @isPlaying() - clearInterval(@player.interval) - @player.interval = setInterval(@update, 200) - else - @currentTime = time - @updatePlayTime time - - onSpeedChange: (event, newSpeed, updateCookie) => - if @video.videoType is 'youtube' - @currentTime = Time.convert(@currentTime, parseFloat(@currentSpeed()), newSpeed) - newSpeed = parseFloat(newSpeed).toFixed(2).replace /\.00$/, '.0' - - @video.log 'speed_change_video', - currentTime: @currentTime - old_speed: @currentSpeed() - new_speed: newSpeed - - @video.setSpeed newSpeed, updateCookie - if @video.videoType is 'youtube' - if @video.show_captions is true - @caption.currentSpeed = newSpeed - - # We request the reloading of the video in the case when YouTube is in Flash player mode, - # or when we are in Firefox, and the new speed is 1.0. The second case is necessary to - # avoid the bug where in Firefox speed switching to 1.0 in HTML5 player mode is handled - # incorrectly by YouTube API. - # - # TODO: Check the status of http://code.google.com/p/gdata-issues/issues/detail?id=4654 - # When the YouTube team fixes the API bug, we can remove this temporary bug fix. - if (@video.videoType is 'youtube') or ((@video.isFirefox) and (@video.playerType is 'youtube') and (newSpeed is '1.0')) - if @isPlaying() - @player.loadVideoById(@video.youtubeId(), @currentTime) - else - @player.cueVideoById(@video.youtubeId(), @currentTime) - else if @video.videoType is 'html5' - @player.setPlaybackRate newSpeed - if @video.videoType is 'youtube' - @updatePlayTime @currentTime - - onVolumeChange: (event, volume) => - @player.setVolume volume - - update: => - if @currentTime = @player.getCurrentTime() - @updatePlayTime @currentTime - - updatePlayTime: (time) -> - progress = Time.format(time) + ' / ' + Time.format(@duration()) - @$(".vidtime").html(progress) - if @video.show_captions is true - @caption.updatePlayTime(time) - @progressSlider.updatePlayTime(time, @duration()) - - toggleFullScreen: (event) => - event.preventDefault() - if @el.hasClass('fullscreen') - type = 'not_fullscreen' - @$('.add-fullscreen').attr('title', 'Fill browser') - @el.removeClass('fullscreen') - else - type = 'fullscreen' - @el.addClass('fullscreen') - @$('.add-fullscreen').attr('title', 'Exit fill browser') - @video.log type, - currentTime: @currentTime - if @video.show_captions is true - @caption.resize() - - # Delegates - play: => - @player.playVideo() if @player.playVideo - - isPlaying: -> - @player.getPlayerState() == @PlayerState.PLAYING - - pause: => - @player.pauseVideo() if @player.pauseVideo - - duration: -> - duration = @player.getDuration() if @player.getDuration - if isFinite(duration) is false - duration = @video.getDuration() - duration - - currentSpeed: -> - @video.speed - - volume: (value) -> - if value? - @player.setVolume value - else - @player.getVolume() diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_progress_slider.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_progress_slider.coffee deleted file mode 100644 index 5197c4938f..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_progress_slider.coffee +++ /dev/null @@ -1,50 +0,0 @@ -class @VideoProgressSliderAlpha extends SubviewAlpha - initialize: -> - @buildSlider() unless onTouchBasedDevice() - - buildSlider: -> - @slider = @el.slider - range: 'min' - change: @onChange - - slide: @onSlide - stop: @onStop - @buildHandle() - - buildHandle: -> - @handle = @$('.ui-slider-handle') - @handle.qtip - content: "#{Time.format(@slider.slider('value'))}" - position: - my: 'bottom center' - at: 'top center' - container: @handle - hide: - delay: 700 - style: - classes: 'ui-tooltip-slider' - widget: true - - play: => - @buildSlider() unless @slider - - updatePlayTime: (currentTime, duration) -> - if @slider && !@frozen - @slider.slider('option', 'max', duration) - @slider.slider('value', currentTime) - - onSlide: (event, ui) => - @frozen = true - @updateTooltip(ui.value) - $(@).trigger('slide_seek', ui.value) - - onChange: (event, ui) => - @updateTooltip(ui.value) - - onStop: (event, ui) => - @frozen = true - $(@).trigger('slide_seek', ui.value) - setTimeout (=> @frozen = false), 200 - - updateTooltip: (value)-> - @handle.qtip('option', 'content.text', "#{Time.format(value)}") diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_quality_control.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_quality_control.coffee deleted file mode 100644 index c67969e34e..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_quality_control.coffee +++ /dev/null @@ -1,26 +0,0 @@ -class @VideoQualityControlAlpha extends SubviewAlpha - initialize: -> - @quality = null; - - bind: -> - @$('.quality_control').click @toggleQuality - - render: -> - @el.append """ - <a href="#" class="quality_control" title="HD">HD</a> - """#" - - onQualityChange: (value) -> - @quality = value - if @quality in ['hd720', 'hd1080', 'highres'] - @el.addClass('active') - else - @el.removeClass('active') - - toggleQuality: (event) => - event.preventDefault() - if @quality in ['hd720', 'hd1080', 'highres'] - newQuality = 'large' - else - newQuality = 'hd720' - $(@).trigger('changeQuality', newQuality) \ No newline at end of file diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_speed_control.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_speed_control.coffee deleted file mode 100644 index b582f81d47..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_speed_control.coffee +++ /dev/null @@ -1,53 +0,0 @@ -class @VideoSpeedControlAlpha extends SubviewAlpha - bind: -> - @$('.video_speeds a').click @changeVideoSpeed - if onTouchBasedDevice() - @$('.speeds').click (event) -> - event.preventDefault() - $(this).toggleClass('open') - else - @$('.speeds').mouseenter -> - $(this).addClass('open') - @$('.speeds').mouseleave -> - $(this).removeClass('open') - @$('.speeds').click (event) -> - event.preventDefault() - $(this).removeClass('open') - - render: -> - @el.prepend """ - <div class="speeds"> - <a href="#"> - <h3>Speed</h3> - <p class="active"></p> - </a> - <ol class="video_speeds"></ol> - </div> - """ - $.each @speeds, (index, speed) => - link = $('<a>').attr(href: "#").html("#{speed}x") - @$('.video_speeds').prepend($('<li>').attr('data-speed', speed).html(link)) - @setSpeed @currentSpeed - - reRender: (newSpeeds, currentSpeed) -> - @$('.video_speeds').empty() - @$('.video_speeds li').removeClass('active') - @speeds = newSpeeds - $.each @speeds, (index, speed) => - link = $('<a>').attr(href: "#").html("#{speed}x") - listItem = $('<li>').attr('data-speed', speed).html(link); - listItem.addClass('active') if speed is currentSpeed - @$('.video_speeds').prepend listItem - @$('.video_speeds a').click @changeVideoSpeed - - changeVideoSpeed: (event) => - event.preventDefault() - unless $(event.target).parent().hasClass('active') - @currentSpeed = $(event.target).parent().data('speed') - $(@).trigger 'speedChange', $(event.target).parent().data('speed') - @setSpeed(parseFloat(@currentSpeed).toFixed(2).replace /\.00$/, '.0') - - setSpeed: (speed) -> - @$('.video_speeds li').removeClass('active') - @$(".video_speeds li[data-speed='#{speed}']").addClass('active') - @$('.speeds p.active').html("#{speed}x") diff --git a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_volume_control.coffee b/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_volume_control.coffee deleted file mode 100644 index 8c17012ca2..0000000000 --- a/common/lib/xmodule/xmodule/js/src/videoalpha/display/video_volume_control.coffee +++ /dev/null @@ -1,40 +0,0 @@ -class @VideoVolumeControlAlpha extends SubviewAlpha - initialize: -> - @currentVolume = 100 - - bind: -> - @$('.volume').mouseenter -> - $(this).addClass('open') - @$('.volume').mouseleave -> - $(this).removeClass('open') - @$('.volume>a').click(@toggleMute) - - render: -> - @el.prepend """ - <div class="volume"> - <a href="#"></a> - <div class="volume-slider-container"> - <div class="volume-slider"></div> - </div> - </div> - """#" - @slider = @$('.volume-slider').slider - orientation: "vertical" - range: "min" - min: 0 - max: 100 - value: 100 - change: @onChange - slide: @onChange - - onChange: (event, ui) => - @currentVolume = ui.value - $(@).trigger 'volumeChange', @currentVolume - @$('.volume').toggleClass 'muted', @currentVolume == 0 - - toggleMute: => - if @currentVolume > 0 - @previousVolume = @currentVolume - @slider.slider 'option', 'value', 0 - else - @slider.slider 'option', 'value', @previousVolume diff --git a/common/lib/xmodule/xmodule/modulestore/locator.py b/common/lib/xmodule/xmodule/modulestore/locator.py index 928bc9f133..591ef3115f 100644 --- a/common/lib/xmodule/xmodule/modulestore/locator.py +++ b/common/lib/xmodule/xmodule/modulestore/locator.py @@ -45,7 +45,7 @@ class Locator(object): def __repr__(self): ''' - repr(self) returns something like this: CourseLocator("edu.mit.eecs.6002x") + repr(self) returns something like this: CourseLocator("mit.eecs.6002x") ''' classname = self.__class__.__name__ if classname.find('.') != -1: @@ -54,13 +54,13 @@ class Locator(object): def __str__(self): ''' - str(self) returns something like this: "edu.mit.eecs.6002x" + str(self) returns something like this: "mit.eecs.6002x" ''' return unicode(self).encode('utf8') def __unicode__(self): ''' - unicode(self) returns something like this: "edu.mit.eecs.6002x" + unicode(self) returns something like this: "mit.eecs.6002x" ''' return self.url() @@ -89,15 +89,15 @@ class CourseLocator(Locator): """ Examples of valid CourseLocator specifications: CourseLocator(version_guid=ObjectId('519665f6223ebd6980884f2b')) - CourseLocator(course_id='edu.mit.eecs.6002x') - CourseLocator(course_id='edu.mit.eecs.6002x;published') - CourseLocator(course_id='edu.mit.eecs.6002x', revision='published') + CourseLocator(course_id='mit.eecs.6002x') + CourseLocator(course_id='mit.eecs.6002x;published') + CourseLocator(course_id='mit.eecs.6002x', branch='published') CourseLocator(url='edx://@519665f6223ebd6980884f2b') - CourseLocator(url='edx://edu.mit.eecs.6002x') - CourseLocator(url='edx://edu.mit.eecs.6002x;published') + CourseLocator(url='edx://mit.eecs.6002x') + CourseLocator(url='edx://mit.eecs.6002x;published') Should have at lease a specific course_id (id for the course as if it were a project w/ - versions) with optional 'revision' (must be 'draft', 'published', or None), + versions) with optional 'branch', or version_guid (which points to a specific version). Can contain both in which case the persistence layer may raise exceptions if the given version != the current such version of the course. @@ -106,7 +106,7 @@ class CourseLocator(Locator): # Default values version_guid = None course_id = None - revision = None + branch = None def __unicode__(self): """ @@ -114,8 +114,8 @@ class CourseLocator(Locator): """ if self.course_id: result = self.course_id - if self.revision: - result += ';' + self.revision + if self.branch: + result += ';' + self.branch return result elif self.version_guid: return '@' + str(self.version_guid) @@ -131,7 +131,7 @@ class CourseLocator(Locator): # -- unused args which are used via inspect # pylint: disable= W0613 - def validate_args(self, url, version_guid, course_id, revision): + def validate_args(self, url, version_guid, course_id, branch): """ Validate provided arguments. """ @@ -144,12 +144,12 @@ class CourseLocator(Locator): def is_fully_specified(self): """ - Returns True if either version_guid is specified, or course_id+revision + Returns True if either version_guid is specified, or course_id+branch are specified. This should always return True, since this should be validated in the constructor. """ return self.version_guid is not None \ - or (self.course_id is not None and self.revision is not None) + or (self.course_id is not None and self.branch is not None) def set_course_id(self, new): """ @@ -158,12 +158,12 @@ class CourseLocator(Locator): """ self.set_property('course_id', new) - def set_revision(self, new): + def set_branch(self, new): """ - Initialize revision to new value. - If revision has already been initialized to a different value, raise an exception. + Initialize branch to new value. + If branch has already been initialized to a different value, raise an exception. """ - self.set_property('revision', new) + self.set_property('branch', new) def set_version_guid(self, new): """ @@ -181,29 +181,29 @@ class CourseLocator(Locator): """ return CourseLocator(course_id=self.course_id, version_guid=self.version_guid, - revision=self.revision) + branch=self.branch) - def __init__(self, url=None, version_guid=None, course_id=None, revision=None): + def __init__(self, url=None, version_guid=None, course_id=None, branch=None): """ Construct a CourseLocator Caller may provide url (but no other parameters). Caller may provide version_guid (but no other parameters). - Caller may provide course_id (optionally provide revision). + Caller may provide course_id (optionally provide branch). Resulting CourseLocator will have either a version_guid property - or a course_id (with optional revision) property, or both. + or a course_id (with optional branch) property, or both. version_guid must be an instance of bson.objectid.ObjectId or None - url, course_id, and revision must be strings or None + url, course_id, and branch must be strings or None """ - self.validate_args(url, version_guid, course_id, revision) + self.validate_args(url, version_guid, course_id, branch) if url: self.init_from_url(url) if version_guid: self.init_from_version_guid(version_guid) - if course_id or revision: - self.init_from_course_id(course_id, revision) + if course_id or branch: + self.init_from_course_id(course_id, branch) assert self.version_guid or self.course_id, \ "Either version_guid or course_id should be set." @@ -223,7 +223,7 @@ class CourseLocator(Locator): def init_from_url(self, url): """ url must be a string beginning with 'edx://' and containing - either a valid version_guid or course_id (with optional revision) + either a valid version_guid or course_id (with optional branch) If a block ('#HW3') is present, it is ignored. """ if isinstance(url, Locator): @@ -237,7 +237,7 @@ class CourseLocator(Locator): self.set_version_guid(self.as_object_id(new_guid)) else: self.set_course_id(parse['id']) - self.set_revision(parse['revision']) + self.set_branch(parse['branch']) def init_from_version_guid(self, version_guid): """ @@ -251,14 +251,14 @@ class CourseLocator(Locator): '%s is not an instance of ObjectId' % version_guid self.set_version_guid(version_guid) - def init_from_course_id(self, course_id, explicit_revision=None): + def init_from_course_id(self, course_id, explicit_branch=None): """ - Course_id is a string like 'edu.mit.eecs.6002x' or 'edu.mit.eecs.6002x;published'. + Course_id is a string like 'mit.eecs.6002x' or 'mit.eecs.6002x;published'. Revision (optional) is a string like 'published'. - It may be provided explicitly (explicit_revision) or embedded into course_id. - If revision is part of course_id ("...;published"), parse it out separately. - If revision is provided both ways, that's ok as long as they are the same value. + It may be provided explicitly (explicit_branch) or embedded into course_id. + If branch is part of course_id ("...;published"), parse it out separately. + If branch is provided both ways, that's ok as long as they are the same value. If a block ('#HW3') is a part of course_id, it is ignored. @@ -272,11 +272,11 @@ class CourseLocator(Locator): parse = parse_course_id(course_id) assert parse, 'Could not parse "%s" as a course_id' % course_id self.set_course_id(parse['id']) - rev = parse['revision'] + rev = parse['branch'] if rev: - self.set_revision(rev) - if explicit_revision: - self.set_revision(explicit_revision) + self.set_branch(rev) + if explicit_branch: + self.set_branch(explicit_branch) def version(self): """ @@ -305,37 +305,37 @@ class BlockUsageLocator(CourseLocator): the defined element in the course. Courses can be a version of an offering, the current draft head, or the current production version. - Locators can contain both a version and a course_id w/ revision. The split mongo functions - may raise errors if these conflict w/ the current db state (i.e., the course's revision != + Locators can contain both a version and a course_id w/ branch. The split mongo functions + may raise errors if these conflict w/ the current db state (i.e., the course's branch != the version_guid) Locations can express as urls as well as dictionaries. They consist of course_identifier: course_guid | version_guid block : guid - revision : 'draft' | 'published' (optional) + branch : string """ # Default value usage_id = None def __init__(self, url=None, version_guid=None, course_id=None, - revision=None, usage_id=None): + branch=None, usage_id=None): """ Construct a BlockUsageLocator - Caller may provide url, version_guid, or course_id, and optionally provide revision. + Caller may provide url, version_guid, or course_id, and optionally provide branch. The usage_id may be specified, either explictly or as part of the url or course_id. If omitted, the locator is created but it has not yet been initialized. Resulting BlockUsageLocator will have a usage_id property. - It will have either a version_guid property or a course_id (with optional revision) property, or both. + It will have either a version_guid property or a course_id (with optional branch) property, or both. version_guid must be an instance of bson.objectid.ObjectId or None - url, course_id, revision, and usage_id must be strings or None + url, course_id, branch, and usage_id must be strings or None """ - self.validate_args(url, version_guid, course_id, revision) + self.validate_args(url, version_guid, course_id, branch) if url: self.init_block_ref_from_url(url) if course_id: @@ -346,7 +346,7 @@ class BlockUsageLocator(CourseLocator): url=url, version_guid=version_guid, course_id=course_id, - revision=revision) + branch=branch) def is_initialized(self): """ @@ -366,11 +366,11 @@ class BlockUsageLocator(CourseLocator): """ if self.course_id and self.version_guid: return BlockUsageLocator(version_guid=self.version_guid, - revision=self.revision, + branch=self.branch, usage_id=self.usage_id) else: return BlockUsageLocator(course_id=self.course_id, - revision=self.revision, + branch=self.branch, usage_id=self.usage_id) def set_usage_id(self, new): diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/base.py b/common/lib/xmodule/xmodule/modulestore/mongo/base.py index bedba5d65d..066197f4b2 100644 --- a/common/lib/xmodule/xmodule/modulestore/mongo/base.py +++ b/common/lib/xmodule/xmodule/modulestore/mongo/base.py @@ -225,6 +225,8 @@ class CachingDescriptorSystem(MakoDescriptorSystem): non_draft_loc = location.replace(revision=None) metadata_to_inherit = self.cached_metadata.get(non_draft_loc.url(), {}) inherit_metadata(module, metadata_to_inherit) + # decache any computed pending field settings + module.save() return module except: log.warning("Failed to load descriptor", exc_info=True) @@ -630,6 +632,8 @@ class MongoModuleStore(ModuleStoreBase): definition_data = {} dbmodel = self._create_new_model_data(location.category, location, definition_data, metadata) xmodule = xblock_class(system, dbmodel) + # decache any pending field settings from init + xmodule.save() return xmodule def save_xmodule(self, xmodule): diff --git a/common/lib/xmodule/xmodule/modulestore/parsers.py b/common/lib/xmodule/xmodule/modulestore/parsers.py index 9aac3073ae..8e5b685cec 100644 --- a/common/lib/xmodule/xmodule/modulestore/parsers.py +++ b/common/lib/xmodule/xmodule/modulestore/parsers.py @@ -20,7 +20,7 @@ def parse_url(string): with key 'version_guid' and the value, If it can be parsed as a course_id, returns a dict - with keys 'id' and 'revision' (value of 'revision' may be None), + with keys 'id' and 'branch' (value of 'branch' may be None), """ match = URL_RE.match(string) @@ -69,14 +69,14 @@ def parse_guid(string): return None -COURSE_ID_RE = re.compile(r'^(?P<id>(\w+)(\.\w+\w*)*)(;(?P<revision>\w+))?(#(?P<block>\w+))?$', re.IGNORECASE) +COURSE_ID_RE = re.compile(r'^(?P<id>(\w+)(\.\w+\w*)*)(;(?P<branch>\w+))?(#(?P<block>\w+))?$', re.IGNORECASE) def parse_course_id(string): r""" A course_id has a main id component. - There may also be an optional revision (;published or ;draft). + There may also be an optional branch (;published or ;draft). There may also be an optional block (#HW3 or #Quiz2). Examples of valid course_ids: @@ -89,11 +89,11 @@ def parse_course_id(string): Syntax: - course_id = main_id [; revision] [# block] + course_id = main_id [; branch] [# block] main_id = name [. name]* - revision = name + branch = name block = name @@ -104,8 +104,8 @@ def parse_course_id(string): and the underscore. (see definition of \w in python regular expressions, at http://docs.python.org/dev/library/re.html) - If string is a course_id, returns a dict with keys 'id', 'revision', and 'block'. - Revision is optional: if missing returned_dict['revision'] is None. + If string is a course_id, returns a dict with keys 'id', 'branch', and 'block'. + Revision is optional: if missing returned_dict['branch'] is None. Block is optional: if missing returned_dict['block'] is None. Else returns None. """ diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py index 1591757490..8a9b35e4f1 100644 --- a/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py +++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py @@ -81,7 +81,7 @@ class CachingDescriptorSystem(MakoDescriptorSystem): version_guid=course_entry_override['_id'], usage_id=usage_id, course_id=course_entry_override.get('course_id'), - revision=course_entry_override.get('revision') + branch=course_entry_override.get('branch') ) kvs = SplitMongoKVS( @@ -116,4 +116,6 @@ class CachingDescriptorSystem(MakoDescriptorSystem): module.previous_version = json_data.get('previous_version') module.update_version = json_data.get('update_version') module.definition_locator = self.modulestore.definition_locator(definition) + # decache any pending field settings + module.save() return module diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py index 6dd6fb480f..c8ed57d027 100644 --- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py +++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py @@ -186,8 +186,8 @@ class SplitMongoModuleStore(ModuleStoreBase): return the CourseDescriptor! It returns the actual db json from structures. - Semantics: if course_id and revision given, then it will get that revision. If - also give a version_guid, it will see if the current head of that revision == that guid. If not + Semantics: if course_id and branch given, then it will get that branch. If + also give a version_guid, it will see if the current head of that branch == that guid. If not it raises VersionConflictError (the version now differs from what it was when you got your reference) @@ -198,19 +198,19 @@ class SplitMongoModuleStore(ModuleStoreBase): if not course_locator.is_fully_specified(): raise InsufficientSpecificationError('Not fully specified: %s' % course_locator) - if course_locator.course_id is not None and course_locator.revision is not None: + if course_locator.course_id is not None and course_locator.branch is not None: # use the course_id index = self.course_index.find_one({'_id': course_locator.course_id}) if index is None: raise ItemNotFoundError(course_locator) - if course_locator.revision not in index['versions']: + if course_locator.branch not in index['versions']: raise ItemNotFoundError(course_locator) - version_guid = index['versions'][course_locator.revision] + version_guid = index['versions'][course_locator.branch] if course_locator.version_guid is not None and version_guid != course_locator.version_guid: # This may be a bit too touchy but it's hard to infer intent raise VersionConflictError(course_locator, CourseLocator(course_locator, version_guid=version_guid)) else: - # TODO should this raise an exception if revision was provided? + # TODO should this raise an exception if branch was provided? version_guid = course_locator.version_guid # cast string to ObjectId if necessary @@ -223,29 +223,29 @@ class SplitMongoModuleStore(ModuleStoreBase): if course_locator.course_id: entry['course_id'] = course_locator.course_id - entry['revision'] = course_locator.revision + entry['branch'] = course_locator.branch return entry - def get_courses(self, revision, qualifiers=None): + def get_courses(self, branch, qualifiers=None): ''' Returns a list of course descriptors matching any given qualifiers. qualifiers should be a dict of keywords matching the db fields or any legal query for mongo to use against the active_versions collection. - Note, this is to find the current head of the named revision type + Note, this is to find the current head of the named branch type (e.g., 'draft'). To get specific versions via guid use get_course. ''' if qualifiers is None: qualifiers = {} - qualifiers.update({"versions.{}".format(revision): {"$exists": True}}) + qualifiers.update({"versions.{}".format(branch): {"$exists": True}}) matching = self.course_index.find(qualifiers) # collect ids and then query for those version_guids = [] id_version_map = {} for course_entry in matching: - version_guid = course_entry['versions'][revision] + version_guid = course_entry['versions'][branch] version_guids.append(version_guid) id_version_map[version_guid] = course_entry['_id'] @@ -667,7 +667,7 @@ class SplitMongoModuleStore(ModuleStoreBase): # update the index entry if appropriate if index_entry is not None: - self._update_head(index_entry, course_or_parent_locator.revision, new_id) + self._update_head(index_entry, course_or_parent_locator.branch, new_id) course_parent = course_or_parent_locator.as_course_locator() else: course_parent = None @@ -786,7 +786,7 @@ class SplitMongoModuleStore(ModuleStoreBase): 'edited_on': datetime.datetime.utcnow(), 'versions': versions_dict} new_id = self.course_index.insert(index_entry) - return self.get_course(CourseLocator(course_id=new_id, revision=master_version)) + return self.get_course(CourseLocator(course_id=new_id, branch=master_version)) def update_item(self, descriptor, user_id, force=False): """ @@ -835,7 +835,7 @@ class SplitMongoModuleStore(ModuleStoreBase): # update the index entry if appropriate if index_entry is not None: - self._update_head(index_entry, descriptor.location.revision, new_id) + self._update_head(index_entry, descriptor.location.branch, new_id) # fetch and return the new item--fetching is unnecessary but a good qc step return self.get_item(BlockUsageLocator(descriptor.location, version_guid=new_id)) @@ -876,7 +876,7 @@ class SplitMongoModuleStore(ModuleStoreBase): # update the index entry if appropriate if index_entry is not None: - self._update_head(index_entry, xblock.location.revision, new_id) + self._update_head(index_entry, xblock.location.branch, new_id) # fetch and return the new item--fetching is unnecessary but a good qc step return self.get_item(BlockUsageLocator(xblock.location, version_guid=new_id)) @@ -1028,9 +1028,9 @@ class SplitMongoModuleStore(ModuleStoreBase): # update the index entry if appropriate if index_entry is not None: - self._update_head(index_entry, usage_locator.revision, new_id) + self._update_head(index_entry, usage_locator.branch, new_id) result.course_id = usage_locator.course_id - result.revision = usage_locator.revision + result.branch = usage_locator.branch return result @@ -1186,19 +1186,19 @@ class SplitMongoModuleStore(ModuleStoreBase): :param locator: """ - if locator.course_id is None or locator.revision is None: + if locator.course_id is None or locator.branch is None: return None else: index_entry = self.course_index.find_one({'_id': locator.course_id}) if (locator.version_guid is not None - and index_entry['versions'][locator.revision] != locator.version_guid + and index_entry['versions'][locator.branch] != locator.version_guid and not force): raise VersionConflictError( locator, CourseLocator( course_id=index_entry['_id'], - version_guid=index_entry['versions'][locator.revision], - revision=locator.revision)) + version_guid=index_entry['versions'][locator.branch], + branch=locator.branch)) else: return index_entry @@ -1227,9 +1227,9 @@ class SplitMongoModuleStore(ModuleStoreBase): return False - def _update_head(self, index_entry, revision, new_id): + def _update_head(self, index_entry, branch, new_id): """ - Update the active index for the given course's revision to point to new_id + Update the active index for the given course's branch to point to new_id :param index_entry: :param course_locator: @@ -1237,4 +1237,4 @@ class SplitMongoModuleStore(ModuleStoreBase): """ self.course_index.update( {"_id": index_entry["_id"]}, - {"$set": {"versions.{}".format(revision): new_id}}) + {"$set": {"versions.{}".format(branch): new_id}}) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py b/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py index 2626b6692d..bb41131234 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py @@ -4,12 +4,10 @@ Created on Mar 14, 2013 @author: dmitchell ''' from unittest import TestCase -from nose.plugins.skip import SkipTest from bson.objectid import ObjectId from xmodule.modulestore.locator import Locator, CourseLocator, BlockUsageLocator -from xmodule.modulestore.exceptions import InvalidLocationError, \ - InsufficientSpecificationError, OverSpecificationError +from xmodule.modulestore.exceptions import InsufficientSpecificationError, OverSpecificationError class LocatorTest(TestCase): @@ -21,30 +19,30 @@ class LocatorTest(TestCase): self.assertRaises( OverSpecificationError, CourseLocator, - url='edx://edu.mit.eecs.6002x', - course_id='edu.harvard.history', - revision='published', + url='edx://mit.eecs.6002x', + course_id='harvard.history', + branch='published', version_guid=ObjectId()) self.assertRaises( OverSpecificationError, CourseLocator, - url='edx://edu.mit.eecs.6002x', - course_id='edu.harvard.history', + url='edx://mit.eecs.6002x', + course_id='harvard.history', version_guid=ObjectId()) self.assertRaises( OverSpecificationError, CourseLocator, - url='edx://edu.mit.eecs.6002x;published', - revision='draft') + url='edx://mit.eecs.6002x;published', + branch='draft') self.assertRaises( OverSpecificationError, CourseLocator, - course_id='edu.mit.eecs.6002x;published', - revision='draft') + course_id='mit.eecs.6002x;published', + branch='draft') def test_course_constructor_underspecified(self): self.assertRaises(InsufficientSpecificationError, CourseLocator) - self.assertRaises(InsufficientSpecificationError, CourseLocator, revision='published') + self.assertRaises(InsufficientSpecificationError, CourseLocator, branch='published') def test_course_constructor_bad_version_guid(self): self.assertRaises(ValueError, CourseLocator, version_guid="012345") @@ -73,467 +71,128 @@ class LocatorTest(TestCase): """ Test all sorts of badly-formed course_ids (and urls with those course_ids) """ - for bad_id in ('edu.mit.', - ' edu.mit.eecs', - 'edu.mit.eecs ', - '@edu.mit.eecs', - '#edu.mit.eecs', - 'edu.mit.ee cs', - 'edu.mit.ee,cs', - 'edu.mit.ee/cs', - 'edu.mit.ee$cs', - 'edu.mit.ee&cs', - 'edu.mit.ee()cs', + for bad_id in ('mit.', + ' mit.eecs', + 'mit.eecs ', + '@mit.eecs', + '#mit.eecs', + 'mit.ee cs', + 'mit.ee,cs', + 'mit.ee/cs', + 'mit.ee$cs', + 'mit.ee&cs', + 'mit.ee()cs', ';this', - 'edu.mit.eecs;', - 'edu.mit.eecs;this;that', - 'edu.mit.eecs;this;', - 'edu.mit.eecs;this ', - 'edu.mit.eecs;th%is ', + 'mit.eecs;', + 'mit.eecs;this;that', + 'mit.eecs;this;', + 'mit.eecs;this ', + 'mit.eecs;th%is ', ): self.assertRaises(AssertionError, CourseLocator, course_id=bad_id) self.assertRaises(AssertionError, CourseLocator, url='edx://' + bad_id) def test_course_constructor_bad_url(self): for bad_url in ('edx://', - 'edx:/edu.mit.eecs', - 'http://edu.mit.eecs', - 'edu.mit.eecs', - 'edx//edu.mit.eecs'): + 'edx:/mit.eecs', + 'http://mit.eecs', + 'mit.eecs', + 'edx//mit.eecs'): self.assertRaises(AssertionError, CourseLocator, url=bad_url) def test_course_constructor_redundant_001(self): - testurn = 'edu.mit.eecs.6002x' + testurn = 'mit.eecs.6002x' testobj = CourseLocator(course_id=testurn, url='edx://' + testurn) self.check_course_locn_fields(testobj, 'course_id', course_id=testurn) def test_course_constructor_redundant_002(self): - testurn = 'edu.mit.eecs.6002x;published' - expected_urn = 'edu.mit.eecs.6002x' + testurn = 'mit.eecs.6002x;published' + expected_urn = 'mit.eecs.6002x' expected_rev = 'published' testobj = CourseLocator(course_id=testurn, url='edx://' + testurn) self.check_course_locn_fields(testobj, 'course_id', course_id=expected_urn, - revision=expected_rev) + branch=expected_rev) - def test_course_constructor_course_id_no_revision(self): - testurn = 'edu.mit.eecs.6002x' + def test_course_constructor_course_id_no_branch(self): + testurn = 'mit.eecs.6002x' testobj = CourseLocator(course_id=testurn) self.check_course_locn_fields(testobj, 'course_id', course_id=testurn) self.assertEqual(testobj.course_id, testurn) self.assertEqual(str(testobj), testurn) self.assertEqual(testobj.url(), 'edx://' + testurn) - def test_course_constructor_course_id_with_revision(self): - testurn = 'edu.mit.eecs.6002x;published' - expected_id = 'edu.mit.eecs.6002x' - expected_revision = 'published' + def test_course_constructor_course_id_with_branch(self): + testurn = 'mit.eecs.6002x;published' + expected_id = 'mit.eecs.6002x' + expected_branch = 'published' testobj = CourseLocator(course_id=testurn) - self.check_course_locn_fields(testobj, 'course_id with revision', + self.check_course_locn_fields(testobj, 'course_id with branch', course_id=expected_id, - revision=expected_revision, + branch=expected_branch, ) self.assertEqual(testobj.course_id, expected_id) - self.assertEqual(testobj.revision, expected_revision) + self.assertEqual(testobj.branch, expected_branch) self.assertEqual(str(testobj), testurn) self.assertEqual(testobj.url(), 'edx://' + testurn) - def test_course_constructor_course_id_separate_revision(self): - test_id = 'edu.mit.eecs.6002x' - test_revision = 'published' - expected_urn = 'edu.mit.eecs.6002x;published' - testobj = CourseLocator(course_id=test_id, revision=test_revision) - self.check_course_locn_fields(testobj, 'course_id with separate revision', + def test_course_constructor_course_id_separate_branch(self): + test_id = 'mit.eecs.6002x' + test_branch = 'published' + expected_urn = 'mit.eecs.6002x;published' + testobj = CourseLocator(course_id=test_id, branch=test_branch) + self.check_course_locn_fields(testobj, 'course_id with separate branch', course_id=test_id, - revision=test_revision, + branch=test_branch, ) self.assertEqual(testobj.course_id, test_id) - self.assertEqual(testobj.revision, test_revision) + self.assertEqual(testobj.branch, test_branch) self.assertEqual(str(testobj), expected_urn) self.assertEqual(testobj.url(), 'edx://' + expected_urn) - def test_course_constructor_course_id_repeated_revision(self): + def test_course_constructor_course_id_repeated_branch(self): """ - The same revision appears in the course_id and the revision field. + The same branch appears in the course_id and the branch field. """ - test_id = 'edu.mit.eecs.6002x;published' - test_revision = 'published' - expected_id = 'edu.mit.eecs.6002x' - expected_urn = 'edu.mit.eecs.6002x;published' - testobj = CourseLocator(course_id=test_id, revision=test_revision) - self.check_course_locn_fields(testobj, 'course_id with repeated revision', + test_id = 'mit.eecs.6002x;published' + test_branch = 'published' + expected_id = 'mit.eecs.6002x' + expected_urn = 'mit.eecs.6002x;published' + testobj = CourseLocator(course_id=test_id, branch=test_branch) + self.check_course_locn_fields(testobj, 'course_id with repeated branch', course_id=expected_id, - revision=test_revision, + branch=test_branch, ) self.assertEqual(testobj.course_id, expected_id) - self.assertEqual(testobj.revision, test_revision) + self.assertEqual(testobj.branch, test_branch) self.assertEqual(str(testobj), expected_urn) self.assertEqual(testobj.url(), 'edx://' + expected_urn) def test_block_constructor(self): - testurn = 'edu.mit.eecs.6002x;published#HW3' - expected_id = 'edu.mit.eecs.6002x' - expected_revision = 'published' + testurn = 'mit.eecs.6002x;published#HW3' + expected_id = 'mit.eecs.6002x' + expected_branch = 'published' expected_block_ref = 'HW3' testobj = BlockUsageLocator(course_id=testurn) self.check_block_locn_fields(testobj, 'test_block constructor', course_id=expected_id, - revision=expected_revision, + branch=expected_branch, block=expected_block_ref) self.assertEqual(str(testobj), testurn) self.assertEqual(testobj.url(), 'edx://' + testurn) - # ------------------------------------------------------------ - # Disabled tests - - def test_course_urls(self): - ''' - Test constructor and property accessors. - ''' - raise SkipTest() - self.assertRaises(TypeError, CourseLocator, 'empty constructor') - - # url inits - testurn = 'edx://org/course/category/name' - self.assertRaises(InvalidLocationError, CourseLocator, url=testurn) - testurn = 'unknown/versionid/blockid' - self.assertRaises(InvalidLocationError, CourseLocator, url=testurn) - - testurn = 'cvx/versionid' - testobj = CourseLocator(testurn) - self.check_course_locn_fields(testobj, testurn, 'versionid') - self.assertEqual(testobj, CourseLocator(testobj), - 'initialization from another instance') - - testurn = 'cvx/versionid/' - testobj = CourseLocator(testurn) - self.check_course_locn_fields(testobj, testurn, 'versionid') - - testurn = 'cvx/versionid/blockid' - testobj = CourseLocator(testurn) - self.check_course_locn_fields(testobj, testurn, 'versionid') - - testurn = 'cvx/versionid/blockid/extraneousstuff?including=args' - testobj = CourseLocator(testurn) - self.check_course_locn_fields(testobj, testurn, 'versionid') - - testurn = 'cvx://versionid/blockid' - testobj = CourseLocator(testurn) - self.check_course_locn_fields(testobj, testurn, 'versionid') - - testurn = 'crx/courseid/blockid' - testobj = CourseLocator(testurn) - self.check_course_locn_fields(testobj, testurn, course_id='courseid') - - testurn = 'crx/courseid@revision/blockid' - testobj = CourseLocator(testurn) - self.check_course_locn_fields(testobj, testurn, course_id='courseid', - revision='revision') - self.assertEqual(testobj, CourseLocator(testobj), - 'run initialization from another instance') - - def test_course_keyword_setters(self): - raise SkipTest() - # arg list inits - testobj = CourseLocator(version_guid='versionid') - self.check_course_locn_fields(testobj, 'versionid arg', 'versionid') - - testobj = CourseLocator(course_id='courseid') - self.check_course_locn_fields(testobj, 'courseid arg', - course_id='courseid') - - testobj = CourseLocator(course_id='courseid', revision='rev') - self.check_course_locn_fields(testobj, 'rev arg', - course_id='courseid', - revision='rev') - # ignores garbage - testobj = CourseLocator(course_id='courseid', revision='rev', - potato='spud') - self.check_course_locn_fields(testobj, 'extra keyword arg', - course_id='courseid', - revision='rev') - - # url w/ keyword override - testurn = 'crx/courseid@revision/blockid' - testobj = CourseLocator(testurn, revision='rev') - self.check_course_locn_fields(testobj, 'rev override', - course_id='courseid', - revision='rev') - - def test_course_dict(self): - raise SkipTest() - # dict init w/ keyword overwrites - testobj = CourseLocator({"version_guid": 'versionid'}) - self.check_course_locn_fields(testobj, 'versionid dict', 'versionid') - - testobj = CourseLocator({"course_id": 'courseid'}) - self.check_course_locn_fields(testobj, 'courseid dict', - course_id='courseid') - - testobj = CourseLocator({"course_id": 'courseid', "revision": 'rev'}) - self.check_course_locn_fields(testobj, 'rev dict', - course_id='courseid', - revision='rev') - # ignores garbage - testobj = CourseLocator({"course_id": 'courseid', "revision": 'rev', - "potato": 'spud'}) - self.check_course_locn_fields(testobj, 'extra keyword dict', - course_id='courseid', - revision='rev') - testobj = CourseLocator({"course_id": 'courseid', "revision": 'rev'}, - revision='alt') - self.check_course_locn_fields(testobj, 'rev dict', - course_id='courseid', - revision='alt') - - # urn init w/ dict & keyword overwrites - testobj = CourseLocator('crx/notcourse@notthis', - {"course_id": 'courseid'}, - revision='alt') - self.check_course_locn_fields(testobj, 'rev dict', - course_id='courseid', - revision='alt') - - def test_url(self): - ''' - Ensure CourseLocator generates expected urls. - ''' - raise SkipTest() - - testobj = CourseLocator(version_guid='versionid') - self.assertEqual(testobj.url(), 'cvx/versionid', 'versionid') - self.assertEqual(testobj, CourseLocator(testobj.url()), - 'versionid conversion through url') - - testobj = CourseLocator(course_id='courseid') - self.assertEqual(testobj.url(), 'crx/courseid', 'courseid') - self.assertEqual(testobj, CourseLocator(testobj.url()), - 'courseid conversion through url') - - testobj = CourseLocator(course_id='courseid', revision='rev') - self.assertEqual(testobj.url(), 'crx/courseid@rev', 'rev') - self.assertEqual(testobj, CourseLocator(testobj.url()), - 'rev conversion through url') - - def test_html(self): - ''' - Ensure CourseLocator generates expected urls. - ''' - raise SkipTest() - testobj = CourseLocator(version_guid='versionid') - self.assertEqual(testobj.html_id(), 'cvx/versionid', 'versionid') - self.assertEqual(testobj, CourseLocator(testobj.html_id()), - 'versionid conversion through html_id') - - testobj = CourseLocator(course_id='courseid') - self.assertEqual(testobj.html_id(), 'crx/courseid', 'courseid') - self.assertEqual(testobj, CourseLocator(testobj.html_id()), - 'courseid conversion through html_id') - - testobj = CourseLocator(course_id='courseid', revision='rev') - self.assertEqual(testobj.html_id(), 'crx/courseid%40rev', 'rev') - self.assertEqual(testobj, CourseLocator(testobj.html_id()), - 'rev conversion through html_id') - - def test_block_locator(self): - ''' - Test constructor and property accessors. - ''' - raise SkipTest() - self.assertIsInstance(BlockUsageLocator(), BlockUsageLocator, - 'empty constructor') - - # url inits - testurn = 'edx://org/course/category/name' - self.assertRaises(InvalidLocationError, BlockUsageLocator, testurn) - testurn = 'unknown/versionid/blockid' - self.assertRaises(InvalidLocationError, BlockUsageLocator, testurn) - - testurn = 'cvx/versionid' - testobj = BlockUsageLocator(testurn) - self.check_block_locn_fields(testobj, testurn, 'versionid') - self.assertEqual(testobj, BlockUsageLocator(testobj), - 'initialization from another instance') - - testurn = 'cvx/versionid/' - testobj = BlockUsageLocator(testurn) - self.check_block_locn_fields(testobj, testurn, 'versionid') - - testurn = 'cvx/versionid/blockid' - testobj = BlockUsageLocator(testurn) - self.check_block_locn_fields(testobj, testurn, 'versionid', - block='blockid') - - testurn = 'cvx/versionid/blockid/extraneousstuff?including=args' - testobj = BlockUsageLocator(testurn) - self.check_block_locn_fields(testobj, testurn, 'versionid', - block='blockid') - - testurn = 'cvx://versionid/blockid' - testobj = BlockUsageLocator(testurn) - self.check_block_locn_fields(testobj, testurn, 'versionid', - block='blockid') - - testurn = 'crx/courseid/blockid' - testobj = BlockUsageLocator(testurn) - self.check_block_locn_fields(testobj, testurn, course_id='courseid', - block='blockid') - - testurn = 'crx/courseid@revision/blockid' - testobj = BlockUsageLocator(testurn) - self.check_block_locn_fields(testobj, testurn, course_id='courseid', - revision='revision', block='blockid') - self.assertEqual(testobj, BlockUsageLocator(testobj), - 'run initialization from another instance') - - def test_block_keyword_init(self): - # arg list inits - raise SkipTest() - testobj = BlockUsageLocator(version_guid='versionid') - self.check_block_locn_fields(testobj, 'versionid arg', 'versionid') - - testobj = BlockUsageLocator(version_guid='versionid', usage_id='myblock') - self.check_block_locn_fields(testobj, 'versionid arg', 'versionid', - block='myblock') - - testobj = BlockUsageLocator(course_id='courseid') - self.check_block_locn_fields(testobj, 'courseid arg', - course_id='courseid') - - testobj = BlockUsageLocator(course_id='courseid', revision='rev') - self.check_block_locn_fields(testobj, 'rev arg', - course_id='courseid', - revision='rev') - # ignores garbage - testobj = BlockUsageLocator(course_id='courseid', revision='rev', - usage_id='this_block', potato='spud') - self.check_block_locn_fields(testobj, 'extra keyword arg', - course_id='courseid', block='this_block', revision='rev') - - # url w/ keyword override - testurn = 'crx/courseid@revision/blockid' - testobj = BlockUsageLocator(testurn, revision='rev') - self.check_block_locn_fields(testobj, 'rev override', - course_id='courseid', block='blockid', - revision='rev') - - def test_block_keywords(self): - # dict init w/ keyword overwrites - raise SkipTest() - testobj = BlockUsageLocator({"version_guid": 'versionid', - 'usage_id': 'dictblock'}) - self.check_block_locn_fields(testobj, 'versionid dict', 'versionid', - block='dictblock') - - testobj = BlockUsageLocator({"course_id": 'courseid', - 'usage_id': 'dictblock'}) - self.check_block_locn_fields(testobj, 'courseid dict', - block='dictblock', course_id='courseid') - - testobj = BlockUsageLocator({"course_id": 'courseid', "revision": 'rev', - 'usage_id': 'dictblock'}) - self.check_block_locn_fields(testobj, 'rev dict', - course_id='courseid', block='dictblock', - revision='rev') - # ignores garbage - testobj = BlockUsageLocator({"course_id": 'courseid', "revision": 'rev', - 'usage_id': 'dictblock', "potato": 'spud'}) - self.check_block_locn_fields(testobj, 'extra keyword dict', - course_id='courseid', block='dictblock', - revision='rev') - testobj = BlockUsageLocator({"course_id": 'courseid', "revision": 'rev', - 'usage_id': 'dictblock'}, revision='alt', usage_id='anotherblock') - self.check_block_locn_fields(testobj, 'rev dict', - course_id='courseid', block='anotherblock', - revision='alt') - - # urn init w/ dict & keyword overwrites - testobj = BlockUsageLocator('crx/notcourse@notthis/northis', - {"course_id": 'courseid'}, revision='alt', usage_id='anotherblock') - self.check_block_locn_fields(testobj, 'rev dict', - course_id='courseid', block='anotherblock', - revision='alt') - - def test_ensure_fully_specd(self): - ''' - Test constructor and property accessors. - ''' - raise SkipTest() - self.assertRaises(InsufficientSpecificationError, - BlockUsageLocator.ensure_fully_specified, BlockUsageLocator()) - - # url inits - testurn = 'edx://org/course/category/name' - self.assertRaises(InvalidLocationError, - BlockUsageLocator.ensure_fully_specified, testurn) - testurn = 'unknown/versionid/blockid' - self.assertRaises(InvalidLocationError, - BlockUsageLocator.ensure_fully_specified, testurn) - - testurn = 'cvx/versionid' - self.assertRaises(InsufficientSpecificationError, - BlockUsageLocator.ensure_fully_specified, testurn) - - testurn = 'cvx/versionid/' - self.assertRaises(InsufficientSpecificationError, - BlockUsageLocator.ensure_fully_specified, testurn) - - testurn = 'cvx/versionid/blockid' - self.assertIsInstance(BlockUsageLocator.ensure_fully_specified(testurn), - BlockUsageLocator, testurn) - - testurn = 'cvx/versionid/blockid/extraneousstuff?including=args' - self.assertIsInstance(BlockUsageLocator.ensure_fully_specified(testurn), - BlockUsageLocator, testurn) - - testurn = 'cvx://versionid/blockid' - self.assertIsInstance(BlockUsageLocator.ensure_fully_specified(testurn), - BlockUsageLocator, testurn) - - testurn = 'crx/courseid/blockid' - self.assertIsInstance(BlockUsageLocator.ensure_fully_specified(testurn), - BlockUsageLocator, testurn) - - testurn = 'crx/courseid@revision/blockid' - self.assertIsInstance(BlockUsageLocator.ensure_fully_specified(testurn), - BlockUsageLocator, testurn) - - def test_ensure_fully_via_keyword(self): - # arg list inits - raise SkipTest() - testobj = BlockUsageLocator(version_guid='versionid') - self.assertRaises(InsufficientSpecificationError, - BlockUsageLocator.ensure_fully_specified, testobj) - - testurn = 'crx/courseid@revision/blockid' - testobj = BlockUsageLocator(version_guid='versionid', usage_id='myblock') - self.assertIsInstance(BlockUsageLocator.ensure_fully_specified(testurn), - BlockUsageLocator, testurn) - - testobj = BlockUsageLocator(course_id='courseid') - self.assertRaises(InsufficientSpecificationError, - BlockUsageLocator.ensure_fully_specified, testobj) - - testobj = BlockUsageLocator(course_id='courseid', revision='rev') - self.assertRaises(InsufficientSpecificationError, - BlockUsageLocator.ensure_fully_specified, testobj) - - testobj = BlockUsageLocator(course_id='courseid', revision='rev', - usage_id='this_block') - self.assertIsInstance(BlockUsageLocator.ensure_fully_specified(testurn), - BlockUsageLocator, testurn) # ------------------------------------------------------------------ # Utilities def check_course_locn_fields(self, testobj, msg, version_guid=None, - course_id=None, revision=None): + course_id=None, branch=None): self.assertEqual(testobj.version_guid, version_guid, msg) self.assertEqual(testobj.course_id, course_id, msg) - self.assertEqual(testobj.revision, revision, msg) + self.assertEqual(testobj.branch, branch, msg) def check_block_locn_fields(self, testobj, msg, version_guid=None, - course_id=None, revision=None, block=None): + course_id=None, branch=None, block=None): self.check_course_locn_fields(testobj, msg, version_guid, course_id, - revision) + branch) self.assertEqual(testobj.usage_id, block) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py index 29f6cce919..d71223f59b 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py @@ -69,10 +69,17 @@ class SplitModuleTest(unittest.TestCase): collection_prefix + collection, '--jsonArray', '--file', SplitModuleTest.COMMON_ROOT + '/test/data/splitmongo_json/' + collection + '.json' - ]) + ], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + ) for collection in ('active_versions', 'structures', 'definitions')] for p in processes: - if p.wait() != 0: + stdout, stderr = p.communicate() + if p.returncode != 0: + print "Couldn't run mongoimport:" + print stdout + print stderr raise Exception("DB did not init correctly") @classmethod @@ -129,8 +136,8 @@ class SplitModuleCourseTests(SplitModuleTest): self.assertEqual(str(course.previous_version), self.GUID_D1) self.assertDictEqual(course.grade_cutoffs, {"Pass": 0.45}) - def test_revision_requests(self): - # query w/ revision qualifier (both draft and published) + def test_branch_requests(self): + # query w/ branch qualifier (both draft and published) courses_published = modulestore().get_courses('published') self.assertEqual(len(courses_published), 1, len(courses_published)) course = self.findByIdInResult(courses_published, "head23456") @@ -182,7 +189,7 @@ class SplitModuleCourseTests(SplitModuleTest): self.assertEqual(course.edited_by, "testassist@edx.org") self.assertDictEqual(course.grade_cutoffs, {"Pass": 0.55}) - locator = CourseLocator(course_id='GreekHero', revision='draft') + locator = CourseLocator(course_id='GreekHero', branch='draft') course = modulestore().get_course(locator) self.assertEqual(course.location.course_id, "GreekHero") self.assertEqual(str(course.location.version_guid), self.GUID_D0) @@ -195,12 +202,12 @@ class SplitModuleCourseTests(SplitModuleTest): self.assertEqual(course.edited_by, "testassist@edx.org") self.assertDictEqual(course.grade_cutoffs, {"Pass": 0.45}) - locator = CourseLocator(course_id='wonderful', revision='published') + locator = CourseLocator(course_id='wonderful', branch='published') course = modulestore().get_course(locator) self.assertEqual(course.location.course_id, "wonderful") self.assertEqual(str(course.location.version_guid), self.GUID_P) - locator = CourseLocator(course_id='wonderful', revision='draft') + locator = CourseLocator(course_id='wonderful', branch='draft') course = modulestore().get_course(locator) self.assertEqual(str(course.location.version_guid), self.GUID_D2) @@ -209,10 +216,10 @@ class SplitModuleCourseTests(SplitModuleTest): self.assertRaises(InsufficientSpecificationError, modulestore().get_course, CourseLocator(course_id='edu.meh.blah')) self.assertRaises(ItemNotFoundError, - modulestore().get_course, CourseLocator(course_id='nosuchthing', revision='draft')) + modulestore().get_course, CourseLocator(course_id='nosuchthing', branch='draft')) self.assertRaises(ItemNotFoundError, modulestore().get_course, - CourseLocator(course_id='GreekHero', revision='published')) + CourseLocator(course_id='GreekHero', branch='published')) def test_course_successors(self): """ @@ -250,7 +257,7 @@ class SplitModuleItemTests(SplitModuleTest): self.assertTrue(modulestore().has_item(locator), "couldn't find in %s" % self.GUID_D1) - locator = BlockUsageLocator(course_id='GreekHero', usage_id='head12345', revision='draft') + locator = BlockUsageLocator(course_id='GreekHero', usage_id='head12345', branch='draft') self.assertTrue( modulestore().has_item(locator), "couldn't find in 12345" @@ -258,7 +265,7 @@ class SplitModuleItemTests(SplitModuleTest): self.assertTrue( modulestore().has_item(BlockUsageLocator( course_id=locator.course_id, - revision='draft', + branch='draft', usage_id=locator.usage_id )), "couldn't find in draft 12345" @@ -266,38 +273,38 @@ class SplitModuleItemTests(SplitModuleTest): self.assertFalse( modulestore().has_item(BlockUsageLocator( course_id=locator.course_id, - revision='published', + branch='published', usage_id=locator.usage_id)), "found in published 12345" ) - locator.revision = 'draft' + locator.branch = 'draft' self.assertTrue( modulestore().has_item(locator), "not found in draft 12345" ) # not a course obj - locator = BlockUsageLocator(course_id='GreekHero', usage_id='chapter1', revision='draft') + locator = BlockUsageLocator(course_id='GreekHero', usage_id='chapter1', branch='draft') self.assertTrue( modulestore().has_item(locator), "couldn't find chapter1" ) # in published course - locator = BlockUsageLocator(course_id="wonderful", usage_id="head23456", revision='draft') + locator = BlockUsageLocator(course_id="wonderful", usage_id="head23456", branch='draft') self.assertTrue(modulestore().has_item(BlockUsageLocator(course_id=locator.course_id, usage_id=locator.usage_id, - revision='published')), + branch='published')), "couldn't find in 23456") - locator.revision = 'published' + locator.branch = 'published' self.assertTrue(modulestore().has_item(locator), "couldn't find in 23456") def test_negative_has_item(self): # negative tests--not found # no such course or block - locator = BlockUsageLocator(course_id="doesnotexist", usage_id="head23456", revision='draft') + locator = BlockUsageLocator(course_id="doesnotexist", usage_id="head23456", branch='draft') self.assertFalse(modulestore().has_item(locator)) - locator = BlockUsageLocator(course_id="wonderful", usage_id="doesnotexist", revision='draft') + locator = BlockUsageLocator(course_id="wonderful", usage_id="doesnotexist", branch='draft') self.assertFalse(modulestore().has_item(locator)) # negative tests--insufficient specification @@ -316,7 +323,7 @@ class SplitModuleItemTests(SplitModuleTest): block = modulestore().get_item(locator) self.assertIsInstance(block, CourseDescriptor) - locator = BlockUsageLocator(course_id='GreekHero', usage_id='head12345', revision='draft') + locator = BlockUsageLocator(course_id='GreekHero', usage_id='head12345', branch='draft') block = modulestore().get_item(locator) self.assertEqual(block.location.course_id, "GreekHero") # look at this one in detail @@ -331,13 +338,13 @@ class SplitModuleItemTests(SplitModuleTest): block.grade_cutoffs, {"Pass": 0.45}, ) - # try to look up other revisions + # try to look up other branches self.assertRaises(ItemNotFoundError, modulestore().get_item, BlockUsageLocator(course_id=locator.as_course_locator(), usage_id=locator.usage_id, - revision='published')) - locator.revision = 'draft' + branch='published')) + locator.branch = 'draft' self.assertIsInstance( modulestore().get_item(locator), CourseDescriptor @@ -345,7 +352,7 @@ class SplitModuleItemTests(SplitModuleTest): def test_get_non_root(self): # not a course obj - locator = BlockUsageLocator(course_id='GreekHero', usage_id='chapter1', revision='draft') + locator = BlockUsageLocator(course_id='GreekHero', usage_id='chapter1', branch='draft') block = modulestore().get_item(locator) self.assertEqual(block.location.course_id, "GreekHero") self.assertEqual(block.category, 'chapter') @@ -354,7 +361,7 @@ class SplitModuleItemTests(SplitModuleTest): self.assertEqual(block.edited_by, "testassist@edx.org") # in published course - locator = BlockUsageLocator(course_id="wonderful", usage_id="head23456", revision='published') + locator = BlockUsageLocator(course_id="wonderful", usage_id="head23456", branch='published') self.assertIsInstance( modulestore().get_item(locator), CourseDescriptor @@ -362,10 +369,10 @@ class SplitModuleItemTests(SplitModuleTest): # negative tests--not found # no such course or block - locator = BlockUsageLocator(course_id="doesnotexist", usage_id="head23456", revision='draft') + locator = BlockUsageLocator(course_id="doesnotexist", usage_id="head23456", branch='draft') with self.assertRaises(ItemNotFoundError): modulestore().get_item(locator) - locator = BlockUsageLocator(course_id="wonderful", usage_id="doesnotexist", revision='draft') + locator = BlockUsageLocator(course_id="wonderful", usage_id="doesnotexist", branch='draft') with self.assertRaises(ItemNotFoundError): modulestore().get_item(locator) @@ -373,7 +380,7 @@ class SplitModuleItemTests(SplitModuleTest): with self.assertRaises(InsufficientSpecificationError): modulestore().get_item(BlockUsageLocator(version_guid=self.GUID_D1)) with self.assertRaises(InsufficientSpecificationError): - modulestore().get_item(BlockUsageLocator(course_id='GreekHero', revision='draft')) + modulestore().get_item(BlockUsageLocator(course_id='GreekHero', branch='draft')) # pylint: disable=W0212 def test_matching(self): @@ -404,7 +411,7 @@ class SplitModuleItemTests(SplitModuleTest): def test_get_items(self): ''' - get_items(locator, qualifiers, [revision]) + get_items(locator, qualifiers, [branch]) ''' locator = CourseLocator(version_guid=self.GUID_D0) # get all modules @@ -429,9 +436,9 @@ class SplitModuleItemTests(SplitModuleTest): def test_get_parents(self): ''' - get_parent_locations(locator, [usage_id], [revision]): [BlockUsageLocator] + get_parent_locations(locator, [usage_id], [branch]): [BlockUsageLocator] ''' - locator = CourseLocator(course_id="GreekHero", revision='draft') + locator = CourseLocator(course_id="GreekHero", branch='draft') parents = modulestore().get_parent_locations(locator, usage_id='chapter1') self.assertEqual(len(parents), 1) self.assertEqual(parents[0].usage_id, 'head12345') @@ -447,7 +454,7 @@ class SplitModuleItemTests(SplitModuleTest): """ Test the existing get_children method on xdescriptors """ - locator = BlockUsageLocator(course_id="GreekHero", usage_id="head12345", revision='draft') + locator = BlockUsageLocator(course_id="GreekHero", usage_id="head12345", branch='draft') block = modulestore().get_item(locator) children = block.get_children() expected_ids = [ @@ -490,7 +497,7 @@ class TestItemCrud(SplitModuleTest): metadata=None): new_desciptor """ # grab link to course to ensure new versioning works - locator = CourseLocator(course_id="GreekHero", revision='draft') + locator = CourseLocator(course_id="GreekHero", branch='draft') premod_course = modulestore().get_course(locator) premod_time = datetime.datetime.now(UTC) - datetime.timedelta(seconds=1) # add minimal one w/o a parent @@ -527,7 +534,7 @@ class TestItemCrud(SplitModuleTest): """ Test create_item w/ specifying the parent of the new item """ - locator = BlockUsageLocator(course_id="wonderful", usage_id="head23456", revision='draft') + locator = BlockUsageLocator(course_id="wonderful", usage_id="head23456", branch='draft') premod_course = modulestore().get_course(locator) category = 'chapter' new_module = modulestore().create_item( @@ -547,7 +554,7 @@ class TestItemCrud(SplitModuleTest): a definition id and new def data that it branches the definition in the db. Actually, this tries to test all create_item features not tested above. """ - locator = BlockUsageLocator(course_id="contender", usage_id="head345679", revision='draft') + locator = BlockUsageLocator(course_id="contender", usage_id="head345679", branch='draft') category = 'problem' premod_time = datetime.datetime.now(UTC) - datetime.timedelta(seconds=1) new_payload = "<problem>empty</problem>" @@ -585,7 +592,7 @@ class TestItemCrud(SplitModuleTest): """ test updating an items metadata ensuring the definition doesn't version but the course does if it should """ - locator = BlockUsageLocator(course_id="GreekHero", usage_id="problem3_2", revision='draft') + locator = BlockUsageLocator(course_id="GreekHero", usage_id="problem3_2", branch='draft') problem = modulestore().get_item(locator) pre_def_id = problem.definition_locator.definition_id pre_version_guid = problem.location.version_guid @@ -622,7 +629,7 @@ class TestItemCrud(SplitModuleTest): """ test updating an item's children ensuring the definition doesn't version but the course does if it should """ - locator = BlockUsageLocator(course_id="GreekHero", usage_id="chapter3", revision='draft') + locator = BlockUsageLocator(course_id="GreekHero", usage_id="chapter3", branch='draft') block = modulestore().get_item(locator) pre_def_id = block.definition_locator.definition_id pre_version_guid = block.location.version_guid @@ -646,7 +653,7 @@ class TestItemCrud(SplitModuleTest): """ test updating an item's definition: ensure it gets versioned as well as the course getting versioned """ - locator = BlockUsageLocator(course_id="GreekHero", usage_id="head12345", revision='draft') + locator = BlockUsageLocator(course_id="GreekHero", usage_id="head12345", branch='draft') block = modulestore().get_item(locator) pre_def_id = block.definition_locator.definition_id pre_version_guid = block.location.version_guid @@ -663,7 +670,7 @@ class TestItemCrud(SplitModuleTest): Test updating metadata, children, and definition in a single call ensuring all the versioning occurs """ # first add 2 children to the course for the update to manipulate - locator = BlockUsageLocator(course_id="contender", usage_id="head345679", revision='draft') + locator = BlockUsageLocator(course_id="contender", usage_id="head345679", branch='draft') category = 'problem' new_payload = "<problem>empty</problem>" modulestore().create_item( @@ -707,14 +714,14 @@ class TestItemCrud(SplitModuleTest): reusable_location = BlockUsageLocator( course_id=course.location.course_id, usage_id=course.location.usage_id, - revision='draft') + branch='draft') # delete a leaf problems = modulestore().get_items(reusable_location, {'category': 'problem'}) locn_to_del = problems[0].location new_course_loc = modulestore().delete_item(locn_to_del, 'deleting_user') deleted = BlockUsageLocator(course_id=reusable_location.course_id, - revision=reusable_location.revision, + branch=reusable_location.branch, usage_id=locn_to_del.usage_id) self.assertFalse(modulestore().has_item(deleted)) self.assertRaises(VersionConflictError, modulestore().has_item, locn_to_del) @@ -736,7 +743,7 @@ class TestItemCrud(SplitModuleTest): self.assertFalse(modulestore().has_item( BlockUsageLocator( course_id=node_loc.course_id, - revision=node_loc.revision, + branch=node_loc.branch, usage_id=node.location.usage_id))) locator = BlockUsageLocator( version_guid=node.location.version_guid, @@ -752,7 +759,7 @@ class TestItemCrud(SplitModuleTest): root = BlockUsageLocator( course_id=course.location.course_id, usage_id=course.location.usage_id, - revision='draft') + branch='draft') for _ in range(4): self.create_subtree_for_deletion(root, ['chapter', 'vertical', 'problem']) return modulestore().get_item(root) @@ -807,7 +814,7 @@ class TestCourseCreation(SplitModuleTest): Test making a course which points to an existing draft and published but not making any changes to either. """ pre_time = datetime.datetime.now(UTC) - original_locator = CourseLocator(course_id="wonderful", revision='draft') + original_locator = CourseLocator(course_id="wonderful", branch='draft') original_index = modulestore().get_course_index_info(original_locator) new_draft = modulestore().create_course( 'leech', 'best_course', 'leech_master', id_root='best', @@ -824,7 +831,7 @@ class TestCourseCreation(SplitModuleTest): self.assertLessEqual(new_index["edited_on"], datetime.datetime.now(UTC)) self.assertEqual(new_index['edited_by'], 'leech_master') - new_published_locator = CourseLocator(course_id=new_draft_locator.course_id, revision='published') + new_published_locator = CourseLocator(course_id=new_draft_locator.course_id, branch='published') new_published = modulestore().get_course(new_published_locator) self.assertEqual(new_published.edited_by, 'test@edx.org') self.assertLess(new_published.edited_on, pre_time) @@ -863,7 +870,7 @@ class TestCourseCreation(SplitModuleTest): Create a new course which overrides metadata and course_data """ pre_time = datetime.datetime.now(UTC) - original_locator = CourseLocator(course_id="contender", revision='draft') + original_locator = CourseLocator(course_id="contender", branch='draft') original = modulestore().get_course(original_locator) original_index = modulestore().get_course_index_info(original_locator) data_payload = {} @@ -902,7 +909,7 @@ class TestCourseCreation(SplitModuleTest): """ Test changing the org, pretty id, etc of a course. Test that it doesn't allow changing the id, etc. """ - locator = CourseLocator(course_id="GreekHero", revision='draft') + locator = CourseLocator(course_id="GreekHero", branch='draft') modulestore().update_course_index(locator, {'org': 'funkyU'}) course_info = modulestore().get_course_index_info(locator) self.assertEqual(course_info['org'], 'funkyU') @@ -938,7 +945,7 @@ class TestCourseCreation(SplitModuleTest): # an allowed but not recommended way to publish a course versions['published'] = self.GUID_D1 modulestore().update_course_index(locator, {'versions': versions}, update_versions=True) - course = modulestore().get_course(CourseLocator(course_id=locator.course_id, revision="published")) + course = modulestore().get_course(CourseLocator(course_id=locator.course_id, branch="published")) self.assertEqual(str(course.location.version_guid), self.GUID_D1) @@ -952,11 +959,11 @@ class TestInheritance(SplitModuleTest): """ # Note, not testing value where defined (course) b/c there's no # defined accessor for it on CourseDescriptor. - locator = BlockUsageLocator(course_id="GreekHero", usage_id="problem3_2", revision='draft') + locator = BlockUsageLocator(course_id="GreekHero", usage_id="problem3_2", branch='draft') node = modulestore().get_item(locator) # inherited self.assertEqual(node.graceperiod, datetime.timedelta(hours=2)) - locator = BlockUsageLocator(course_id="GreekHero", usage_id="problem1", revision='draft') + locator = BlockUsageLocator(course_id="GreekHero", usage_id="problem1", branch='draft') node = modulestore().get_item(locator) # overridden self.assertEqual(node.graceperiod, datetime.timedelta(hours=4)) diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py index 8df768f442..698310da87 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 @@ -61,45 +60,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: @@ -126,27 +86,6 @@ def import_module_from_xml(modulestore, static_content_store, course_data_path, 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 <img src='foo.jpg' /> -> <img src='bar.jpg'> - # 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: @@ -166,9 +105,6 @@ def import_course_from_xml(modulestore, static_content_store, course_data_path, {"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) @@ -241,10 +177,6 @@ def import_from_xml(store, data_dir, course_dirs=None, 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') - course_items.append(module) # then import all the static content @@ -302,27 +234,6 @@ 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 <img src='foo.jpg' /> -> <img src='bar.jpg'> - # 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 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 71b48aed54..30b95525b4 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 @@ -453,4 +453,4 @@ class OpenEndedChild(object): else: eta_string = "" - return eta_string \ No newline at end of file + return eta_string 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 415298edf3..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,23 +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, answer_unknown): - 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, - 'answer_unknown' : answer_unknown, - } + 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): @@ -64,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): @@ -102,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, answer_unknown): + def save_grade(self, **kwargs): return {'success': True} def is_student_calibrated(self, problem_location, grader_id): @@ -126,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 059b66b615..c29b6a8069 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='<peergrading></peergrading>', - 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,37 +312,26 @@ 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') - answer_unknown = data.get('answer_unknown', False) + 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, answer_unknown) - + response = self.peer_gs.save_grade(**data_dict) success, location_data = self.query_data_for_location() response.update({'required_done' : False}) - if 'count_graded' in location_data and 'count_required' in location_data: + if 'count_graded' in location_data and 'count_required' in location_data and int(location_data['count_graded'])>=int(location_data['count_required']): response['required_done'] = True 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 { @@ -457,27 +450,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.') @@ -538,15 +525,15 @@ class PeerGradingModule(PeerGradingFields, XModule): good_problem_list = [] for problem in problem_list: problem_location = problem['location'] - try: - descriptor = _find_corresponding_module_for_location(problem_location) - except: - continue + try: + descriptor = _find_corresponding_module_for_location(problem_location) + except: + continue 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 @@ -640,5 +627,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 4c6c719224..b972d7c8eb 100644 --- a/common/lib/xmodule/xmodule/raw_module.py +++ b/common/lib/xmodule/xmodule/raw_module.py @@ -32,3 +32,22 @@ class RawDescriptor(XmlDescriptor, XMLEditingDescriptor): context=lines[line - 1][offset - 40:offset + 40], loc=self.location)) raise Exception, msg, sys.exc_info()[2] + + +class EmptyDataRawDescriptor(XmlDescriptor, XMLEditingDescriptor): + """ + Version of RawDescriptor for modules which may have no XML data, + but use XMLEditingDescriptor for import/export handling. + """ + data = String(default='', scope=Scope.content) + + @classmethod + def definition_from_xml(cls, xml_object, system): + if len(xml_object) == 0 and len(xml_object.items()) == 0: + return {'data': ''}, [] + return {'data': etree.tostring(xml_object, pretty_print=True, encoding='unicode')}, [] + + def definition_to_xml(self, resource_fs): + if self.data: + return etree.fromstring(self.data) + return etree.Element(self.category) diff --git a/common/lib/xmodule/xmodule/templates/html/latex_html.yaml b/common/lib/xmodule/xmodule/templates/html/latex_html.yaml index 2db7e98c65..9163b3e8b9 100644 --- a/common/lib/xmodule/xmodule/templates/html/latex_html.yaml +++ b/common/lib/xmodule/xmodule/templates/html/latex_html.yaml @@ -1,16 +1,16 @@ --- metadata: display_name: E-text Written in LaTeX -source_code: | - \subsection{Example of E-text in LaTeX} + source_code: | + \subsection{Example of E-text in LaTeX} - It is very convenient to write complex equations in LaTeX. + It is very convenient to write complex equations in LaTeX. - \begin{equation} - x = \frac{-b\pm\sqrt{b^2-4*a*c}}{2a} - \end{equation} + \begin{equation} + x = \frac{-b\pm\sqrt{b^2-4*a*c}}{2a} + \end{equation} - Seize the moment. + Seize the moment. data: | <html> diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py index d310110844..f599e0dd3b 100644 --- a/common/lib/xmodule/xmodule/tests/__init__.py +++ b/common/lib/xmodule/xmodule/tests/__init__.py @@ -14,11 +14,14 @@ import fs.osfs import numpy +import json + import calc import xmodule from xmodule.x_module import ModuleSystem from mock import Mock + open_ended_grading_interface = { 'url': 'blah/', 'username': 'incorrect_user', @@ -111,3 +114,36 @@ class ModelsTest(unittest.TestCase): except: exception_happened = True self.assertTrue(exception_happened) + + +class PostData(object): + """Class which emulate postdata.""" + def __init__(self, dict_data): + self.dict_data = dict_data + + def getlist(self, key): + """Get data by key from `self.dict_data`.""" + return self.dict_data.get(key) + + +class LogicTest(unittest.TestCase): + """Base class for testing xmodule logic.""" + descriptor_class = None + raw_model_data = {} + + def setUp(self): + class EmptyClass: + """Empty object.""" + url_name = '' + category = 'test' + + self.system = get_test_system() + self.descriptor = EmptyClass() + + self.xmodule_class = self.descriptor_class.module_class + self.xmodule = self.xmodule_class( + self.system, self.descriptor, self.raw_model_data) + + def ajax_request(self, dispatch, data): + """Call Xmodule.handle_ajax.""" + return json.loads(self.xmodule.handle_ajax(dispatch, data)) diff --git a/common/lib/xmodule/xmodule/tests/test_conditional_logic.py b/common/lib/xmodule/xmodule/tests/test_conditional_logic.py new file mode 100644 index 0000000000..72b9aec0c1 --- /dev/null +++ b/common/lib/xmodule/xmodule/tests/test_conditional_logic.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +"""Test for Conditional Xmodule functional logic.""" + +from xmodule.conditional_module import ConditionalDescriptor +from . import LogicTest + + +class ConditionalModuleTest(LogicTest): + """Logic tests for Conditional Xmodule.""" + descriptor_class = ConditionalDescriptor + + def test_ajax_request(self): + "Make shure that ajax request works correctly" + # Mock is_condition_satisfied + self.xmodule.is_condition_satisfied = lambda: True + setattr(self.xmodule.descriptor, 'get_children', lambda: []) + + response = self.ajax_request('No', {}) + html = response['html'] + + self.assertEqual(html, []) 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 = ''' - <course org="{org}" course="{course}" + <course org="{org}" course="{course}" display_organization="{org}_display" display_coursenumber="{course}_display" graceperiod="1 day" url_name="test" start="{start}" {announcement} @@ -141,6 +141,16 @@ class IsNewCourseTestCase(unittest.TestCase): print "Checking start=%s advertised=%s" % (s[0], s[1]) self.assertEqual(d.start_date_text, s[2]) + def test_display_organization(self): + descriptor = get_dummy_course(start='2012-12-02T12:00', is_new=True) + self.assertNotEqual(descriptor.location.org, descriptor.display_org_with_default) + self.assertEqual(descriptor.display_org_with_default, "{0}_display".format(ORG)) + + def test_display_coursenumber(self): + descriptor = get_dummy_course(start='2012-12-02T12:00', is_new=True) + self.assertNotEqual(descriptor.location.course, descriptor.display_number_with_default) + self.assertEqual(descriptor.display_number_with_default, "{0}_display".format(COURSE)) + def test_is_newish(self): descriptor = get_dummy_course(start='2012-12-02T12:00', is_new=True) assert(descriptor.is_newish is True) diff --git a/common/lib/xmodule/xmodule/tests/test_editing_module.py b/common/lib/xmodule/xmodule/tests/test_editing_module.py new file mode 100644 index 0000000000..03e257940f --- /dev/null +++ b/common/lib/xmodule/xmodule/tests/test_editing_module.py @@ -0,0 +1,63 @@ +""" Tests for editing descriptors""" +import unittest +import os +import logging + +from mock import Mock +from pkg_resources import resource_string +from xmodule.editing_module import TabsEditingDescriptor + +from .import get_test_system + +log = logging.getLogger(__name__) + + +class TabsEditingDescriptorTestCase(unittest.TestCase): + """ Testing TabsEditingDescriptor""" + + def setUp(self): + super(TabsEditingDescriptorTestCase, self).setUp() + system = get_test_system() + system.render_template = Mock(return_value="<div>Test Template HTML</div>") + 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_import.py b/common/lib/xmodule/xmodule/tests/test_import.py index 2fe9d70627..fb1bed2d3a 100644 --- a/common/lib/xmodule/xmodule/tests/test_import.py +++ b/common/lib/xmodule/xmodule/tests/test_import.py @@ -445,7 +445,7 @@ class ImportTestCase(BaseCourseTestCase): render_string_from_sample_gst_xml = """ <slider var="a" style="width:400px;float:left;"/>\ <plot style="margin-top:15px;margin-bottom:15px;"/>""".strip() - self.assertEqual(gst_sample.render, render_string_from_sample_gst_xml) + self.assertIn(render_string_from_sample_gst_xml, gst_sample.data) def test_word_cloud_import(self): modulestore = XMLModuleStore(DATA_DIR, course_dirs=['word_cloud']) diff --git a/common/lib/xmodule/xmodule/tests/test_logic.py b/common/lib/xmodule/xmodule/tests/test_logic.py deleted file mode 100644 index 5fe7aa2832..0000000000 --- a/common/lib/xmodule/xmodule/tests/test_logic.py +++ /dev/null @@ -1,127 +0,0 @@ -# -*- coding: utf-8 -*- -# pylint: disable=W0232 -"""Test for Xmodule functional logic.""" - -import json -import unittest - -from xmodule.poll_module import PollDescriptor -from xmodule.conditional_module import ConditionalDescriptor -from xmodule.word_cloud_module import WordCloudDescriptor -from xmodule.tests import get_test_system - -class PostData: - """Class which emulate postdata.""" - def __init__(self, dict_data): - self.dict_data = dict_data - - def getlist(self, key): - """Get data by key from `self.dict_data`.""" - return self.dict_data.get(key) - - -class LogicTest(unittest.TestCase): - """Base class for testing xmodule logic.""" - descriptor_class = None - raw_model_data = {} - - def setUp(self): - class EmptyClass: - """Empty object.""" - url_name = '' - category = 'test' - - self.system = get_test_system() - self.descriptor = EmptyClass() - - self.xmodule_class = self.descriptor_class.module_class - self.xmodule = self.xmodule_class( - self.system, - self.descriptor, - self.raw_model_data - ) - - def ajax_request(self, dispatch, data): - """Call Xmodule.handle_ajax.""" - return json.loads(self.xmodule.handle_ajax(dispatch, data)) - - -class PollModuleTest(LogicTest): - """Logic tests for Poll Xmodule.""" - descriptor_class = PollDescriptor - raw_model_data = { - 'poll_answers': {'Yes': 1, 'Dont_know': 0, 'No': 0}, - 'voted': False, - 'poll_answer': '' - } - - def test_bad_ajax_request(self): - response = self.ajax_request('bad_answer', {}) - self.assertDictEqual(response, {'error': 'Unknown Command!'}) - - def test_good_ajax_request(self): - response = self.ajax_request('No', {}) - - poll_answers = response['poll_answers'] - total = response['total'] - callback = response['callback'] - - self.assertDictEqual(poll_answers, {'Yes': 1, 'Dont_know': 0, 'No': 1}) - self.assertEqual(total, 2) - self.assertDictEqual(callback, {'objectName': 'Conditional'}) - self.assertEqual(self.xmodule.poll_answer, 'No') - - -class ConditionalModuleTest(LogicTest): - """Logic tests for Conditional Xmodule.""" - descriptor_class = ConditionalDescriptor - - def test_ajax_request(self): - # Mock is_condition_satisfied - self.xmodule.is_condition_satisfied = lambda: True - setattr(self.xmodule.descriptor, 'get_children', lambda: []) - - response = self.ajax_request('No', {}) - html = response['html'] - - self.assertEqual(html, []) - - -class WordCloudModuleTest(LogicTest): - """Logic tests for Word Cloud Xmodule.""" - descriptor_class = WordCloudDescriptor - raw_model_data = { - 'all_words': {'cat': 10, 'dog': 5, 'mom': 1, 'dad': 2}, - 'top_words': {'cat': 10, 'dog': 5, 'dad': 2}, - 'submitted': False - } - - def test_bad_ajax_request(self): - response = self.ajax_request('bad_dispatch', {}) - self.assertDictEqual(response, { - 'status': 'fail', - 'error': 'Unknown Command!' - }) - - def test_good_ajax_request(self): - post_data = PostData({'student_words[]': ['cat', 'cat', 'dog', 'sun']}) - response = self.ajax_request('submit', post_data) - self.assertEqual(response['status'], 'success') - self.assertEqual(response['submitted'], True) - self.assertEqual(response['total_count'], 22) - self.assertDictEqual( - response['student_words'], - {'sun': 1, 'dog': 6, 'cat': 12} - ) - self.assertListEqual( - response['top_words'], - [{'text': 'dad', 'size': 2, 'percent': 9.0}, - {'text': 'sun', 'size': 1, 'percent': 5.0}, - {'text': 'dog', 'size': 6, 'percent': 27.0}, - {'text': 'mom', 'size': 1, 'percent': 5.0}, - {'text': 'cat', 'size': 12, 'percent': 54.0}] - ) - - self.assertEqual( - 100.0, - sum(i['percent'] for i in response['top_words'])) 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_poll.py b/common/lib/xmodule/xmodule/tests/test_poll.py new file mode 100644 index 0000000000..bbd0c3bb12 --- /dev/null +++ b/common/lib/xmodule/xmodule/tests/test_poll.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +"""Test for Poll Xmodule functional logic.""" +from xmodule.poll_module import PollDescriptor +from . import LogicTest + + +class PollModuleTest(LogicTest): + """Logic tests for Poll Xmodule.""" + descriptor_class = PollDescriptor + raw_model_data = { + 'poll_answers': {'Yes': 1, 'Dont_know': 0, 'No': 0}, + 'voted': False, + 'poll_answer': '' + } + + def test_bad_ajax_request(self): + # Make sure that answer for incorrect request is error json. + response = self.ajax_request('bad_answer', {}) + self.assertDictEqual(response, {'error': 'Unknown Command!'}) + + def test_good_ajax_request(self): + # Make sure that ajax request works correctly. + response = self.ajax_request('No', {}) + + poll_answers = response['poll_answers'] + total = response['total'] + callback = response['callback'] + + self.assertDictEqual(poll_answers, {'Yes': 1, 'Dont_know': 0, 'No': 1}) + self.assertEqual(total, 2) + self.assertDictEqual(callback, {'objectName': 'Conditional'}) + self.assertEqual(self.xmodule.poll_answer, 'No') diff --git a/common/lib/xmodule/xmodule/tests/test_video_xml.py b/common/lib/xmodule/xmodule/tests/test_video_xml.py index 081870792c..1ccc633ee2 100644 --- a/common/lib/xmodule/xmodule/tests/test_video_xml.py +++ b/common/lib/xmodule/xmodule/tests/test_video_xml.py @@ -13,15 +13,12 @@ common/lib/xmodule/xmodule/modulestore/tests/factories.py to create the course, section, subsection, unit, etc. """ -import json -import unittest from mock import Mock -from lxml import etree from xmodule.video_module import VideoDescriptor, VideoModule, _parse_time, _parse_youtube from xmodule.modulestore import Location from xmodule.tests import get_test_system -from xmodule.tests.test_logic import LogicTest +from xmodule.tests import LogicTest class VideoFactory(object): diff --git a/common/lib/xmodule/xmodule/tests/test_videoalpha.py b/common/lib/xmodule/xmodule/tests/test_videoalpha.py new file mode 100644 index 0000000000..76f86d6d4a --- /dev/null +++ b/common/lib/xmodule/xmodule/tests/test_videoalpha.py @@ -0,0 +1,369 @@ +# -*- coding: utf-8 -*- +#pylint: disable=W0212 +"""Test for Video Alpha Xmodule functional logic. +These test data read from xml, not from mongo. + +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, +flush the contentstore before and after, load the templates, etc. +You can then use the CourseFactory and XModuleItemFactory as defined +in common/lib/xmodule/xmodule/modulestore/tests/factories.py to create +the course, section, subsection, unit, etc. +""" + +import unittest +from . import LogicTest +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): + """Logic tests for VideoAlpha Xmodule.""" + descriptor_class = VideoAlphaDescriptor + + raw_model_data = { + 'data': '<videoalpha />' + } + + 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_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_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) + ) + + 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 = ''' + <videoalpha display_name="Test Video" + youtube="1.0:p2Q6BrNhdh8,0.75:izygArpw-Qo,1.25:1EeWXzPdhSA,1.5:rABDYkeK0x8" + show_captions="false" + start_time="00:00:01" + end_time="00:01:00"> + <source src="http://www.example.com/source.mp4"/> + <source src="http://www.example.com/source.ogg"/> + <track src="http://www.example.com/track"/> + </videoalpha> + ''' + 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 = ''' + <videoalpha display_name="Test Video" + youtube="1.0:p2Q6BrNhdh8,0.75:izygArpw-Qo,1.25:1EeWXzPdhSA,1.5:rABDYkeK0x8" + show_captions="false" + start_time="00:00:01" + end_time="00:01:00"> + <source src="http://www.example.com/source.mp4"/> + <track src="http://www.example.com/track"/> + </videoalpha> + ''' + 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 = ''' + <videoalpha display_name="Test Video" + youtube="1.0:p2Q6BrNhdh8,1.25:1EeWXzPdhSA" + show_captions="true"> + <source src="http://www.example.com/source.mp4"/> + <track src="http://www.example.com/track"/> + </videoalpha> + ''' + 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 = '<videoalpha></videoalpha>' + 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 = """ + <videoalpha display_name="Test Video" + youtube="1.0:p2Q6BrNhdh8,0.75:izygArpw-Qo,1.25:1EeWXzPdhSA,1.5:rABDYkeK0x8" + show_captions="false" + from="00:00:01" + to="00:01:00"> + <source src="http://www.example.com/source.mp4"/> + <track src="http://www.example.com/track"/> + </videoalpha> + """ + 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 display_name="Test Video" + youtube="1.0:p2Q6BrNhdh8,0.75:izygArpw-Qo,1.25:1EeWXzPdhSA,1.5:rABDYkeK0x8" + show_captions="false" + from="00:00:01" + to="00:01:00"> + <source src="http://www.example.com/source.mp4"/> + <track src="http://www.example.com/track"/> + </video> + """ + 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('''\ + <videoalpha display_name="Video Alpha" start_time="0:00:01" youtube="0.75:izygArpw-Qo,1.00:p2Q6BrNhdh8,1.25:1EeWXzPdhSA,1.50:rABDYkeK0x8" show_captions="false" end_time="0:01:00"> + <source src="http://www.example.com/source.mp4"/> + <source src="http://www.example.com/source.ogg"/> + <track src="http://www.example.com/track"/> + </videoalpha> + ''') + + 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 = '<videoalpha display_name="Video Alpha" youtube="1.00:OEoXaMPEzfM" show_captions="true"/>\n' + + self.assertEquals(expected, xml) diff --git a/common/lib/xmodule/xmodule/tests/test_word_cloud.py b/common/lib/xmodule/xmodule/tests/test_word_cloud.py new file mode 100644 index 0000000000..c0e00941c8 --- /dev/null +++ b/common/lib/xmodule/xmodule/tests/test_word_cloud.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +"""Test for Word cloud Xmodule functional logic.""" + +from xmodule.word_cloud_module import WordCloudDescriptor +from . import PostData, LogicTest + + +class WordCloudModuleTest(LogicTest): + """Logic tests for Word Cloud Xmodule.""" + descriptor_class = WordCloudDescriptor + raw_model_data = { + 'all_words': {'cat': 10, 'dog': 5, 'mom': 1, 'dad': 2}, + 'top_words': {'cat': 10, 'dog': 5, 'dad': 2}, + 'submitted': False + } + + def test_bad_ajax_request(self): + "Make sure that answer for incorrect request is error json" + response = self.ajax_request('bad_dispatch', {}) + self.assertDictEqual(response, { + 'status': 'fail', + 'error': 'Unknown Command!' + }) + + def test_good_ajax_request(self): + "Make shure that ajax request works correctly" + post_data = PostData({'student_words[]': ['cat', 'cat', 'dog', 'sun']}) + response = self.ajax_request('submit', post_data) + self.assertEqual(response['status'], 'success') + self.assertEqual(response['submitted'], True) + self.assertEqual(response['total_count'], 22) + self.assertDictEqual( + response['student_words'], + {'sun': 1, 'dog': 6, 'cat': 12} + ) + self.assertListEqual( + response['top_words'], + [{'text': 'dad', 'size': 2, 'percent': 9.0}, + {'text': 'sun', 'size': 1, 'percent': 5.0}, + {'text': 'dog', 'size': 6, 'percent': 27.0}, + {'text': 'mom', 'size': 1, 'percent': 5.0}, + {'text': 'cat', 'size': 12, 'percent': 54.0}] + ) + + self.assertEqual( + 100.0, + sum(i['percent'] for i in response['top_words'])) + diff --git a/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py b/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py index d4df2e1054..90ff209c7d 100644 --- a/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py +++ b/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py @@ -53,32 +53,38 @@ CONTAINER_XMODULES = ( CourseDescriptor, ) +# These modules are editable in studio yet +NOT_STUDIO_EDITABLE = ( + CrowdsourceHinterDescriptor, + GraphicalSliderToolDescriptor, + PollDescriptor +) + class TestXBlockWrapper(object): @property def leaf_module_runtime(self): runtime = Mock() - runtime.render_template = lambda *args, **kwargs: unicode((args, kwargs)) - runtime.anonymous_student_id = 'anonymous_student_id' + runtime.render_template = lambda *args, **kwargs: u'{!r}, {!r}'.format(args, kwargs) + runtime.anonymous_student_id = 'dummy_anonymous_student_id' runtime.open_ended_grading_interface = {} runtime.seed = 5 runtime.get = lambda x: getattr(runtime, x) - runtime.position = 2 - runtime.ajax_url = 'ajax_url' + runtime.ajax_url = 'dummy_ajax_url' runtime.xblock_model_data = lambda d: d._model_data return runtime @property def leaf_descriptor_runtime(self): runtime = Mock() - runtime.render_template = lambda *args, **kwargs: unicode((args, kwargs)) + runtime.render_template = lambda *args, **kwargs: u'{!r}, {!r}'.format(args, kwargs) return runtime def leaf_descriptor(self, descriptor_cls): return descriptor_cls( self.leaf_descriptor_runtime, - {'location': 'i4x://org/course/catagory/name'} + {'location': 'i4x://org/course/category/name'} ) def leaf_module(self, descriptor_cls): @@ -90,19 +96,20 @@ class TestXBlockWrapper(object): runtime.get_module.side_effect = lambda x: self.leaf_module(HtmlDescriptor) else: runtime.get_module.side_effect = lambda x: self.container_module(VerticalDescriptor, depth-1) + runtime.position = 2 return runtime @property def container_descriptor_runtime(self): runtime = Mock() - runtime.render_template = lambda *args, **kwargs: unicode((args, kwargs)) + runtime.render_template = lambda *args, **kwargs: u'{!r}, {!r}'.format(args, kwargs) return runtime def container_descriptor(self, descriptor_cls): return descriptor_cls( self.container_descriptor_runtime, { - 'location': 'i4x://org/course/catagory/name', + 'location': 'i4x://org/course/category/name', 'children': range(3) } ) @@ -158,3 +165,62 @@ class TestStudentView(TestXBlockWrapper): def check_student_view_container_node_xblocks_only(self, descriptor_cls): raise SkipTest("XBlock support in XModules not yet fully implemented") + +class TestStudioView(TestXBlockWrapper): + + # Test that for all of the Descriptors listed in LEAF_XMODULES, + # the studio_view wrapper returns the same thing in its content + # as get_html returns + def test_studio_view_leaf_node(self): + for descriptor_cls in LEAF_XMODULES: + yield self.check_studio_view_leaf_node, descriptor_cls + + # Check that when a descriptor is instantiated from descriptor_cls + # it generates the same thing from studio_view that it does from get_html + def check_studio_view_leaf_node(self, descriptor_cls): + if descriptor_cls in NOT_STUDIO_EDITABLE: + raise SkipTest(descriptor_cls.__name__ + "is not editable in studio") + + descriptor = self.leaf_descriptor(descriptor_cls) + assert_equal(descriptor.get_html(), descriptor.studio_view(None).content) + + + # Test that for all of the Descriptors listed in CONTAINER_XMODULES + # render the same thing using studio_view as they do using get_html, under the following conditions: + # a) All of its descendents are xmodules + # b) Some of its descendents are xmodules and some are xblocks + # c) All of its descendents are xblocks + def test_studio_view_container_node(self): + for descriptor_cls in CONTAINER_XMODULES: + yield self.check_studio_view_container_node_xmodules_only, descriptor_cls + yield self.check_studio_view_container_node_mixed, descriptor_cls + yield self.check_studio_view_container_node_xblocks_only, descriptor_cls + + + # Check that when a descriptor is generated from descriptor_cls + # with only xmodule children, it generates the same html from studio_view + # as it does using get_html + def check_studio_view_container_node_xmodules_only(self, descriptor_cls): + if descriptor_cls in NOT_STUDIO_EDITABLE: + raise SkipTest(descriptor_cls.__name__ + "is not editable in studio") + + descriptor = self.container_descriptor(descriptor_cls) + assert_equal(descriptor.get_html(), descriptor.studio_view(None).content) + + # Check that when a descriptor is generated from descriptor_cls + # with mixed xmodule and xblock children, it generates the same html from studio_view + # as it does using get_html + def check_studio_view_container_node_mixed(self, descriptor_cls): + if descriptor_cls in NOT_STUDIO_EDITABLE: + raise SkipTest(descriptor_cls.__name__ + "is not editable in studio") + + raise SkipTest("XBlock support in XDescriptor not yet fully implemented") + + # Check that when a descriptor is generated from descriptor_cls + # with only xblock children, it generates the same html from studio_view + # as it does using get_html + def check_studio_view_container_node_xblocks_only(self, descriptor_cls): + if descriptor_cls in NOT_STUDIO_EDITABLE: + raise SkipTest(descriptor_cls.__name__ + "is not editable in studio") + + raise SkipTest("XBlock support in XModules not yet fully implemented") 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/video_module.py b/common/lib/xmodule/xmodule/video_module.py index 6c5640346e..763975fc3b 100644 --- a/common/lib/xmodule/xmodule/video_module.py +++ b/common/lib/xmodule/xmodule/video_module.py @@ -12,7 +12,7 @@ import time from django.http import Http404 from xmodule.x_module import XModule -from xmodule.raw_module import RawDescriptor +from xmodule.raw_module import EmptyDataRawDescriptor from xmodule.editing_module import MetadataOnlyEditingDescriptor from xblock.core import Integer, Scope, String, Float, Boolean @@ -97,7 +97,7 @@ class VideoModule(VideoFields, XModule): class VideoDescriptor(VideoFields, MetadataOnlyEditingDescriptor, - RawDescriptor): + EmptyDataRawDescriptor): module_class = VideoModule def __init__(self, *args, **kwargs): @@ -130,19 +130,15 @@ class VideoDescriptor(VideoFields, _parse_video_xml(video, video.data) return video - def definition_to_xml(self, resource_fs): - """ - Override the base implementation. We don't actually have anything in the 'data' field - (it's an empty string), so we just return a simple XML element - """ - return etree.Element('video') - def _parse_video_xml(video, xml_data): """ Parse video fields out of xml_data. The fields are set if they are present in the XML. """ + if not xml_data: + return + xml = etree.fromstring(xml_data) display_name = xml.get('display_name') diff --git a/common/lib/xmodule/xmodule/videoalpha_module.py b/common/lib/xmodule/xmodule/videoalpha_module.py index d8ed8949f1..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('''\ - <videoalpha show_captions="true" sub="name_of_file" youtube="0.75:JMD_ifUUfsU,1.0:OEoXaMPEzfM,1.25:AKqURZnYqpk,1.50:DYpADpL7jAY" > - <source src="https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.mp4"/> - <source src="https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.webm"/> - <source src="https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.ogv"/> - </videoalpha>'''), - 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): @@ -68,78 +132,22 @@ class VideoAlphaModule(VideoAlphaFields, XModule): icon_class = 'video' js = { - 'js': [resource_string(__name__, 'js/src/videoalpha/display/html5_video.js')], - 'coffee': - [resource_string(__name__, 'js/src/time.coffee'), - resource_string(__name__, 'js/src/videoalpha/display.coffee')] + - [resource_string(__name__, 'js/src/videoalpha/display/' + filename) - for filename - in sorted(resource_listdir(__name__, 'js/src/videoalpha/display')) - if filename.endswith('.coffee')]} + 'js': [ + resource_string(__name__, 'js/src/videoalpha/01_initialize.js'), + resource_string(__name__, 'js/src/videoalpha/02_html5_video.js'), + resource_string(__name__, 'js/src/videoalpha/03_video_player.js'), + resource_string(__name__, 'js/src/videoalpha/04_video_control.js'), + resource_string(__name__, 'js/src/videoalpha/05_video_quality_control.js'), + resource_string(__name__, 'js/src/videoalpha/06_video_progress_slider.js'), + resource_string(__name__, 'js/src/videoalpha/07_video_volume_control.js'), + resource_string(__name__, 'js/src/videoalpha/08_video_speed_control.js'), + resource_string(__name__, 'js/src/videoalpha/09_video_caption.js'), + resource_string(__name__, 'js/src/videoalpha/10_main.js') + ] + } 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.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)) @@ -158,24 +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, - '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/word_cloud_module.py b/common/lib/xmodule/xmodule/word_cloud_module.py index 004e6ed320..900bded760 100644 --- a/common/lib/xmodule/xmodule/word_cloud_module.py +++ b/common/lib/xmodule/xmodule/word_cloud_module.py @@ -10,7 +10,7 @@ import json import logging from pkg_resources import resource_string -from xmodule.raw_module import RawDescriptor +from xmodule.raw_module import EmptyDataRawDescriptor from xmodule.editing_module import MetadataOnlyEditingDescriptor from xmodule.x_module import XModule @@ -240,7 +240,7 @@ class WordCloudModule(WordCloudFields, XModule): return self.content -class WordCloudDescriptor(WordCloudFields, MetadataOnlyEditingDescriptor, RawDescriptor): +class WordCloudDescriptor(WordCloudFields, MetadataOnlyEditingDescriptor, EmptyDataRawDescriptor): """Descriptor for WordCloud Xmodule.""" module_class = WordCloudModule template_dir_name = 'word_cloud' diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index 47642e9f90..3556f3f0f3 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -10,8 +10,9 @@ 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 log = logging.getLogger(__name__) @@ -537,11 +538,14 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock): system: Module system """ - return self.module_class( + # save any field changes + module = self.module_class( system, self, system.xblock_model_data(self), ) + module.save() + return module def has_dynamic_children(self): """ @@ -613,7 +617,13 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock): new_block = system.xblock_from_json(cls, usage_id, json_data) if parent_xblock is not None: - parent_xblock.children.append(new_block) + children = parent_xblock.children + children.append(new_block) + # trigger setter method by using top level field access + parent_xblock.children = children + # decache pending children field settings (Note, truly persisting at this point would break b/c + # persistence assumes children is a list of ids not actual xblocks) + parent_xblock.save() return new_block @classmethod @@ -756,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): @@ -773,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, @@ -785,6 +797,18 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock): return metadata_fields + # ~~~~~~~~~~~~~~~ XBlock API Wrappers ~~~~~~~~~~~~~~~~ + def studio_view(self, context): + """ + Return a fragment with the html from this XModuleDescriptor's editing view + + Doesn't yet add any of the javascript to the fragment, nor the css. + Also doesn't expect any javascript binding, yet. + + Makes no use of the context parameter + """ + return Fragment(self.get_html()) + class DescriptorSystem(object): def __init__(self, load_item, resources_fs, error_tracker, **kwargs): @@ -849,7 +873,7 @@ class XMLParsingSystem(DescriptorSystem): self.policy = policy -class ModuleSystem(object): +class ModuleSystem(Runtime): ''' This is an abstraction such that x_modules can function independent of the courseware (e.g. import into other types of courseware, LMS, @@ -880,6 +904,8 @@ class ModuleSystem(object): 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. @@ -956,6 +982,8 @@ class ModuleSystem(object): 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/coffee/src/discussion/discussion_router.coffee b/common/static/coffee/src/discussion/discussion_router.coffee index 50c14b20de..283632a542 100644 --- a/common/static/coffee/src/discussion/discussion_router.coffee +++ b/common/static/coffee/src/discussion/discussion_router.coffee @@ -20,10 +20,13 @@ if Backbone? allThreads: -> @nav.updateSidebar() + @nav.goHome() setActiveThread: => if @thread @nav.setActiveThread(@thread.get("id")) + else + @nav.goHome showThread: (forum_name, thread_id) -> @thread = @discussion.get(thread_id) diff --git a/common/static/coffee/src/discussion/utils.coffee b/common/static/coffee/src/discussion/utils.coffee index b7b7cb2550..e2ca220a8d 100644 --- a/common/static/coffee/src/discussion/utils.coffee +++ b/common/static/coffee/src/discussion/utils.coffee @@ -82,6 +82,9 @@ class @DiscussionUtil user_profile : "/courses/#{$$course_id}/discussion/forum/users/#{param}" followed_threads : "/courses/#{$$course_id}/discussion/forum/users/#{param}/followed" threads : "/courses/#{$$course_id}/discussion/forum" + "enable_notifications" : "/notification_prefs/enable/" + "disable_notifications" : "/notification_prefs/disable/" + "notifications_status" : "/notification_prefs/status" }[name] @safeAjax: (params) -> diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index 9aa4ba869d..f9710c7077 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -2,6 +2,7 @@ if Backbone? class @DiscussionThreadListView extends Backbone.View events: "click .search": "showSearch" + "click .home": "goHome" "click .browse": "toggleTopicDrop" "keydown .post-search-field": "performSearch" "click .sort-bar a": "sortThreads" @@ -43,6 +44,7 @@ if Backbone? if active @setActiveThread(thread_id) + #TODO fix this entire chain of events addAndSelectThread: (thread) => commentable_id = thread.get("commentable_id") @@ -191,6 +193,25 @@ if Backbone? @$(".browse").removeClass('is-open') setTimeout (-> @$(".post-search-field").focus()), 200 + goHome: -> + @template = _.template($("#discussion-home").html()) + $(".discussion-column").html(@template) + $(".post-list a").removeClass("active") + $("input.email-setting").bind "click", @updateEmailNotifications + url = DiscussionUtil.urlFor("notifications_status",window.user.get("id")) + DiscussionUtil.safeAjax + url: url + type: "GET" + success: (response, textStatus) => + if response.status + $('input.email-setting').attr('checked','checked') + else + $('input.email-setting').removeAttr('checked') + thread_id = null + @trigger("thread:removed") + #select all threads + + toggleTopicDrop: (event) => event.preventDefault() event.stopPropagation() @@ -312,6 +333,7 @@ if Backbone? if callback? callback() + retrieveDiscussions: (discussion_ids) -> @discussionIds = discussion_ids.join(',') @mode = 'commentables' @@ -418,3 +440,19 @@ if Backbone? retrieveFollowed: (event)=> @mode = 'followed' @retrieveFirstPage(event) + + updateEmailNotifications: () => + if $('input.email-setting').attr('checked') + DiscussionUtil.safeAjax + url: DiscussionUtil.urlFor("enable_notifications") + type: "POST" + error: () => + $('input.email-setting').removeAttr('checked') + else + DiscussionUtil.safeAjax + url: DiscussionUtil.urlFor("disable_notifications") + type: "POST" + error: () => + $('input.email-setting').attr('checked','checked') + + diff --git a/common/static/css/vendor/slickgrid/images/actions.gif b/common/static/css/vendor/slickgrid/images/actions.gif new file mode 100755 index 0000000000..026dd108ed Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/actions.gif differ diff --git a/common/static/css/vendor/slickgrid/images/ajax-loader-small.gif b/common/static/css/vendor/slickgrid/images/ajax-loader-small.gif new file mode 100755 index 0000000000..5b33f7e54f Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/ajax-loader-small.gif differ diff --git a/common/static/css/vendor/slickgrid/images/arrow_redo.png b/common/static/css/vendor/slickgrid/images/arrow_redo.png new file mode 100755 index 0000000000..4f7f55d6f2 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/arrow_redo.png differ diff --git a/common/static/css/vendor/slickgrid/images/arrow_right_peppermint.png b/common/static/css/vendor/slickgrid/images/arrow_right_peppermint.png new file mode 100755 index 0000000000..8722567866 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/arrow_right_peppermint.png differ diff --git a/common/static/css/vendor/slickgrid/images/arrow_right_spearmint.png b/common/static/css/vendor/slickgrid/images/arrow_right_spearmint.png new file mode 100755 index 0000000000..277ddde384 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/arrow_right_spearmint.png differ diff --git a/common/static/css/vendor/slickgrid/images/arrow_undo.png b/common/static/css/vendor/slickgrid/images/arrow_undo.png new file mode 100755 index 0000000000..bc9924ac07 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/arrow_undo.png differ diff --git a/common/static/css/vendor/slickgrid/images/bullet_blue.png b/common/static/css/vendor/slickgrid/images/bullet_blue.png new file mode 100755 index 0000000000..79d978c36a Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/bullet_blue.png differ diff --git a/common/static/css/vendor/slickgrid/images/bullet_star.png b/common/static/css/vendor/slickgrid/images/bullet_star.png new file mode 100755 index 0000000000..142ea482a5 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/bullet_star.png differ diff --git a/common/static/css/vendor/slickgrid/images/bullet_toggle_minus.png b/common/static/css/vendor/slickgrid/images/bullet_toggle_minus.png new file mode 100755 index 0000000000..f5aa0450d4 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/bullet_toggle_minus.png differ diff --git a/common/static/css/vendor/slickgrid/images/bullet_toggle_plus.png b/common/static/css/vendor/slickgrid/images/bullet_toggle_plus.png new file mode 100755 index 0000000000..a965053423 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/bullet_toggle_plus.png differ diff --git a/common/static/css/vendor/slickgrid/images/calendar.gif b/common/static/css/vendor/slickgrid/images/calendar.gif new file mode 100755 index 0000000000..90fd2e17fe Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/calendar.gif differ diff --git a/common/static/css/vendor/slickgrid/images/collapse.gif b/common/static/css/vendor/slickgrid/images/collapse.gif new file mode 100755 index 0000000000..01e691450c Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/collapse.gif differ diff --git a/common/static/css/vendor/slickgrid/images/comment_yellow.gif b/common/static/css/vendor/slickgrid/images/comment_yellow.gif new file mode 100755 index 0000000000..df7158a477 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/comment_yellow.gif differ diff --git a/common/static/css/vendor/slickgrid/images/down.gif b/common/static/css/vendor/slickgrid/images/down.gif new file mode 100755 index 0000000000..9bd9447552 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/down.gif differ diff --git a/common/static/css/vendor/slickgrid/images/drag-handle.png b/common/static/css/vendor/slickgrid/images/drag-handle.png new file mode 100755 index 0000000000..ad7531cf04 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/drag-handle.png differ diff --git a/common/static/css/vendor/slickgrid/images/editor-helper-bg.gif b/common/static/css/vendor/slickgrid/images/editor-helper-bg.gif new file mode 100755 index 0000000000..2daa973bc5 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/editor-helper-bg.gif differ diff --git a/common/static/css/vendor/slickgrid/images/expand.gif b/common/static/css/vendor/slickgrid/images/expand.gif new file mode 100755 index 0000000000..1b24ef1248 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/expand.gif differ diff --git a/common/static/css/vendor/slickgrid/images/header-bg.gif b/common/static/css/vendor/slickgrid/images/header-bg.gif new file mode 100755 index 0000000000..fe7dd1c1eb Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/header-bg.gif differ diff --git a/common/static/css/vendor/slickgrid/images/header-columns-bg.gif b/common/static/css/vendor/slickgrid/images/header-columns-bg.gif new file mode 100755 index 0000000000..8d459a304e Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/header-columns-bg.gif differ diff --git a/common/static/css/vendor/slickgrid/images/header-columns-over-bg.gif b/common/static/css/vendor/slickgrid/images/header-columns-over-bg.gif new file mode 100755 index 0000000000..f9c07af134 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/header-columns-over-bg.gif differ diff --git a/common/static/css/vendor/slickgrid/images/help.png b/common/static/css/vendor/slickgrid/images/help.png new file mode 100755 index 0000000000..85eca0950f Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/help.png differ diff --git a/common/static/css/vendor/slickgrid/images/info.gif b/common/static/css/vendor/slickgrid/images/info.gif new file mode 100755 index 0000000000..5769434fb2 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/info.gif differ diff --git a/common/static/css/vendor/slickgrid/images/listview.gif b/common/static/css/vendor/slickgrid/images/listview.gif new file mode 100755 index 0000000000..3ec25ca719 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/listview.gif differ diff --git a/common/static/css/vendor/slickgrid/images/pencil.gif b/common/static/css/vendor/slickgrid/images/pencil.gif new file mode 100755 index 0000000000..29f78f433d Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/pencil.gif differ diff --git a/common/static/css/vendor/slickgrid/images/row-over-bg.gif b/common/static/css/vendor/slickgrid/images/row-over-bg.gif new file mode 100755 index 0000000000..b288e38739 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/row-over-bg.gif differ diff --git a/common/static/css/vendor/slickgrid/images/sort-asc.gif b/common/static/css/vendor/slickgrid/images/sort-asc.gif new file mode 100755 index 0000000000..67a2a4c669 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/sort-asc.gif differ diff --git a/common/static/css/vendor/slickgrid/images/sort-asc.png b/common/static/css/vendor/slickgrid/images/sort-asc.png new file mode 100755 index 0000000000..8604ff4e07 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/sort-asc.png differ diff --git a/common/static/css/vendor/slickgrid/images/sort-desc.gif b/common/static/css/vendor/slickgrid/images/sort-desc.gif new file mode 100755 index 0000000000..34db47c3b1 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/sort-desc.gif differ diff --git a/common/static/css/vendor/slickgrid/images/sort-desc.png b/common/static/css/vendor/slickgrid/images/sort-desc.png new file mode 100755 index 0000000000..a2a6adf936 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/sort-desc.png differ diff --git a/common/static/css/vendor/slickgrid/images/stripes.png b/common/static/css/vendor/slickgrid/images/stripes.png new file mode 100755 index 0000000000..c3c4b28a80 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/stripes.png differ diff --git a/common/static/css/vendor/slickgrid/images/tag_red.png b/common/static/css/vendor/slickgrid/images/tag_red.png new file mode 100755 index 0000000000..d290fcd791 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/tag_red.png differ diff --git a/common/static/css/vendor/slickgrid/images/tick.png b/common/static/css/vendor/slickgrid/images/tick.png new file mode 100755 index 0000000000..3899d71dfa Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/tick.png differ diff --git a/common/static/css/vendor/slickgrid/images/user_identity.gif b/common/static/css/vendor/slickgrid/images/user_identity.gif new file mode 100755 index 0000000000..095831ba42 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/user_identity.gif differ diff --git a/common/static/css/vendor/slickgrid/images/user_identity_plus.gif b/common/static/css/vendor/slickgrid/images/user_identity_plus.gif new file mode 100755 index 0000000000..b276a81c78 Binary files /dev/null and b/common/static/css/vendor/slickgrid/images/user_identity_plus.gif differ diff --git a/common/static/css/vendor/slickgrid/slick.grid.css b/common/static/css/vendor/slickgrid/slick.grid.css new file mode 100755 index 0000000000..6a416db1ef --- /dev/null +++ b/common/static/css/vendor/slickgrid/slick.grid.css @@ -0,0 +1,157 @@ +/* +IMPORTANT: +In order to preserve the uniform grid appearance, all cell styles need to have padding, margin and border sizes. +No built-in (selected, editable, highlight, flashing, invalid, loading, :focus) or user-specified CSS +classes should alter those! +*/ + +.slick-header.ui-state-default, .slick-headerrow.ui-state-default { + width: 100%; + overflow: hidden; + border-left: 0px; +} + +.slick-header-columns, .slick-headerrow-columns { + position: relative; + white-space: nowrap; + cursor: default; + overflow: hidden; +} + +.slick-header-column.ui-state-default { + position: relative; + display: inline-block; + overflow: hidden; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + height: 16px; + line-height: 16px; + margin: 0; + padding: 4px; + border-right: 1px solid silver; + border-left: 0px; + border-top: 0px; + border-bottom: 0px; + float: left; +} + +.slick-headerrow-column.ui-state-default { + padding: 4px; +} + +.slick-header-column-sorted { + font-style: italic; +} + +.slick-sort-indicator { + display: inline-block; + width: 8px; + height: 5px; + margin-left: 4px; + margin-top: 6px; + float: left; +} + +.slick-sort-indicator-desc { + background: url(images/sort-desc.gif); +} + +.slick-sort-indicator-asc { + background: url(images/sort-asc.gif); +} + +.slick-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; + cursor: col-resize; + width: 4px; + right: 0px; + top: 0; + height: 100%; +} + +.slick-sortable-placeholder { + background: silver; +} + +.grid-canvas { + position: relative; + outline: 0; +} + +.slick-row.ui-widget-content, .slick-row.ui-state-active { + position: absolute; + border: 0px; + width: 100%; +} + +.slick-cell, .slick-headerrow-column { + position: absolute; + border: 1px solid transparent; + border-right: 1px dotted silver; + border-bottom-color: silver; + overflow: hidden; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + vertical-align: middle; + z-index: 1; + padding: 1px 2px 2px 1px; + margin: 0; + white-space: nowrap; + cursor: default; +} + +.slick-group { +} + +.slick-group-toggle { + display: inline-block; +} + +.slick-cell.highlighted { + background: lightskyblue; + background: rgba(0, 0, 255, 0.2); + -webkit-transition: all 0.5s; + -moz-transition: all 0.5s; + -o-transition: all 0.5s; + transition: all 0.5s; +} + +.slick-cell.flashing { + border: 1px solid red !important; +} + +.slick-cell.editable { + z-index: 11; + overflow: visible; + background: white; + border-color: black; + border-style: solid; +} + +.slick-cell:focus { + outline: none; +} + +.slick-reorder-proxy { + display: inline-block; + background: blue; + opacity: 0.15; + filter: alpha(opacity = 15); + cursor: move; +} + +.slick-reorder-guide { + display: inline-block; + height: 2px; + background: blue; + opacity: 0.7; + filter: alpha(opacity = 70); +} + +.slick-selection { + z-index: 10; + position: absolute; + border: 2px dashed black; +} diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png new file mode 100755 index 0000000000..5b5dab2ab7 Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_flat_75_ffffff_40x100.png new file mode 100755 index 0000000000..ac8b229af9 Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_flat_75_ffffff_40x100.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png new file mode 100755 index 0000000000..ad3d6346e0 Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_65_ffffff_1x400.png new file mode 100755 index 0000000000..42ccba269b Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_65_ffffff_1x400.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_75_dadada_1x400.png new file mode 100755 index 0000000000..5a46b47cb1 Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_75_dadada_1x400.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png new file mode 100755 index 0000000000..86c2baa655 Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png new file mode 100755 index 0000000000..4443fdc1a1 Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png new file mode 100755 index 0000000000..7c9fa6c6ed Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_222222_256x240.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_222222_256x240.png new file mode 100755 index 0000000000..b273ff111d Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_222222_256x240.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_2e83ff_256x240.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_2e83ff_256x240.png new file mode 100755 index 0000000000..09d1cdc856 Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_2e83ff_256x240.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_454545_256x240.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_454545_256x240.png new file mode 100755 index 0000000000..59bd45b907 Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_454545_256x240.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_888888_256x240.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_888888_256x240.png new file mode 100755 index 0000000000..6d02426c11 Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_888888_256x240.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_cd0a0a_256x240.png b/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_cd0a0a_256x240.png new file mode 100755 index 0000000000..2ab019b73e Binary files /dev/null and b/common/static/css/vendor/slickgrid/smoothness/images/ui-icons_cd0a0a_256x240.png differ diff --git a/common/static/css/vendor/slickgrid/smoothness/jquery-ui-1.8.16.custom.css b/common/static/css/vendor/slickgrid/smoothness/jquery-ui-1.8.16.custom.css new file mode 100755 index 0000000000..527338f7e5 --- /dev/null +++ b/common/static/css/vendor/slickgrid/smoothness/jquery-ui-1.8.16.custom.css @@ -0,0 +1,409 @@ +/* + * jQuery UI CSS Framework 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } +.ui-helper-clearfix { display: inline-block; } +/* required comment for clearfix to work in Opera \*/ +* html .ui-helper-clearfix { height:1%; } +.ui-helper-clearfix { display:block; } +/* end clearfix */ +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + + +/* + * jQuery UI CSS Framework 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Theming/API + * + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px + */ + + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } +.ui-widget .ui-widget { font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } +.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content a { color: #222222; } +.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } +.ui-widget-header a { color: #222222; } + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } +.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; } +.ui-widget :active { outline: none; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; } +.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; } +.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } + +/* Overlays */ +.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } +.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* + * jQuery UI Resizable 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Resizable#theming + */ +.ui-resizable { position: relative;} +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; } +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } +.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } +.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } +.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } +.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } +.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } +.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } +.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* + * jQuery UI Selectable 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Selectable#theming + */ +.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; } +/* + * jQuery UI Slider 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Slider#theming + */ +.ui-slider { position: relative; text-align: left; } +.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } +.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } + +.ui-slider-horizontal { height: .8em; } +.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } +.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } +.ui-slider-horizontal .ui-slider-range-min { left: 0; } +.ui-slider-horizontal .ui-slider-range-max { right: 0; } + +.ui-slider-vertical { width: .8em; height: 100px; } +.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } +.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } +.ui-slider-vertical .ui-slider-range-min { bottom: 0; } +.ui-slider-vertical .ui-slider-range-max { top: 0; }/* + * jQuery UI Datepicker 1.8.16 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Datepicker#theming + */ +.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } +.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } +.ui-datepicker td { border: 0; padding: 1px; } +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { width:auto; } +.ui-datepicker-multi .ui-datepicker-group { float:left; } +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } +.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; } + +/* RTL support */ +.ui-datepicker-rtl { direction: rtl; } +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } +.ui-datepicker-rtl .ui-datepicker-group { float:right; } +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-datepicker-cover { + display: none; /*sorry for IE5*/ + display/**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ +} \ No newline at end of file diff --git a/common/static/js/utility.js b/common/static/js/utility.js new file mode 100644 index 0000000000..a983535b46 --- /dev/null +++ b/common/static/js/utility.js @@ -0,0 +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 +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) + 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 && + // 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) + return true; + return false; +}; diff --git a/common/static/js/vendor/jasmine-jquery.js b/common/static/js/vendor/jasmine-jquery.js index f1b2c138c6..6a9a3aba98 100644 --- a/common/static/js/vendor/jasmine-jquery.js +++ b/common/static/js/vendor/jasmine-jquery.js @@ -315,8 +315,8 @@ jasmine.JQuery.matchersClass = {}; || jasmine.isDomNode(this.actual))) { this.actual = $(this.actual) var result = jQueryMatchers[methodName].apply(this, arguments) - var element; - if (this.actual.get && (element = this.actual.get()[0]) && !$.isWindow(element) && element.tagName !== "HTML") + var element; + if (this.actual.get && (element = this.actual.get()[0]) && !$.isWindow(element) && element.tagName !== "HTML") this.actual = jasmine.JQuery.elementToString(this.actual) return result } diff --git a/common/static/js/vendor/jquery.event.drag-2.2.js b/common/static/js/vendor/jquery.event.drag-2.2.js new file mode 100644 index 0000000000..1cda0e2166 --- /dev/null +++ b/common/static/js/vendor/jquery.event.drag-2.2.js @@ -0,0 +1,402 @@ +/*! + * jquery.event.drag - v 2.2 + * Copyright (c) 2010 Three Dub Media - http://threedubmedia.com + * Open Source MIT License - http://threedubmedia.com/code/license + */ +// Created: 2008-06-04 +// Updated: 2012-05-21 +// REQUIRES: jquery 1.7.x + +;(function( $ ){ + +// add the jquery instance method +$.fn.drag = function( str, arg, opts ){ + // figure out the event type + var type = typeof str == "string" ? str : "", + // figure out the event handler... + fn = $.isFunction( str ) ? str : $.isFunction( arg ) ? arg : null; + // fix the event type + if ( type.indexOf("drag") !== 0 ) + type = "drag"+ type; + // were options passed + opts = ( str == fn ? arg : opts ) || {}; + // trigger or bind event handler + return fn ? this.bind( type, opts, fn ) : this.trigger( type ); +}; + +// local refs (increase compression) +var $event = $.event, +$special = $event.special, +// configure the drag special event +drag = $special.drag = { + + // these are the default settings + defaults: { + which: 1, // mouse button pressed to start drag sequence + distance: 0, // distance dragged before dragstart + not: ':input', // selector to suppress dragging on target elements + handle: null, // selector to match handle target elements + relative: false, // true to use "position", false to use "offset" + drop: true, // false to suppress drop events, true or selector to allow + click: false // false to suppress click events after dragend (no proxy) + }, + + // the key name for stored drag data + datakey: "dragdata", + + // prevent bubbling for better performance + noBubble: true, + + // count bound related events + add: function( obj ){ + // read the interaction data + var data = $.data( this, drag.datakey ), + // read any passed options + opts = obj.data || {}; + // count another realted event + data.related += 1; + // extend data options bound with this event + // don't iterate "opts" in case it is a node + $.each( drag.defaults, function( key, def ){ + if ( opts[ key ] !== undefined ) + data[ key ] = opts[ key ]; + }); + }, + + // forget unbound related events + remove: function(){ + $.data( this, drag.datakey ).related -= 1; + }, + + // configure interaction, capture settings + setup: function(){ + // check for related events + if ( $.data( this, drag.datakey ) ) + return; + // initialize the drag data with copied defaults + var data = $.extend({ related:0 }, drag.defaults ); + // store the interaction data + $.data( this, drag.datakey, data ); + // bind the mousedown event, which starts drag interactions + $event.add( this, "touchstart mousedown", drag.init, data ); + // prevent image dragging in IE... + if ( this.attachEvent ) + this.attachEvent("ondragstart", drag.dontstart ); + }, + + // destroy configured interaction + teardown: function(){ + var data = $.data( this, drag.datakey ) || {}; + // check for related events + if ( data.related ) + return; + // remove the stored data + $.removeData( this, drag.datakey ); + // remove the mousedown event + $event.remove( this, "touchstart mousedown", drag.init ); + // enable text selection + drag.textselect( true ); + // un-prevent image dragging in IE... + if ( this.detachEvent ) + this.detachEvent("ondragstart", drag.dontstart ); + }, + + // initialize the interaction + init: function( event ){ + // sorry, only one touch at a time + if ( drag.touched ) + return; + // the drag/drop interaction data + var dd = event.data, results; + // check the which directive + if ( event.which != 0 && dd.which > 0 && event.which != dd.which ) + return; + // check for suppressed selector + if ( $( event.target ).is( dd.not ) ) + return; + // check for handle selector + if ( dd.handle && !$( event.target ).closest( dd.handle, event.currentTarget ).length ) + return; + + drag.touched = event.type == 'touchstart' ? this : null; + dd.propagates = 1; + dd.mousedown = this; + dd.interactions = [ drag.interaction( this, dd ) ]; + dd.target = event.target; + dd.pageX = event.pageX; + dd.pageY = event.pageY; + dd.dragging = null; + // handle draginit event... + results = drag.hijack( event, "draginit", dd ); + // early cancel + if ( !dd.propagates ) + return; + // flatten the result set + results = drag.flatten( results ); + // insert new interaction elements + if ( results && results.length ){ + dd.interactions = []; + $.each( results, function(){ + dd.interactions.push( drag.interaction( this, dd ) ); + }); + } + // remember how many interactions are propagating + dd.propagates = dd.interactions.length; + // locate and init the drop targets + if ( dd.drop !== false && $special.drop ) + $special.drop.handler( event, dd ); + // disable text selection + drag.textselect( false ); + // bind additional events... + if ( drag.touched ) + $event.add( drag.touched, "touchmove touchend", drag.handler, dd ); + else + $event.add( document, "mousemove mouseup", drag.handler, dd ); + // helps prevent text selection or scrolling + if ( !drag.touched || dd.live ) + return false; + }, + + // returns an interaction object + interaction: function( elem, dd ){ + var offset = $( elem )[ dd.relative ? "position" : "offset" ]() || { top:0, left:0 }; + return { + drag: elem, + callback: new drag.callback(), + droppable: [], + offset: offset + }; + }, + + // handle drag-releatd DOM events + handler: function( event ){ + // read the data before hijacking anything + var dd = event.data; + // handle various events + switch ( event.type ){ + // mousemove, check distance, start dragging + case !dd.dragging && 'touchmove': + event.preventDefault(); + case !dd.dragging && 'mousemove': + // drag tolerance, x + y = distance + if ( Math.pow( event.pageX-dd.pageX, 2 ) + Math.pow( event.pageY-dd.pageY, 2 ) < Math.pow( dd.distance, 2 ) ) + break; // distance tolerance not reached + event.target = dd.target; // force target from "mousedown" event (fix distance issue) + drag.hijack( event, "dragstart", dd ); // trigger "dragstart" + if ( dd.propagates ) // "dragstart" not rejected + dd.dragging = true; // activate interaction + // mousemove, dragging + case 'touchmove': + event.preventDefault(); + case 'mousemove': + if ( dd.dragging ){ + // trigger "drag" + drag.hijack( event, "drag", dd ); + if ( dd.propagates ){ + // manage drop events + if ( dd.drop !== false && $special.drop ) + $special.drop.handler( event, dd ); // "dropstart", "dropend" + break; // "drag" not rejected, stop + } + event.type = "mouseup"; // helps "drop" handler behave + } + // mouseup, stop dragging + case 'touchend': + case 'mouseup': + default: + if ( drag.touched ) + $event.remove( drag.touched, "touchmove touchend", drag.handler ); // remove touch events + else + $event.remove( document, "mousemove mouseup", drag.handler ); // remove page events + if ( dd.dragging ){ + if ( dd.drop !== false && $special.drop ) + $special.drop.handler( event, dd ); // "drop" + drag.hijack( event, "dragend", dd ); // trigger "dragend" + } + drag.textselect( true ); // enable text selection + // if suppressing click events... + if ( dd.click === false && dd.dragging ) + $.data( dd.mousedown, "suppress.click", new Date().getTime() + 5 ); + dd.dragging = drag.touched = false; // deactivate element + break; + } + }, + + // re-use event object for custom events + hijack: function( event, type, dd, x, elem ){ + // not configured + if ( !dd ) + return; + // remember the original event and type + var orig = { event:event.originalEvent, type:event.type }, + // is the event drag related or drog related? + mode = type.indexOf("drop") ? "drag" : "drop", + // iteration vars + result, i = x || 0, ia, $elems, callback, + len = !isNaN( x ) ? x : dd.interactions.length; + // modify the event type + event.type = type; + // remove the original event + event.originalEvent = null; + // initialize the results + dd.results = []; + // handle each interacted element + do if ( ia = dd.interactions[ i ] ){ + // validate the interaction + if ( type !== "dragend" && ia.cancelled ) + continue; + // set the dragdrop properties on the event object + callback = drag.properties( event, dd, ia ); + // prepare for more results + ia.results = []; + // handle each element + $( elem || ia[ mode ] || dd.droppable ).each(function( p, subject ){ + // identify drag or drop targets individually + callback.target = subject; + // force propagtion of the custom event + event.isPropagationStopped = function(){ return false; }; + // handle the event + result = subject ? $event.dispatch.call( subject, event, callback ) : null; + // stop the drag interaction for this element + if ( result === false ){ + if ( mode == "drag" ){ + ia.cancelled = true; + dd.propagates -= 1; + } + if ( type == "drop" ){ + ia[ mode ][p] = null; + } + } + // assign any dropinit elements + else if ( type == "dropinit" ) + ia.droppable.push( drag.element( result ) || subject ); + // accept a returned proxy element + if ( type == "dragstart" ) + ia.proxy = $( drag.element( result ) || ia.drag )[0]; + // remember this result + ia.results.push( result ); + // forget the event result, for recycling + delete event.result; + // break on cancelled handler + if ( type !== "dropinit" ) + return result; + }); + // flatten the results + dd.results[ i ] = drag.flatten( ia.results ); + // accept a set of valid drop targets + if ( type == "dropinit" ) + ia.droppable = drag.flatten( ia.droppable ); + // locate drop targets + if ( type == "dragstart" && !ia.cancelled ) + callback.update(); + } + while ( ++i < len ) + // restore the original event & type + event.type = orig.type; + event.originalEvent = orig.event; + // return all handler results + return drag.flatten( dd.results ); + }, + + // extend the callback object with drag/drop properties... + properties: function( event, dd, ia ){ + var obj = ia.callback; + // elements + obj.drag = ia.drag; + obj.proxy = ia.proxy || ia.drag; + // starting mouse position + obj.startX = dd.pageX; + obj.startY = dd.pageY; + // current distance dragged + obj.deltaX = event.pageX - dd.pageX; + obj.deltaY = event.pageY - dd.pageY; + // original element position + obj.originalX = ia.offset.left; + obj.originalY = ia.offset.top; + // adjusted element position + obj.offsetX = obj.originalX + obj.deltaX; + obj.offsetY = obj.originalY + obj.deltaY; + // assign the drop targets information + obj.drop = drag.flatten( ( ia.drop || [] ).slice() ); + obj.available = drag.flatten( ( ia.droppable || [] ).slice() ); + return obj; + }, + + // determine is the argument is an element or jquery instance + element: function( arg ){ + if ( arg && ( arg.jquery || arg.nodeType == 1 ) ) + return arg; + }, + + // flatten nested jquery objects and arrays into a single dimension array + flatten: function( arr ){ + return $.map( arr, function( member ){ + return member && member.jquery ? $.makeArray( member ) : + member && member.length ? drag.flatten( member ) : member; + }); + }, + + // toggles text selection attributes ON (true) or OFF (false) + textselect: function( bool ){ + $( document )[ bool ? "unbind" : "bind" ]("selectstart", drag.dontstart ) + .css("MozUserSelect", bool ? "" : "none" ); + // .attr("unselectable", bool ? "off" : "on" ) + document.unselectable = bool ? "off" : "on"; + }, + + // suppress "selectstart" and "ondragstart" events + dontstart: function(){ + return false; + }, + + // a callback instance contructor + callback: function(){} + +}; + +// callback methods +drag.callback.prototype = { + update: function(){ + if ( $special.drop && this.available.length ) + $.each( this.available, function( i ){ + $special.drop.locate( this, i ); + }); + } +}; + +// patch $.event.$dispatch to allow suppressing clicks +var $dispatch = $event.dispatch; +$event.dispatch = function( event ){ + if ( $.data( this, "suppress."+ event.type ) - new Date().getTime() > 0 ){ + $.removeData( this, "suppress."+ event.type ); + return; + } + return $dispatch.apply( this, arguments ); +}; + +// event fix hooks for touch events... +var touchHooks = +$event.fixHooks.touchstart = +$event.fixHooks.touchmove = +$event.fixHooks.touchend = +$event.fixHooks.touchcancel = { + props: "clientX clientY pageX pageY screenX screenY".split( " " ), + filter: function( event, orig ) { + if ( orig ){ + var touched = ( orig.touches && orig.touches[0] ) + || ( orig.changedTouches && orig.changedTouches[0] ) + || null; + // iOS webkit: touchstart, touchmove, touchend + if ( touched ) + $.each( touchHooks.props, function( i, prop ){ + event[ prop ] = touched[ prop ]; + }); + } + return event; + } +}; + +// share the same special event configuration with related events... +$special.draginit = $special.dragstart = $special.dragend = drag; + +})( jQuery ); \ No newline at end of file diff --git a/common/static/js/vendor/jquery.event.drop-2.2.js b/common/static/js/vendor/jquery.event.drop-2.2.js new file mode 100644 index 0000000000..7599ef91e7 --- /dev/null +++ b/common/static/js/vendor/jquery.event.drop-2.2.js @@ -0,0 +1,302 @@ +/*! + * jquery.event.drop - v 2.2 + * Copyright (c) 2010 Three Dub Media - http://threedubmedia.com + * Open Source MIT License - http://threedubmedia.com/code/license + */ +// Created: 2008-06-04 +// Updated: 2012-05-21 +// REQUIRES: jquery 1.7.x, event.drag 2.2 + +;(function($){ // secure $ jQuery alias + +// Events: drop, dropstart, dropend + +// add the jquery instance method +$.fn.drop = function( str, arg, opts ){ + // figure out the event type + var type = typeof str == "string" ? str : "", + // figure out the event handler... + fn = $.isFunction( str ) ? str : $.isFunction( arg ) ? arg : null; + // fix the event type + if ( type.indexOf("drop") !== 0 ) + type = "drop"+ type; + // were options passed + opts = ( str == fn ? arg : opts ) || {}; + // trigger or bind event handler + return fn ? this.bind( type, opts, fn ) : this.trigger( type ); +}; + +// DROP MANAGEMENT UTILITY +// returns filtered drop target elements, caches their positions +$.drop = function( opts ){ + opts = opts || {}; + // safely set new options... + drop.multi = opts.multi === true ? Infinity : + opts.multi === false ? 1 : !isNaN( opts.multi ) ? opts.multi : drop.multi; + drop.delay = opts.delay || drop.delay; + drop.tolerance = $.isFunction( opts.tolerance ) ? opts.tolerance : + opts.tolerance === null ? null : drop.tolerance; + drop.mode = opts.mode || drop.mode || 'intersect'; +}; + +// local refs (increase compression) +var $event = $.event, +$special = $event.special, +// configure the drop special event +drop = $.event.special.drop = { + + // these are the default settings + multi: 1, // allow multiple drop winners per dragged element + delay: 20, // async timeout delay + mode: 'overlap', // drop tolerance mode + + // internal cache + targets: [], + + // the key name for stored drop data + datakey: "dropdata", + + // prevent bubbling for better performance + noBubble: true, + + // count bound related events + add: function( obj ){ + // read the interaction data + var data = $.data( this, drop.datakey ); + // count another realted event + data.related += 1; + }, + + // forget unbound related events + remove: function(){ + $.data( this, drop.datakey ).related -= 1; + }, + + // configure the interactions + setup: function(){ + // check for related events + if ( $.data( this, drop.datakey ) ) + return; + // initialize the drop element data + var data = { + related: 0, + active: [], + anyactive: 0, + winner: 0, + location: {} + }; + // store the drop data on the element + $.data( this, drop.datakey, data ); + // store the drop target in internal cache + drop.targets.push( this ); + }, + + // destroy the configure interaction + teardown: function(){ + var data = $.data( this, drop.datakey ) || {}; + // check for related events + if ( data.related ) + return; + // remove the stored data + $.removeData( this, drop.datakey ); + // reference the targeted element + var element = this; + // remove from the internal cache + drop.targets = $.grep( drop.targets, function( target ){ + return ( target !== element ); + }); + }, + + // shared event handler + handler: function( event, dd ){ + // local vars + var results, $targets; + // make sure the right data is available + if ( !dd ) + return; + // handle various events + switch ( event.type ){ + // draginit, from $.event.special.drag + case 'mousedown': // DROPINIT >> + case 'touchstart': // DROPINIT >> + // collect and assign the drop targets + $targets = $( drop.targets ); + if ( typeof dd.drop == "string" ) + $targets = $targets.filter( dd.drop ); + // reset drop data winner properties + $targets.each(function(){ + var data = $.data( this, drop.datakey ); + data.active = []; + data.anyactive = 0; + data.winner = 0; + }); + // set available target elements + dd.droppable = $targets; + // activate drop targets for the initial element being dragged + $special.drag.hijack( event, "dropinit", dd ); + break; + // drag, from $.event.special.drag + case 'mousemove': // TOLERATE >> + case 'touchmove': // TOLERATE >> + drop.event = event; // store the mousemove event + if ( !drop.timer ) + // monitor drop targets + drop.tolerate( dd ); + break; + // dragend, from $.event.special.drag + case 'mouseup': // DROP >> DROPEND >> + case 'touchend': // DROP >> DROPEND >> + drop.timer = clearTimeout( drop.timer ); // delete timer + if ( dd.propagates ){ + $special.drag.hijack( event, "drop", dd ); + $special.drag.hijack( event, "dropend", dd ); + } + break; + + } + }, + + // returns the location positions of an element + locate: function( elem, index ){ + var data = $.data( elem, drop.datakey ), + $elem = $( elem ), + posi = $elem.offset() || {}, + height = $elem.outerHeight(), + width = $elem.outerWidth(), + location = { + elem: elem, + width: width, + height: height, + top: posi.top, + left: posi.left, + right: posi.left + width, + bottom: posi.top + height + }; + // drag elements might not have dropdata + if ( data ){ + data.location = location; + data.index = index; + data.elem = elem; + } + return location; + }, + + // test the location positions of an element against another OR an X,Y coord + contains: function( target, test ){ // target { location } contains test [x,y] or { location } + return ( ( test[0] || test.left ) >= target.left && ( test[0] || test.right ) <= target.right + && ( test[1] || test.top ) >= target.top && ( test[1] || test.bottom ) <= target.bottom ); + }, + + // stored tolerance modes + modes: { // fn scope: "$.event.special.drop" object + // target with mouse wins, else target with most overlap wins + 'intersect': function( event, proxy, target ){ + return this.contains( target, [ event.pageX, event.pageY ] ) ? // check cursor + 1e9 : this.modes.overlap.apply( this, arguments ); // check overlap + }, + // target with most overlap wins + 'overlap': function( event, proxy, target ){ + // calculate the area of overlap... + return Math.max( 0, Math.min( target.bottom, proxy.bottom ) - Math.max( target.top, proxy.top ) ) + * Math.max( 0, Math.min( target.right, proxy.right ) - Math.max( target.left, proxy.left ) ); + }, + // proxy is completely contained within target bounds + 'fit': function( event, proxy, target ){ + return this.contains( target, proxy ) ? 1 : 0; + }, + // center of the proxy is contained within target bounds + 'middle': function( event, proxy, target ){ + return this.contains( target, [ proxy.left + proxy.width * .5, proxy.top + proxy.height * .5 ] ) ? 1 : 0; + } + }, + + // sort drop target cache by by winner (dsc), then index (asc) + sort: function( a, b ){ + return ( b.winner - a.winner ) || ( a.index - b.index ); + }, + + // async, recursive tolerance execution + tolerate: function( dd ){ + // declare local refs + var i, drp, drg, data, arr, len, elem, + // interaction iteration variables + x = 0, ia, end = dd.interactions.length, + // determine the mouse coords + xy = [ drop.event.pageX, drop.event.pageY ], + // custom or stored tolerance fn + tolerance = drop.tolerance || drop.modes[ drop.mode ]; + // go through each passed interaction... + do if ( ia = dd.interactions[x] ){ + // check valid interaction + if ( !ia ) + return; + // initialize or clear the drop data + ia.drop = []; + // holds the drop elements + arr = []; + len = ia.droppable.length; + // determine the proxy location, if needed + if ( tolerance ) + drg = drop.locate( ia.proxy ); + // reset the loop + i = 0; + // loop each stored drop target + do if ( elem = ia.droppable[i] ){ + data = $.data( elem, drop.datakey ); + drp = data.location; + if ( !drp ) continue; + // find a winner: tolerance function is defined, call it + data.winner = tolerance ? tolerance.call( drop, drop.event, drg, drp ) + // mouse position is always the fallback + : drop.contains( drp, xy ) ? 1 : 0; + arr.push( data ); + } while ( ++i < len ); // loop + // sort the drop targets + arr.sort( drop.sort ); + // reset the loop + i = 0; + // loop through all of the targets again + do if ( data = arr[ i ] ){ + // winners... + if ( data.winner && ia.drop.length < drop.multi ){ + // new winner... dropstart + if ( !data.active[x] && !data.anyactive ){ + // check to make sure that this is not prevented + if ( $special.drag.hijack( drop.event, "dropstart", dd, x, data.elem )[0] !== false ){ + data.active[x] = 1; + data.anyactive += 1; + } + // if false, it is not a winner + else + data.winner = 0; + } + // if it is still a winner + if ( data.winner ) + ia.drop.push( data.elem ); + } + // losers... + else if ( data.active[x] && data.anyactive == 1 ){ + // former winner... dropend + $special.drag.hijack( drop.event, "dropend", dd, x, data.elem ); + data.active[x] = 0; + data.anyactive -= 1; + } + } while ( ++i < len ); // loop + } while ( ++x < end ) // loop + // check if the mouse is still moving or is idle + if ( drop.last && xy[0] == drop.last.pageX && xy[1] == drop.last.pageY ) + delete drop.timer; // idle, don't recurse + else // recurse + drop.timer = setTimeout(function(){ + drop.tolerate( dd ); + }, drop.delay ); + // remember event, to compare idleness + drop.last = drop.event; + } + +}; + +// share the same special event configuration with related events... +$special.dropinit = $special.dropstart = $special.dropend = drop; + +})(jQuery); // confine scope \ No newline at end of file diff --git a/common/static/js/vendor/slick.core.js b/common/static/js/vendor/slick.core.js new file mode 100755 index 0000000000..5c4c69562a --- /dev/null +++ b/common/static/js/vendor/slick.core.js @@ -0,0 +1,458 @@ +/*** + * Contains core SlickGrid classes. + * @module Core + * @namespace Slick + */ + +(function ($) { + // register namespace + $.extend(true, window, { + "Slick": { + "Event": Event, + "EventData": EventData, + "EventHandler": EventHandler, + "Range": Range, + "NonDataRow": NonDataItem, + "Group": Group, + "GroupTotals": GroupTotals, + "EditorLock": EditorLock, + + /*** + * A global singleton editor lock. + * @class GlobalEditorLock + * @static + * @constructor + */ + "GlobalEditorLock": new EditorLock() + } + }); + + /*** + * An event object for passing data to event handlers and letting them control propagation. + * <p>This is pretty much identical to how W3C and jQuery implement events.</p> + * @class EventData + * @constructor + */ + function EventData() { + var isPropagationStopped = false; + var isImmediatePropagationStopped = false; + + /*** + * Stops event from propagating up the DOM tree. + * @method stopPropagation + */ + this.stopPropagation = function () { + isPropagationStopped = true; + }; + + /*** + * Returns whether stopPropagation was called on this event object. + * @method isPropagationStopped + * @return {Boolean} + */ + this.isPropagationStopped = function () { + return isPropagationStopped; + }; + + /*** + * Prevents the rest of the handlers from being executed. + * @method stopImmediatePropagation + */ + this.stopImmediatePropagation = function () { + isImmediatePropagationStopped = true; + }; + + /*** + * Returns whether stopImmediatePropagation was called on this event object.\ + * @method isImmediatePropagationStopped + * @return {Boolean} + */ + this.isImmediatePropagationStopped = function () { + return isImmediatePropagationStopped; + } + } + + /*** + * A simple publisher-subscriber implementation. + * @class Event + * @constructor + */ + function Event() { + var handlers = []; + + /*** + * Adds an event handler to be called when the event is fired. + * <p>Event handler will receive two arguments - an <code>EventData</code> and the <code>data</code> + * object the event was fired with.<p> + * @method subscribe + * @param fn {Function} Event handler. + */ + this.subscribe = function (fn) { + handlers.push(fn); + }; + + /*** + * Removes an event handler added with <code>subscribe(fn)</code>. + * @method unsubscribe + * @param fn {Function} Event handler to be removed. + */ + this.unsubscribe = function (fn) { + for (var i = handlers.length - 1; i >= 0; i--) { + if (handlers[i] === fn) { + handlers.splice(i, 1); + } + } + }; + + /*** + * Fires an event notifying all subscribers. + * @method notify + * @param args {Object} Additional data object to be passed to all handlers. + * @param e {EventData} + * Optional. + * An <code>EventData</code> object to be passed to all handlers. + * For DOM events, an existing W3C/jQuery event object can be passed in. + * @param scope {Object} + * Optional. + * The scope ("this") within which the handler will be executed. + * If not specified, the scope will be set to the <code>Event</code> instance. + */ + this.notify = function (args, e, scope) { + e = e || new EventData(); + scope = scope || this; + + var returnValue; + for (var i = 0; i < handlers.length && !(e.isPropagationStopped() || e.isImmediatePropagationStopped()); i++) { + returnValue = handlers[i].call(scope, e, args); + } + + return returnValue; + }; + } + + function EventHandler() { + var handlers = []; + + this.subscribe = function (event, handler) { + handlers.push({ + event: event, + handler: handler + }); + event.subscribe(handler); + + return this; // allow chaining + }; + + this.unsubscribe = function (event, handler) { + var i = handlers.length; + while (i--) { + if (handlers[i].event === event && + handlers[i].handler === handler) { + handlers.splice(i, 1); + event.unsubscribe(handler); + return; + } + } + + return this; // allow chaining + }; + + this.unsubscribeAll = function () { + var i = handlers.length; + while (i--) { + handlers[i].event.unsubscribe(handlers[i].handler); + } + handlers = []; + + return this; // allow chaining + } + } + + /*** + * A structure containing a range of cells. + * @class Range + * @constructor + * @param fromRow {Integer} Starting row. + * @param fromCell {Integer} Starting cell. + * @param toRow {Integer} Optional. Ending row. Defaults to <code>fromRow</code>. + * @param toCell {Integer} Optional. Ending cell. Defaults to <code>fromCell</code>. + */ + function Range(fromRow, fromCell, toRow, toCell) { + if (toRow === undefined && toCell === undefined) { + toRow = fromRow; + toCell = fromCell; + } + + /*** + * @property fromRow + * @type {Integer} + */ + this.fromRow = Math.min(fromRow, toRow); + + /*** + * @property fromCell + * @type {Integer} + */ + this.fromCell = Math.min(fromCell, toCell); + + /*** + * @property toRow + * @type {Integer} + */ + this.toRow = Math.max(fromRow, toRow); + + /*** + * @property toCell + * @type {Integer} + */ + this.toCell = Math.max(fromCell, toCell); + + /*** + * Returns whether a range represents a single row. + * @method isSingleRow + * @return {Boolean} + */ + this.isSingleRow = function () { + return this.fromRow == this.toRow; + }; + + /*** + * Returns whether a range represents a single cell. + * @method isSingleCell + * @return {Boolean} + */ + this.isSingleCell = function () { + return this.fromRow == this.toRow && this.fromCell == this.toCell; + }; + + /*** + * Returns whether a range contains a given cell. + * @method contains + * @param row {Integer} + * @param cell {Integer} + * @return {Boolean} + */ + this.contains = function (row, cell) { + return row >= this.fromRow && row <= this.toRow && + cell >= this.fromCell && cell <= this.toCell; + }; + + /*** + * Returns a readable representation of a range. + * @method toString + * @return {String} + */ + this.toString = function () { + if (this.isSingleCell()) { + return "(" + this.fromRow + ":" + this.fromCell + ")"; + } + else { + return "(" + this.fromRow + ":" + this.fromCell + " - " + this.toRow + ":" + this.toCell + ")"; + } + } + } + + + /*** + * A base class that all special / non-data rows (like Group and GroupTotals) derive from. + * @class NonDataItem + * @constructor + */ + function NonDataItem() { + this.__nonDataRow = true; + } + + + /*** + * Information about a group of rows. + * @class Group + * @extends Slick.NonDataItem + * @constructor + */ + function Group() { + this.__group = true; + + /** + * Grouping level, starting with 0. + * @property level + * @type {Number} + */ + this.level = 0; + + /*** + * Number of rows in the group. + * @property count + * @type {Integer} + */ + this.count = 0; + + /*** + * Grouping value. + * @property value + * @type {Object} + */ + this.value = null; + + /*** + * Formatted display value of the group. + * @property title + * @type {String} + */ + this.title = null; + + /*** + * Whether a group is collapsed. + * @property collapsed + * @type {Boolean} + */ + this.collapsed = false; + + /*** + * GroupTotals, if any. + * @property totals + * @type {GroupTotals} + */ + this.totals = null; + + /** + * Rows that are part of the group. + * @property rows + * @type {Array} + */ + this.rows = []; + + /** + * Sub-groups that are part of the group. + * @property groups + * @type {Array} + */ + this.groups = null; + + /** + * A unique key used to identify the group. This key can be used in calls to DataView + * collapseGroup() or expandGroup(). + * @property groupingKey + * @type {Object} + */ + this.groupingKey = null; + } + + Group.prototype = new NonDataItem(); + + /*** + * Compares two Group instances. + * @method equals + * @return {Boolean} + * @param group {Group} Group instance to compare to. + */ + Group.prototype.equals = function (group) { + return this.value === group.value && + this.count === group.count && + this.collapsed === group.collapsed; + }; + + /*** + * Information about group totals. + * An instance of GroupTotals will be created for each totals row and passed to the aggregators + * so that they can store arbitrary data in it. That data can later be accessed by group totals + * formatters during the display. + * @class GroupTotals + * @extends Slick.NonDataItem + * @constructor + */ + function GroupTotals() { + this.__groupTotals = true; + + /*** + * Parent Group. + * @param group + * @type {Group} + */ + this.group = null; + } + + GroupTotals.prototype = new NonDataItem(); + + /*** + * A locking helper to track the active edit controller and ensure that only a single controller + * can be active at a time. This prevents a whole class of state and validation synchronization + * issues. An edit controller (such as SlickGrid) can query if an active edit is in progress + * and attempt a commit or cancel before proceeding. + * @class EditorLock + * @constructor + */ + function EditorLock() { + var activeEditController = null; + + /*** + * Returns true if a specified edit controller is active (has the edit lock). + * If the parameter is not specified, returns true if any edit controller is active. + * @method isActive + * @param editController {EditController} + * @return {Boolean} + */ + this.isActive = function (editController) { + return (editController ? activeEditController === editController : activeEditController !== null); + }; + + /*** + * Sets the specified edit controller as the active edit controller (acquire edit lock). + * If another edit controller is already active, and exception will be thrown. + * @method activate + * @param editController {EditController} edit controller acquiring the lock + */ + this.activate = function (editController) { + if (editController === activeEditController) { // already activated? + return; + } + if (activeEditController !== null) { + throw "SlickGrid.EditorLock.activate: an editController is still active, can't activate another editController"; + } + if (!editController.commitCurrentEdit) { + throw "SlickGrid.EditorLock.activate: editController must implement .commitCurrentEdit()"; + } + if (!editController.cancelCurrentEdit) { + throw "SlickGrid.EditorLock.activate: editController must implement .cancelCurrentEdit()"; + } + activeEditController = editController; + }; + + /*** + * Unsets the specified edit controller as the active edit controller (release edit lock). + * If the specified edit controller is not the active one, an exception will be thrown. + * @method deactivate + * @param editController {EditController} edit controller releasing the lock + */ + this.deactivate = function (editController) { + if (activeEditController !== editController) { + throw "SlickGrid.EditorLock.deactivate: specified editController is not the currently active one"; + } + activeEditController = null; + }; + + /*** + * Attempts to commit the current edit by calling "commitCurrentEdit" method on the active edit + * controller and returns whether the commit attempt was successful (commit may fail due to validation + * errors, etc.). Edit controller's "commitCurrentEdit" must return true if the commit has succeeded + * and false otherwise. If no edit controller is active, returns true. + * @method commitCurrentEdit + * @return {Boolean} + */ + this.commitCurrentEdit = function () { + return (activeEditController ? activeEditController.commitCurrentEdit() : true); + }; + + /*** + * Attempts to cancel the current edit by calling "cancelCurrentEdit" method on the active edit + * controller and returns whether the edit was successfully cancelled. If no edit controller is + * active, returns true. + * @method cancelCurrentEdit + * @return {Boolean} + */ + this.cancelCurrentEdit = function cancelCurrentEdit() { + return (activeEditController ? activeEditController.cancelCurrentEdit() : true); + }; + } +})(jQuery); + + diff --git a/common/static/js/vendor/slick.dataview.js b/common/static/js/vendor/slick.dataview.js new file mode 100755 index 0000000000..45439b659f --- /dev/null +++ b/common/static/js/vendor/slick.dataview.js @@ -0,0 +1,1063 @@ +(function ($) { + $.extend(true, window, { + Slick: { + Data: { + DataView: DataView, + Aggregators: { + Avg: AvgAggregator, + Min: MinAggregator, + Max: MaxAggregator, + Sum: SumAggregator + } + } + } + }); + + + /*** + * A sample Model implementation. + * Provides a filtered view of the underlying data. + * + * Relies on the data item having an "id" property uniquely identifying it. + */ + function DataView(options) { + var self = this; + + var defaults = { + groupItemMetadataProvider: null, + inlineFilters: false + }; + + + // private + var idProperty = "id"; // property holding a unique row id + var items = []; // data by index + var rows = []; // data by row + var idxById = {}; // indexes by id + var rowsById = null; // rows by id; lazy-calculated + var filter = null; // filter function + var updated = null; // updated item ids + var suspend = false; // suspends the recalculation + var sortAsc = true; + var fastSortField; + var sortComparer; + var refreshHints = {}; + var prevRefreshHints = {}; + var filterArgs; + var filteredItems = []; + var compiledFilter; + var compiledFilterWithCaching; + var filterCache = []; + + // grouping + var groupingInfoDefaults = { + getter: null, + formatter: null, + comparer: function(a, b) { return a.value - b.value; }, + predefinedValues: [], + aggregators: [], + aggregateEmpty: false, + aggregateCollapsed: false, + aggregateChildGroups: false, + collapsed: false, + displayTotalsRow: true + }; + var groupingInfos = []; + var groups = []; + var toggledGroupsByLevel = []; + var groupingDelimiter = ':|:'; + + var pagesize = 0; + var pagenum = 0; + var totalRows = 0; + + // events + var onRowCountChanged = new Slick.Event(); + var onRowsChanged = new Slick.Event(); + var onPagingInfoChanged = new Slick.Event(); + + options = $.extend(true, {}, defaults, options); + + + function beginUpdate() { + suspend = true; + } + + function endUpdate() { + suspend = false; + refresh(); + } + + function setRefreshHints(hints) { + refreshHints = hints; + } + + function setFilterArgs(args) { + filterArgs = args; + } + + function updateIdxById(startingIndex) { + startingIndex = startingIndex || 0; + var id; + for (var i = startingIndex, l = items.length; i < l; i++) { + id = items[i][idProperty]; + if (id === undefined) { + throw "Each data element must implement a unique 'id' property"; + } + idxById[id] = i; + } + } + + function ensureIdUniqueness() { + var id; + for (var i = 0, l = items.length; i < l; i++) { + id = items[i][idProperty]; + if (id === undefined || idxById[id] !== i) { + throw "Each data element must implement a unique 'id' property"; + } + } + } + + function getItems() { + return items; + } + + function setItems(data, objectIdProperty) { + if (objectIdProperty !== undefined) { + idProperty = objectIdProperty; + } + items = filteredItems = data; + idxById = {}; + updateIdxById(); + ensureIdUniqueness(); + refresh(); + } + + function setPagingOptions(args) { + if (args.pageSize != undefined) { + pagesize = args.pageSize; + pagenum = pagesize ? Math.min(pagenum, Math.max(0, Math.ceil(totalRows / pagesize) - 1)) : 0; + } + + if (args.pageNum != undefined) { + pagenum = Math.min(args.pageNum, Math.max(0, Math.ceil(totalRows / pagesize) - 1)); + } + + onPagingInfoChanged.notify(getPagingInfo(), null, self); + + refresh(); + } + + function getPagingInfo() { + var totalPages = pagesize ? Math.max(1, Math.ceil(totalRows / pagesize)) : 1; + return {pageSize: pagesize, pageNum: pagenum, totalRows: totalRows, totalPages: totalPages}; + } + + function sort(comparer, ascending) { + sortAsc = ascending; + sortComparer = comparer; + fastSortField = null; + if (ascending === false) { + items.reverse(); + } + items.sort(comparer); + if (ascending === false) { + items.reverse(); + } + idxById = {}; + updateIdxById(); + refresh(); + } + + /*** + * Provides a workaround for the extremely slow sorting in IE. + * Does a [lexicographic] sort on a give column by temporarily overriding Object.prototype.toString + * to return the value of that field and then doing a native Array.sort(). + */ + function fastSort(field, ascending) { + sortAsc = ascending; + fastSortField = field; + sortComparer = null; + var oldToString = Object.prototype.toString; + Object.prototype.toString = (typeof field == "function") ? field : function () { + return this[field] + }; + // an extra reversal for descending sort keeps the sort stable + // (assuming a stable native sort implementation, which isn't true in some cases) + if (ascending === false) { + items.reverse(); + } + items.sort(); + Object.prototype.toString = oldToString; + if (ascending === false) { + items.reverse(); + } + idxById = {}; + updateIdxById(); + refresh(); + } + + function reSort() { + if (sortComparer) { + sort(sortComparer, sortAsc); + } else if (fastSortField) { + fastSort(fastSortField, sortAsc); + } + } + + function setFilter(filterFn) { + filter = filterFn; + if (options.inlineFilters) { + compiledFilter = compileFilter(); + compiledFilterWithCaching = compileFilterWithCaching(); + } + refresh(); + } + + function getGrouping() { + return groupingInfos; + } + + function setGrouping(groupingInfo) { + if (!options.groupItemMetadataProvider) { + options.groupItemMetadataProvider = new Slick.Data.GroupItemMetadataProvider(); + } + + groups = []; + toggledGroupsByLevel = []; + groupingInfo = groupingInfo || []; + groupingInfos = (groupingInfo instanceof Array) ? groupingInfo : [groupingInfo]; + + for (var i = 0; i < groupingInfos.length; i++) { + var gi = groupingInfos[i] = $.extend(true, {}, groupingInfoDefaults, groupingInfos[i]); + gi.getterIsAFn = typeof gi.getter === "function"; + + // pre-compile accumulator loops + gi.compiledAccumulators = []; + var idx = gi.aggregators.length; + while (idx--) { + gi.compiledAccumulators[idx] = compileAccumulatorLoop(gi.aggregators[idx]); + } + + toggledGroupsByLevel[i] = {}; + } + + refresh(); + } + + /** + * @deprecated Please use {@link setGrouping}. + */ + function groupBy(valueGetter, valueFormatter, sortComparer) { + if (valueGetter == null) { + setGrouping([]); + return; + } + + setGrouping({ + getter: valueGetter, + formatter: valueFormatter, + comparer: sortComparer + }); + } + + /** + * @deprecated Please use {@link setGrouping}. + */ + function setAggregators(groupAggregators, includeCollapsed) { + if (!groupingInfos.length) { + throw new Error("At least one grouping must be specified before calling setAggregators()."); + } + + groupingInfos[0].aggregators = groupAggregators; + groupingInfos[0].aggregateCollapsed = includeCollapsed; + + setGrouping(groupingInfos); + } + + function getItemByIdx(i) { + return items[i]; + } + + function getIdxById(id) { + return idxById[id]; + } + + function ensureRowsByIdCache() { + if (!rowsById) { + rowsById = {}; + for (var i = 0, l = rows.length; i < l; i++) { + rowsById[rows[i][idProperty]] = i; + } + } + } + + function getRowById(id) { + ensureRowsByIdCache(); + return rowsById[id]; + } + + function getItemById(id) { + return items[idxById[id]]; + } + + function mapIdsToRows(idArray) { + var rows = []; + ensureRowsByIdCache(); + for (var i = 0; i < idArray.length; i++) { + var row = rowsById[idArray[i]]; + if (row != null) { + rows[rows.length] = row; + } + } + return rows; + } + + function mapRowsToIds(rowArray) { + var ids = []; + for (var i = 0; i < rowArray.length; i++) { + if (rowArray[i] < rows.length) { + ids[ids.length] = rows[rowArray[i]][idProperty]; + } + } + return ids; + } + + function updateItem(id, item) { + if (idxById[id] === undefined || id !== item[idProperty]) { + throw "Invalid or non-matching id"; + } + items[idxById[id]] = item; + if (!updated) { + updated = {}; + } + updated[id] = true; + refresh(); + } + + function insertItem(insertBefore, item) { + items.splice(insertBefore, 0, item); + updateIdxById(insertBefore); + refresh(); + } + + function addItem(item) { + items.push(item); + updateIdxById(items.length - 1); + refresh(); + } + + function deleteItem(id) { + var idx = idxById[id]; + if (idx === undefined) { + throw "Invalid id"; + } + delete idxById[id]; + items.splice(idx, 1); + updateIdxById(idx); + refresh(); + } + + function getLength() { + return rows.length; + } + + function getItem(i) { + return rows[i]; + } + + function getItemMetadata(i) { + var item = rows[i]; + if (item === undefined) { + return null; + } + + // overrides for grouping rows + if (item.__group) { + return options.groupItemMetadataProvider.getGroupRowMetadata(item); + } + + // overrides for totals rows + if (item.__groupTotals) { + return options.groupItemMetadataProvider.getTotalsRowMetadata(item); + } + + return null; + } + + function expandCollapseAllGroups(level, collapse) { + if (level == null) { + for (var i = 0; i < groupingInfos.length; i++) { + toggledGroupsByLevel[i] = {}; + groupingInfos[i].collapsed = collapse; + } + } else { + toggledGroupsByLevel[level] = {}; + groupingInfos[level].collapsed = collapse; + } + refresh(); + } + + /** + * @param level {Number} Optional level to collapse. If not specified, applies to all levels. + */ + function collapseAllGroups(level) { + expandCollapseAllGroups(level, true); + } + + /** + * @param level {Number} Optional level to expand. If not specified, applies to all levels. + */ + function expandAllGroups(level) { + expandCollapseAllGroups(level, false); + } + + function expandCollapseGroup(level, groupingKey, collapse) { + toggledGroupsByLevel[level][groupingKey] = groupingInfos[level].collapsed ^ collapse; + refresh(); + } + + /** + * @param varArgs Either a Slick.Group's "groupingKey" property, or a + * variable argument list of grouping values denoting a unique path to the row. For + * example, calling collapseGroup('high', '10%') will collapse the '10%' subgroup of + * the 'high' setGrouping. + */ + function collapseGroup(varArgs) { + var args = Array.prototype.slice.call(arguments); + var arg0 = args[0]; + if (args.length == 1 && arg0.indexOf(groupingDelimiter) != -1) { + expandCollapseGroup(arg0.split(groupingDelimiter).length - 1, arg0, true); + } else { + expandCollapseGroup(args.length - 1, args.join(groupingDelimiter), true); + } + } + + /** + * @param varArgs Either a Slick.Group's "groupingKey" property, or a + * variable argument list of grouping values denoting a unique path to the row. For + * example, calling expandGroup('high', '10%') will expand the '10%' subgroup of + * the 'high' setGrouping. + */ + function expandGroup(varArgs) { + var args = Array.prototype.slice.call(arguments); + var arg0 = args[0]; + if (args.length == 1 && arg0.indexOf(groupingDelimiter) != -1) { + expandCollapseGroup(arg0.split(groupingDelimiter).length - 1, arg0, false); + } else { + expandCollapseGroup(args.length - 1, args.join(groupingDelimiter), false); + } + } + + function getGroups() { + return groups; + } + + function extractGroups(rows, parentGroup) { + var group; + var val; + var groups = []; + var groupsByVal = []; + var r; + var level = parentGroup ? parentGroup.level + 1 : 0; + var gi = groupingInfos[level]; + + for (var i = 0, l = gi.predefinedValues.length; i < l; i++) { + val = gi.predefinedValues[i]; + group = groupsByVal[val]; + if (!group) { + group = new Slick.Group(); + group.value = val; + group.level = level; + group.groupingKey = (parentGroup ? parentGroup.groupingKey + groupingDelimiter : '') + val; + groups[groups.length] = group; + groupsByVal[val] = group; + } + } + + for (var i = 0, l = rows.length; i < l; i++) { + r = rows[i]; + val = gi.getterIsAFn ? gi.getter(r) : r[gi.getter]; + group = groupsByVal[val]; + if (!group) { + group = new Slick.Group(); + group.value = val; + group.level = level; + group.groupingKey = (parentGroup ? parentGroup.groupingKey + groupingDelimiter : '') + val; + groups[groups.length] = group; + groupsByVal[val] = group; + } + + group.rows[group.count++] = r; + } + + if (level < groupingInfos.length - 1) { + for (var i = 0; i < groups.length; i++) { + group = groups[i]; + group.groups = extractGroups(group.rows, group); + } + } + + groups.sort(groupingInfos[level].comparer); + + return groups; + } + + // TODO: lazy totals calculation + function calculateGroupTotals(group) { + // TODO: try moving iterating over groups into compiled accumulator + var gi = groupingInfos[group.level]; + var isLeafLevel = (group.level == groupingInfos.length); + var totals = new Slick.GroupTotals(); + var agg, idx = gi.aggregators.length; + while (idx--) { + agg = gi.aggregators[idx]; + agg.init(); + gi.compiledAccumulators[idx].call(agg, + (!isLeafLevel && gi.aggregateChildGroups) ? group.groups : group.rows); + agg.storeResult(totals); + } + totals.group = group; + group.totals = totals; + } + + function calculateTotals(groups, level) { + level = level || 0; + var gi = groupingInfos[level]; + var idx = groups.length, g; + while (idx--) { + g = groups[idx]; + + if (g.collapsed && !gi.aggregateCollapsed) { + continue; + } + + // Do a depth-first aggregation so that parent setGrouping aggregators can access subgroup totals. + if (g.groups) { + calculateTotals(g.groups, level + 1); + } + + if (gi.aggregators.length && ( + gi.aggregateEmpty || g.rows.length || (g.groups && g.groups.length))) { + calculateGroupTotals(g); + } + } + } + + function finalizeGroups(groups, level) { + level = level || 0; + var gi = groupingInfos[level]; + var groupCollapsed = gi.collapsed; + var toggledGroups = toggledGroupsByLevel[level]; + var idx = groups.length, g; + while (idx--) { + g = groups[idx]; + g.collapsed = groupCollapsed ^ toggledGroups[g.groupingKey]; + g.title = gi.formatter ? gi.formatter(g) : g.value; + + if (g.groups) { + finalizeGroups(g.groups, level + 1); + // Let the non-leaf setGrouping rows get garbage-collected. + // They may have been used by aggregates that go over all of the descendants, + // but at this point they are no longer needed. + g.rows = []; + } + } + } + + function flattenGroupedRows(groups, level) { + level = level || 0; + var gi = groupingInfos[level]; + var groupedRows = [], rows, gl = 0, g; + for (var i = 0, l = groups.length; i < l; i++) { + g = groups[i]; + groupedRows[gl++] = g; + + if (!g.collapsed) { + rows = g.groups ? flattenGroupedRows(g.groups, level + 1) : g.rows; + for (var j = 0, jj = rows.length; j < jj; j++) { + groupedRows[gl++] = rows[j]; + } + } + + if (g.totals && gi.displayTotalsRow && (!g.collapsed || gi.aggregateCollapsed)) { + groupedRows[gl++] = g.totals; + } + } + return groupedRows; + } + + function getFunctionInfo(fn) { + var fnRegex = /^function[^(]*\(([^)]*)\)\s*{([\s\S]*)}$/; + var matches = fn.toString().match(fnRegex); + return { + params: matches[1].split(","), + body: matches[2] + }; + } + + function compileAccumulatorLoop(aggregator) { + var accumulatorInfo = getFunctionInfo(aggregator.accumulate); + var fn = new Function( + "_items", + "for (var " + accumulatorInfo.params[0] + ", _i=0, _il=_items.length; _i<_il; _i++) {" + + accumulatorInfo.params[0] + " = _items[_i]; " + + accumulatorInfo.body + + "}" + ); + fn.displayName = fn.name = "compiledAccumulatorLoop"; + return fn; + } + + function compileFilter() { + var filterInfo = getFunctionInfo(filter); + + var filterBody = filterInfo.body + .replace(/return false[;}]/gi, "{ continue _coreloop; }") + .replace(/return true[;}]/gi, "{ _retval[_idx++] = $item$; continue _coreloop; }") + .replace(/return ([^;}]+?);/gi, + "{ if ($1) { _retval[_idx++] = $item$; }; continue _coreloop; }"); + + // This preserves the function template code after JS compression, + // so that replace() commands still work as expected. + var tpl = [ + //"function(_items, _args) { ", + "var _retval = [], _idx = 0; ", + "var $item$, $args$ = _args; ", + "_coreloop: ", + "for (var _i = 0, _il = _items.length; _i < _il; _i++) { ", + "$item$ = _items[_i]; ", + "$filter$; ", + "} ", + "return _retval; " + //"}" + ].join(""); + tpl = tpl.replace(/\$filter\$/gi, filterBody); + tpl = tpl.replace(/\$item\$/gi, filterInfo.params[0]); + tpl = tpl.replace(/\$args\$/gi, filterInfo.params[1]); + + var fn = new Function("_items,_args", tpl); + fn.displayName = fn.name = "compiledFilter"; + return fn; + } + + function compileFilterWithCaching() { + var filterInfo = getFunctionInfo(filter); + + var filterBody = filterInfo.body + .replace(/return false[;}]/gi, "{ continue _coreloop; }") + .replace(/return true[;}]/gi, "{ _cache[_i] = true;_retval[_idx++] = $item$; continue _coreloop; }") + .replace(/return ([^;}]+?);/gi, + "{ if ((_cache[_i] = $1)) { _retval[_idx++] = $item$; }; continue _coreloop; }"); + + // This preserves the function template code after JS compression, + // so that replace() commands still work as expected. + var tpl = [ + //"function(_items, _args, _cache) { ", + "var _retval = [], _idx = 0; ", + "var $item$, $args$ = _args; ", + "_coreloop: ", + "for (var _i = 0, _il = _items.length; _i < _il; _i++) { ", + "$item$ = _items[_i]; ", + "if (_cache[_i]) { ", + "_retval[_idx++] = $item$; ", + "continue _coreloop; ", + "} ", + "$filter$; ", + "} ", + "return _retval; " + //"}" + ].join(""); + tpl = tpl.replace(/\$filter\$/gi, filterBody); + tpl = tpl.replace(/\$item\$/gi, filterInfo.params[0]); + tpl = tpl.replace(/\$args\$/gi, filterInfo.params[1]); + + var fn = new Function("_items,_args,_cache", tpl); + fn.displayName = fn.name = "compiledFilterWithCaching"; + return fn; + } + + function uncompiledFilter(items, args) { + var retval = [], idx = 0; + + for (var i = 0, ii = items.length; i < ii; i++) { + if (filter(items[i], args)) { + retval[idx++] = items[i]; + } + } + + return retval; + } + + function uncompiledFilterWithCaching(items, args, cache) { + var retval = [], idx = 0, item; + + for (var i = 0, ii = items.length; i < ii; i++) { + item = items[i]; + if (cache[i]) { + retval[idx++] = item; + } else if (filter(item, args)) { + retval[idx++] = item; + cache[i] = true; + } + } + + return retval; + } + + function getFilteredAndPagedItems(items) { + if (filter) { + var batchFilter = options.inlineFilters ? compiledFilter : uncompiledFilter; + var batchFilterWithCaching = options.inlineFilters ? compiledFilterWithCaching : uncompiledFilterWithCaching; + + if (refreshHints.isFilterNarrowing) { + filteredItems = batchFilter(filteredItems, filterArgs); + } else if (refreshHints.isFilterExpanding) { + filteredItems = batchFilterWithCaching(items, filterArgs, filterCache); + } else if (!refreshHints.isFilterUnchanged) { + filteredItems = batchFilter(items, filterArgs); + } + } else { + // special case: if not filtering and not paging, the resulting + // rows collection needs to be a copy so that changes due to sort + // can be caught + filteredItems = pagesize ? items : items.concat(); + } + + // get the current page + var paged; + if (pagesize) { + if (filteredItems.length < pagenum * pagesize) { + pagenum = Math.floor(filteredItems.length / pagesize); + } + paged = filteredItems.slice(pagesize * pagenum, pagesize * pagenum + pagesize); + } else { + paged = filteredItems; + } + + return {totalRows: filteredItems.length, rows: paged}; + } + + function getRowDiffs(rows, newRows) { + var item, r, eitherIsNonData, diff = []; + var from = 0, to = newRows.length; + + if (refreshHints && refreshHints.ignoreDiffsBefore) { + from = Math.max(0, + Math.min(newRows.length, refreshHints.ignoreDiffsBefore)); + } + + if (refreshHints && refreshHints.ignoreDiffsAfter) { + to = Math.min(newRows.length, + Math.max(0, refreshHints.ignoreDiffsAfter)); + } + + for (var i = from, rl = rows.length; i < to; i++) { + if (i >= rl) { + diff[diff.length] = i; + } else { + item = newRows[i]; + r = rows[i]; + + if ((groupingInfos.length && (eitherIsNonData = (item.__nonDataRow) || (r.__nonDataRow)) && + item.__group !== r.__group || + item.__group && !item.equals(r)) + || (eitherIsNonData && + // no good way to compare totals since they are arbitrary DTOs + // deep object comparison is pretty expensive + // always considering them 'dirty' seems easier for the time being + (item.__groupTotals || r.__groupTotals)) + || item[idProperty] != r[idProperty] + || (updated && updated[item[idProperty]]) + ) { + diff[diff.length] = i; + } + } + } + return diff; + } + + function recalc(_items) { + rowsById = null; + + if (refreshHints.isFilterNarrowing != prevRefreshHints.isFilterNarrowing || + refreshHints.isFilterExpanding != prevRefreshHints.isFilterExpanding) { + filterCache = []; + } + + var filteredItems = getFilteredAndPagedItems(_items); + totalRows = filteredItems.totalRows; + var newRows = filteredItems.rows; + + groups = []; + if (groupingInfos.length) { + groups = extractGroups(newRows); + if (groups.length) { + calculateTotals(groups); + finalizeGroups(groups); + newRows = flattenGroupedRows(groups); + } + } + + var diff = getRowDiffs(rows, newRows); + + rows = newRows; + + return diff; + } + + function refresh() { + if (suspend) { + return; + } + + var countBefore = rows.length; + var totalRowsBefore = totalRows; + + var diff = recalc(items, filter); // pass as direct refs to avoid closure perf hit + + // if the current page is no longer valid, go to last page and recalc + // we suffer a performance penalty here, but the main loop (recalc) remains highly optimized + if (pagesize && totalRows < pagenum * pagesize) { + pagenum = Math.max(0, Math.ceil(totalRows / pagesize) - 1); + diff = recalc(items, filter); + } + + updated = null; + prevRefreshHints = refreshHints; + refreshHints = {}; + + if (totalRowsBefore != totalRows) { + onPagingInfoChanged.notify(getPagingInfo(), null, self); + } + if (countBefore != rows.length) { + onRowCountChanged.notify({previous: countBefore, current: rows.length}, null, self); + } + if (diff.length > 0) { + onRowsChanged.notify({rows: diff}, null, self); + } + } + + function syncGridSelection(grid, preserveHidden) { + var self = this; + var selectedRowIds = self.mapRowsToIds(grid.getSelectedRows());; + var inHandler; + + function update() { + if (selectedRowIds.length > 0) { + inHandler = true; + var selectedRows = self.mapIdsToRows(selectedRowIds); + if (!preserveHidden) { + selectedRowIds = self.mapRowsToIds(selectedRows); + } + grid.setSelectedRows(selectedRows); + inHandler = false; + } + } + + grid.onSelectedRowsChanged.subscribe(function(e, args) { + if (inHandler) { return; } + selectedRowIds = self.mapRowsToIds(grid.getSelectedRows()); + }); + + this.onRowsChanged.subscribe(update); + + this.onRowCountChanged.subscribe(update); + } + + function syncGridCellCssStyles(grid, key) { + var hashById; + var inHandler; + + // since this method can be called after the cell styles have been set, + // get the existing ones right away + storeCellCssStyles(grid.getCellCssStyles(key)); + + function storeCellCssStyles(hash) { + hashById = {}; + for (var row in hash) { + var id = rows[row][idProperty]; + hashById[id] = hash[row]; + } + } + + function update() { + if (hashById) { + inHandler = true; + ensureRowsByIdCache(); + var newHash = {}; + for (var id in hashById) { + var row = rowsById[id]; + if (row != undefined) { + newHash[row] = hashById[id]; + } + } + grid.setCellCssStyles(key, newHash); + inHandler = false; + } + } + + grid.onCellCssStylesChanged.subscribe(function(e, args) { + if (inHandler) { return; } + if (key != args.key) { return; } + if (args.hash) { + storeCellCssStyles(args.hash); + } + }); + + this.onRowsChanged.subscribe(update); + + this.onRowCountChanged.subscribe(update); + } + + $.extend(this, { + // methods + "beginUpdate": beginUpdate, + "endUpdate": endUpdate, + "setPagingOptions": setPagingOptions, + "getPagingInfo": getPagingInfo, + "getItems": getItems, + "setItems": setItems, + "setFilter": setFilter, + "sort": sort, + "fastSort": fastSort, + "reSort": reSort, + "setGrouping": setGrouping, + "getGrouping": getGrouping, + "groupBy": groupBy, + "setAggregators": setAggregators, + "collapseAllGroups": collapseAllGroups, + "expandAllGroups": expandAllGroups, + "collapseGroup": collapseGroup, + "expandGroup": expandGroup, + "getGroups": getGroups, + "getIdxById": getIdxById, + "getRowById": getRowById, + "getItemById": getItemById, + "getItemByIdx": getItemByIdx, + "mapRowsToIds": mapRowsToIds, + "mapIdsToRows": mapIdsToRows, + "setRefreshHints": setRefreshHints, + "setFilterArgs": setFilterArgs, + "refresh": refresh, + "updateItem": updateItem, + "insertItem": insertItem, + "addItem": addItem, + "deleteItem": deleteItem, + "syncGridSelection": syncGridSelection, + "syncGridCellCssStyles": syncGridCellCssStyles, + + // data provider methods + "getLength": getLength, + "getItem": getItem, + "getItemMetadata": getItemMetadata, + + // events + "onRowCountChanged": onRowCountChanged, + "onRowsChanged": onRowsChanged, + "onPagingInfoChanged": onPagingInfoChanged + }); + } + + function AvgAggregator(field) { + this.field_ = field; + + this.init = function () { + this.count_ = 0; + this.nonNullCount_ = 0; + this.sum_ = 0; + }; + + this.accumulate = function (item) { + var val = item[this.field_]; + this.count_++; + if (val != null && val !== "" && val !== NaN) { + this.nonNullCount_++; + this.sum_ += parseFloat(val); + } + }; + + this.storeResult = function (groupTotals) { + if (!groupTotals.avg) { + groupTotals.avg = {}; + } + if (this.nonNullCount_ != 0) { + groupTotals.avg[this.field_] = this.sum_ / this.nonNullCount_; + } + }; + } + + function MinAggregator(field) { + this.field_ = field; + + this.init = function () { + this.min_ = null; + }; + + this.accumulate = function (item) { + var val = item[this.field_]; + if (val != null && val !== "" && val !== NaN) { + if (this.min_ == null || val < this.min_) { + this.min_ = val; + } + } + }; + + this.storeResult = function (groupTotals) { + if (!groupTotals.min) { + groupTotals.min = {}; + } + groupTotals.min[this.field_] = this.min_; + } + } + + function MaxAggregator(field) { + this.field_ = field; + + this.init = function () { + this.max_ = null; + }; + + this.accumulate = function (item) { + var val = item[this.field_]; + if (val != null && val !== "" && val !== NaN) { + if (this.max_ == null || val > this.max_) { + this.max_ = val; + } + } + }; + + this.storeResult = function (groupTotals) { + if (!groupTotals.max) { + groupTotals.max = {}; + } + groupTotals.max[this.field_] = this.max_; + } + } + + function SumAggregator(field) { + this.field_ = field; + + this.init = function () { + this.sum_ = null; + }; + + this.accumulate = function (item) { + var val = item[this.field_]; + if (val != null && val !== "" && val !== NaN) { + this.sum_ += parseFloat(val); + } + }; + + this.storeResult = function (groupTotals) { + if (!groupTotals.sum) { + groupTotals.sum = {}; + } + groupTotals.sum[this.field_] = this.sum_; + } + } + + // TODO: add more built-in aggregators + // TODO: merge common aggregators in one to prevent needles iterating + +})(jQuery); diff --git a/common/static/js/vendor/slick.editors.js b/common/static/js/vendor/slick.editors.js new file mode 100755 index 0000000000..f3ef8e9d28 --- /dev/null +++ b/common/static/js/vendor/slick.editors.js @@ -0,0 +1,512 @@ +/*** + * Contains basic SlickGrid editors. + * @module Editors + * @namespace Slick + */ + +(function ($) { + // register namespace + $.extend(true, window, { + "Slick": { + "Editors": { + "Text": TextEditor, + "Integer": IntegerEditor, + "Date": DateEditor, + "YesNoSelect": YesNoSelectEditor, + "Checkbox": CheckboxEditor, + "PercentComplete": PercentCompleteEditor, + "LongText": LongTextEditor + } + } + }); + + function TextEditor(args) { + var $input; + var defaultValue; + var scope = this; + + this.init = function () { + $input = $("<INPUT type=text class='editor-text' />") + .appendTo(args.container) + .bind("keydown.nav", function (e) { + if (e.keyCode === $.ui.keyCode.LEFT || e.keyCode === $.ui.keyCode.RIGHT) { + e.stopImmediatePropagation(); + } + }) + .focus() + .select(); + }; + + this.destroy = function () { + $input.remove(); + }; + + this.focus = function () { + $input.focus(); + }; + + this.getValue = function () { + return $input.val(); + }; + + this.setValue = function (val) { + $input.val(val); + }; + + this.loadValue = function (item) { + defaultValue = item[args.column.field] || ""; + $input.val(defaultValue); + $input[0].defaultValue = defaultValue; + $input.select(); + }; + + this.serializeValue = function () { + return $input.val(); + }; + + this.applyValue = function (item, state) { + item[args.column.field] = state; + }; + + this.isValueChanged = function () { + return (!($input.val() == "" && defaultValue == null)) && ($input.val() != defaultValue); + }; + + this.validate = function () { + if (args.column.validator) { + var validationResults = args.column.validator($input.val()); + if (!validationResults.valid) { + return validationResults; + } + } + + return { + valid: true, + msg: null + }; + }; + + this.init(); + } + + function IntegerEditor(args) { + var $input; + var defaultValue; + var scope = this; + + this.init = function () { + $input = $("<INPUT type=text class='editor-text' />"); + + $input.bind("keydown.nav", function (e) { + if (e.keyCode === $.ui.keyCode.LEFT || e.keyCode === $.ui.keyCode.RIGHT) { + e.stopImmediatePropagation(); + } + }); + + $input.appendTo(args.container); + $input.focus().select(); + }; + + this.destroy = function () { + $input.remove(); + }; + + this.focus = function () { + $input.focus(); + }; + + this.loadValue = function (item) { + defaultValue = item[args.column.field]; + $input.val(defaultValue); + $input[0].defaultValue = defaultValue; + $input.select(); + }; + + this.serializeValue = function () { + return parseInt($input.val(), 10) || 0; + }; + + this.applyValue = function (item, state) { + item[args.column.field] = state; + }; + + this.isValueChanged = function () { + return (!($input.val() == "" && defaultValue == null)) && ($input.val() != defaultValue); + }; + + this.validate = function () { + if (isNaN($input.val())) { + return { + valid: false, + msg: "Please enter a valid integer" + }; + } + + return { + valid: true, + msg: null + }; + }; + + this.init(); + } + + function DateEditor(args) { + var $input; + var defaultValue; + var scope = this; + var calendarOpen = false; + + this.init = function () { + $input = $("<INPUT type=text class='editor-text' />"); + $input.appendTo(args.container); + $input.focus().select(); + $input.datepicker({ + showOn: "button", + buttonImageOnly: true, + buttonImage: "../images/calendar.gif", + beforeShow: function () { + calendarOpen = true + }, + onClose: function () { + calendarOpen = false + } + }); + $input.width($input.width() - 18); + }; + + this.destroy = function () { + $.datepicker.dpDiv.stop(true, true); + $input.datepicker("hide"); + $input.datepicker("destroy"); + $input.remove(); + }; + + this.show = function () { + if (calendarOpen) { + $.datepicker.dpDiv.stop(true, true).show(); + } + }; + + this.hide = function () { + if (calendarOpen) { + $.datepicker.dpDiv.stop(true, true).hide(); + } + }; + + this.position = function (position) { + if (!calendarOpen) { + return; + } + $.datepicker.dpDiv + .css("top", position.top + 30) + .css("left", position.left); + }; + + this.focus = function () { + $input.focus(); + }; + + this.loadValue = function (item) { + defaultValue = item[args.column.field]; + $input.val(defaultValue); + $input[0].defaultValue = defaultValue; + $input.select(); + }; + + this.serializeValue = function () { + return $input.val(); + }; + + this.applyValue = function (item, state) { + item[args.column.field] = state; + }; + + this.isValueChanged = function () { + return (!($input.val() == "" && defaultValue == null)) && ($input.val() != defaultValue); + }; + + this.validate = function () { + return { + valid: true, + msg: null + }; + }; + + this.init(); + } + + function YesNoSelectEditor(args) { + var $select; + var defaultValue; + var scope = this; + + this.init = function () { + $select = $("<SELECT tabIndex='0' class='editor-yesno'><OPTION value='yes'>Yes</OPTION><OPTION value='no'>No</OPTION></SELECT>"); + $select.appendTo(args.container); + $select.focus(); + }; + + this.destroy = function () { + $select.remove(); + }; + + this.focus = function () { + $select.focus(); + }; + + this.loadValue = function (item) { + $select.val((defaultValue = item[args.column.field]) ? "yes" : "no"); + $select.select(); + }; + + this.serializeValue = function () { + return ($select.val() == "yes"); + }; + + this.applyValue = function (item, state) { + item[args.column.field] = state; + }; + + this.isValueChanged = function () { + return ($select.val() != defaultValue); + }; + + this.validate = function () { + return { + valid: true, + msg: null + }; + }; + + this.init(); + } + + function CheckboxEditor(args) { + var $select; + var defaultValue; + var scope = this; + + this.init = function () { + $select = $("<INPUT type=checkbox value='true' class='editor-checkbox' hideFocus>"); + $select.appendTo(args.container); + $select.focus(); + }; + + this.destroy = function () { + $select.remove(); + }; + + this.focus = function () { + $select.focus(); + }; + + this.loadValue = function (item) { + defaultValue = !!item[args.column.field]; + if (defaultValue) { + $select.attr("checked", "checked"); + } else { + $select.removeAttr("checked"); + } + }; + + this.serializeValue = function () { + return !!$select.attr("checked"); + }; + + this.applyValue = function (item, state) { + item[args.column.field] = state; + }; + + this.isValueChanged = function () { + return (this.serializeValue() !== defaultValue); + }; + + this.validate = function () { + return { + valid: true, + msg: null + }; + }; + + this.init(); + } + + function PercentCompleteEditor(args) { + var $input, $picker; + var defaultValue; + var scope = this; + + this.init = function () { + $input = $("<INPUT type=text class='editor-percentcomplete' />"); + $input.width($(args.container).innerWidth() - 25); + $input.appendTo(args.container); + + $picker = $("<div class='editor-percentcomplete-picker' />").appendTo(args.container); + $picker.append("<div class='editor-percentcomplete-helper'><div class='editor-percentcomplete-wrapper'><div class='editor-percentcomplete-slider' /><div class='editor-percentcomplete-buttons' /></div></div>"); + + $picker.find(".editor-percentcomplete-buttons").append("<button val=0>Not started</button><br/><button val=50>In Progress</button><br/><button val=100>Complete</button>"); + + $input.focus().select(); + + $picker.find(".editor-percentcomplete-slider").slider({ + orientation: "vertical", + range: "min", + value: defaultValue, + slide: function (event, ui) { + $input.val(ui.value) + } + }); + + $picker.find(".editor-percentcomplete-buttons button").bind("click", function (e) { + $input.val($(this).attr("val")); + $picker.find(".editor-percentcomplete-slider").slider("value", $(this).attr("val")); + }) + }; + + this.destroy = function () { + $input.remove(); + $picker.remove(); + }; + + this.focus = function () { + $input.focus(); + }; + + this.loadValue = function (item) { + $input.val(defaultValue = item[args.column.field]); + $input.select(); + }; + + this.serializeValue = function () { + return parseInt($input.val(), 10) || 0; + }; + + this.applyValue = function (item, state) { + item[args.column.field] = state; + }; + + this.isValueChanged = function () { + return (!($input.val() == "" && defaultValue == null)) && ((parseInt($input.val(), 10) || 0) != defaultValue); + }; + + this.validate = function () { + if (isNaN(parseInt($input.val(), 10))) { + return { + valid: false, + msg: "Please enter a valid positive number" + }; + } + + return { + valid: true, + msg: null + }; + }; + + this.init(); + } + + /* + * An example of a "detached" editor. + * The UI is added onto document BODY and .position(), .show() and .hide() are implemented. + * KeyDown events are also handled to provide handling for Tab, Shift-Tab, Esc and Ctrl-Enter. + */ + function LongTextEditor(args) { + var $input, $wrapper; + var defaultValue; + var scope = this; + + this.init = function () { + var $container = $("body"); + + $wrapper = $("<DIV style='z-index:10000;position:absolute;background:white;padding:5px;border:3px solid gray; -moz-border-radius:10px; border-radius:10px;'/>") + .appendTo($container); + + $input = $("<TEXTAREA hidefocus rows=5 style='backround:white;width:250px;height:80px;border:0;outline:0'>") + .appendTo($wrapper); + + $("<DIV style='text-align:right'><BUTTON>Save</BUTTON><BUTTON>Cancel</BUTTON></DIV>") + .appendTo($wrapper); + + $wrapper.find("button:first").bind("click", this.save); + $wrapper.find("button:last").bind("click", this.cancel); + $input.bind("keydown", this.handleKeyDown); + + scope.position(args.position); + $input.focus().select(); + }; + + this.handleKeyDown = function (e) { + if (e.which == $.ui.keyCode.ENTER && e.ctrlKey) { + scope.save(); + } else if (e.which == $.ui.keyCode.ESCAPE) { + e.preventDefault(); + scope.cancel(); + } else if (e.which == $.ui.keyCode.TAB && e.shiftKey) { + e.preventDefault(); + args.grid.navigatePrev(); + } else if (e.which == $.ui.keyCode.TAB) { + e.preventDefault(); + args.grid.navigateNext(); + } + }; + + this.save = function () { + args.commitChanges(); + }; + + this.cancel = function () { + $input.val(defaultValue); + args.cancelChanges(); + }; + + this.hide = function () { + $wrapper.hide(); + }; + + this.show = function () { + $wrapper.show(); + }; + + this.position = function (position) { + $wrapper + .css("top", position.top - 5) + .css("left", position.left - 5) + }; + + this.destroy = function () { + $wrapper.remove(); + }; + + this.focus = function () { + $input.focus(); + }; + + this.loadValue = function (item) { + $input.val(defaultValue = item[args.column.field]); + $input.select(); + }; + + this.serializeValue = function () { + return $input.val(); + }; + + this.applyValue = function (item, state) { + item[args.column.field] = state; + }; + + this.isValueChanged = function () { + return (!($input.val() == "" && defaultValue == null)) && ($input.val() != defaultValue); + }; + + this.validate = function () { + return { + valid: true, + msg: null + }; + }; + + this.init(); + } +})(jQuery); diff --git a/common/static/js/vendor/slick.formatters.js b/common/static/js/vendor/slick.formatters.js new file mode 100755 index 0000000000..a31aaf9319 --- /dev/null +++ b/common/static/js/vendor/slick.formatters.js @@ -0,0 +1,59 @@ +/*** + * Contains basic SlickGrid formatters. + * + * NOTE: These are merely examples. You will most likely need to implement something more + * robust/extensible/localizable/etc. for your use! + * + * @module Formatters + * @namespace Slick + */ + +(function ($) { + // register namespace + $.extend(true, window, { + "Slick": { + "Formatters": { + "PercentComplete": PercentCompleteFormatter, + "PercentCompleteBar": PercentCompleteBarFormatter, + "YesNo": YesNoFormatter, + "Checkmark": CheckmarkFormatter + } + } + }); + + function PercentCompleteFormatter(row, cell, value, columnDef, dataContext) { + if (value == null || value === "") { + return "-"; + } else if (value < 50) { + return "<span style='color:red;font-weight:bold;'>" + value + "%</span>"; + } else { + return "<span style='color:green'>" + value + "%</span>"; + } + } + + function PercentCompleteBarFormatter(row, cell, value, columnDef, dataContext) { + if (value == null || value === "") { + return ""; + } + + var color; + + if (value < 30) { + color = "red"; + } else if (value < 70) { + color = "silver"; + } else { + color = "green"; + } + + return "<span class='percent-complete-bar' style='background:" + color + ";width:" + value + "%'></span>"; + } + + function YesNoFormatter(row, cell, value, columnDef, dataContext) { + return value ? "Yes" : "No"; + } + + function CheckmarkFormatter(row, cell, value, columnDef, dataContext) { + return value ? "<img src='../images/tick.png'>" : ""; + } +})(jQuery); diff --git a/common/static/js/vendor/slick.grid.js b/common/static/js/vendor/slick.grid.js new file mode 100755 index 0000000000..9fa3f6f372 --- /dev/null +++ b/common/static/js/vendor/slick.grid.js @@ -0,0 +1,3306 @@ +/** + * @license + * (c) 2009-2012 Michael Leibman + * michael{dot}leibman{at}gmail{dot}com + * http://github.com/mleibman/slickgrid + * + * Distributed under MIT license. + * All rights reserved. + * + * SlickGrid v2.1 + * + * NOTES: + * Cell/row DOM manipulations are done directly bypassing jQuery's DOM manipulation methods. + * This increases the speed dramatically, but can only be done safely because there are no event handlers + * or data associated with any cell/row DOM nodes. Cell editors must make sure they implement .destroy() + * and do proper cleanup. + */ + +// make sure required JavaScript modules are loaded +if (typeof jQuery === "undefined") { + throw "SlickGrid requires jquery module to be loaded"; +} +if (!jQuery.fn.drag) { + throw "SlickGrid requires jquery.event.drag module to be loaded"; +} +if (typeof Slick === "undefined") { + throw "slick.core.js not loaded"; +} + + +(function ($) { + // Slick.Grid + $.extend(true, window, { + Slick: { + Grid: SlickGrid + } + }); + + // shared across all grids on the page + var scrollbarDimensions; + var maxSupportedCssHeight; // browser's breaking point + + ////////////////////////////////////////////////////////////////////////////////////////////// + // SlickGrid class implementation (available as Slick.Grid) + + /** + * Creates a new instance of the grid. + * @class SlickGrid + * @constructor + * @param {Node} container Container node to create the grid in. + * @param {Array,Object} data An array of objects for databinding. + * @param {Array} columns An array of column definitions. + * @param {Object} options Grid options. + **/ + function SlickGrid(container, data, columns, options) { + // settings + var defaults = { + explicitInitialization: false, + rowHeight: 25, + defaultColumnWidth: 80, + enableAddRow: false, + leaveSpaceForNewRows: false, + editable: false, + autoEdit: true, + enableCellNavigation: true, + enableColumnReorder: true, + asyncEditorLoading: false, + asyncEditorLoadDelay: 100, + forceFitColumns: false, + enableAsyncPostRender: false, + asyncPostRenderDelay: 50, + autoHeight: false, + editorLock: Slick.GlobalEditorLock, + showHeaderRow: false, + headerRowHeight: 25, + showTopPanel: false, + topPanelHeight: 25, + formatterFactory: null, + editorFactory: null, + cellFlashingCssClass: "flashing", + selectedCellCssClass: "selected", + multiSelect: true, + enableTextSelectionOnCells: false, + dataItemColumnValueExtractor: null, + fullWidthRows: false, + multiColumnSort: false, + defaultFormatter: defaultFormatter, + forceSyncScrolling: false + }; + + var columnDefaults = { + name: "", + resizable: true, + sortable: false, + minWidth: 30, + rerenderOnResize: false, + headerCssClass: null, + defaultSortAsc: true, + focusable: true, + selectable: true + }; + + // scroller + var th; // virtual height + var h; // real scrollable height + var ph; // page height + var n; // number of pages + var cj; // "jumpiness" coefficient + + var page = 0; // current page + var offset = 0; // current page offset + var vScrollDir = 1; + + // private + var initialized = false; + var $container; + var uid = "slickgrid_" + Math.round(1000000 * Math.random()); + var self = this; + var $focusSink, $focusSink2; + var $headerScroller; + var $headers; + var $headerRow, $headerRowScroller, $headerRowSpacer; + var $topPanelScroller; + var $topPanel; + var $viewport; + var $canvas; + var $style; + var $boundAncestors; + var stylesheet, columnCssRulesL, columnCssRulesR; + var viewportH, viewportW; + var canvasWidth; + var viewportHasHScroll, viewportHasVScroll; + var headerColumnWidthDiff = 0, headerColumnHeightDiff = 0, // border+padding + cellWidthDiff = 0, cellHeightDiff = 0; + var absoluteColumnMinWidth; + var numberOfRows = 0; + + var tabbingDirection = 1; + var activePosX; + var activeRow, activeCell; + var activeCellNode = null; + var currentEditor = null; + var serializedEditorValue; + var editController; + + var rowsCache = {}; + var renderedRows = 0; + var numVisibleRows; + var prevScrollTop = 0; + var scrollTop = 0; + var lastRenderedScrollTop = 0; + var lastRenderedScrollLeft = 0; + var prevScrollLeft = 0; + var scrollLeft = 0; + + var selectionModel; + var selectedRows = []; + + var plugins = []; + var cellCssClasses = {}; + + var columnsById = {}; + var sortColumns = []; + var columnPosLeft = []; + var columnPosRight = []; + + + // async call handles + var h_editorLoader = null; + var h_render = null; + var h_postrender = null; + var postProcessedRows = {}; + var postProcessToRow = null; + var postProcessFromRow = null; + + // perf counters + var counter_rows_rendered = 0; + var counter_rows_removed = 0; + + + ////////////////////////////////////////////////////////////////////////////////////////////// + // Initialization + + function init() { + $container = $(container); + if ($container.length < 1) { + throw new Error("SlickGrid requires a valid container, " + container + " does not exist in the DOM."); + } + + // calculate these only once and share between grid instances + maxSupportedCssHeight = maxSupportedCssHeight || getMaxSupportedCssHeight(); + scrollbarDimensions = scrollbarDimensions || measureScrollbar(); + + options = $.extend({}, defaults, options); + validateAndEnforceOptions(); + columnDefaults.width = options.defaultColumnWidth; + + columnsById = {}; + for (var i = 0; i < columns.length; i++) { + var m = columns[i] = $.extend({}, columnDefaults, columns[i]); + columnsById[m.id] = i; + if (m.minWidth && m.width < m.minWidth) { + m.width = m.minWidth; + } + if (m.maxWidth && m.width > m.maxWidth) { + m.width = m.maxWidth; + } + } + + // validate loaded JavaScript modules against requested options + if (options.enableColumnReorder && !$.fn.sortable) { + throw new Error("SlickGrid's 'enableColumnReorder = true' option requires jquery-ui.sortable module to be loaded"); + } + + editController = { + "commitCurrentEdit": commitCurrentEdit, + "cancelCurrentEdit": cancelCurrentEdit + }; + + $container + .empty() + .css("overflow", "hidden") + .css("outline", 0) + .addClass(uid) + .addClass("ui-widget"); + + // set up a positioning container if needed + if (!/relative|absolute|fixed/.test($container.css("position"))) { + $container.css("position", "relative"); + } + + $focusSink = $("<div tabIndex='0' hideFocus style='position:fixed;width:0;height:0;top:0;left:0;outline:0;'></div>").appendTo($container); + + $headerScroller = $("<div class='slick-header ui-state-default' style='overflow:hidden;position:relative;' />").appendTo($container); + $headers = $("<div class='slick-header-columns' style='left:-1000px' />").appendTo($headerScroller); + $headers.width(getHeadersWidth()); + + $headerRowScroller = $("<div class='slick-headerrow ui-state-default' style='overflow:hidden;position:relative;' />").appendTo($container); + $headerRow = $("<div class='slick-headerrow-columns' />").appendTo($headerRowScroller); + $headerRowSpacer = $("<div style='display:block;height:1px;position:absolute;top:0;left:0;'></div>") + .css("width", getCanvasWidth() + scrollbarDimensions.width + "px") + .appendTo($headerRowScroller); + + $topPanelScroller = $("<div class='slick-top-panel-scroller ui-state-default' style='overflow:hidden;position:relative;' />").appendTo($container); + $topPanel = $("<div class='slick-top-panel' style='width:10000px' />").appendTo($topPanelScroller); + + if (!options.showTopPanel) { + $topPanelScroller.hide(); + } + + if (!options.showHeaderRow) { + $headerRowScroller.hide(); + } + + $viewport = $("<div class='slick-viewport' style='width:100%;overflow:auto;outline:0;position:relative;;'>").appendTo($container); + $viewport.css("overflow-y", options.autoHeight ? "hidden" : "auto"); + + $canvas = $("<div class='grid-canvas' />").appendTo($viewport); + + $focusSink2 = $focusSink.clone().appendTo($container); + + if (!options.explicitInitialization) { + finishInitialization(); + } + } + + function finishInitialization() { + if (!initialized) { + initialized = true; + + viewportW = parseFloat($.css($container[0], "width", true)); + + // header columns and cells may have different padding/border skewing width calculations (box-sizing, hello?) + // calculate the diff so we can set consistent sizes + measureCellPaddingAndBorder(); + + // for usability reasons, all text selection in SlickGrid is disabled + // with the exception of input and textarea elements (selection must + // be enabled there so that editors work as expected); note that + // selection in grid cells (grid body) is already unavailable in + // all browsers except IE + disableSelection($headers); // disable all text selection in header (including input and textarea) + + if (!options.enableTextSelectionOnCells) { + // disable text selection in grid cells except in input and textarea elements + // (this is IE-specific, because selectstart event will only fire in IE) + $viewport.bind("selectstart.ui", function (event) { + return $(event.target).is("input,textarea"); + }); + } + + updateColumnCaches(); + createColumnHeaders(); + setupColumnSort(); + createCssRules(); + resizeCanvas(); + bindAncestorScrollEvents(); + + $container + .bind("resize.slickgrid", resizeCanvas); + $viewport + .bind("scroll", handleScroll); + $headerScroller + .bind("contextmenu", handleHeaderContextMenu) + .bind("click", handleHeaderClick) + .delegate(".slick-header-column", "mouseenter", handleHeaderMouseEnter) + .delegate(".slick-header-column", "mouseleave", handleHeaderMouseLeave); + $headerRowScroller + .bind("scroll", handleHeaderRowScroll); + $focusSink.add($focusSink2) + .bind("keydown", handleKeyDown); + $canvas + .bind("keydown", handleKeyDown) + .bind("click", handleClick) + .bind("dblclick", handleDblClick) + .bind("contextmenu", handleContextMenu) + .bind("draginit", handleDragInit) + .bind("dragstart", {distance: 3}, handleDragStart) + .bind("drag", handleDrag) + .bind("dragend", handleDragEnd) + .delegate(".slick-cell", "mouseenter", handleMouseEnter) + .delegate(".slick-cell", "mouseleave", handleMouseLeave); + } + } + + function registerPlugin(plugin) { + plugins.unshift(plugin); + plugin.init(self); + } + + function unregisterPlugin(plugin) { + for (var i = plugins.length; i >= 0; i--) { + if (plugins[i] === plugin) { + if (plugins[i].destroy) { + plugins[i].destroy(); + } + plugins.splice(i, 1); + break; + } + } + } + + function setSelectionModel(model) { + if (selectionModel) { + selectionModel.onSelectedRangesChanged.unsubscribe(handleSelectedRangesChanged); + if (selectionModel.destroy) { + selectionModel.destroy(); + } + } + + selectionModel = model; + if (selectionModel) { + selectionModel.init(self); + selectionModel.onSelectedRangesChanged.subscribe(handleSelectedRangesChanged); + } + } + + function getSelectionModel() { + return selectionModel; + } + + function getCanvasNode() { + return $canvas[0]; + } + + function measureScrollbar() { + var $c = $("<div style='position:absolute; top:-10000px; left:-10000px; width:100px; height:100px; overflow:scroll;'></div>").appendTo("body"); + var dim = { + width: $c.width() - $c[0].clientWidth, + height: $c.height() - $c[0].clientHeight + }; + $c.remove(); + return dim; + } + + function getHeadersWidth() { + var headersWidth = 0; + for (var i = 0, ii = columns.length; i < ii; i++) { + var width = columns[i].width; + headersWidth += width; + } + headersWidth += scrollbarDimensions.width; + return Math.max(headersWidth, viewportW) + 1000; + } + + function getCanvasWidth() { + var availableWidth = viewportHasVScroll ? viewportW - scrollbarDimensions.width : viewportW; + var rowWidth = 0; + var i = columns.length; + while (i--) { + rowWidth += columns[i].width; + } + return options.fullWidthRows ? Math.max(rowWidth, availableWidth) : rowWidth; + } + + function updateCanvasWidth(forceColumnWidthsUpdate) { + var oldCanvasWidth = canvasWidth; + canvasWidth = getCanvasWidth(); + + if (canvasWidth != oldCanvasWidth) { + $canvas.width(canvasWidth); + $headerRow.width(canvasWidth); + $headers.width(getHeadersWidth()); + viewportHasHScroll = (canvasWidth > viewportW - scrollbarDimensions.width); + } + + $headerRowSpacer.width(canvasWidth + (viewportHasVScroll ? scrollbarDimensions.width : 0)); + + if (canvasWidth != oldCanvasWidth || forceColumnWidthsUpdate) { + applyColumnWidths(); + } + } + + function disableSelection($target) { + if ($target && $target.jquery) { + $target + .attr("unselectable", "on") + .css("MozUserSelect", "none") + .bind("selectstart.ui", function () { + return false; + }); // from jquery:ui.core.js 1.7.2 + } + } + + function getMaxSupportedCssHeight() { + var supportedHeight = 1000000; + // FF reports the height back but still renders blank after ~6M px + var testUpTo = navigator.userAgent.toLowerCase().match(/firefox/) ? 6000000 : 1000000000; + var div = $("<div style='display:none' />").appendTo(document.body); + + while (true) { + var test = supportedHeight * 2; + div.css("height", test); + if (test > testUpTo || div.height() !== test) { + break; + } else { + supportedHeight = test; + } + } + + div.remove(); + return supportedHeight; + } + + // TODO: this is static. need to handle page mutation. + function bindAncestorScrollEvents() { + var elem = $canvas[0]; + while ((elem = elem.parentNode) != document.body && elem != null) { + // bind to scroll containers only + if (elem == $viewport[0] || elem.scrollWidth != elem.clientWidth || elem.scrollHeight != elem.clientHeight) { + var $elem = $(elem); + if (!$boundAncestors) { + $boundAncestors = $elem; + } else { + $boundAncestors = $boundAncestors.add($elem); + } + $elem.bind("scroll." + uid, handleActiveCellPositionChange); + } + } + } + + function unbindAncestorScrollEvents() { + if (!$boundAncestors) { + return; + } + $boundAncestors.unbind("scroll." + uid); + $boundAncestors = null; + } + + function updateColumnHeader(columnId, title, toolTip) { + if (!initialized) { return; } + var idx = getColumnIndex(columnId); + if (idx == null) { + return; + } + + var columnDef = columns[idx]; + var $header = $headers.children().eq(idx); + if ($header) { + if (title !== undefined) { + columns[idx].name = title; + } + if (toolTip !== undefined) { + columns[idx].toolTip = toolTip; + } + + trigger(self.onBeforeHeaderCellDestroy, { + "node": $header[0], + "column": columnDef + }); + + $header + .attr("title", toolTip || "") + .children().eq(0).html(title); + + trigger(self.onHeaderCellRendered, { + "node": $header[0], + "column": columnDef + }); + } + } + + function getHeaderRow() { + return $headerRow[0]; + } + + function getHeaderRowColumn(columnId) { + var idx = getColumnIndex(columnId); + var $header = $headerRow.children().eq(idx); + return $header && $header[0]; + } + + function createColumnHeaders() { + function onMouseEnter() { + $(this).addClass("ui-state-hover"); + } + + function onMouseLeave() { + $(this).removeClass("ui-state-hover"); + } + + $headers.find(".slick-header-column") + .each(function() { + var columnDef = $(this).data("column"); + if (columnDef) { + trigger(self.onBeforeHeaderCellDestroy, { + "node": this, + "column": columnDef + }); + } + }); + $headers.empty(); + $headers.width(getHeadersWidth()); + + $headerRow.find(".slick-headerrow-column") + .each(function() { + var columnDef = $(this).data("column"); + if (columnDef) { + trigger(self.onBeforeHeaderRowCellDestroy, { + "node": this, + "column": columnDef + }); + } + }); + $headerRow.empty(); + + for (var i = 0; i < columns.length; i++) { + var m = columns[i]; + + var header = $("<div class='ui-state-default slick-header-column' />") + .html("<span class='slick-column-name'>" + m.name + "</span>") + .width(m.width - headerColumnWidthDiff) + .attr("id", "" + uid + m.id) + .attr("title", m.toolTip || "") + .data("column", m) + .addClass(m.headerCssClass || "") + .appendTo($headers); + + if (options.enableColumnReorder || m.sortable) { + header + .on('mouseenter', onMouseEnter) + .on('mouseleave', onMouseLeave); + } + + if (m.sortable) { + header.addClass("slick-header-sortable"); + header.append("<span class='slick-sort-indicator' />"); + } + + trigger(self.onHeaderCellRendered, { + "node": header[0], + "column": m + }); + + if (options.showHeaderRow) { + var headerRowCell = $("<div class='ui-state-default slick-headerrow-column l" + i + " r" + i + "'></div>") + .data("column", m) + .appendTo($headerRow); + + trigger(self.onHeaderRowCellRendered, { + "node": headerRowCell[0], + "column": m + }); + } + } + + setSortColumns(sortColumns); + setupColumnResize(); + if (options.enableColumnReorder) { + setupColumnReorder(); + } + } + + function setupColumnSort() { + $headers.click(function (e) { + // temporary workaround for a bug in jQuery 1.7.1 (http://bugs.jquery.com/ticket/11328) + e.metaKey = e.metaKey || e.ctrlKey; + + if ($(e.target).hasClass("slick-resizable-handle")) { + return; + } + + var $col = $(e.target).closest(".slick-header-column"); + if (!$col.length) { + return; + } + + var column = $col.data("column"); + if (column.sortable) { + if (!getEditorLock().commitCurrentEdit()) { + return; + } + + var sortOpts = null; + var i = 0; + for (; i < sortColumns.length; i++) { + if (sortColumns[i].columnId == column.id) { + sortOpts = sortColumns[i]; + sortOpts.sortAsc = !sortOpts.sortAsc; + break; + } + } + + if (e.metaKey && options.multiColumnSort) { + if (sortOpts) { + sortColumns.splice(i, 1); + } + } + else { + if ((!e.shiftKey && !e.metaKey) || !options.multiColumnSort) { + sortColumns = []; + } + + if (!sortOpts) { + sortOpts = { columnId: column.id, sortAsc: column.defaultSortAsc }; + sortColumns.push(sortOpts); + } else if (sortColumns.length == 0) { + sortColumns.push(sortOpts); + } + } + + setSortColumns(sortColumns); + + if (!options.multiColumnSort) { + trigger(self.onSort, { + multiColumnSort: false, + sortCol: column, + sortAsc: sortOpts.sortAsc}, e); + } else { + trigger(self.onSort, { + multiColumnSort: true, + sortCols: $.map(sortColumns, function(col) { + return {sortCol: columns[getColumnIndex(col.columnId)], sortAsc: col.sortAsc }; + })}, e); + } + } + }); + } + + function setupColumnReorder() { + $headers.filter(":ui-sortable").sortable("destroy"); + $headers.sortable({ + containment: "parent", + distance: 3, + axis: "x", + cursor: "default", + tolerance: "intersection", + helper: "clone", + placeholder: "slick-sortable-placeholder ui-state-default slick-header-column", + forcePlaceholderSize: true, + start: function (e, ui) { + $(ui.helper).addClass("slick-header-column-active"); + }, + beforeStop: function (e, ui) { + $(ui.helper).removeClass("slick-header-column-active"); + }, + stop: function (e) { + if (!getEditorLock().commitCurrentEdit()) { + $(this).sortable("cancel"); + return; + } + + var reorderedIds = $headers.sortable("toArray"); + var reorderedColumns = []; + for (var i = 0; i < reorderedIds.length; i++) { + reorderedColumns.push(columns[getColumnIndex(reorderedIds[i].replace(uid, ""))]); + } + setColumns(reorderedColumns); + + trigger(self.onColumnsReordered, {}); + e.stopPropagation(); + setupColumnResize(); + } + }); + } + + function setupColumnResize() { + var $col, j, c, pageX, columnElements, minPageX, maxPageX, firstResizable, lastResizable; + columnElements = $headers.children(); + columnElements.find(".slick-resizable-handle").remove(); + columnElements.each(function (i, e) { + if (columns[i].resizable) { + if (firstResizable === undefined) { + firstResizable = i; + } + lastResizable = i; + } + }); + if (firstResizable === undefined) { + return; + } + columnElements.each(function (i, e) { + if (i < firstResizable || (options.forceFitColumns && i >= lastResizable)) { + return; + } + $col = $(e); + $("<div class='slick-resizable-handle' />") + .appendTo(e) + .bind("dragstart", function (e, dd) { + if (!getEditorLock().commitCurrentEdit()) { + return false; + } + pageX = e.pageX; + $(this).parent().addClass("slick-header-column-active"); + var shrinkLeewayOnRight = null, stretchLeewayOnRight = null; + // lock each column's width option to current width + columnElements.each(function (i, e) { + columns[i].previousWidth = $(e).outerWidth(); + }); + if (options.forceFitColumns) { + shrinkLeewayOnRight = 0; + stretchLeewayOnRight = 0; + // colums on right affect maxPageX/minPageX + for (j = i + 1; j < columnElements.length; j++) { + c = columns[j]; + if (c.resizable) { + if (stretchLeewayOnRight !== null) { + if (c.maxWidth) { + stretchLeewayOnRight += c.maxWidth - c.previousWidth; + } else { + stretchLeewayOnRight = null; + } + } + shrinkLeewayOnRight += c.previousWidth - Math.max(c.minWidth || 0, absoluteColumnMinWidth); + } + } + } + var shrinkLeewayOnLeft = 0, stretchLeewayOnLeft = 0; + for (j = 0; j <= i; j++) { + // columns on left only affect minPageX + c = columns[j]; + if (c.resizable) { + if (stretchLeewayOnLeft !== null) { + if (c.maxWidth) { + stretchLeewayOnLeft += c.maxWidth - c.previousWidth; + } else { + stretchLeewayOnLeft = null; + } + } + shrinkLeewayOnLeft += c.previousWidth - Math.max(c.minWidth || 0, absoluteColumnMinWidth); + } + } + if (shrinkLeewayOnRight === null) { + shrinkLeewayOnRight = 100000; + } + if (shrinkLeewayOnLeft === null) { + shrinkLeewayOnLeft = 100000; + } + if (stretchLeewayOnRight === null) { + stretchLeewayOnRight = 100000; + } + if (stretchLeewayOnLeft === null) { + stretchLeewayOnLeft = 100000; + } + maxPageX = pageX + Math.min(shrinkLeewayOnRight, stretchLeewayOnLeft); + minPageX = pageX - Math.min(shrinkLeewayOnLeft, stretchLeewayOnRight); + }) + .bind("drag", function (e, dd) { + var actualMinWidth, d = Math.min(maxPageX, Math.max(minPageX, e.pageX)) - pageX, x; + if (d < 0) { // shrink column + x = d; + for (j = i; j >= 0; j--) { + c = columns[j]; + if (c.resizable) { + actualMinWidth = Math.max(c.minWidth || 0, absoluteColumnMinWidth); + if (x && c.previousWidth + x < actualMinWidth) { + x += c.previousWidth - actualMinWidth; + c.width = actualMinWidth; + } else { + c.width = c.previousWidth + x; + x = 0; + } + } + } + + if (options.forceFitColumns) { + x = -d; + for (j = i + 1; j < columnElements.length; j++) { + c = columns[j]; + if (c.resizable) { + if (x && c.maxWidth && (c.maxWidth - c.previousWidth < x)) { + x -= c.maxWidth - c.previousWidth; + c.width = c.maxWidth; + } else { + c.width = c.previousWidth + x; + x = 0; + } + } + } + } + } else { // stretch column + x = d; + for (j = i; j >= 0; j--) { + c = columns[j]; + if (c.resizable) { + if (x && c.maxWidth && (c.maxWidth - c.previousWidth < x)) { + x -= c.maxWidth - c.previousWidth; + c.width = c.maxWidth; + } else { + c.width = c.previousWidth + x; + x = 0; + } + } + } + + if (options.forceFitColumns) { + x = -d; + for (j = i + 1; j < columnElements.length; j++) { + c = columns[j]; + if (c.resizable) { + actualMinWidth = Math.max(c.minWidth || 0, absoluteColumnMinWidth); + if (x && c.previousWidth + x < actualMinWidth) { + x += c.previousWidth - actualMinWidth; + c.width = actualMinWidth; + } else { + c.width = c.previousWidth + x; + x = 0; + } + } + } + } + } + applyColumnHeaderWidths(); + if (options.syncColumnCellResize) { + applyColumnWidths(); + } + }) + .bind("dragend", function (e, dd) { + var newWidth; + $(this).parent().removeClass("slick-header-column-active"); + for (j = 0; j < columnElements.length; j++) { + c = columns[j]; + newWidth = $(columnElements[j]).outerWidth(); + + if (c.previousWidth !== newWidth && c.rerenderOnResize) { + invalidateAllRows(); + } + } + updateCanvasWidth(true); + render(); + trigger(self.onColumnsResized, {}); + }); + }); + } + + function getVBoxDelta($el) { + var p = ["borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom"]; + var delta = 0; + $.each(p, function (n, val) { + delta += parseFloat($el.css(val)) || 0; + }); + return delta; + } + + function measureCellPaddingAndBorder() { + var el; + var h = ["borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight"]; + var v = ["borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom"]; + + el = $("<div class='ui-state-default slick-header-column' style='visibility:hidden'>-</div>").appendTo($headers); + headerColumnWidthDiff = headerColumnHeightDiff = 0; + $.each(h, function (n, val) { + headerColumnWidthDiff += parseFloat(el.css(val)) || 0; + }); + $.each(v, function (n, val) { + headerColumnHeightDiff += parseFloat(el.css(val)) || 0; + }); + el.remove(); + + var r = $("<div class='slick-row' />").appendTo($canvas); + el = $("<div class='slick-cell' id='' style='visibility:hidden'>-</div>").appendTo(r); + cellWidthDiff = cellHeightDiff = 0; + $.each(h, function (n, val) { + cellWidthDiff += parseFloat(el.css(val)) || 0; + }); + $.each(v, function (n, val) { + cellHeightDiff += parseFloat(el.css(val)) || 0; + }); + r.remove(); + + absoluteColumnMinWidth = Math.max(headerColumnWidthDiff, cellWidthDiff); + } + + function createCssRules() { + $style = $("<style type='text/css' rel='stylesheet' />").appendTo($("head")); + var rowHeight = (options.rowHeight - cellHeightDiff); + var rules = [ + "." + uid + " .slick-header-column { left: 1000px; }", + "." + uid + " .slick-top-panel { height:" + options.topPanelHeight + "px; }", + "." + uid + " .slick-headerrow-columns { height:" + options.headerRowHeight + "px; }", + "." + uid + " .slick-cell { height:" + rowHeight + "px; }", + "." + uid + " .slick-row { height:" + options.rowHeight + "px; }" + ]; + + for (var i = 0; i < columns.length; i++) { + rules.push("." + uid + " .l" + i + " { }"); + rules.push("." + uid + " .r" + i + " { }"); + } + + if ($style[0].styleSheet) { // IE + $style[0].styleSheet.cssText = rules.join(" "); + } else { + $style[0].appendChild(document.createTextNode(rules.join(" "))); + } + } + + function getColumnCssRules(idx) { + if (!stylesheet) { + var sheets = document.styleSheets; + for (var i = 0; i < sheets.length; i++) { + if ((sheets[i].ownerNode || sheets[i].owningElement) == $style[0]) { + stylesheet = sheets[i]; + break; + } + } + + if (!stylesheet) { + throw new Error("Cannot find stylesheet."); + } + + // find and cache column CSS rules + columnCssRulesL = []; + columnCssRulesR = []; + var cssRules = (stylesheet.cssRules || stylesheet.rules); + var matches, columnIdx; + for (var i = 0; i < cssRules.length; i++) { + var selector = cssRules[i].selectorText; + if (matches = /\.l\d+/.exec(selector)) { + columnIdx = parseInt(matches[0].substr(2, matches[0].length - 2), 10); + columnCssRulesL[columnIdx] = cssRules[i]; + } else if (matches = /\.r\d+/.exec(selector)) { + columnIdx = parseInt(matches[0].substr(2, matches[0].length - 2), 10); + columnCssRulesR[columnIdx] = cssRules[i]; + } + } + } + + return { + "left": columnCssRulesL[idx], + "right": columnCssRulesR[idx] + }; + } + + function removeCssRules() { + $style.remove(); + stylesheet = null; + } + + function destroy() { + getEditorLock().cancelCurrentEdit(); + + trigger(self.onBeforeDestroy, {}); + + var i = plugins.length; + while(i--) { + unregisterPlugin(plugins[i]); + } + + if (options.enableColumnReorder) { + $headers.filter(":ui-sortable").sortable("destroy"); + } + + unbindAncestorScrollEvents(); + $container.unbind(".slickgrid"); + removeCssRules(); + + $canvas.unbind("draginit dragstart dragend drag"); + $container.empty().removeClass(uid); + } + + + ////////////////////////////////////////////////////////////////////////////////////////////// + // General + + function trigger(evt, args, e) { + e = e || new Slick.EventData(); + args = args || {}; + args.grid = self; + return evt.notify(args, e, self); + } + + function getEditorLock() { + return options.editorLock; + } + + function getEditController() { + return editController; + } + + function getColumnIndex(id) { + return columnsById[id]; + } + + function autosizeColumns() { + var i, c, + widths = [], + shrinkLeeway = 0, + total = 0, + prevTotal, + availWidth = viewportHasVScroll ? viewportW - scrollbarDimensions.width : viewportW; + + for (i = 0; i < columns.length; i++) { + c = columns[i]; + widths.push(c.width); + total += c.width; + if (c.resizable) { + shrinkLeeway += c.width - Math.max(c.minWidth, absoluteColumnMinWidth); + } + } + + // shrink + prevTotal = total; + while (total > availWidth && shrinkLeeway) { + var shrinkProportion = (total - availWidth) / shrinkLeeway; + for (i = 0; i < columns.length && total > availWidth; i++) { + c = columns[i]; + var width = widths[i]; + if (!c.resizable || width <= c.minWidth || width <= absoluteColumnMinWidth) { + continue; + } + var absMinWidth = Math.max(c.minWidth, absoluteColumnMinWidth); + var shrinkSize = Math.floor(shrinkProportion * (width - absMinWidth)) || 1; + shrinkSize = Math.min(shrinkSize, width - absMinWidth); + total -= shrinkSize; + shrinkLeeway -= shrinkSize; + widths[i] -= shrinkSize; + } + if (prevTotal == total) { // avoid infinite loop + break; + } + prevTotal = total; + } + + // grow + prevTotal = total; + while (total < availWidth) { + var growProportion = availWidth / total; + for (i = 0; i < columns.length && total < availWidth; i++) { + c = columns[i]; + if (!c.resizable || c.maxWidth <= c.width) { + continue; + } + var growSize = Math.min(Math.floor(growProportion * c.width) - c.width, (c.maxWidth - c.width) || 1000000) || 1; + total += growSize; + widths[i] += growSize; + } + if (prevTotal == total) { // avoid infinite loop + break; + } + prevTotal = total; + } + + var reRender = false; + for (i = 0; i < columns.length; i++) { + if (columns[i].rerenderOnResize && columns[i].width != widths[i]) { + reRender = true; + } + columns[i].width = widths[i]; + } + + applyColumnHeaderWidths(); + updateCanvasWidth(true); + if (reRender) { + invalidateAllRows(); + render(); + } + } + + function applyColumnHeaderWidths() { + if (!initialized) { return; } + var h; + for (var i = 0, headers = $headers.children(), ii = headers.length; i < ii; i++) { + h = $(headers[i]); + if (h.width() !== columns[i].width - headerColumnWidthDiff) { + h.width(columns[i].width - headerColumnWidthDiff); + } + } + + updateColumnCaches(); + } + + function applyColumnWidths() { + var x = 0, w, rule; + for (var i = 0; i < columns.length; i++) { + w = columns[i].width; + + rule = getColumnCssRules(i); + rule.left.style.left = x + "px"; + rule.right.style.right = (canvasWidth - x - w) + "px"; + + x += columns[i].width; + } + } + + function setSortColumn(columnId, ascending) { + setSortColumns([{ columnId: columnId, sortAsc: ascending}]); + } + + function setSortColumns(cols) { + sortColumns = cols; + + var headerColumnEls = $headers.children(); + headerColumnEls + .removeClass("slick-header-column-sorted") + .find(".slick-sort-indicator") + .removeClass("slick-sort-indicator-asc slick-sort-indicator-desc"); + + $.each(sortColumns, function(i, col) { + if (col.sortAsc == null) { + col.sortAsc = true; + } + var columnIndex = getColumnIndex(col.columnId); + if (columnIndex != null) { + headerColumnEls.eq(columnIndex) + .addClass("slick-header-column-sorted") + .find(".slick-sort-indicator") + .addClass(col.sortAsc ? "slick-sort-indicator-asc" : "slick-sort-indicator-desc"); + } + }); + } + + function getSortColumns() { + return sortColumns; + } + + function handleSelectedRangesChanged(e, ranges) { + selectedRows = []; + var hash = {}; + for (var i = 0; i < ranges.length; i++) { + for (var j = ranges[i].fromRow; j <= ranges[i].toRow; j++) { + if (!hash[j]) { // prevent duplicates + selectedRows.push(j); + hash[j] = {}; + } + for (var k = ranges[i].fromCell; k <= ranges[i].toCell; k++) { + if (canCellBeSelected(j, k)) { + hash[j][columns[k].id] = options.selectedCellCssClass; + } + } + } + } + + setCellCssStyles(options.selectedCellCssClass, hash); + + trigger(self.onSelectedRowsChanged, {rows: getSelectedRows()}, e); + } + + function getColumns() { + return columns; + } + + function updateColumnCaches() { + // Pre-calculate cell boundaries. + columnPosLeft = []; + columnPosRight = []; + var x = 0; + for (var i = 0, ii = columns.length; i < ii; i++) { + columnPosLeft[i] = x; + columnPosRight[i] = x + columns[i].width; + x += columns[i].width; + } + } + + function setColumns(columnDefinitions) { + columns = columnDefinitions; + + columnsById = {}; + for (var i = 0; i < columns.length; i++) { + var m = columns[i] = $.extend({}, columnDefaults, columns[i]); + columnsById[m.id] = i; + if (m.minWidth && m.width < m.minWidth) { + m.width = m.minWidth; + } + if (m.maxWidth && m.width > m.maxWidth) { + m.width = m.maxWidth; + } + } + + updateColumnCaches(); + + if (initialized) { + invalidateAllRows(); + createColumnHeaders(); + removeCssRules(); + createCssRules(); + resizeCanvas(); + applyColumnWidths(); + handleScroll(); + } + } + + function getOptions() { + return options; + } + + function setOptions(args) { + if (!getEditorLock().commitCurrentEdit()) { + return; + } + + makeActiveCellNormal(); + + if (options.enableAddRow !== args.enableAddRow) { + invalidateRow(getDataLength()); + } + + options = $.extend(options, args); + validateAndEnforceOptions(); + + $viewport.css("overflow-y", options.autoHeight ? "hidden" : "auto"); + render(); + } + + function validateAndEnforceOptions() { + if (options.autoHeight) { + options.leaveSpaceForNewRows = false; + } + } + + function setData(newData, scrollToTop) { + data = newData; + invalidateAllRows(); + updateRowCount(); + if (scrollToTop) { + scrollTo(0); + } + } + + function getData() { + return data; + } + + function getDataLength() { + if (data.getLength) { + return data.getLength(); + } else { + return data.length; + } + } + + function getDataItem(i) { + if (data.getItem) { + return data.getItem(i); + } else { + return data[i]; + } + } + + function getTopPanel() { + return $topPanel[0]; + } + + function setTopPanelVisibility(visible) { + if (options.showTopPanel != visible) { + options.showTopPanel = visible; + if (visible) { + $topPanelScroller.slideDown("fast", resizeCanvas); + } else { + $topPanelScroller.slideUp("fast", resizeCanvas); + } + } + } + + function setHeaderRowVisibility(visible) { + if (options.showHeaderRow != visible) { + options.showHeaderRow = visible; + if (visible) { + $headerRowScroller.slideDown("fast", resizeCanvas); + } else { + $headerRowScroller.slideUp("fast", resizeCanvas); + } + } + } + + function getContainerNode() { + return $container.get(0); + } + + ////////////////////////////////////////////////////////////////////////////////////////////// + // Rendering / Scrolling + + function getRowTop(row) { + return options.rowHeight * row - offset; + } + + function getRowFromPosition(y) { + return Math.floor((y + offset) / options.rowHeight); + } + + function scrollTo(y) { + y = Math.max(y, 0); + y = Math.min(y, th - viewportH + (viewportHasHScroll ? scrollbarDimensions.height : 0)); + + var oldOffset = offset; + + page = Math.min(n - 1, Math.floor(y / ph)); + offset = Math.round(page * cj); + var newScrollTop = y - offset; + + if (offset != oldOffset) { + var range = getVisibleRange(newScrollTop); + cleanupRows(range); + updateRowPositions(); + } + + if (prevScrollTop != newScrollTop) { + vScrollDir = (prevScrollTop + oldOffset < newScrollTop + offset) ? 1 : -1; + $viewport[0].scrollTop = (lastRenderedScrollTop = scrollTop = prevScrollTop = newScrollTop); + + trigger(self.onViewportChanged, {}); + } + } + + function defaultFormatter(row, cell, value, columnDef, dataContext) { + if (value == null) { + return ""; + } else { + return (value + "").replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">"); + } + } + + function getFormatter(row, column) { + var rowMetadata = data.getItemMetadata && data.getItemMetadata(row); + + // look up by id, then index + var columnOverrides = rowMetadata && + rowMetadata.columns && + (rowMetadata.columns[column.id] || rowMetadata.columns[getColumnIndex(column.id)]); + + return (columnOverrides && columnOverrides.formatter) || + (rowMetadata && rowMetadata.formatter) || + column.formatter || + (options.formatterFactory && options.formatterFactory.getFormatter(column)) || + options.defaultFormatter; + } + + function getEditor(row, cell) { + var column = columns[cell]; + var rowMetadata = data.getItemMetadata && data.getItemMetadata(row); + var columnMetadata = rowMetadata && rowMetadata.columns; + + if (columnMetadata && columnMetadata[column.id] && columnMetadata[column.id].editor !== undefined) { + return columnMetadata[column.id].editor; + } + if (columnMetadata && columnMetadata[cell] && columnMetadata[cell].editor !== undefined) { + return columnMetadata[cell].editor; + } + + return column.editor || (options.editorFactory && options.editorFactory.getEditor(column)); + } + + function getDataItemValueForColumn(item, columnDef) { + if (options.dataItemColumnValueExtractor) { + return options.dataItemColumnValueExtractor(item, columnDef); + } + return item[columnDef.field]; + } + + function appendRowHtml(stringArray, row, range, dataLength) { + var d = getDataItem(row); + var dataLoading = row < dataLength && !d; + var rowCss = "slick-row" + + (dataLoading ? " loading" : "") + + (row === activeRow ? " active" : "") + + (row % 2 == 1 ? " odd" : " even"); + + var metadata = data.getItemMetadata && data.getItemMetadata(row); + + if (metadata && metadata.cssClasses) { + rowCss += " " + metadata.cssClasses; + } + + stringArray.push("<div class='ui-widget-content " + rowCss + "' style='top:" + getRowTop(row) + "px'>"); + + var colspan, m; + for (var i = 0, ii = columns.length; i < ii; i++) { + m = columns[i]; + colspan = 1; + if (metadata && metadata.columns) { + var columnData = metadata.columns[m.id] || metadata.columns[i]; + colspan = (columnData && columnData.colspan) || 1; + if (colspan === "*") { + colspan = ii - i; + } + } + + // Do not render cells outside of the viewport. + if (columnPosRight[Math.min(ii - 1, i + colspan - 1)] > range.leftPx) { + if (columnPosLeft[i] > range.rightPx) { + // All columns to the right are outside the range. + break; + } + + appendCellHtml(stringArray, row, i, colspan, d); + } + + if (colspan > 1) { + i += (colspan - 1); + } + } + + stringArray.push("</div>"); + } + + function appendCellHtml(stringArray, row, cell, colspan, item) { + var m = columns[cell]; + var cellCss = "slick-cell l" + cell + " r" + Math.min(columns.length - 1, cell + colspan - 1) + + (m.cssClass ? " " + m.cssClass : ""); + if (row === activeRow && cell === activeCell) { + cellCss += (" active"); + } + + // TODO: merge them together in the setter + for (var key in cellCssClasses) { + if (cellCssClasses[key][row] && cellCssClasses[key][row][m.id]) { + cellCss += (" " + cellCssClasses[key][row][m.id]); + } + } + + stringArray.push("<div class='" + cellCss + "'>"); + + // if there is a corresponding row (if not, this is the Add New row or this data hasn't been loaded yet) + if (item) { + var value = getDataItemValueForColumn(item, m); + stringArray.push(getFormatter(row, m)(row, cell, value, m, item)); + } + + stringArray.push("</div>"); + + rowsCache[row].cellRenderQueue.push(cell); + rowsCache[row].cellColSpans[cell] = colspan; + } + + + function cleanupRows(rangeToKeep) { + for (var i in rowsCache) { + if (((i = parseInt(i, 10)) !== activeRow) && (i < rangeToKeep.top || i > rangeToKeep.bottom)) { + removeRowFromCache(i); + } + } + } + + function invalidate() { + updateRowCount(); + invalidateAllRows(); + render(); + } + + function invalidateAllRows() { + if (currentEditor) { + makeActiveCellNormal(); + } + for (var row in rowsCache) { + removeRowFromCache(row); + } + } + + function removeRowFromCache(row) { + var cacheEntry = rowsCache[row]; + if (!cacheEntry) { + return; + } + $canvas[0].removeChild(cacheEntry.rowNode); + delete rowsCache[row]; + delete postProcessedRows[row]; + renderedRows--; + counter_rows_removed++; + } + + function invalidateRows(rows) { + var i, rl; + if (!rows || !rows.length) { + return; + } + vScrollDir = 0; + for (i = 0, rl = rows.length; i < rl; i++) { + if (currentEditor && activeRow === rows[i]) { + makeActiveCellNormal(); + } + if (rowsCache[rows[i]]) { + removeRowFromCache(rows[i]); + } + } + } + + function invalidateRow(row) { + invalidateRows([row]); + } + + function updateCell(row, cell) { + var cellNode = getCellNode(row, cell); + if (!cellNode) { + return; + } + + var m = columns[cell], d = getDataItem(row); + if (currentEditor && activeRow === row && activeCell === cell) { + currentEditor.loadValue(d); + } else { + cellNode.innerHTML = d ? getFormatter(row, m)(row, cell, getDataItemValueForColumn(d, m), m, d) : ""; + invalidatePostProcessingResults(row); + } + } + + function updateRow(row) { + var cacheEntry = rowsCache[row]; + if (!cacheEntry) { + return; + } + + ensureCellNodesInRowsCache(row); + + var d = getDataItem(row); + + for (var columnIdx in cacheEntry.cellNodesByColumnIdx) { + if (!cacheEntry.cellNodesByColumnIdx.hasOwnProperty(columnIdx)) { + continue; + } + + columnIdx = columnIdx | 0; + var m = columns[columnIdx], + node = cacheEntry.cellNodesByColumnIdx[columnIdx]; + + if (row === activeRow && columnIdx === activeCell && currentEditor) { + currentEditor.loadValue(d); + } else if (d) { + node.innerHTML = getFormatter(row, m)(row, columnIdx, getDataItemValueForColumn(d, m), m, d); + } else { + node.innerHTML = ""; + } + } + + invalidatePostProcessingResults(row); + } + + function getViewportHeight() { + return parseFloat($.css($container[0], "height", true)) - + parseFloat($.css($container[0], "paddingTop", true)) - + parseFloat($.css($container[0], "paddingBottom", true)) - + parseFloat($.css($headerScroller[0], "height")) - getVBoxDelta($headerScroller) - + (options.showTopPanel ? options.topPanelHeight + getVBoxDelta($topPanelScroller) : 0) - + (options.showHeaderRow ? options.headerRowHeight + getVBoxDelta($headerRowScroller) : 0); + } + + function resizeCanvas() { + if (!initialized) { return; } + if (options.autoHeight) { + viewportH = options.rowHeight * (getDataLength() + (options.enableAddRow ? 1 : 0)); + } else { + viewportH = getViewportHeight(); + } + + numVisibleRows = Math.ceil(viewportH / options.rowHeight); + viewportW = parseFloat($.css($container[0], "width", true)); + if (!options.autoHeight) { + $viewport.height(viewportH); + } + + if (options.forceFitColumns) { + autosizeColumns(); + } + + updateRowCount(); + handleScroll(); + render(); + } + + function updateRowCount() { + var dataLength = getDataLength(); + if (!initialized) { return; } + numberOfRows = dataLength + + (options.enableAddRow ? 1 : 0) + + (options.leaveSpaceForNewRows ? numVisibleRows - 1 : 0); + + var oldViewportHasVScroll = viewportHasVScroll; + // with autoHeight, we do not need to accommodate the vertical scroll bar + viewportHasVScroll = !options.autoHeight && (numberOfRows * options.rowHeight > viewportH); + + // remove the rows that are now outside of the data range + // this helps avoid redundant calls to .removeRow() when the size of the data decreased by thousands of rows + var l = options.enableAddRow ? dataLength : dataLength - 1; + for (var i in rowsCache) { + if (i >= l) { + removeRowFromCache(i); + } + } + + if (activeCellNode && activeRow > l) { + resetActiveCell(); + } + + var oldH = h; + th = Math.max(options.rowHeight * numberOfRows, viewportH - scrollbarDimensions.height); + if (th < maxSupportedCssHeight) { + // just one page + h = ph = th; + n = 1; + cj = 0; + } else { + // break into pages + h = maxSupportedCssHeight; + ph = h / 100; + n = Math.floor(th / ph); + cj = (th - h) / (n - 1); + } + + if (h !== oldH) { + $canvas.css("height", h); + scrollTop = $viewport[0].scrollTop; + } + + var oldScrollTopInRange = (scrollTop + offset <= th - viewportH); + + if (th == 0 || scrollTop == 0) { + page = offset = 0; + } else if (oldScrollTopInRange) { + // maintain virtual position + scrollTo(scrollTop + offset); + } else { + // scroll to bottom + scrollTo(th - viewportH); + } + + if (h != oldH && options.autoHeight) { + resizeCanvas(); + } + + if (options.forceFitColumns && oldViewportHasVScroll != viewportHasVScroll) { + autosizeColumns(); + } + updateCanvasWidth(false); + } + + function getVisibleRange(viewportTop, viewportLeft) { + if (viewportTop == null) { + viewportTop = scrollTop; + } + if (viewportLeft == null) { + viewportLeft = scrollLeft; + } + + return { + top: getRowFromPosition(viewportTop), + bottom: getRowFromPosition(viewportTop + viewportH) + 1, + leftPx: viewportLeft, + rightPx: viewportLeft + viewportW + }; + } + + function getRenderedRange(viewportTop, viewportLeft) { + var range = getVisibleRange(viewportTop, viewportLeft); + var buffer = Math.round(viewportH / options.rowHeight); + var minBuffer = 3; + + if (vScrollDir == -1) { + range.top -= buffer; + range.bottom += minBuffer; + } else if (vScrollDir == 1) { + range.top -= minBuffer; + range.bottom += buffer; + } else { + range.top -= minBuffer; + range.bottom += minBuffer; + } + + range.top = Math.max(0, range.top); + range.bottom = Math.min(options.enableAddRow ? getDataLength() : getDataLength() - 1, range.bottom); + + range.leftPx -= viewportW; + range.rightPx += viewportW; + + range.leftPx = Math.max(0, range.leftPx); + range.rightPx = Math.min(canvasWidth, range.rightPx); + + return range; + } + + function ensureCellNodesInRowsCache(row) { + var cacheEntry = rowsCache[row]; + if (cacheEntry) { + if (cacheEntry.cellRenderQueue.length) { + var lastChild = cacheEntry.rowNode.lastChild; + while (cacheEntry.cellRenderQueue.length) { + var columnIdx = cacheEntry.cellRenderQueue.pop(); + cacheEntry.cellNodesByColumnIdx[columnIdx] = lastChild; + lastChild = lastChild.previousSibling; + } + } + } + } + + function cleanUpCells(range, row) { + var totalCellsRemoved = 0; + var cacheEntry = rowsCache[row]; + + // Remove cells outside the range. + var cellsToRemove = []; + for (var i in cacheEntry.cellNodesByColumnIdx) { + // I really hate it when people mess with Array.prototype. + if (!cacheEntry.cellNodesByColumnIdx.hasOwnProperty(i)) { + continue; + } + + // This is a string, so it needs to be cast back to a number. + i = i | 0; + + var colspan = cacheEntry.cellColSpans[i]; + if (columnPosLeft[i] > range.rightPx || + columnPosRight[Math.min(columns.length - 1, i + colspan - 1)] < range.leftPx) { + if (!(row == activeRow && i == activeCell)) { + cellsToRemove.push(i); + } + } + } + + var cellToRemove; + while ((cellToRemove = cellsToRemove.pop()) != null) { + cacheEntry.rowNode.removeChild(cacheEntry.cellNodesByColumnIdx[cellToRemove]); + delete cacheEntry.cellColSpans[cellToRemove]; + delete cacheEntry.cellNodesByColumnIdx[cellToRemove]; + if (postProcessedRows[row]) { + delete postProcessedRows[row][cellToRemove]; + } + totalCellsRemoved++; + } + } + + function cleanUpAndRenderCells(range) { + var cacheEntry; + var stringArray = []; + var processedRows = []; + var cellsAdded; + var totalCellsAdded = 0; + var colspan; + + for (var row = range.top, btm = range.bottom; row <= btm; row++) { + cacheEntry = rowsCache[row]; + if (!cacheEntry) { + continue; + } + + // cellRenderQueue populated in renderRows() needs to be cleared first + ensureCellNodesInRowsCache(row); + + cleanUpCells(range, row); + + // Render missing cells. + cellsAdded = 0; + + var metadata = data.getItemMetadata && data.getItemMetadata(row); + metadata = metadata && metadata.columns; + + var d = getDataItem(row); + + // TODO: shorten this loop (index? heuristics? binary search?) + for (var i = 0, ii = columns.length; i < ii; i++) { + // Cells to the right are outside the range. + if (columnPosLeft[i] > range.rightPx) { + break; + } + + // Already rendered. + if ((colspan = cacheEntry.cellColSpans[i]) != null) { + i += (colspan > 1 ? colspan - 1 : 0); + continue; + } + + colspan = 1; + if (metadata) { + var columnData = metadata[columns[i].id] || metadata[i]; + colspan = (columnData && columnData.colspan) || 1; + if (colspan === "*") { + colspan = ii - i; + } + } + + if (columnPosRight[Math.min(ii - 1, i + colspan - 1)] > range.leftPx) { + appendCellHtml(stringArray, row, i, colspan, d); + cellsAdded++; + } + + i += (colspan > 1 ? colspan - 1 : 0); + } + + if (cellsAdded) { + totalCellsAdded += cellsAdded; + processedRows.push(row); + } + } + + if (!stringArray.length) { + return; + } + + var x = document.createElement("div"); + x.innerHTML = stringArray.join(""); + + var processedRow; + var node; + while ((processedRow = processedRows.pop()) != null) { + cacheEntry = rowsCache[processedRow]; + var columnIdx; + while ((columnIdx = cacheEntry.cellRenderQueue.pop()) != null) { + node = x.lastChild; + cacheEntry.rowNode.appendChild(node); + cacheEntry.cellNodesByColumnIdx[columnIdx] = node; + } + } + } + + function renderRows(range) { + var parentNode = $canvas[0], + stringArray = [], + rows = [], + needToReselectCell = false, + dataLength = getDataLength(); + + for (var i = range.top, ii = range.bottom; i <= ii; i++) { + if (rowsCache[i]) { + continue; + } + renderedRows++; + rows.push(i); + + // Create an entry right away so that appendRowHtml() can + // start populatating it. + rowsCache[i] = { + "rowNode": null, + + // ColSpans of rendered cells (by column idx). + // Can also be used for checking whether a cell has been rendered. + "cellColSpans": [], + + // Cell nodes (by column idx). Lazy-populated by ensureCellNodesInRowsCache(). + "cellNodesByColumnIdx": [], + + // Column indices of cell nodes that have been rendered, but not yet indexed in + // cellNodesByColumnIdx. These are in the same order as cell nodes added at the + // end of the row. + "cellRenderQueue": [] + }; + + appendRowHtml(stringArray, i, range, dataLength); + if (activeCellNode && activeRow === i) { + needToReselectCell = true; + } + counter_rows_rendered++; + } + + if (!rows.length) { return; } + + var x = document.createElement("div"); + x.innerHTML = stringArray.join(""); + + for (var i = 0, ii = rows.length; i < ii; i++) { + rowsCache[rows[i]].rowNode = parentNode.appendChild(x.firstChild); + } + + if (needToReselectCell) { + activeCellNode = getCellNode(activeRow, activeCell); + } + } + + function startPostProcessing() { + if (!options.enableAsyncPostRender) { + return; + } + clearTimeout(h_postrender); + h_postrender = setTimeout(asyncPostProcessRows, options.asyncPostRenderDelay); + } + + function invalidatePostProcessingResults(row) { + delete postProcessedRows[row]; + postProcessFromRow = Math.min(postProcessFromRow, row); + postProcessToRow = Math.max(postProcessToRow, row); + startPostProcessing(); + } + + function updateRowPositions() { + for (var row in rowsCache) { + rowsCache[row].rowNode.style.top = getRowTop(row) + "px"; + } + } + + function render() { + if (!initialized) { return; } + var visible = getVisibleRange(); + var rendered = getRenderedRange(); + + // remove rows no longer in the viewport + cleanupRows(rendered); + + // add new rows & missing cells in existing rows + if (lastRenderedScrollLeft != scrollLeft) { + cleanUpAndRenderCells(rendered); + } + + // render missing rows + renderRows(rendered); + + postProcessFromRow = visible.top; + postProcessToRow = Math.min(options.enableAddRow ? getDataLength() : getDataLength() - 1, visible.bottom); + startPostProcessing(); + + lastRenderedScrollTop = scrollTop; + lastRenderedScrollLeft = scrollLeft; + h_render = null; + } + + function handleHeaderRowScroll() { + var scrollLeft = $headerRowScroller[0].scrollLeft; + if (scrollLeft != $viewport[0].scrollLeft) { + $viewport[0].scrollLeft = scrollLeft; + } + } + + function handleScroll() { + scrollTop = $viewport[0].scrollTop; + scrollLeft = $viewport[0].scrollLeft; + var vScrollDist = Math.abs(scrollTop - prevScrollTop); + var hScrollDist = Math.abs(scrollLeft - prevScrollLeft); + + if (hScrollDist) { + prevScrollLeft = scrollLeft; + $headerScroller[0].scrollLeft = scrollLeft; + $topPanelScroller[0].scrollLeft = scrollLeft; + $headerRowScroller[0].scrollLeft = scrollLeft; + } + + if (vScrollDist) { + vScrollDir = prevScrollTop < scrollTop ? 1 : -1; + prevScrollTop = scrollTop; + + // switch virtual pages if needed + if (vScrollDist < viewportH) { + scrollTo(scrollTop + offset); + } else { + var oldOffset = offset; + if (h == viewportH) { + page = 0; + } else { + page = Math.min(n - 1, Math.floor(scrollTop * ((th - viewportH) / (h - viewportH)) * (1 / ph))); + } + offset = Math.round(page * cj); + if (oldOffset != offset) { + invalidateAllRows(); + } + } + } + + if (hScrollDist || vScrollDist) { + if (h_render) { + clearTimeout(h_render); + } + + if (Math.abs(lastRenderedScrollTop - scrollTop) > 20 || + Math.abs(lastRenderedScrollLeft - scrollLeft) > 20) { + if (options.forceSyncScrolling || ( + Math.abs(lastRenderedScrollTop - scrollTop) < viewportH && + Math.abs(lastRenderedScrollLeft - scrollLeft) < viewportW)) { + render(); + } else { + h_render = setTimeout(render, 50); + } + + trigger(self.onViewportChanged, {}); + } + } + + trigger(self.onScroll, {scrollLeft: scrollLeft, scrollTop: scrollTop}); + } + + function asyncPostProcessRows() { + while (postProcessFromRow <= postProcessToRow) { + var row = (vScrollDir >= 0) ? postProcessFromRow++ : postProcessToRow--; + var cacheEntry = rowsCache[row]; + if (!cacheEntry || row >= getDataLength()) { + continue; + } + + if (!postProcessedRows[row]) { + postProcessedRows[row] = {}; + } + + ensureCellNodesInRowsCache(row); + for (var columnIdx in cacheEntry.cellNodesByColumnIdx) { + if (!cacheEntry.cellNodesByColumnIdx.hasOwnProperty(columnIdx)) { + continue; + } + + columnIdx = columnIdx | 0; + + var m = columns[columnIdx]; + if (m.asyncPostRender && !postProcessedRows[row][columnIdx]) { + var node = cacheEntry.cellNodesByColumnIdx[columnIdx]; + if (node) { + m.asyncPostRender(node, row, getDataItem(row), m); + } + postProcessedRows[row][columnIdx] = true; + } + } + + h_postrender = setTimeout(asyncPostProcessRows, options.asyncPostRenderDelay); + return; + } + } + + function updateCellCssStylesOnRenderedRows(addedHash, removedHash) { + var node, columnId, addedRowHash, removedRowHash; + for (var row in rowsCache) { + removedRowHash = removedHash && removedHash[row]; + addedRowHash = addedHash && addedHash[row]; + + if (removedRowHash) { + for (columnId in removedRowHash) { + if (!addedRowHash || removedRowHash[columnId] != addedRowHash[columnId]) { + node = getCellNode(row, getColumnIndex(columnId)); + if (node) { + $(node).removeClass(removedRowHash[columnId]); + } + } + } + } + + if (addedRowHash) { + for (columnId in addedRowHash) { + if (!removedRowHash || removedRowHash[columnId] != addedRowHash[columnId]) { + node = getCellNode(row, getColumnIndex(columnId)); + if (node) { + $(node).addClass(addedRowHash[columnId]); + } + } + } + } + } + } + + function addCellCssStyles(key, hash) { + if (cellCssClasses[key]) { + throw "addCellCssStyles: cell CSS hash with key '" + key + "' already exists."; + } + + cellCssClasses[key] = hash; + updateCellCssStylesOnRenderedRows(hash, null); + + trigger(self.onCellCssStylesChanged, { "key": key, "hash": hash }); + } + + function removeCellCssStyles(key) { + if (!cellCssClasses[key]) { + return; + } + + updateCellCssStylesOnRenderedRows(null, cellCssClasses[key]); + delete cellCssClasses[key]; + + trigger(self.onCellCssStylesChanged, { "key": key, "hash": null }); + } + + function setCellCssStyles(key, hash) { + var prevHash = cellCssClasses[key]; + + cellCssClasses[key] = hash; + updateCellCssStylesOnRenderedRows(hash, prevHash); + + trigger(self.onCellCssStylesChanged, { "key": key, "hash": hash }); + } + + function getCellCssStyles(key) { + return cellCssClasses[key]; + } + + function flashCell(row, cell, speed) { + speed = speed || 100; + if (rowsCache[row]) { + var $cell = $(getCellNode(row, cell)); + + function toggleCellClass(times) { + if (!times) { + return; + } + setTimeout(function () { + $cell.queue(function () { + $cell.toggleClass(options.cellFlashingCssClass).dequeue(); + toggleCellClass(times - 1); + }); + }, + speed); + } + + toggleCellClass(4); + } + } + + ////////////////////////////////////////////////////////////////////////////////////////////// + // Interactivity + + function handleDragInit(e, dd) { + var cell = getCellFromEvent(e); + if (!cell || !cellExists(cell.row, cell.cell)) { + return false; + } + + var retval = trigger(self.onDragInit, dd, e); + if (e.isImmediatePropagationStopped()) { + return retval; + } + + // if nobody claims to be handling drag'n'drop by stopping immediate propagation, + // cancel out of it + return false; + } + + function handleDragStart(e, dd) { + var cell = getCellFromEvent(e); + if (!cell || !cellExists(cell.row, cell.cell)) { + return false; + } + + var retval = trigger(self.onDragStart, dd, e); + if (e.isImmediatePropagationStopped()) { + return retval; + } + + return false; + } + + function handleDrag(e, dd) { + return trigger(self.onDrag, dd, e); + } + + function handleDragEnd(e, dd) { + trigger(self.onDragEnd, dd, e); + } + + function handleKeyDown(e) { + trigger(self.onKeyDown, {row: activeRow, cell: activeCell}, e); + var handled = e.isImmediatePropagationStopped(); + + if (!handled) { + if (!e.shiftKey && !e.altKey && !e.ctrlKey) { + if (e.which == 27) { + if (!getEditorLock().isActive()) { + return; // no editing mode to cancel, allow bubbling and default processing (exit without cancelling the event) + } + cancelEditAndSetFocus(); + } else if (e.which == 37) { + handled = navigateLeft(); + } else if (e.which == 39) { + handled = navigateRight(); + } else if (e.which == 38) { + handled = navigateUp(); + } else if (e.which == 40) { + handled = navigateDown(); + } else if (e.which == 9) { + handled = navigateNext(); + } else if (e.which == 13) { + if (options.editable) { + if (currentEditor) { + // adding new row + if (activeRow === getDataLength()) { + navigateDown(); + } else { + commitEditAndSetFocus(); + } + } else { + if (getEditorLock().commitCurrentEdit()) { + makeActiveCellEditable(); + } + } + } + handled = true; + } + } else if (e.which == 9 && e.shiftKey && !e.ctrlKey && !e.altKey) { + handled = navigatePrev(); + } + } + + if (handled) { + // the event has been handled so don't let parent element (bubbling/propagation) or browser (default) handle it + e.stopPropagation(); + e.preventDefault(); + try { + e.originalEvent.keyCode = 0; // prevent default behaviour for special keys in IE browsers (F3, F5, etc.) + } + // ignore exceptions - setting the original event's keycode throws access denied exception for "Ctrl" + // (hitting control key only, nothing else), "Shift" (maybe others) + catch (error) { + } + } + } + + function handleClick(e) { + if (!currentEditor) { + // if this click resulted in some cell child node getting focus, + // don't steal it back - keyboard events will still bubble up + if (e.target != document.activeElement) { + setFocus(); + } + } + + var cell = getCellFromEvent(e); + if (!cell || (currentEditor !== null && activeRow == cell.row && activeCell == cell.cell)) { + return; + } + + trigger(self.onClick, {row: cell.row, cell: cell.cell}, e); + if (e.isImmediatePropagationStopped()) { + return; + } + + if ((activeCell != cell.cell || activeRow != cell.row) && canCellBeActive(cell.row, cell.cell)) { + if (!getEditorLock().isActive() || getEditorLock().commitCurrentEdit()) { + scrollRowIntoView(cell.row, false); + setActiveCellInternal(getCellNode(cell.row, cell.cell), (cell.row === getDataLength()) || options.autoEdit); + } + } + } + + function handleContextMenu(e) { + var $cell = $(e.target).closest(".slick-cell", $canvas); + if ($cell.length === 0) { + return; + } + + // are we editing this cell? + if (activeCellNode === $cell[0] && currentEditor !== null) { + return; + } + + trigger(self.onContextMenu, {}, e); + } + + function handleDblClick(e) { + var cell = getCellFromEvent(e); + if (!cell || (currentEditor !== null && activeRow == cell.row && activeCell == cell.cell)) { + return; + } + + trigger(self.onDblClick, {row: cell.row, cell: cell.cell}, e); + if (e.isImmediatePropagationStopped()) { + return; + } + + if (options.editable) { + gotoCell(cell.row, cell.cell, true); + } + } + + function handleHeaderMouseEnter(e) { + trigger(self.onHeaderMouseEnter, { + "column": $(this).data("column") + }, e); + } + + function handleHeaderMouseLeave(e) { + trigger(self.onHeaderMouseLeave, { + "column": $(this).data("column") + }, e); + } + + function handleHeaderContextMenu(e) { + var $header = $(e.target).closest(".slick-header-column", ".slick-header-columns"); + var column = $header && $header.data("column"); + trigger(self.onHeaderContextMenu, {column: column}, e); + } + + function handleHeaderClick(e) { + var $header = $(e.target).closest(".slick-header-column", ".slick-header-columns"); + var column = $header && $header.data("column"); + if (column) { + trigger(self.onHeaderClick, {column: column}, e); + } + } + + function handleMouseEnter(e) { + trigger(self.onMouseEnter, {}, e); + } + + function handleMouseLeave(e) { + trigger(self.onMouseLeave, {}, e); + } + + function cellExists(row, cell) { + return !(row < 0 || row >= getDataLength() || cell < 0 || cell >= columns.length); + } + + function getCellFromPoint(x, y) { + var row = getRowFromPosition(y); + var cell = 0; + + var w = 0; + for (var i = 0; i < columns.length && w < x; i++) { + w += columns[i].width; + cell++; + } + + if (cell < 0) { + cell = 0; + } + + return {row: row, cell: cell - 1}; + } + + function getCellFromNode(cellNode) { + // read column number from .l<columnNumber> CSS class + var cls = /l\d+/.exec(cellNode.className); + if (!cls) { + throw "getCellFromNode: cannot get cell - " + cellNode.className; + } + return parseInt(cls[0].substr(1, cls[0].length - 1), 10); + } + + function getRowFromNode(rowNode) { + for (var row in rowsCache) { + if (rowsCache[row].rowNode === rowNode) { + return row | 0; + } + } + + return null; + } + + function getCellFromEvent(e) { + var $cell = $(e.target).closest(".slick-cell", $canvas); + if (!$cell.length) { + return null; + } + + var row = getRowFromNode($cell[0].parentNode); + var cell = getCellFromNode($cell[0]); + + if (row == null || cell == null) { + return null; + } else { + return { + "row": row, + "cell": cell + }; + } + } + + function getCellNodeBox(row, cell) { + if (!cellExists(row, cell)) { + return null; + } + + var y1 = getRowTop(row); + var y2 = y1 + options.rowHeight - 1; + var x1 = 0; + for (var i = 0; i < cell; i++) { + x1 += columns[i].width; + } + var x2 = x1 + columns[cell].width; + + return { + top: y1, + left: x1, + bottom: y2, + right: x2 + }; + } + + ////////////////////////////////////////////////////////////////////////////////////////////// + // Cell switching + + function resetActiveCell() { + setActiveCellInternal(null, false); + } + + function setFocus() { + if (tabbingDirection == -1) { + $focusSink[0].focus(); + } else { + $focusSink2[0].focus(); + } + } + + function scrollCellIntoView(row, cell, doPaging) { + scrollRowIntoView(row, doPaging); + + var colspan = getColspan(row, cell); + var left = columnPosLeft[cell], + right = columnPosRight[cell + (colspan > 1 ? colspan - 1 : 0)], + scrollRight = scrollLeft + viewportW; + + if (left < scrollLeft) { + $viewport.scrollLeft(left); + handleScroll(); + render(); + } else if (right > scrollRight) { + $viewport.scrollLeft(Math.min(left, right - $viewport[0].clientWidth)); + handleScroll(); + render(); + } + } + + function setActiveCellInternal(newCell, editMode) { + if (activeCellNode !== null) { + makeActiveCellNormal(); + $(activeCellNode).removeClass("active"); + if (rowsCache[activeRow]) { + $(rowsCache[activeRow].rowNode).removeClass("active"); + } + } + + var activeCellChanged = (activeCellNode !== newCell); + activeCellNode = newCell; + + if (activeCellNode != null) { + activeRow = getRowFromNode(activeCellNode.parentNode); + activeCell = activePosX = getCellFromNode(activeCellNode); + + $(activeCellNode).addClass("active"); + $(rowsCache[activeRow].rowNode).addClass("active"); + + if (options.editable && editMode && isCellPotentiallyEditable(activeRow, activeCell)) { + clearTimeout(h_editorLoader); + + if (options.asyncEditorLoading) { + h_editorLoader = setTimeout(function () { + makeActiveCellEditable(); + }, options.asyncEditorLoadDelay); + } else { + makeActiveCellEditable(); + } + } + } else { + activeRow = activeCell = null; + } + + if (activeCellChanged) { + trigger(self.onActiveCellChanged, getActiveCell()); + } + } + + function clearTextSelection() { + if (document.selection && document.selection.empty) { + document.selection.empty(); + } else if (window.getSelection) { + var sel = window.getSelection(); + if (sel && sel.removeAllRanges) { + sel.removeAllRanges(); + } + } + } + + function isCellPotentiallyEditable(row, cell) { + // is the data for this row loaded? + if (row < getDataLength() && !getDataItem(row)) { + return false; + } + + // are we in the Add New row? can we create new from this cell? + if (columns[cell].cannotTriggerInsert && row >= getDataLength()) { + return false; + } + + // does this cell have an editor? + if (!getEditor(row, cell)) { + return false; + } + + return true; + } + + function makeActiveCellNormal() { + if (!currentEditor) { + return; + } + trigger(self.onBeforeCellEditorDestroy, {editor: currentEditor}); + currentEditor.destroy(); + currentEditor = null; + + if (activeCellNode) { + var d = getDataItem(activeRow); + $(activeCellNode).removeClass("editable invalid"); + if (d) { + var column = columns[activeCell]; + var formatter = getFormatter(activeRow, column); + activeCellNode.innerHTML = formatter(activeRow, activeCell, getDataItemValueForColumn(d, column), column, d); + invalidatePostProcessingResults(activeRow); + } + } + + // if there previously was text selected on a page (such as selected text in the edit cell just removed), + // IE can't set focus to anything else correctly + if (navigator.userAgent.toLowerCase().match(/msie/)) { + clearTextSelection(); + } + + getEditorLock().deactivate(editController); + } + + function makeActiveCellEditable(editor) { + if (!activeCellNode) { + return; + } + if (!options.editable) { + throw "Grid : makeActiveCellEditable : should never get called when options.editable is false"; + } + + // cancel pending async call if there is one + clearTimeout(h_editorLoader); + + if (!isCellPotentiallyEditable(activeRow, activeCell)) { + return; + } + + var columnDef = columns[activeCell]; + var item = getDataItem(activeRow); + + if (trigger(self.onBeforeEditCell, {row: activeRow, cell: activeCell, item: item, column: columnDef}) === false) { + setFocus(); + return; + } + + getEditorLock().activate(editController); + $(activeCellNode).addClass("editable"); + + // don't clear the cell if a custom editor is passed through + if (!editor) { + activeCellNode.innerHTML = ""; + } + + currentEditor = new (editor || getEditor(activeRow, activeCell))({ + grid: self, + gridPosition: absBox($container[0]), + position: absBox(activeCellNode), + container: activeCellNode, + column: columnDef, + item: item || {}, + commitChanges: commitEditAndSetFocus, + cancelChanges: cancelEditAndSetFocus + }); + + if (item) { + currentEditor.loadValue(item); + } + + serializedEditorValue = currentEditor.serializeValue(); + + if (currentEditor.position) { + handleActiveCellPositionChange(); + } + } + + function commitEditAndSetFocus() { + // if the commit fails, it would do so due to a validation error + // if so, do not steal the focus from the editor + if (getEditorLock().commitCurrentEdit()) { + setFocus(); + if (options.autoEdit) { + navigateDown(); + } + } + } + + function cancelEditAndSetFocus() { + if (getEditorLock().cancelCurrentEdit()) { + setFocus(); + } + } + + function absBox(elem) { + var box = { + top: elem.offsetTop, + left: elem.offsetLeft, + bottom: 0, + right: 0, + width: $(elem).outerWidth(), + height: $(elem).outerHeight(), + visible: true}; + box.bottom = box.top + box.height; + box.right = box.left + box.width; + + // walk up the tree + var offsetParent = elem.offsetParent; + while ((elem = elem.parentNode) != document.body) { + if (box.visible && elem.scrollHeight != elem.offsetHeight && $(elem).css("overflowY") != "visible") { + box.visible = box.bottom > elem.scrollTop && box.top < elem.scrollTop + elem.clientHeight; + } + + if (box.visible && elem.scrollWidth != elem.offsetWidth && $(elem).css("overflowX") != "visible") { + box.visible = box.right > elem.scrollLeft && box.left < elem.scrollLeft + elem.clientWidth; + } + + box.left -= elem.scrollLeft; + box.top -= elem.scrollTop; + + if (elem === offsetParent) { + box.left += elem.offsetLeft; + box.top += elem.offsetTop; + offsetParent = elem.offsetParent; + } + + box.bottom = box.top + box.height; + box.right = box.left + box.width; + } + + return box; + } + + function getActiveCellPosition() { + return absBox(activeCellNode); + } + + function getGridPosition() { + return absBox($container[0]) + } + + function handleActiveCellPositionChange() { + if (!activeCellNode) { + return; + } + + trigger(self.onActiveCellPositionChanged, {}); + + if (currentEditor) { + var cellBox = getActiveCellPosition(); + if (currentEditor.show && currentEditor.hide) { + if (!cellBox.visible) { + currentEditor.hide(); + } else { + currentEditor.show(); + } + } + + if (currentEditor.position) { + currentEditor.position(cellBox); + } + } + } + + function getCellEditor() { + return currentEditor; + } + + function getActiveCell() { + if (!activeCellNode) { + return null; + } else { + return {row: activeRow, cell: activeCell}; + } + } + + function getActiveCellNode() { + return activeCellNode; + } + + function scrollRowIntoView(row, doPaging) { + var rowAtTop = row * options.rowHeight; + var rowAtBottom = (row + 1) * options.rowHeight - viewportH + (viewportHasHScroll ? scrollbarDimensions.height : 0); + + // need to page down? + if ((row + 1) * options.rowHeight > scrollTop + viewportH + offset) { + scrollTo(doPaging ? rowAtTop : rowAtBottom); + render(); + } + // or page up? + else if (row * options.rowHeight < scrollTop + offset) { + scrollTo(doPaging ? rowAtBottom : rowAtTop); + render(); + } + } + + function scrollRowToTop(row) { + scrollTo(row * options.rowHeight); + render(); + } + + function getColspan(row, cell) { + var metadata = data.getItemMetadata && data.getItemMetadata(row); + if (!metadata || !metadata.columns) { + return 1; + } + + var columnData = metadata.columns[columns[cell].id] || metadata.columns[cell]; + var colspan = (columnData && columnData.colspan); + if (colspan === "*") { + colspan = columns.length - cell; + } else { + colspan = colspan || 1; + } + + return colspan; + } + + function findFirstFocusableCell(row) { + var cell = 0; + while (cell < columns.length) { + if (canCellBeActive(row, cell)) { + return cell; + } + cell += getColspan(row, cell); + } + return null; + } + + function findLastFocusableCell(row) { + var cell = 0; + var lastFocusableCell = null; + while (cell < columns.length) { + if (canCellBeActive(row, cell)) { + lastFocusableCell = cell; + } + cell += getColspan(row, cell); + } + return lastFocusableCell; + } + + function gotoRight(row, cell, posX) { + if (cell >= columns.length) { + return null; + } + + do { + cell += getColspan(row, cell); + } + while (cell < columns.length && !canCellBeActive(row, cell)); + + if (cell < columns.length) { + return { + "row": row, + "cell": cell, + "posX": cell + }; + } + return null; + } + + function gotoLeft(row, cell, posX) { + if (cell <= 0) { + return null; + } + + var firstFocusableCell = findFirstFocusableCell(row); + if (firstFocusableCell === null || firstFocusableCell >= cell) { + return null; + } + + var prev = { + "row": row, + "cell": firstFocusableCell, + "posX": firstFocusableCell + }; + var pos; + while (true) { + pos = gotoRight(prev.row, prev.cell, prev.posX); + if (!pos) { + return null; + } + if (pos.cell >= cell) { + return prev; + } + prev = pos; + } + } + + function gotoDown(row, cell, posX) { + var prevCell; + while (true) { + if (++row >= getDataLength() + (options.enableAddRow ? 1 : 0)) { + return null; + } + + prevCell = cell = 0; + while (cell <= posX) { + prevCell = cell; + cell += getColspan(row, cell); + } + + if (canCellBeActive(row, prevCell)) { + return { + "row": row, + "cell": prevCell, + "posX": posX + }; + } + } + } + + function gotoUp(row, cell, posX) { + var prevCell; + while (true) { + if (--row < 0) { + return null; + } + + prevCell = cell = 0; + while (cell <= posX) { + prevCell = cell; + cell += getColspan(row, cell); + } + + if (canCellBeActive(row, prevCell)) { + return { + "row": row, + "cell": prevCell, + "posX": posX + }; + } + } + } + + function gotoNext(row, cell, posX) { + if (row == null && cell == null) { + row = cell = posX = 0; + if (canCellBeActive(row, cell)) { + return { + "row": row, + "cell": cell, + "posX": cell + }; + } + } + + var pos = gotoRight(row, cell, posX); + if (pos) { + return pos; + } + + var firstFocusableCell = null; + while (++row < getDataLength() + (options.enableAddRow ? 1 : 0)) { + firstFocusableCell = findFirstFocusableCell(row); + if (firstFocusableCell !== null) { + return { + "row": row, + "cell": firstFocusableCell, + "posX": firstFocusableCell + }; + } + } + return null; + } + + function gotoPrev(row, cell, posX) { + if (row == null && cell == null) { + row = getDataLength() + (options.enableAddRow ? 1 : 0) - 1; + cell = posX = columns.length - 1; + if (canCellBeActive(row, cell)) { + return { + "row": row, + "cell": cell, + "posX": cell + }; + } + } + + var pos; + var lastSelectableCell; + while (!pos) { + pos = gotoLeft(row, cell, posX); + if (pos) { + break; + } + if (--row < 0) { + return null; + } + + cell = 0; + lastSelectableCell = findLastFocusableCell(row); + if (lastSelectableCell !== null) { + pos = { + "row": row, + "cell": lastSelectableCell, + "posX": lastSelectableCell + }; + } + } + return pos; + } + + function navigateRight() { + return navigate("right"); + } + + function navigateLeft() { + return navigate("left"); + } + + function navigateDown() { + return navigate("down"); + } + + function navigateUp() { + return navigate("up"); + } + + function navigateNext() { + return navigate("next"); + } + + function navigatePrev() { + return navigate("prev"); + } + + /** + * @param {string} dir Navigation direction. + * @return {boolean} Whether navigation resulted in a change of active cell. + */ + function navigate(dir) { + if (!options.enableCellNavigation) { + return false; + } + + if (!activeCellNode && dir != "prev" && dir != "next") { + return false; + } + + if (!getEditorLock().commitCurrentEdit()) { + return true; + } + setFocus(); + + var tabbingDirections = { + "up": -1, + "down": 1, + "left": -1, + "right": 1, + "prev": -1, + "next": 1 + }; + tabbingDirection = tabbingDirections[dir]; + + var stepFunctions = { + "up": gotoUp, + "down": gotoDown, + "left": gotoLeft, + "right": gotoRight, + "prev": gotoPrev, + "next": gotoNext + }; + var stepFn = stepFunctions[dir]; + var pos = stepFn(activeRow, activeCell, activePosX); + if (pos) { + var isAddNewRow = (pos.row == getDataLength()); + scrollCellIntoView(pos.row, pos.cell, !isAddNewRow); + setActiveCellInternal(getCellNode(pos.row, pos.cell), isAddNewRow || options.autoEdit); + activePosX = pos.posX; + return true; + } else { + setActiveCellInternal(getCellNode(activeRow, activeCell), (activeRow == getDataLength()) || options.autoEdit); + return false; + } + } + + function getCellNode(row, cell) { + if (rowsCache[row]) { + ensureCellNodesInRowsCache(row); + return rowsCache[row].cellNodesByColumnIdx[cell]; + } + return null; + } + + function setActiveCell(row, cell) { + if (!initialized) { return; } + if (row > getDataLength() || row < 0 || cell >= columns.length || cell < 0) { + return; + } + + if (!options.enableCellNavigation) { + return; + } + + scrollCellIntoView(row, cell, false); + setActiveCellInternal(getCellNode(row, cell), false); + } + + function canCellBeActive(row, cell) { + if (!options.enableCellNavigation || row >= getDataLength() + (options.enableAddRow ? 1 : 0) || + row < 0 || cell >= columns.length || cell < 0) { + return false; + } + + var rowMetadata = data.getItemMetadata && data.getItemMetadata(row); + if (rowMetadata && typeof rowMetadata.focusable === "boolean") { + return rowMetadata.focusable; + } + + var columnMetadata = rowMetadata && rowMetadata.columns; + if (columnMetadata && columnMetadata[columns[cell].id] && typeof columnMetadata[columns[cell].id].focusable === "boolean") { + return columnMetadata[columns[cell].id].focusable; + } + if (columnMetadata && columnMetadata[cell] && typeof columnMetadata[cell].focusable === "boolean") { + return columnMetadata[cell].focusable; + } + + return columns[cell].focusable; + } + + function canCellBeSelected(row, cell) { + if (row >= getDataLength() || row < 0 || cell >= columns.length || cell < 0) { + return false; + } + + var rowMetadata = data.getItemMetadata && data.getItemMetadata(row); + if (rowMetadata && typeof rowMetadata.selectable === "boolean") { + return rowMetadata.selectable; + } + + var columnMetadata = rowMetadata && rowMetadata.columns && (rowMetadata.columns[columns[cell].id] || rowMetadata.columns[cell]); + if (columnMetadata && typeof columnMetadata.selectable === "boolean") { + return columnMetadata.selectable; + } + + return columns[cell].selectable; + } + + function gotoCell(row, cell, forceEdit) { + if (!initialized) { return; } + if (!canCellBeActive(row, cell)) { + return; + } + + if (!getEditorLock().commitCurrentEdit()) { + return; + } + + scrollCellIntoView(row, cell, false); + + var newCell = getCellNode(row, cell); + + // if selecting the 'add new' row, start editing right away + setActiveCellInternal(newCell, forceEdit || (row === getDataLength()) || options.autoEdit); + + // if no editor was created, set the focus back on the grid + if (!currentEditor) { + setFocus(); + } + } + + + ////////////////////////////////////////////////////////////////////////////////////////////// + // IEditor implementation for the editor lock + + function commitCurrentEdit() { + var item = getDataItem(activeRow); + var column = columns[activeCell]; + + if (currentEditor) { + if (currentEditor.isValueChanged()) { + var validationResults = currentEditor.validate(); + + if (validationResults.valid) { + if (activeRow < getDataLength()) { + var editCommand = { + row: activeRow, + cell: activeCell, + editor: currentEditor, + serializedValue: currentEditor.serializeValue(), + prevSerializedValue: serializedEditorValue, + execute: function () { + this.editor.applyValue(item, this.serializedValue); + updateRow(this.row); + }, + undo: function () { + this.editor.applyValue(item, this.prevSerializedValue); + updateRow(this.row); + } + }; + + if (options.editCommandHandler) { + makeActiveCellNormal(); + options.editCommandHandler(item, column, editCommand); + } else { + editCommand.execute(); + makeActiveCellNormal(); + } + + trigger(self.onCellChange, { + row: activeRow, + cell: activeCell, + item: item + }); + } else { + var newItem = {}; + currentEditor.applyValue(newItem, currentEditor.serializeValue()); + makeActiveCellNormal(); + trigger(self.onAddNewRow, {item: newItem, column: column}); + } + + // check whether the lock has been re-acquired by event handlers + return !getEditorLock().isActive(); + } else { + // Re-add the CSS class to trigger transitions, if any. + $(activeCellNode).removeClass("invalid"); + $(activeCellNode).width(); // force layout + $(activeCellNode).addClass("invalid"); + + trigger(self.onValidationError, { + editor: currentEditor, + cellNode: activeCellNode, + validationResults: validationResults, + row: activeRow, + cell: activeCell, + column: column + }); + + currentEditor.focus(); + return false; + } + } + + makeActiveCellNormal(); + } + return true; + } + + function cancelCurrentEdit() { + makeActiveCellNormal(); + return true; + } + + function rowsToRanges(rows) { + var ranges = []; + var lastCell = columns.length - 1; + for (var i = 0; i < rows.length; i++) { + ranges.push(new Slick.Range(rows[i], 0, rows[i], lastCell)); + } + return ranges; + } + + function getSelectedRows() { + if (!selectionModel) { + throw "Selection model is not set"; + } + return selectedRows; + } + + function setSelectedRows(rows) { + if (!selectionModel) { + throw "Selection model is not set"; + } + selectionModel.setSelectedRanges(rowsToRanges(rows)); + } + + + ////////////////////////////////////////////////////////////////////////////////////////////// + // Debug + + this.debug = function () { + var s = ""; + + s += ("\n" + "counter_rows_rendered: " + counter_rows_rendered); + s += ("\n" + "counter_rows_removed: " + counter_rows_removed); + s += ("\n" + "renderedRows: " + renderedRows); + s += ("\n" + "numVisibleRows: " + numVisibleRows); + s += ("\n" + "maxSupportedCssHeight: " + maxSupportedCssHeight); + s += ("\n" + "n(umber of pages): " + n); + s += ("\n" + "(current) page: " + page); + s += ("\n" + "page height (ph): " + ph); + s += ("\n" + "vScrollDir: " + vScrollDir); + + alert(s); + }; + + // a debug helper to be able to access private members + this.eval = function (expr) { + return eval(expr); + }; + + ////////////////////////////////////////////////////////////////////////////////////////////// + // Public API + + $.extend(this, { + "slickGridVersion": "2.1", + + // Events + "onScroll": new Slick.Event(), + "onSort": new Slick.Event(), + "onHeaderMouseEnter": new Slick.Event(), + "onHeaderMouseLeave": new Slick.Event(), + "onHeaderContextMenu": new Slick.Event(), + "onHeaderClick": new Slick.Event(), + "onHeaderCellRendered": new Slick.Event(), + "onBeforeHeaderCellDestroy": new Slick.Event(), + "onHeaderRowCellRendered": new Slick.Event(), + "onBeforeHeaderRowCellDestroy": new Slick.Event(), + "onMouseEnter": new Slick.Event(), + "onMouseLeave": new Slick.Event(), + "onClick": new Slick.Event(), + "onDblClick": new Slick.Event(), + "onContextMenu": new Slick.Event(), + "onKeyDown": new Slick.Event(), + "onAddNewRow": new Slick.Event(), + "onValidationError": new Slick.Event(), + "onViewportChanged": new Slick.Event(), + "onColumnsReordered": new Slick.Event(), + "onColumnsResized": new Slick.Event(), + "onCellChange": new Slick.Event(), + "onBeforeEditCell": new Slick.Event(), + "onBeforeCellEditorDestroy": new Slick.Event(), + "onBeforeDestroy": new Slick.Event(), + "onActiveCellChanged": new Slick.Event(), + "onActiveCellPositionChanged": new Slick.Event(), + "onDragInit": new Slick.Event(), + "onDragStart": new Slick.Event(), + "onDrag": new Slick.Event(), + "onDragEnd": new Slick.Event(), + "onSelectedRowsChanged": new Slick.Event(), + "onCellCssStylesChanged": new Slick.Event(), + + // Methods + "registerPlugin": registerPlugin, + "unregisterPlugin": unregisterPlugin, + "getColumns": getColumns, + "setColumns": setColumns, + "getColumnIndex": getColumnIndex, + "updateColumnHeader": updateColumnHeader, + "setSortColumn": setSortColumn, + "setSortColumns": setSortColumns, + "getSortColumns": getSortColumns, + "autosizeColumns": autosizeColumns, + "getOptions": getOptions, + "setOptions": setOptions, + "getData": getData, + "getDataLength": getDataLength, + "getDataItem": getDataItem, + "setData": setData, + "getSelectionModel": getSelectionModel, + "setSelectionModel": setSelectionModel, + "getSelectedRows": getSelectedRows, + "setSelectedRows": setSelectedRows, + "getContainerNode": getContainerNode, + + "render": render, + "invalidate": invalidate, + "invalidateRow": invalidateRow, + "invalidateRows": invalidateRows, + "invalidateAllRows": invalidateAllRows, + "updateCell": updateCell, + "updateRow": updateRow, + "getViewport": getVisibleRange, + "getRenderedRange": getRenderedRange, + "resizeCanvas": resizeCanvas, + "updateRowCount": updateRowCount, + "scrollRowIntoView": scrollRowIntoView, + "scrollRowToTop": scrollRowToTop, + "scrollCellIntoView": scrollCellIntoView, + "getCanvasNode": getCanvasNode, + "focus": setFocus, + + "getCellFromPoint": getCellFromPoint, + "getCellFromEvent": getCellFromEvent, + "getActiveCell": getActiveCell, + "setActiveCell": setActiveCell, + "getActiveCellNode": getActiveCellNode, + "getActiveCellPosition": getActiveCellPosition, + "resetActiveCell": resetActiveCell, + "editActiveCell": makeActiveCellEditable, + "getCellEditor": getCellEditor, + "getCellNode": getCellNode, + "getCellNodeBox": getCellNodeBox, + "canCellBeSelected": canCellBeSelected, + "canCellBeActive": canCellBeActive, + "navigatePrev": navigatePrev, + "navigateNext": navigateNext, + "navigateUp": navigateUp, + "navigateDown": navigateDown, + "navigateLeft": navigateLeft, + "navigateRight": navigateRight, + "gotoCell": gotoCell, + "getTopPanel": getTopPanel, + "setTopPanelVisibility": setTopPanelVisibility, + "setHeaderRowVisibility": setHeaderRowVisibility, + "getHeaderRow": getHeaderRow, + "getHeaderRowColumn": getHeaderRowColumn, + "getGridPosition": getGridPosition, + "flashCell": flashCell, + "addCellCssStyles": addCellCssStyles, + "setCellCssStyles": setCellCssStyles, + "removeCellCssStyles": removeCellCssStyles, + "getCellCssStyles": getCellCssStyles, + + "init": finishInitialization, + "destroy": destroy, + + // IEditor implementation + "getEditorLock": getEditorLock, + "getEditController": getEditController + }); + + init(); + } +}(jQuery)); diff --git a/common/static/js/vendor/slick.groupitemmetadataprovider.js b/common/static/js/vendor/slick.groupitemmetadataprovider.js new file mode 100755 index 0000000000..49852a469a --- /dev/null +++ b/common/static/js/vendor/slick.groupitemmetadataprovider.js @@ -0,0 +1,144 @@ +(function ($) { + $.extend(true, window, { + Slick: { + Data: { + GroupItemMetadataProvider: GroupItemMetadataProvider + } + } + }); + + + /*** + * Provides item metadata for group (Slick.Group) and totals (Slick.Totals) rows produced by the DataView. + * This metadata overrides the default behavior and formatting of those rows so that they appear and function + * correctly when processed by the grid. + * + * This class also acts as a grid plugin providing event handlers to expand & collapse groups. + * If "grid.registerPlugin(...)" is not called, expand & collapse will not work. + * + * @class GroupItemMetadataProvider + * @module Data + * @namespace Slick.Data + * @constructor + * @param options + */ + function GroupItemMetadataProvider(options) { + var _grid; + var _defaults = { + groupCssClass: "slick-group", + groupTitleCssClass: "slick-group-title", + totalsCssClass: "slick-group-totals", + groupFocusable: true, + totalsFocusable: false, + toggleCssClass: "slick-group-toggle", + toggleExpandedCssClass: "expanded", + toggleCollapsedCssClass: "collapsed", + enableExpandCollapse: true + }; + + options = $.extend(true, {}, _defaults, options); + + + function defaultGroupCellFormatter(row, cell, value, columnDef, item) { + if (!options.enableExpandCollapse) { + return item.title; + } + + var indentation = item.level * 15 + "px"; + + return "<span class='" + options.toggleCssClass + " " + + (item.collapsed ? options.toggleCollapsedCssClass : options.toggleExpandedCssClass) + + "' style='margin-left:" + indentation +"'>" + + "</span>" + + "<span class='" + options.groupTitleCssClass + "' level='" + item.level + "'>" + + item.title + + "</span>"; + } + + function defaultTotalsCellFormatter(row, cell, value, columnDef, item) { + return (columnDef.groupTotalsFormatter && columnDef.groupTotalsFormatter(item, columnDef)) || ""; + } + + + function init(grid) { + _grid = grid; + _grid.onClick.subscribe(handleGridClick); + _grid.onKeyDown.subscribe(handleGridKeyDown); + + } + + function destroy() { + if (_grid) { + _grid.onClick.unsubscribe(handleGridClick); + _grid.onKeyDown.unsubscribe(handleGridKeyDown); + } + } + + function handleGridClick(e, args) { + var item = this.getDataItem(args.row); + if (item && item instanceof Slick.Group && $(e.target).hasClass(options.toggleCssClass)) { + if (item.collapsed) { + this.getData().expandGroup(item.groupingKey); + } else { + this.getData().collapseGroup(item.groupingKey); + } + + e.stopImmediatePropagation(); + e.preventDefault(); + } + } + + // TODO: add -/+ handling + function handleGridKeyDown(e, args) { + if (options.enableExpandCollapse && (e.which == $.ui.keyCode.SPACE)) { + var activeCell = this.getActiveCell(); + if (activeCell) { + var item = this.getDataItem(activeCell.row); + if (item && item instanceof Slick.Group) { + if (item.collapsed) { + this.getData().expandGroup(item.groupingKey); + } else { + this.getData().collapseGroup(item.groupingKey); + } + + e.stopImmediatePropagation(); + e.preventDefault(); + } + } + } + } + + function getGroupRowMetadata(item) { + return { + selectable: false, + focusable: options.groupFocusable, + cssClasses: options.groupCssClass, + columns: { + 0: { + colspan: "*", + formatter: defaultGroupCellFormatter, + editor: null + } + } + }; + } + + function getTotalsRowMetadata(item) { + return { + selectable: false, + focusable: options.totalsFocusable, + cssClasses: options.totalsCssClass, + formatter: defaultTotalsCellFormatter, + editor: null + }; + } + + + return { + "init": init, + "destroy": destroy, + "getGroupRowMetadata": getGroupRowMetadata, + "getTotalsRowMetadata": getTotalsRowMetadata + }; + } +})(jQuery); diff --git a/common/static/js/vendor/slick.remotemodel.js b/common/static/js/vendor/slick.remotemodel.js new file mode 100755 index 0000000000..e485706b08 --- /dev/null +++ b/common/static/js/vendor/slick.remotemodel.js @@ -0,0 +1,164 @@ +(function ($) { + /*** + * A sample AJAX data store implementation. + * Right now, it's hooked up to load all Apple-related Digg stories, but can + * easily be extended to support and JSONP-compatible backend that accepts paging parameters. + */ + function RemoteModel() { + // private + var PAGESIZE = 50; + var data = {length: 0}; + var searchstr = "apple"; + var sortcol = null; + var sortdir = 1; + var h_request = null; + var req = null; // ajax request + + // events + var onDataLoading = new Slick.Event(); + var onDataLoaded = new Slick.Event(); + + + function init() { + } + + + function isDataLoaded(from, to) { + for (var i = from; i <= to; i++) { + if (data[i] == undefined || data[i] == null) { + return false; + } + } + + return true; + } + + + function clear() { + for (var key in data) { + delete data[key]; + } + data.length = 0; + } + + + function ensureData(from, to) { + if (req) { + req.abort(); + for (var i = req.fromPage; i <= req.toPage; i++) + data[i * PAGESIZE] = undefined; + } + + if (from < 0) { + from = 0; + } + + var fromPage = Math.floor(from / PAGESIZE); + var toPage = Math.floor(to / PAGESIZE); + + while (data[fromPage * PAGESIZE] !== undefined && fromPage < toPage) + fromPage++; + + while (data[toPage * PAGESIZE] !== undefined && fromPage < toPage) + toPage--; + + if (fromPage > toPage || ((fromPage == toPage) && data[fromPage * PAGESIZE] !== undefined)) { + // TODO: look-ahead + return; + } + + var url = "http://services.digg.com/search/stories?query=" + searchstr + "&offset=" + (fromPage * PAGESIZE) + "&count=" + (((toPage - fromPage) * PAGESIZE) + PAGESIZE) + "&appkey=http://slickgrid.googlecode.com&type=javascript"; + + switch (sortcol) { + case "diggs": + url += ("&sort=" + ((sortdir > 0) ? "digg_count-asc" : "digg_count-desc")); + break; + } + + if (h_request != null) { + clearTimeout(h_request); + } + + h_request = setTimeout(function () { + for (var i = fromPage; i <= toPage; i++) + data[i * PAGESIZE] = null; // null indicates a 'requested but not available yet' + + onDataLoading.notify({from: from, to: to}); + + req = $.jsonp({ + url: url, + callbackParameter: "callback", + cache: true, // Digg doesn't accept the autogenerated cachebuster param + success: onSuccess, + error: function () { + onError(fromPage, toPage) + } + }); + req.fromPage = fromPage; + req.toPage = toPage; + }, 50); + } + + + function onError(fromPage, toPage) { + alert("error loading pages " + fromPage + " to " + toPage); + } + + function onSuccess(resp) { + var from = this.fromPage * PAGESIZE, to = from + resp.count; + data.length = parseInt(resp.total); + + for (var i = 0; i < resp.stories.length; i++) { + data[from + i] = resp.stories[i]; + data[from + i].index = from + i; + } + + req = null; + + onDataLoaded.notify({from: from, to: to}); + } + + + function reloadData(from, to) { + for (var i = from; i <= to; i++) + delete data[i]; + + ensureData(from, to); + } + + + function setSort(column, dir) { + sortcol = column; + sortdir = dir; + clear(); + } + + function setSearch(str) { + searchstr = str; + clear(); + } + + + init(); + + return { + // properties + "data": data, + + // methods + "clear": clear, + "isDataLoaded": isDataLoaded, + "ensureData": ensureData, + "reloadData": reloadData, + "setSort": setSort, + "setSearch": setSearch, + + // events + "onDataLoading": onDataLoading, + "onDataLoaded": onDataLoaded + }; + } + + // Slick.Data.RemoteModel + $.extend(true, window, { Slick: { Data: { RemoteModel: RemoteModel }}}); +})(jQuery); \ No newline at end of file diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss index d3ead53b25..3687d395f4 100644 --- a/common/static/sass/_mixins.scss +++ b/common/static/sass/_mixins.scss @@ -91,7 +91,7 @@ } - &.disabled, &[disabled] { + &.disabled, &[disabled], &.is-disabled { cursor: default; pointer-events: none; opacity: 0.5; @@ -205,7 +205,7 @@ // extends - UI archetypes - well .ui-well { box-shadow: inset 0 1px 2px 1px $shadow; - padding: ($baseline*0.75); + padding: ($baseline*0.75) $baseline; } // ==================== diff --git a/common/templates/courseware_vendor_js.html b/common/templates/courseware_vendor_js.html index 84e682ddac..20466210b8 100644 --- a/common/templates/courseware_vendor_js.html +++ b/common/templates/courseware_vendor_js.html @@ -8,6 +8,7 @@ <script type="text/javascript" src="${static.url('js/vendor/jquery.cookie.js')}"></script> <script type="text/javascript" src="${static.url('js/vendor/jquery.qtip.min.js')}"></script> <script type="text/javascript" src="${static.url('js/vendor/jquery.scrollTo-1.4.2-min.js')}"></script> +<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script> ## codemirror <link rel="stylesheet" href="${static.url('js/vendor/CodeMirror/codemirror.css')}" type="text/css" media="all" /> diff --git a/common/test/data/toy/course/2012_Fall.xml b/common/test/data/toy/course/2012_Fall.xml index 679f7bbfdb..2fd5401c24 100644 --- a/common/test/data/toy/course/2012_Fall.xml +++ b/common/test/data/toy/course/2012_Fall.xml @@ -4,6 +4,7 @@ <videosequence url_name="Toy_Videos"> <html url_name="secret:toylab"/> <html url_name="toyjumpto"/> + <html url_name="toyhtml"/> <video url_name="Video_Resources" youtube_id_1_0="1bK-WdDi6Qw" display_name="Video Resources"/> </videosequence> <video url_name="Welcome" youtube_id_1_0="p2Q6BrNhdh8" display_name="Welcome"/> diff --git a/common/test/data/toy/html/toyhtml.html b/common/test/data/toy/html/toyhtml.html new file mode 100644 index 0000000000..85fa34d71d --- /dev/null +++ b/common/test/data/toy/html/toyhtml.html @@ -0,0 +1 @@ +<a href='/static/handouts/sample_handout.txt'>Sample</a> \ No newline at end of file diff --git a/common/test/data/toy/html/toyhtml.xml b/common/test/data/toy/html/toyhtml.xml new file mode 100644 index 0000000000..321253e441 --- /dev/null +++ b/common/test/data/toy/html/toyhtml.xml @@ -0,0 +1 @@ +<html filename="toyhtml.html"/> \ No newline at end of file diff --git a/common/test/data/toy/roots/2012_Fall.xml b/common/test/data/toy/roots/2012_Fall.xml index b71528809b..2ed8c5458c 100644 --- a/common/test/data/toy/roots/2012_Fall.xml +++ b/common/test/data/toy/roots/2012_Fall.xml @@ -1 +1 @@ -<course org="edX" course="toy" url_name="2012_Fall"/> \ No newline at end of file +<course org="edX" course="toy" url_name="2012_Fall" display_organization="edX_display" display_coursenum="2012_Fall_Display" /> \ No newline at end of file diff --git a/conf/locale/babel.cfg b/conf/locale/babel.cfg index 5b8333cf1e..6631586ad4 100644 --- a/conf/locale/babel.cfg +++ b/conf/locale/babel.cfg @@ -17,3 +17,5 @@ input_encoding = utf-8 input_encoding = utf-8 [mako: common/templates/**.html] input_encoding = utf-8 +[mako: cms/templates/emails/**.txt] +input_encoding = utf-8 diff --git a/conf/locale/config b/conf/locale/config index 58f8da0513..67252b1fa0 100644 --- a/conf/locale/config +++ b/conf/locale/config @@ -1,4 +1,4 @@ { - "locales" : ["en", "es"], + "locales" : ["en"], "dummy-locale" : "fr" } diff --git a/doc/public/conf.py b/doc/public/conf.py deleted file mode 100644 index 5bb6ffad9b..0000000000 --- a/doc/public/conf.py +++ /dev/null @@ -1,245 +0,0 @@ -# -*- coding: utf-8 -*- -# -# edX Docs documentation build configuration file, created by -# sphinx-quickstart on Mon Feb 25 16:55:22 2013. -# -# This file is execfile()d with the current directory set to its containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys, os - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) - -# -- General configuration ----------------------------------------------------- -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be extensions -# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.mathjax'] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'edX Data' -copyright = u'2013, edX Team' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '0.1' -# The full version, including alpha/beta/rc tags. -release = '0.1' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ['_build'] - -# The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - - -# -- Options for HTML output --------------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'sphinxdoc' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# "<project> v<release> documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a <link> tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'edXDocsdoc' - - -# -- Options for LaTeX output -------------------------------------------------- - -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass [howto/manual]). -latex_documents = [ - ('index', 'edXDocs.tex', u'edX Data Documentation', - u'edX Team', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - -# -- Options for manual page output -------------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'edxdocs', u'edX Data Documentation', - [u'edX Team'], 1) -] - -# If true, show URL addresses after external links. -#man_show_urls = False - - -# -- Options for Texinfo output ------------------------------------------------ - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'edXDocs', u'edX Data Documentation', - u'edX Team', 'edXDocs', 'One line description of project.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -#texinfo_appendices = [] - -# If false, no module index is generated. -#texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' - - -# Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = {'http://docs.python.org/': None} diff --git a/docs/Makefile b/docs/Makefile index 1d3bb030a1..8e5e368266 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,153 +1,7 @@ -# Makefile for Sphinx documentation -# -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = build - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source - -.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext - -help: - @echo "Please use \`make <target>' where <target> is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - -rm -rf $(BUILDDIR)/* +.PHONY: html html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/MITx.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/MITx.qhc" - -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/MITx" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/MITx" - @echo "# devhelp" - -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." + @cd $(CURDIR)/data && make html + @cd $(CURDIR)/course_authors && make html + @cd $(CURDIR)/developers && make html diff --git a/docs/__init__.py b/docs/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/userdocs/Makefile b/docs/course_authors/Makefile old mode 100755 new mode 100644 similarity index 98% rename from userdocs/Makefile rename to docs/course_authors/Makefile index 06fa770521..a9054b9932 --- a/userdocs/Makefile +++ b/docs/course_authors/Makefile @@ -15,7 +15,7 @@ endif # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source diff --git a/docs/course_authors/__init__.py b/docs/course_authors/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/userdocs/source/Format Cheat Sheet.rst b/docs/course_authors/source/Format Cheat Sheet.rstnouse similarity index 100% rename from userdocs/source/Format Cheat Sheet.rst rename to docs/course_authors/source/Format Cheat Sheet.rstnouse diff --git a/userdocs/source/Images/286.png b/docs/course_authors/source/Images/286.png similarity index 100% rename from userdocs/source/Images/286.png rename to docs/course_authors/source/Images/286.png diff --git a/userdocs/source/Images/Image276.png b/docs/course_authors/source/Images/Image276.png similarity index 100% rename from userdocs/source/Images/Image276.png rename to docs/course_authors/source/Images/Image276.png diff --git a/userdocs/source/Images/Image300.png b/docs/course_authors/source/Images/Image300.png similarity index 100% rename from userdocs/source/Images/Image300.png rename to docs/course_authors/source/Images/Image300.png diff --git a/userdocs/source/Images/Image305.png b/docs/course_authors/source/Images/Image305.png similarity index 100% rename from userdocs/source/Images/Image305.png rename to docs/course_authors/source/Images/Image305.png diff --git a/userdocs/source/Images/filelist.xml b/docs/course_authors/source/Images/filelist.xml similarity index 100% rename from userdocs/source/Images/filelist.xml rename to docs/course_authors/source/Images/filelist.xml diff --git a/userdocs/source/Images/formularesponse.png b/docs/course_authors/source/Images/formularesponse.png similarity index 100% rename from userdocs/source/Images/formularesponse.png rename to docs/course_authors/source/Images/formularesponse.png diff --git a/userdocs/source/Images/formularesponse1.png b/docs/course_authors/source/Images/formularesponse1.png similarity index 100% rename from userdocs/source/Images/formularesponse1.png rename to docs/course_authors/source/Images/formularesponse1.png diff --git a/userdocs/source/Images/formularesponse3.png b/docs/course_authors/source/Images/formularesponse3.png similarity index 100% rename from userdocs/source/Images/formularesponse3.png rename to docs/course_authors/source/Images/formularesponse3.png diff --git a/userdocs/source/Images/formularesponse6.png b/docs/course_authors/source/Images/formularesponse6.png similarity index 100% rename from userdocs/source/Images/formularesponse6.png rename to docs/course_authors/source/Images/formularesponse6.png diff --git a/userdocs/source/Images/image001.png b/docs/course_authors/source/Images/image001.png similarity index 100% rename from userdocs/source/Images/image001.png rename to docs/course_authors/source/Images/image001.png diff --git a/userdocs/source/Images/image002.png b/docs/course_authors/source/Images/image002.png similarity index 100% rename from userdocs/source/Images/image002.png rename to docs/course_authors/source/Images/image002.png diff --git a/userdocs/source/Images/image003.png b/docs/course_authors/source/Images/image003.png similarity index 100% rename from userdocs/source/Images/image003.png rename to docs/course_authors/source/Images/image003.png diff --git a/userdocs/source/Images/image004.png b/docs/course_authors/source/Images/image004.png similarity index 100% rename from userdocs/source/Images/image004.png rename to docs/course_authors/source/Images/image004.png diff --git a/userdocs/source/Images/image005.png b/docs/course_authors/source/Images/image005.png similarity index 100% rename from userdocs/source/Images/image005.png rename to docs/course_authors/source/Images/image005.png diff --git a/userdocs/source/Images/image006.png b/docs/course_authors/source/Images/image006.png similarity index 100% rename from userdocs/source/Images/image006.png rename to docs/course_authors/source/Images/image006.png diff --git a/userdocs/source/Images/image007.png b/docs/course_authors/source/Images/image007.png similarity index 100% rename from userdocs/source/Images/image007.png rename to docs/course_authors/source/Images/image007.png diff --git a/userdocs/source/Images/image008.png b/docs/course_authors/source/Images/image008.png similarity index 100% rename from userdocs/source/Images/image008.png rename to docs/course_authors/source/Images/image008.png diff --git a/userdocs/source/Images/image009.png b/docs/course_authors/source/Images/image009.png similarity index 100% rename from userdocs/source/Images/image009.png rename to docs/course_authors/source/Images/image009.png diff --git a/userdocs/source/Images/image010.png b/docs/course_authors/source/Images/image010.png similarity index 100% rename from userdocs/source/Images/image010.png rename to docs/course_authors/source/Images/image010.png diff --git a/userdocs/source/Images/image011.png b/docs/course_authors/source/Images/image011.png similarity index 100% rename from userdocs/source/Images/image011.png rename to docs/course_authors/source/Images/image011.png diff --git a/userdocs/source/Images/image012.png b/docs/course_authors/source/Images/image012.png similarity index 100% rename from userdocs/source/Images/image012.png rename to docs/course_authors/source/Images/image012.png diff --git a/userdocs/source/Images/image013.png b/docs/course_authors/source/Images/image013.png similarity index 100% rename from userdocs/source/Images/image013.png rename to docs/course_authors/source/Images/image013.png diff --git a/userdocs/source/Images/image014.png b/docs/course_authors/source/Images/image014.png similarity index 100% rename from userdocs/source/Images/image014.png rename to docs/course_authors/source/Images/image014.png diff --git a/userdocs/source/Images/image015.png b/docs/course_authors/source/Images/image015.png similarity index 100% rename from userdocs/source/Images/image015.png rename to docs/course_authors/source/Images/image015.png diff --git a/userdocs/source/Images/image016.png b/docs/course_authors/source/Images/image016.png similarity index 100% rename from userdocs/source/Images/image016.png rename to docs/course_authors/source/Images/image016.png diff --git a/userdocs/source/Images/image017.png b/docs/course_authors/source/Images/image017.png similarity index 100% rename from userdocs/source/Images/image017.png rename to docs/course_authors/source/Images/image017.png diff --git a/userdocs/source/Images/image018.png b/docs/course_authors/source/Images/image018.png similarity index 100% rename from userdocs/source/Images/image018.png rename to docs/course_authors/source/Images/image018.png diff --git a/userdocs/source/Images/image019.png b/docs/course_authors/source/Images/image019.png similarity index 100% rename from userdocs/source/Images/image019.png rename to docs/course_authors/source/Images/image019.png diff --git a/userdocs/source/Images/image020.png b/docs/course_authors/source/Images/image020.png similarity index 100% rename from userdocs/source/Images/image020.png rename to docs/course_authors/source/Images/image020.png diff --git a/userdocs/source/Images/image021.png b/docs/course_authors/source/Images/image021.png similarity index 100% rename from userdocs/source/Images/image021.png rename to docs/course_authors/source/Images/image021.png diff --git a/userdocs/source/Images/image022.png b/docs/course_authors/source/Images/image022.png similarity index 100% rename from userdocs/source/Images/image022.png rename to docs/course_authors/source/Images/image022.png diff --git a/userdocs/source/Images/image023.png b/docs/course_authors/source/Images/image023.png similarity index 100% rename from userdocs/source/Images/image023.png rename to docs/course_authors/source/Images/image023.png diff --git a/userdocs/source/Images/image024.png b/docs/course_authors/source/Images/image024.png similarity index 100% rename from userdocs/source/Images/image024.png rename to docs/course_authors/source/Images/image024.png diff --git a/userdocs/source/Images/image025.png b/docs/course_authors/source/Images/image025.png similarity index 100% rename from userdocs/source/Images/image025.png rename to docs/course_authors/source/Images/image025.png diff --git a/userdocs/source/Images/image026.png b/docs/course_authors/source/Images/image026.png similarity index 100% rename from userdocs/source/Images/image026.png rename to docs/course_authors/source/Images/image026.png diff --git a/userdocs/source/Images/image027.png b/docs/course_authors/source/Images/image027.png similarity index 100% rename from userdocs/source/Images/image027.png rename to docs/course_authors/source/Images/image027.png diff --git a/userdocs/source/Images/image028.png b/docs/course_authors/source/Images/image028.png similarity index 100% rename from userdocs/source/Images/image028.png rename to docs/course_authors/source/Images/image028.png diff --git a/userdocs/source/Images/image029.png b/docs/course_authors/source/Images/image029.png similarity index 100% rename from userdocs/source/Images/image029.png rename to docs/course_authors/source/Images/image029.png diff --git a/userdocs/source/Images/image030.png b/docs/course_authors/source/Images/image030.png similarity index 100% rename from userdocs/source/Images/image030.png rename to docs/course_authors/source/Images/image030.png diff --git a/userdocs/source/Images/image031.png b/docs/course_authors/source/Images/image031.png similarity index 100% rename from userdocs/source/Images/image031.png rename to docs/course_authors/source/Images/image031.png diff --git a/userdocs/source/Images/image032.png b/docs/course_authors/source/Images/image032.png similarity index 100% rename from userdocs/source/Images/image032.png rename to docs/course_authors/source/Images/image032.png diff --git a/userdocs/source/Images/image033.png b/docs/course_authors/source/Images/image033.png similarity index 100% rename from userdocs/source/Images/image033.png rename to docs/course_authors/source/Images/image033.png diff --git a/userdocs/source/Images/image034.png b/docs/course_authors/source/Images/image034.png similarity index 100% rename from userdocs/source/Images/image034.png rename to docs/course_authors/source/Images/image034.png diff --git a/userdocs/source/Images/image035.png b/docs/course_authors/source/Images/image035.png similarity index 100% rename from userdocs/source/Images/image035.png rename to docs/course_authors/source/Images/image035.png diff --git a/userdocs/source/Images/image036.png b/docs/course_authors/source/Images/image036.png similarity index 100% rename from userdocs/source/Images/image036.png rename to docs/course_authors/source/Images/image036.png diff --git a/userdocs/source/Images/image037.png b/docs/course_authors/source/Images/image037.png similarity index 100% rename from userdocs/source/Images/image037.png rename to docs/course_authors/source/Images/image037.png diff --git a/userdocs/source/Images/image038.png b/docs/course_authors/source/Images/image038.png similarity index 100% rename from userdocs/source/Images/image038.png rename to docs/course_authors/source/Images/image038.png diff --git a/userdocs/source/Images/image039.png b/docs/course_authors/source/Images/image039.png similarity index 100% rename from userdocs/source/Images/image039.png rename to docs/course_authors/source/Images/image039.png diff --git a/userdocs/source/Images/image040.png b/docs/course_authors/source/Images/image040.png similarity index 100% rename from userdocs/source/Images/image040.png rename to docs/course_authors/source/Images/image040.png diff --git a/userdocs/source/Images/image041.png b/docs/course_authors/source/Images/image041.png similarity index 100% rename from userdocs/source/Images/image041.png rename to docs/course_authors/source/Images/image041.png diff --git a/userdocs/source/Images/image042.png b/docs/course_authors/source/Images/image042.png similarity index 100% rename from userdocs/source/Images/image042.png rename to docs/course_authors/source/Images/image042.png diff --git a/userdocs/source/Images/image043.png b/docs/course_authors/source/Images/image043.png similarity index 100% rename from userdocs/source/Images/image043.png rename to docs/course_authors/source/Images/image043.png diff --git a/userdocs/source/Images/image044.png b/docs/course_authors/source/Images/image044.png similarity index 100% rename from userdocs/source/Images/image044.png rename to docs/course_authors/source/Images/image044.png diff --git a/userdocs/source/Images/image045.png b/docs/course_authors/source/Images/image045.png similarity index 100% rename from userdocs/source/Images/image045.png rename to docs/course_authors/source/Images/image045.png diff --git a/userdocs/source/Images/image046.png b/docs/course_authors/source/Images/image046.png similarity index 100% rename from userdocs/source/Images/image046.png rename to docs/course_authors/source/Images/image046.png diff --git a/userdocs/source/Images/image047.png b/docs/course_authors/source/Images/image047.png similarity index 100% rename from userdocs/source/Images/image047.png rename to docs/course_authors/source/Images/image047.png diff --git a/userdocs/source/Images/image048.png b/docs/course_authors/source/Images/image048.png similarity index 100% rename from userdocs/source/Images/image048.png rename to docs/course_authors/source/Images/image048.png diff --git a/userdocs/source/Images/image049.png b/docs/course_authors/source/Images/image049.png similarity index 100% rename from userdocs/source/Images/image049.png rename to docs/course_authors/source/Images/image049.png diff --git a/userdocs/source/Images/image050.png b/docs/course_authors/source/Images/image050.png similarity index 100% rename from userdocs/source/Images/image050.png rename to docs/course_authors/source/Images/image050.png diff --git a/userdocs/source/Images/image051.png b/docs/course_authors/source/Images/image051.png similarity index 100% rename from userdocs/source/Images/image051.png rename to docs/course_authors/source/Images/image051.png diff --git a/userdocs/source/Images/image052.png b/docs/course_authors/source/Images/image052.png similarity index 100% rename from userdocs/source/Images/image052.png rename to docs/course_authors/source/Images/image052.png diff --git a/userdocs/source/Images/image053.png b/docs/course_authors/source/Images/image053.png similarity index 100% rename from userdocs/source/Images/image053.png rename to docs/course_authors/source/Images/image053.png diff --git a/userdocs/source/Images/image054.png b/docs/course_authors/source/Images/image054.png similarity index 100% rename from userdocs/source/Images/image054.png rename to docs/course_authors/source/Images/image054.png diff --git a/userdocs/source/Images/image055.png b/docs/course_authors/source/Images/image055.png similarity index 100% rename from userdocs/source/Images/image055.png rename to docs/course_authors/source/Images/image055.png diff --git a/userdocs/source/Images/image056.png b/docs/course_authors/source/Images/image056.png similarity index 100% rename from userdocs/source/Images/image056.png rename to docs/course_authors/source/Images/image056.png diff --git a/userdocs/source/Images/image057.png b/docs/course_authors/source/Images/image057.png similarity index 100% rename from userdocs/source/Images/image057.png rename to docs/course_authors/source/Images/image057.png diff --git a/userdocs/source/Images/image058.png b/docs/course_authors/source/Images/image058.png similarity index 100% rename from userdocs/source/Images/image058.png rename to docs/course_authors/source/Images/image058.png diff --git a/userdocs/source/Images/image059.png b/docs/course_authors/source/Images/image059.png similarity index 100% rename from userdocs/source/Images/image059.png rename to docs/course_authors/source/Images/image059.png diff --git a/userdocs/source/Images/image060.png b/docs/course_authors/source/Images/image060.png similarity index 100% rename from userdocs/source/Images/image060.png rename to docs/course_authors/source/Images/image060.png diff --git a/userdocs/source/Images/image061.png b/docs/course_authors/source/Images/image061.png similarity index 100% rename from userdocs/source/Images/image061.png rename to docs/course_authors/source/Images/image061.png diff --git a/userdocs/source/Images/image062.png b/docs/course_authors/source/Images/image062.png similarity index 100% rename from userdocs/source/Images/image062.png rename to docs/course_authors/source/Images/image062.png diff --git a/userdocs/source/Images/image063.png b/docs/course_authors/source/Images/image063.png similarity index 100% rename from userdocs/source/Images/image063.png rename to docs/course_authors/source/Images/image063.png diff --git a/userdocs/source/Images/image063.psd b/docs/course_authors/source/Images/image063.psd similarity index 100% rename from userdocs/source/Images/image063.psd rename to docs/course_authors/source/Images/image063.psd diff --git a/userdocs/source/Images/image064.png b/docs/course_authors/source/Images/image064.png similarity index 100% rename from userdocs/source/Images/image064.png rename to docs/course_authors/source/Images/image064.png diff --git a/userdocs/source/Images/image065.png b/docs/course_authors/source/Images/image065.png similarity index 100% rename from userdocs/source/Images/image065.png rename to docs/course_authors/source/Images/image065.png diff --git a/userdocs/source/Images/image066.png b/docs/course_authors/source/Images/image066.png similarity index 100% rename from userdocs/source/Images/image066.png rename to docs/course_authors/source/Images/image066.png diff --git a/userdocs/source/Images/image067.png b/docs/course_authors/source/Images/image067.png similarity index 100% rename from userdocs/source/Images/image067.png rename to docs/course_authors/source/Images/image067.png diff --git a/userdocs/source/Images/image068.png b/docs/course_authors/source/Images/image068.png similarity index 100% rename from userdocs/source/Images/image068.png rename to docs/course_authors/source/Images/image068.png diff --git a/userdocs/source/Images/image069.png b/docs/course_authors/source/Images/image069.png similarity index 100% rename from userdocs/source/Images/image069.png rename to docs/course_authors/source/Images/image069.png diff --git a/userdocs/source/Images/image070.png b/docs/course_authors/source/Images/image070.png similarity index 100% rename from userdocs/source/Images/image070.png rename to docs/course_authors/source/Images/image070.png diff --git a/userdocs/source/Images/image071.png b/docs/course_authors/source/Images/image071.png similarity index 100% rename from userdocs/source/Images/image071.png rename to docs/course_authors/source/Images/image071.png diff --git a/userdocs/source/Images/image072.png b/docs/course_authors/source/Images/image072.png similarity index 100% rename from userdocs/source/Images/image072.png rename to docs/course_authors/source/Images/image072.png diff --git a/userdocs/source/Images/image073.png b/docs/course_authors/source/Images/image073.png similarity index 100% rename from userdocs/source/Images/image073.png rename to docs/course_authors/source/Images/image073.png diff --git a/userdocs/source/Images/image074.png b/docs/course_authors/source/Images/image074.png similarity index 100% rename from userdocs/source/Images/image074.png rename to docs/course_authors/source/Images/image074.png diff --git a/userdocs/source/Images/image075.png b/docs/course_authors/source/Images/image075.png similarity index 100% rename from userdocs/source/Images/image075.png rename to docs/course_authors/source/Images/image075.png diff --git a/userdocs/source/Images/image076.png b/docs/course_authors/source/Images/image076.png similarity index 100% rename from userdocs/source/Images/image076.png rename to docs/course_authors/source/Images/image076.png diff --git a/userdocs/source/Images/image077.jpg b/docs/course_authors/source/Images/image077.jpg similarity index 100% rename from userdocs/source/Images/image077.jpg rename to docs/course_authors/source/Images/image077.jpg diff --git a/userdocs/source/Images/image078.png b/docs/course_authors/source/Images/image078.png similarity index 100% rename from userdocs/source/Images/image078.png rename to docs/course_authors/source/Images/image078.png diff --git a/userdocs/source/Images/image079.png b/docs/course_authors/source/Images/image079.png similarity index 100% rename from userdocs/source/Images/image079.png rename to docs/course_authors/source/Images/image079.png diff --git a/userdocs/source/Images/image080.png b/docs/course_authors/source/Images/image080.png similarity index 100% rename from userdocs/source/Images/image080.png rename to docs/course_authors/source/Images/image080.png diff --git a/userdocs/source/Images/image081.png b/docs/course_authors/source/Images/image081.png similarity index 100% rename from userdocs/source/Images/image081.png rename to docs/course_authors/source/Images/image081.png diff --git a/userdocs/source/Images/image082.png b/docs/course_authors/source/Images/image082.png similarity index 100% rename from userdocs/source/Images/image082.png rename to docs/course_authors/source/Images/image082.png diff --git a/userdocs/source/Images/image083.png b/docs/course_authors/source/Images/image083.png similarity index 100% rename from userdocs/source/Images/image083.png rename to docs/course_authors/source/Images/image083.png diff --git a/userdocs/source/Images/image084.png b/docs/course_authors/source/Images/image084.png similarity index 100% rename from userdocs/source/Images/image084.png rename to docs/course_authors/source/Images/image084.png diff --git a/userdocs/source/Images/image085.png b/docs/course_authors/source/Images/image085.png similarity index 100% rename from userdocs/source/Images/image085.png rename to docs/course_authors/source/Images/image085.png diff --git a/userdocs/source/Images/image086.png b/docs/course_authors/source/Images/image086.png similarity index 100% rename from userdocs/source/Images/image086.png rename to docs/course_authors/source/Images/image086.png diff --git a/userdocs/source/Images/image087.png b/docs/course_authors/source/Images/image087.png similarity index 100% rename from userdocs/source/Images/image087.png rename to docs/course_authors/source/Images/image087.png diff --git a/userdocs/source/Images/image088.png b/docs/course_authors/source/Images/image088.png similarity index 100% rename from userdocs/source/Images/image088.png rename to docs/course_authors/source/Images/image088.png diff --git a/userdocs/source/Images/image089.png b/docs/course_authors/source/Images/image089.png similarity index 100% rename from userdocs/source/Images/image089.png rename to docs/course_authors/source/Images/image089.png diff --git a/userdocs/source/Images/image090.png b/docs/course_authors/source/Images/image090.png similarity index 100% rename from userdocs/source/Images/image090.png rename to docs/course_authors/source/Images/image090.png diff --git a/userdocs/source/Images/image091.png b/docs/course_authors/source/Images/image091.png similarity index 100% rename from userdocs/source/Images/image091.png rename to docs/course_authors/source/Images/image091.png diff --git a/userdocs/source/Images/image092.png b/docs/course_authors/source/Images/image092.png similarity index 100% rename from userdocs/source/Images/image092.png rename to docs/course_authors/source/Images/image092.png diff --git a/userdocs/source/Images/image093.png b/docs/course_authors/source/Images/image093.png similarity index 100% rename from userdocs/source/Images/image093.png rename to docs/course_authors/source/Images/image093.png diff --git a/userdocs/source/Images/image094.png b/docs/course_authors/source/Images/image094.png similarity index 100% rename from userdocs/source/Images/image094.png rename to docs/course_authors/source/Images/image094.png diff --git a/userdocs/source/Images/image095.png b/docs/course_authors/source/Images/image095.png similarity index 100% rename from userdocs/source/Images/image095.png rename to docs/course_authors/source/Images/image095.png diff --git a/userdocs/source/Images/image096.png b/docs/course_authors/source/Images/image096.png similarity index 100% rename from userdocs/source/Images/image096.png rename to docs/course_authors/source/Images/image096.png diff --git a/userdocs/source/Images/image097.png b/docs/course_authors/source/Images/image097.png similarity index 100% rename from userdocs/source/Images/image097.png rename to docs/course_authors/source/Images/image097.png diff --git a/userdocs/source/Images/image098.png b/docs/course_authors/source/Images/image098.png similarity index 100% rename from userdocs/source/Images/image098.png rename to docs/course_authors/source/Images/image098.png diff --git a/userdocs/source/Images/image099.png b/docs/course_authors/source/Images/image099.png similarity index 100% rename from userdocs/source/Images/image099.png rename to docs/course_authors/source/Images/image099.png diff --git a/userdocs/source/Images/image100.png b/docs/course_authors/source/Images/image100.png similarity index 100% rename from userdocs/source/Images/image100.png rename to docs/course_authors/source/Images/image100.png diff --git a/userdocs/source/Images/image101.png b/docs/course_authors/source/Images/image101.png similarity index 100% rename from userdocs/source/Images/image101.png rename to docs/course_authors/source/Images/image101.png diff --git a/userdocs/source/Images/image102.png b/docs/course_authors/source/Images/image102.png similarity index 100% rename from userdocs/source/Images/image102.png rename to docs/course_authors/source/Images/image102.png diff --git a/userdocs/source/Images/image103.jpg b/docs/course_authors/source/Images/image103.jpg similarity index 100% rename from userdocs/source/Images/image103.jpg rename to docs/course_authors/source/Images/image103.jpg diff --git a/userdocs/source/Images/image104.png b/docs/course_authors/source/Images/image104.png similarity index 100% rename from userdocs/source/Images/image104.png rename to docs/course_authors/source/Images/image104.png diff --git a/userdocs/source/Images/image105.png b/docs/course_authors/source/Images/image105.png similarity index 100% rename from userdocs/source/Images/image105.png rename to docs/course_authors/source/Images/image105.png diff --git a/userdocs/source/Images/image106.png b/docs/course_authors/source/Images/image106.png similarity index 100% rename from userdocs/source/Images/image106.png rename to docs/course_authors/source/Images/image106.png diff --git a/userdocs/source/Images/image107.png b/docs/course_authors/source/Images/image107.png similarity index 100% rename from userdocs/source/Images/image107.png rename to docs/course_authors/source/Images/image107.png diff --git a/userdocs/source/Images/image108.png b/docs/course_authors/source/Images/image108.png similarity index 100% rename from userdocs/source/Images/image108.png rename to docs/course_authors/source/Images/image108.png diff --git a/userdocs/source/Images/image109.png b/docs/course_authors/source/Images/image109.png similarity index 100% rename from userdocs/source/Images/image109.png rename to docs/course_authors/source/Images/image109.png diff --git a/userdocs/source/Images/image110.png b/docs/course_authors/source/Images/image110.png similarity index 100% rename from userdocs/source/Images/image110.png rename to docs/course_authors/source/Images/image110.png diff --git a/userdocs/source/Images/image111.png b/docs/course_authors/source/Images/image111.png similarity index 100% rename from userdocs/source/Images/image111.png rename to docs/course_authors/source/Images/image111.png diff --git a/userdocs/source/Images/image112.png b/docs/course_authors/source/Images/image112.png similarity index 100% rename from userdocs/source/Images/image112.png rename to docs/course_authors/source/Images/image112.png diff --git a/userdocs/source/Images/image113.png b/docs/course_authors/source/Images/image113.png similarity index 100% rename from userdocs/source/Images/image113.png rename to docs/course_authors/source/Images/image113.png diff --git a/userdocs/source/Images/image114.png b/docs/course_authors/source/Images/image114.png similarity index 100% rename from userdocs/source/Images/image114.png rename to docs/course_authors/source/Images/image114.png diff --git a/userdocs/source/Images/image115.png b/docs/course_authors/source/Images/image115.png similarity index 100% rename from userdocs/source/Images/image115.png rename to docs/course_authors/source/Images/image115.png diff --git a/userdocs/source/Images/image116.png b/docs/course_authors/source/Images/image116.png similarity index 100% rename from userdocs/source/Images/image116.png rename to docs/course_authors/source/Images/image116.png diff --git a/userdocs/source/Images/image117.png b/docs/course_authors/source/Images/image117.png similarity index 100% rename from userdocs/source/Images/image117.png rename to docs/course_authors/source/Images/image117.png diff --git a/userdocs/source/Images/image118.png b/docs/course_authors/source/Images/image118.png similarity index 100% rename from userdocs/source/Images/image118.png rename to docs/course_authors/source/Images/image118.png diff --git a/userdocs/source/Images/image119.png b/docs/course_authors/source/Images/image119.png similarity index 100% rename from userdocs/source/Images/image119.png rename to docs/course_authors/source/Images/image119.png diff --git a/userdocs/source/Images/image120.png b/docs/course_authors/source/Images/image120.png similarity index 100% rename from userdocs/source/Images/image120.png rename to docs/course_authors/source/Images/image120.png diff --git a/userdocs/source/Images/image121.png b/docs/course_authors/source/Images/image121.png similarity index 100% rename from userdocs/source/Images/image121.png rename to docs/course_authors/source/Images/image121.png diff --git a/userdocs/source/Images/image122.png b/docs/course_authors/source/Images/image122.png similarity index 100% rename from userdocs/source/Images/image122.png rename to docs/course_authors/source/Images/image122.png diff --git a/userdocs/source/Images/image123.png b/docs/course_authors/source/Images/image123.png similarity index 100% rename from userdocs/source/Images/image123.png rename to docs/course_authors/source/Images/image123.png diff --git a/userdocs/source/Images/image124.png b/docs/course_authors/source/Images/image124.png similarity index 100% rename from userdocs/source/Images/image124.png rename to docs/course_authors/source/Images/image124.png diff --git a/userdocs/source/Images/image125.png b/docs/course_authors/source/Images/image125.png similarity index 100% rename from userdocs/source/Images/image125.png rename to docs/course_authors/source/Images/image125.png diff --git a/userdocs/source/Images/image126.png b/docs/course_authors/source/Images/image126.png similarity index 100% rename from userdocs/source/Images/image126.png rename to docs/course_authors/source/Images/image126.png diff --git a/userdocs/source/Images/image127.png b/docs/course_authors/source/Images/image127.png similarity index 100% rename from userdocs/source/Images/image127.png rename to docs/course_authors/source/Images/image127.png diff --git a/userdocs/source/Images/image128.png b/docs/course_authors/source/Images/image128.png similarity index 100% rename from userdocs/source/Images/image128.png rename to docs/course_authors/source/Images/image128.png diff --git a/userdocs/source/Images/image129.png b/docs/course_authors/source/Images/image129.png similarity index 100% rename from userdocs/source/Images/image129.png rename to docs/course_authors/source/Images/image129.png diff --git a/userdocs/source/Images/image130.png b/docs/course_authors/source/Images/image130.png similarity index 100% rename from userdocs/source/Images/image130.png rename to docs/course_authors/source/Images/image130.png diff --git a/userdocs/source/Images/image131.png b/docs/course_authors/source/Images/image131.png similarity index 100% rename from userdocs/source/Images/image131.png rename to docs/course_authors/source/Images/image131.png diff --git a/userdocs/source/Images/image132.png b/docs/course_authors/source/Images/image132.png similarity index 100% rename from userdocs/source/Images/image132.png rename to docs/course_authors/source/Images/image132.png diff --git a/userdocs/source/Images/image133.png b/docs/course_authors/source/Images/image133.png similarity index 100% rename from userdocs/source/Images/image133.png rename to docs/course_authors/source/Images/image133.png diff --git a/userdocs/source/Images/image134.png b/docs/course_authors/source/Images/image134.png similarity index 100% rename from userdocs/source/Images/image134.png rename to docs/course_authors/source/Images/image134.png diff --git a/userdocs/source/Images/image135.png b/docs/course_authors/source/Images/image135.png similarity index 100% rename from userdocs/source/Images/image135.png rename to docs/course_authors/source/Images/image135.png diff --git a/userdocs/source/Images/image136.png b/docs/course_authors/source/Images/image136.png similarity index 100% rename from userdocs/source/Images/image136.png rename to docs/course_authors/source/Images/image136.png diff --git a/userdocs/source/Images/image137.png b/docs/course_authors/source/Images/image137.png similarity index 100% rename from userdocs/source/Images/image137.png rename to docs/course_authors/source/Images/image137.png diff --git a/userdocs/source/Images/image138.png b/docs/course_authors/source/Images/image138.png similarity index 100% rename from userdocs/source/Images/image138.png rename to docs/course_authors/source/Images/image138.png diff --git a/userdocs/source/Images/image139.png b/docs/course_authors/source/Images/image139.png similarity index 100% rename from userdocs/source/Images/image139.png rename to docs/course_authors/source/Images/image139.png diff --git a/userdocs/source/Images/image140.png b/docs/course_authors/source/Images/image140.png similarity index 100% rename from userdocs/source/Images/image140.png rename to docs/course_authors/source/Images/image140.png diff --git a/userdocs/source/Images/image141.png b/docs/course_authors/source/Images/image141.png similarity index 100% rename from userdocs/source/Images/image141.png rename to docs/course_authors/source/Images/image141.png diff --git a/userdocs/source/Images/image142.png b/docs/course_authors/source/Images/image142.png similarity index 100% rename from userdocs/source/Images/image142.png rename to docs/course_authors/source/Images/image142.png diff --git a/userdocs/source/Images/image143.png b/docs/course_authors/source/Images/image143.png similarity index 100% rename from userdocs/source/Images/image143.png rename to docs/course_authors/source/Images/image143.png diff --git a/userdocs/source/Images/image144.png b/docs/course_authors/source/Images/image144.png similarity index 100% rename from userdocs/source/Images/image144.png rename to docs/course_authors/source/Images/image144.png diff --git a/userdocs/source/Images/image145.png b/docs/course_authors/source/Images/image145.png similarity index 100% rename from userdocs/source/Images/image145.png rename to docs/course_authors/source/Images/image145.png diff --git a/userdocs/source/Images/image146.png b/docs/course_authors/source/Images/image146.png similarity index 100% rename from userdocs/source/Images/image146.png rename to docs/course_authors/source/Images/image146.png diff --git a/userdocs/source/Images/image147.png b/docs/course_authors/source/Images/image147.png similarity index 100% rename from userdocs/source/Images/image147.png rename to docs/course_authors/source/Images/image147.png diff --git a/userdocs/source/Images/image148.png b/docs/course_authors/source/Images/image148.png similarity index 100% rename from userdocs/source/Images/image148.png rename to docs/course_authors/source/Images/image148.png diff --git a/userdocs/source/Images/image149.png b/docs/course_authors/source/Images/image149.png similarity index 100% rename from userdocs/source/Images/image149.png rename to docs/course_authors/source/Images/image149.png diff --git a/userdocs/source/Images/image150.png b/docs/course_authors/source/Images/image150.png similarity index 100% rename from userdocs/source/Images/image150.png rename to docs/course_authors/source/Images/image150.png diff --git a/userdocs/source/Images/image151.png b/docs/course_authors/source/Images/image151.png similarity index 100% rename from userdocs/source/Images/image151.png rename to docs/course_authors/source/Images/image151.png diff --git a/userdocs/source/Images/image152.png b/docs/course_authors/source/Images/image152.png similarity index 100% rename from userdocs/source/Images/image152.png rename to docs/course_authors/source/Images/image152.png diff --git a/userdocs/source/Images/image153.png b/docs/course_authors/source/Images/image153.png similarity index 100% rename from userdocs/source/Images/image153.png rename to docs/course_authors/source/Images/image153.png diff --git a/userdocs/source/Images/image154.png b/docs/course_authors/source/Images/image154.png similarity index 100% rename from userdocs/source/Images/image154.png rename to docs/course_authors/source/Images/image154.png diff --git a/userdocs/source/Images/image155.png b/docs/course_authors/source/Images/image155.png similarity index 100% rename from userdocs/source/Images/image155.png rename to docs/course_authors/source/Images/image155.png diff --git a/userdocs/source/Images/image156.png b/docs/course_authors/source/Images/image156.png similarity index 100% rename from userdocs/source/Images/image156.png rename to docs/course_authors/source/Images/image156.png diff --git a/userdocs/source/Images/image157.png b/docs/course_authors/source/Images/image157.png similarity index 100% rename from userdocs/source/Images/image157.png rename to docs/course_authors/source/Images/image157.png diff --git a/userdocs/source/Images/image158.png b/docs/course_authors/source/Images/image158.png similarity index 100% rename from userdocs/source/Images/image158.png rename to docs/course_authors/source/Images/image158.png diff --git a/userdocs/source/Images/image159.png b/docs/course_authors/source/Images/image159.png similarity index 100% rename from userdocs/source/Images/image159.png rename to docs/course_authors/source/Images/image159.png diff --git a/userdocs/source/Images/image160.png b/docs/course_authors/source/Images/image160.png similarity index 100% rename from userdocs/source/Images/image160.png rename to docs/course_authors/source/Images/image160.png diff --git a/userdocs/source/Images/image161.png b/docs/course_authors/source/Images/image161.png similarity index 100% rename from userdocs/source/Images/image161.png rename to docs/course_authors/source/Images/image161.png diff --git a/userdocs/source/Images/image162.png b/docs/course_authors/source/Images/image162.png similarity index 100% rename from userdocs/source/Images/image162.png rename to docs/course_authors/source/Images/image162.png diff --git a/userdocs/source/Images/image163.png b/docs/course_authors/source/Images/image163.png similarity index 100% rename from userdocs/source/Images/image163.png rename to docs/course_authors/source/Images/image163.png diff --git a/userdocs/source/Images/image164.png b/docs/course_authors/source/Images/image164.png similarity index 100% rename from userdocs/source/Images/image164.png rename to docs/course_authors/source/Images/image164.png diff --git a/userdocs/source/Images/image165.png b/docs/course_authors/source/Images/image165.png similarity index 100% rename from userdocs/source/Images/image165.png rename to docs/course_authors/source/Images/image165.png diff --git a/userdocs/source/Images/image166.png b/docs/course_authors/source/Images/image166.png similarity index 100% rename from userdocs/source/Images/image166.png rename to docs/course_authors/source/Images/image166.png diff --git a/userdocs/source/Images/image167.png b/docs/course_authors/source/Images/image167.png similarity index 100% rename from userdocs/source/Images/image167.png rename to docs/course_authors/source/Images/image167.png diff --git a/userdocs/source/Images/image168.png b/docs/course_authors/source/Images/image168.png similarity index 100% rename from userdocs/source/Images/image168.png rename to docs/course_authors/source/Images/image168.png diff --git a/userdocs/source/Images/image169.png b/docs/course_authors/source/Images/image169.png similarity index 100% rename from userdocs/source/Images/image169.png rename to docs/course_authors/source/Images/image169.png diff --git a/userdocs/source/Images/image170.png b/docs/course_authors/source/Images/image170.png similarity index 100% rename from userdocs/source/Images/image170.png rename to docs/course_authors/source/Images/image170.png diff --git a/userdocs/source/Images/image171.png b/docs/course_authors/source/Images/image171.png similarity index 100% rename from userdocs/source/Images/image171.png rename to docs/course_authors/source/Images/image171.png diff --git a/userdocs/source/Images/image172.png b/docs/course_authors/source/Images/image172.png similarity index 100% rename from userdocs/source/Images/image172.png rename to docs/course_authors/source/Images/image172.png diff --git a/userdocs/source/Images/image173.png b/docs/course_authors/source/Images/image173.png similarity index 100% rename from userdocs/source/Images/image173.png rename to docs/course_authors/source/Images/image173.png diff --git a/userdocs/source/Images/image174.png b/docs/course_authors/source/Images/image174.png similarity index 100% rename from userdocs/source/Images/image174.png rename to docs/course_authors/source/Images/image174.png diff --git a/userdocs/source/Images/image175.png b/docs/course_authors/source/Images/image175.png similarity index 100% rename from userdocs/source/Images/image175.png rename to docs/course_authors/source/Images/image175.png diff --git a/userdocs/source/Images/image176.png b/docs/course_authors/source/Images/image176.png similarity index 100% rename from userdocs/source/Images/image176.png rename to docs/course_authors/source/Images/image176.png diff --git a/userdocs/source/Images/image177.png b/docs/course_authors/source/Images/image177.png similarity index 100% rename from userdocs/source/Images/image177.png rename to docs/course_authors/source/Images/image177.png diff --git a/userdocs/source/Images/image178.png b/docs/course_authors/source/Images/image178.png similarity index 100% rename from userdocs/source/Images/image178.png rename to docs/course_authors/source/Images/image178.png diff --git a/userdocs/source/Images/image179.png b/docs/course_authors/source/Images/image179.png similarity index 100% rename from userdocs/source/Images/image179.png rename to docs/course_authors/source/Images/image179.png diff --git a/userdocs/source/Images/image180.png b/docs/course_authors/source/Images/image180.png similarity index 100% rename from userdocs/source/Images/image180.png rename to docs/course_authors/source/Images/image180.png diff --git a/userdocs/source/Images/image181.png b/docs/course_authors/source/Images/image181.png similarity index 100% rename from userdocs/source/Images/image181.png rename to docs/course_authors/source/Images/image181.png diff --git a/userdocs/source/Images/image182.png b/docs/course_authors/source/Images/image182.png similarity index 100% rename from userdocs/source/Images/image182.png rename to docs/course_authors/source/Images/image182.png diff --git a/userdocs/source/Images/image183.jpg b/docs/course_authors/source/Images/image183.jpg similarity index 100% rename from userdocs/source/Images/image183.jpg rename to docs/course_authors/source/Images/image183.jpg diff --git a/userdocs/source/Images/image184.png b/docs/course_authors/source/Images/image184.png similarity index 100% rename from userdocs/source/Images/image184.png rename to docs/course_authors/source/Images/image184.png diff --git a/userdocs/source/Images/image185.png b/docs/course_authors/source/Images/image185.png similarity index 100% rename from userdocs/source/Images/image185.png rename to docs/course_authors/source/Images/image185.png diff --git a/userdocs/source/Images/image186.png b/docs/course_authors/source/Images/image186.png similarity index 100% rename from userdocs/source/Images/image186.png rename to docs/course_authors/source/Images/image186.png diff --git a/userdocs/source/Images/image187.png b/docs/course_authors/source/Images/image187.png similarity index 100% rename from userdocs/source/Images/image187.png rename to docs/course_authors/source/Images/image187.png diff --git a/userdocs/source/Images/image188.png b/docs/course_authors/source/Images/image188.png similarity index 100% rename from userdocs/source/Images/image188.png rename to docs/course_authors/source/Images/image188.png diff --git a/userdocs/source/Images/image189.png b/docs/course_authors/source/Images/image189.png similarity index 100% rename from userdocs/source/Images/image189.png rename to docs/course_authors/source/Images/image189.png diff --git a/userdocs/source/Images/image190.png b/docs/course_authors/source/Images/image190.png similarity index 100% rename from userdocs/source/Images/image190.png rename to docs/course_authors/source/Images/image190.png diff --git a/userdocs/source/Images/image191.png b/docs/course_authors/source/Images/image191.png similarity index 100% rename from userdocs/source/Images/image191.png rename to docs/course_authors/source/Images/image191.png diff --git a/userdocs/source/Images/image192.png b/docs/course_authors/source/Images/image192.png similarity index 100% rename from userdocs/source/Images/image192.png rename to docs/course_authors/source/Images/image192.png diff --git a/userdocs/source/Images/image193.png b/docs/course_authors/source/Images/image193.png similarity index 100% rename from userdocs/source/Images/image193.png rename to docs/course_authors/source/Images/image193.png diff --git a/userdocs/source/Images/image194.png b/docs/course_authors/source/Images/image194.png similarity index 100% rename from userdocs/source/Images/image194.png rename to docs/course_authors/source/Images/image194.png diff --git a/userdocs/source/Images/image195.png b/docs/course_authors/source/Images/image195.png similarity index 100% rename from userdocs/source/Images/image195.png rename to docs/course_authors/source/Images/image195.png diff --git a/userdocs/source/Images/image196.png b/docs/course_authors/source/Images/image196.png similarity index 100% rename from userdocs/source/Images/image196.png rename to docs/course_authors/source/Images/image196.png diff --git a/userdocs/source/Images/image197.png b/docs/course_authors/source/Images/image197.png similarity index 100% rename from userdocs/source/Images/image197.png rename to docs/course_authors/source/Images/image197.png diff --git a/userdocs/source/Images/image198.png b/docs/course_authors/source/Images/image198.png similarity index 100% rename from userdocs/source/Images/image198.png rename to docs/course_authors/source/Images/image198.png diff --git a/userdocs/source/Images/image199.png b/docs/course_authors/source/Images/image199.png similarity index 100% rename from userdocs/source/Images/image199.png rename to docs/course_authors/source/Images/image199.png diff --git a/userdocs/source/Images/image200.png b/docs/course_authors/source/Images/image200.png similarity index 100% rename from userdocs/source/Images/image200.png rename to docs/course_authors/source/Images/image200.png diff --git a/userdocs/source/Images/image201.png b/docs/course_authors/source/Images/image201.png similarity index 100% rename from userdocs/source/Images/image201.png rename to docs/course_authors/source/Images/image201.png diff --git a/userdocs/source/Images/image202.png b/docs/course_authors/source/Images/image202.png similarity index 100% rename from userdocs/source/Images/image202.png rename to docs/course_authors/source/Images/image202.png diff --git a/userdocs/source/Images/image203.png b/docs/course_authors/source/Images/image203.png similarity index 100% rename from userdocs/source/Images/image203.png rename to docs/course_authors/source/Images/image203.png diff --git a/userdocs/source/Images/image204.png b/docs/course_authors/source/Images/image204.png similarity index 100% rename from userdocs/source/Images/image204.png rename to docs/course_authors/source/Images/image204.png diff --git a/userdocs/source/Images/image205.png b/docs/course_authors/source/Images/image205.png similarity index 100% rename from userdocs/source/Images/image205.png rename to docs/course_authors/source/Images/image205.png diff --git a/userdocs/source/Images/image206.png b/docs/course_authors/source/Images/image206.png similarity index 100% rename from userdocs/source/Images/image206.png rename to docs/course_authors/source/Images/image206.png diff --git a/userdocs/source/Images/image207.png b/docs/course_authors/source/Images/image207.png similarity index 100% rename from userdocs/source/Images/image207.png rename to docs/course_authors/source/Images/image207.png diff --git a/userdocs/source/Images/image208.png b/docs/course_authors/source/Images/image208.png similarity index 100% rename from userdocs/source/Images/image208.png rename to docs/course_authors/source/Images/image208.png diff --git a/userdocs/source/Images/image209.png b/docs/course_authors/source/Images/image209.png similarity index 100% rename from userdocs/source/Images/image209.png rename to docs/course_authors/source/Images/image209.png diff --git a/userdocs/source/Images/image210.png b/docs/course_authors/source/Images/image210.png similarity index 100% rename from userdocs/source/Images/image210.png rename to docs/course_authors/source/Images/image210.png diff --git a/userdocs/source/Images/image211.png b/docs/course_authors/source/Images/image211.png similarity index 100% rename from userdocs/source/Images/image211.png rename to docs/course_authors/source/Images/image211.png diff --git a/userdocs/source/Images/image212.png b/docs/course_authors/source/Images/image212.png similarity index 100% rename from userdocs/source/Images/image212.png rename to docs/course_authors/source/Images/image212.png diff --git a/userdocs/source/Images/image213.png b/docs/course_authors/source/Images/image213.png similarity index 100% rename from userdocs/source/Images/image213.png rename to docs/course_authors/source/Images/image213.png diff --git a/userdocs/source/Images/image214.png b/docs/course_authors/source/Images/image214.png similarity index 100% rename from userdocs/source/Images/image214.png rename to docs/course_authors/source/Images/image214.png diff --git a/userdocs/source/Images/image215.png b/docs/course_authors/source/Images/image215.png similarity index 100% rename from userdocs/source/Images/image215.png rename to docs/course_authors/source/Images/image215.png diff --git a/userdocs/source/Images/image216.png b/docs/course_authors/source/Images/image216.png similarity index 100% rename from userdocs/source/Images/image216.png rename to docs/course_authors/source/Images/image216.png diff --git a/userdocs/source/Images/image217.png b/docs/course_authors/source/Images/image217.png similarity index 100% rename from userdocs/source/Images/image217.png rename to docs/course_authors/source/Images/image217.png diff --git a/userdocs/source/Images/image218.png b/docs/course_authors/source/Images/image218.png similarity index 100% rename from userdocs/source/Images/image218.png rename to docs/course_authors/source/Images/image218.png diff --git a/userdocs/source/Images/image219.png b/docs/course_authors/source/Images/image219.png similarity index 100% rename from userdocs/source/Images/image219.png rename to docs/course_authors/source/Images/image219.png diff --git a/userdocs/source/Images/image220.png b/docs/course_authors/source/Images/image220.png similarity index 100% rename from userdocs/source/Images/image220.png rename to docs/course_authors/source/Images/image220.png diff --git a/userdocs/source/Images/image221.png b/docs/course_authors/source/Images/image221.png similarity index 100% rename from userdocs/source/Images/image221.png rename to docs/course_authors/source/Images/image221.png diff --git a/userdocs/source/Images/image222.png b/docs/course_authors/source/Images/image222.png similarity index 100% rename from userdocs/source/Images/image222.png rename to docs/course_authors/source/Images/image222.png diff --git a/userdocs/source/Images/image223.png b/docs/course_authors/source/Images/image223.png similarity index 100% rename from userdocs/source/Images/image223.png rename to docs/course_authors/source/Images/image223.png diff --git a/userdocs/source/Images/image224.png b/docs/course_authors/source/Images/image224.png similarity index 100% rename from userdocs/source/Images/image224.png rename to docs/course_authors/source/Images/image224.png diff --git a/userdocs/source/Images/image225.png b/docs/course_authors/source/Images/image225.png similarity index 100% rename from userdocs/source/Images/image225.png rename to docs/course_authors/source/Images/image225.png diff --git a/userdocs/source/Images/image226.png b/docs/course_authors/source/Images/image226.png similarity index 100% rename from userdocs/source/Images/image226.png rename to docs/course_authors/source/Images/image226.png diff --git a/userdocs/source/Images/image227.png b/docs/course_authors/source/Images/image227.png similarity index 100% rename from userdocs/source/Images/image227.png rename to docs/course_authors/source/Images/image227.png diff --git a/userdocs/source/Images/image228.png b/docs/course_authors/source/Images/image228.png similarity index 100% rename from userdocs/source/Images/image228.png rename to docs/course_authors/source/Images/image228.png diff --git a/userdocs/source/Images/image229.png b/docs/course_authors/source/Images/image229.png similarity index 100% rename from userdocs/source/Images/image229.png rename to docs/course_authors/source/Images/image229.png diff --git a/userdocs/source/Images/image230.png b/docs/course_authors/source/Images/image230.png similarity index 100% rename from userdocs/source/Images/image230.png rename to docs/course_authors/source/Images/image230.png diff --git a/userdocs/source/Images/image231.png b/docs/course_authors/source/Images/image231.png similarity index 100% rename from userdocs/source/Images/image231.png rename to docs/course_authors/source/Images/image231.png diff --git a/userdocs/source/Images/image232.png b/docs/course_authors/source/Images/image232.png similarity index 100% rename from userdocs/source/Images/image232.png rename to docs/course_authors/source/Images/image232.png diff --git a/userdocs/source/Images/image233.png b/docs/course_authors/source/Images/image233.png similarity index 100% rename from userdocs/source/Images/image233.png rename to docs/course_authors/source/Images/image233.png diff --git a/userdocs/source/Images/image234.png b/docs/course_authors/source/Images/image234.png similarity index 100% rename from userdocs/source/Images/image234.png rename to docs/course_authors/source/Images/image234.png diff --git a/userdocs/source/Images/image235.png b/docs/course_authors/source/Images/image235.png similarity index 100% rename from userdocs/source/Images/image235.png rename to docs/course_authors/source/Images/image235.png diff --git a/userdocs/source/Images/image236.png b/docs/course_authors/source/Images/image236.png similarity index 100% rename from userdocs/source/Images/image236.png rename to docs/course_authors/source/Images/image236.png diff --git a/userdocs/source/Images/image237.png b/docs/course_authors/source/Images/image237.png similarity index 100% rename from userdocs/source/Images/image237.png rename to docs/course_authors/source/Images/image237.png diff --git a/userdocs/source/Images/image238.png b/docs/course_authors/source/Images/image238.png similarity index 100% rename from userdocs/source/Images/image238.png rename to docs/course_authors/source/Images/image238.png diff --git a/userdocs/source/Images/image239.png b/docs/course_authors/source/Images/image239.png similarity index 100% rename from userdocs/source/Images/image239.png rename to docs/course_authors/source/Images/image239.png diff --git a/userdocs/source/Images/image240.png b/docs/course_authors/source/Images/image240.png similarity index 100% rename from userdocs/source/Images/image240.png rename to docs/course_authors/source/Images/image240.png diff --git a/userdocs/source/Images/image241.png b/docs/course_authors/source/Images/image241.png similarity index 100% rename from userdocs/source/Images/image241.png rename to docs/course_authors/source/Images/image241.png diff --git a/userdocs/source/Images/image242.png b/docs/course_authors/source/Images/image242.png similarity index 100% rename from userdocs/source/Images/image242.png rename to docs/course_authors/source/Images/image242.png diff --git a/userdocs/source/Images/image243.png b/docs/course_authors/source/Images/image243.png similarity index 100% rename from userdocs/source/Images/image243.png rename to docs/course_authors/source/Images/image243.png diff --git a/userdocs/source/Images/image244.png b/docs/course_authors/source/Images/image244.png similarity index 100% rename from userdocs/source/Images/image244.png rename to docs/course_authors/source/Images/image244.png diff --git a/userdocs/source/Images/image245.png b/docs/course_authors/source/Images/image245.png similarity index 100% rename from userdocs/source/Images/image245.png rename to docs/course_authors/source/Images/image245.png diff --git a/userdocs/source/Images/image246.png b/docs/course_authors/source/Images/image246.png similarity index 100% rename from userdocs/source/Images/image246.png rename to docs/course_authors/source/Images/image246.png diff --git a/userdocs/source/Images/image247.png b/docs/course_authors/source/Images/image247.png similarity index 100% rename from userdocs/source/Images/image247.png rename to docs/course_authors/source/Images/image247.png diff --git a/userdocs/source/Images/image248.png b/docs/course_authors/source/Images/image248.png similarity index 100% rename from userdocs/source/Images/image248.png rename to docs/course_authors/source/Images/image248.png diff --git a/userdocs/source/Images/image249.png b/docs/course_authors/source/Images/image249.png similarity index 100% rename from userdocs/source/Images/image249.png rename to docs/course_authors/source/Images/image249.png diff --git a/userdocs/source/Images/image250.png b/docs/course_authors/source/Images/image250.png similarity index 100% rename from userdocs/source/Images/image250.png rename to docs/course_authors/source/Images/image250.png diff --git a/userdocs/source/Images/image251.png b/docs/course_authors/source/Images/image251.png similarity index 100% rename from userdocs/source/Images/image251.png rename to docs/course_authors/source/Images/image251.png diff --git a/userdocs/source/Images/image252.png b/docs/course_authors/source/Images/image252.png similarity index 100% rename from userdocs/source/Images/image252.png rename to docs/course_authors/source/Images/image252.png diff --git a/userdocs/source/Images/image253.png b/docs/course_authors/source/Images/image253.png similarity index 100% rename from userdocs/source/Images/image253.png rename to docs/course_authors/source/Images/image253.png diff --git a/userdocs/source/Images/image254.png b/docs/course_authors/source/Images/image254.png similarity index 100% rename from userdocs/source/Images/image254.png rename to docs/course_authors/source/Images/image254.png diff --git a/userdocs/source/Images/image255.png b/docs/course_authors/source/Images/image255.png similarity index 100% rename from userdocs/source/Images/image255.png rename to docs/course_authors/source/Images/image255.png diff --git a/userdocs/source/Images/image256.png b/docs/course_authors/source/Images/image256.png similarity index 100% rename from userdocs/source/Images/image256.png rename to docs/course_authors/source/Images/image256.png diff --git a/userdocs/source/Images/image257.png b/docs/course_authors/source/Images/image257.png similarity index 100% rename from userdocs/source/Images/image257.png rename to docs/course_authors/source/Images/image257.png diff --git a/userdocs/source/Images/image258.png b/docs/course_authors/source/Images/image258.png similarity index 100% rename from userdocs/source/Images/image258.png rename to docs/course_authors/source/Images/image258.png diff --git a/userdocs/source/Images/image259.png b/docs/course_authors/source/Images/image259.png similarity index 100% rename from userdocs/source/Images/image259.png rename to docs/course_authors/source/Images/image259.png diff --git a/userdocs/source/Images/image260.png b/docs/course_authors/source/Images/image260.png similarity index 100% rename from userdocs/source/Images/image260.png rename to docs/course_authors/source/Images/image260.png diff --git a/userdocs/source/Images/image261.png b/docs/course_authors/source/Images/image261.png similarity index 100% rename from userdocs/source/Images/image261.png rename to docs/course_authors/source/Images/image261.png diff --git a/userdocs/source/Images/image262.png b/docs/course_authors/source/Images/image262.png similarity index 100% rename from userdocs/source/Images/image262.png rename to docs/course_authors/source/Images/image262.png diff --git a/userdocs/source/Images/image263.png b/docs/course_authors/source/Images/image263.png similarity index 100% rename from userdocs/source/Images/image263.png rename to docs/course_authors/source/Images/image263.png diff --git a/userdocs/source/Images/image264.png b/docs/course_authors/source/Images/image264.png similarity index 100% rename from userdocs/source/Images/image264.png rename to docs/course_authors/source/Images/image264.png diff --git a/userdocs/source/Images/image265.png b/docs/course_authors/source/Images/image265.png similarity index 100% rename from userdocs/source/Images/image265.png rename to docs/course_authors/source/Images/image265.png diff --git a/userdocs/source/Images/image266.png b/docs/course_authors/source/Images/image266.png similarity index 100% rename from userdocs/source/Images/image266.png rename to docs/course_authors/source/Images/image266.png diff --git a/userdocs/source/Images/image267.png b/docs/course_authors/source/Images/image267.png similarity index 100% rename from userdocs/source/Images/image267.png rename to docs/course_authors/source/Images/image267.png diff --git a/userdocs/source/Images/image268.png b/docs/course_authors/source/Images/image268.png similarity index 100% rename from userdocs/source/Images/image268.png rename to docs/course_authors/source/Images/image268.png diff --git a/userdocs/source/Images/image269.png b/docs/course_authors/source/Images/image269.png similarity index 100% rename from userdocs/source/Images/image269.png rename to docs/course_authors/source/Images/image269.png diff --git a/userdocs/source/Images/image270.png b/docs/course_authors/source/Images/image270.png similarity index 100% rename from userdocs/source/Images/image270.png rename to docs/course_authors/source/Images/image270.png diff --git a/userdocs/source/Images/image271.png b/docs/course_authors/source/Images/image271.png similarity index 100% rename from userdocs/source/Images/image271.png rename to docs/course_authors/source/Images/image271.png diff --git a/userdocs/source/Images/image272.png b/docs/course_authors/source/Images/image272.png similarity index 100% rename from userdocs/source/Images/image272.png rename to docs/course_authors/source/Images/image272.png diff --git a/userdocs/source/Images/image273.png b/docs/course_authors/source/Images/image273.png similarity index 100% rename from userdocs/source/Images/image273.png rename to docs/course_authors/source/Images/image273.png diff --git a/userdocs/source/Images/image274.png b/docs/course_authors/source/Images/image274.png similarity index 100% rename from userdocs/source/Images/image274.png rename to docs/course_authors/source/Images/image274.png diff --git a/userdocs/source/Images/image275.png b/docs/course_authors/source/Images/image275.png similarity index 100% rename from userdocs/source/Images/image275.png rename to docs/course_authors/source/Images/image275.png diff --git a/userdocs/source/Images/image277.png b/docs/course_authors/source/Images/image277.png similarity index 100% rename from userdocs/source/Images/image277.png rename to docs/course_authors/source/Images/image277.png diff --git a/userdocs/source/Images/image278.png b/docs/course_authors/source/Images/image278.png similarity index 100% rename from userdocs/source/Images/image278.png rename to docs/course_authors/source/Images/image278.png diff --git a/userdocs/source/Images/image279.png b/docs/course_authors/source/Images/image279.png similarity index 100% rename from userdocs/source/Images/image279.png rename to docs/course_authors/source/Images/image279.png diff --git a/userdocs/source/Images/image280.png b/docs/course_authors/source/Images/image280.png similarity index 100% rename from userdocs/source/Images/image280.png rename to docs/course_authors/source/Images/image280.png diff --git a/userdocs/source/Images/image281.png b/docs/course_authors/source/Images/image281.png similarity index 100% rename from userdocs/source/Images/image281.png rename to docs/course_authors/source/Images/image281.png diff --git a/userdocs/source/Images/image282.png b/docs/course_authors/source/Images/image282.png similarity index 100% rename from userdocs/source/Images/image282.png rename to docs/course_authors/source/Images/image282.png diff --git a/userdocs/source/Images/image285.png b/docs/course_authors/source/Images/image285.png similarity index 100% rename from userdocs/source/Images/image285.png rename to docs/course_authors/source/Images/image285.png diff --git a/userdocs/source/Images/image286.png b/docs/course_authors/source/Images/image286.png similarity index 100% rename from userdocs/source/Images/image286.png rename to docs/course_authors/source/Images/image286.png diff --git a/userdocs/source/Images/image287.png b/docs/course_authors/source/Images/image287.png similarity index 100% rename from userdocs/source/Images/image287.png rename to docs/course_authors/source/Images/image287.png diff --git a/userdocs/source/Images/image288.png b/docs/course_authors/source/Images/image288.png similarity index 100% rename from userdocs/source/Images/image288.png rename to docs/course_authors/source/Images/image288.png diff --git a/userdocs/source/Images/image289.png b/docs/course_authors/source/Images/image289.png similarity index 100% rename from userdocs/source/Images/image289.png rename to docs/course_authors/source/Images/image289.png diff --git a/userdocs/source/Images/image290.png b/docs/course_authors/source/Images/image290.png similarity index 100% rename from userdocs/source/Images/image290.png rename to docs/course_authors/source/Images/image290.png diff --git a/userdocs/source/Images/image291.png b/docs/course_authors/source/Images/image291.png similarity index 100% rename from userdocs/source/Images/image291.png rename to docs/course_authors/source/Images/image291.png diff --git a/userdocs/source/Images/image292.png b/docs/course_authors/source/Images/image292.png similarity index 100% rename from userdocs/source/Images/image292.png rename to docs/course_authors/source/Images/image292.png diff --git a/userdocs/source/Images/image293.png b/docs/course_authors/source/Images/image293.png similarity index 100% rename from userdocs/source/Images/image293.png rename to docs/course_authors/source/Images/image293.png diff --git a/userdocs/source/Images/image294.png b/docs/course_authors/source/Images/image294.png similarity index 100% rename from userdocs/source/Images/image294.png rename to docs/course_authors/source/Images/image294.png diff --git a/userdocs/source/Images/image295.png b/docs/course_authors/source/Images/image295.png similarity index 100% rename from userdocs/source/Images/image295.png rename to docs/course_authors/source/Images/image295.png diff --git a/userdocs/source/Images/image296.png b/docs/course_authors/source/Images/image296.png similarity index 100% rename from userdocs/source/Images/image296.png rename to docs/course_authors/source/Images/image296.png diff --git a/userdocs/source/Images/image297.png b/docs/course_authors/source/Images/image297.png similarity index 100% rename from userdocs/source/Images/image297.png rename to docs/course_authors/source/Images/image297.png diff --git a/userdocs/source/Images/image298.png b/docs/course_authors/source/Images/image298.png similarity index 100% rename from userdocs/source/Images/image298.png rename to docs/course_authors/source/Images/image298.png diff --git a/userdocs/source/Images/image299.png b/docs/course_authors/source/Images/image299.png similarity index 100% rename from userdocs/source/Images/image299.png rename to docs/course_authors/source/Images/image299.png diff --git a/userdocs/source/Images/image301.png b/docs/course_authors/source/Images/image301.png similarity index 100% rename from userdocs/source/Images/image301.png rename to docs/course_authors/source/Images/image301.png diff --git a/userdocs/source/Images/image302.png b/docs/course_authors/source/Images/image302.png similarity index 100% rename from userdocs/source/Images/image302.png rename to docs/course_authors/source/Images/image302.png diff --git a/userdocs/source/Images/image303.png b/docs/course_authors/source/Images/image303.png similarity index 100% rename from userdocs/source/Images/image303.png rename to docs/course_authors/source/Images/image303.png diff --git a/userdocs/source/Images/imageresponse1.png b/docs/course_authors/source/Images/imageresponse1.png similarity index 100% rename from userdocs/source/Images/imageresponse1.png rename to docs/course_authors/source/Images/imageresponse1.png diff --git a/userdocs/source/Images/imageresponse2.png b/docs/course_authors/source/Images/imageresponse2.png similarity index 100% rename from userdocs/source/Images/imageresponse2.png rename to docs/course_authors/source/Images/imageresponse2.png diff --git a/userdocs/source/Images/item0001.xml b/docs/course_authors/source/Images/item0001.xml similarity index 100% rename from userdocs/source/Images/item0001.xml rename to docs/course_authors/source/Images/item0001.xml diff --git a/userdocs/source/Images/multipleresponse.png b/docs/course_authors/source/Images/multipleresponse.png similarity index 100% rename from userdocs/source/Images/multipleresponse.png rename to docs/course_authors/source/Images/multipleresponse.png diff --git a/userdocs/source/Images/multipleresponse2.png b/docs/course_authors/source/Images/multipleresponse2.png similarity index 100% rename from userdocs/source/Images/multipleresponse2.png rename to docs/course_authors/source/Images/multipleresponse2.png diff --git a/userdocs/source/Images/multipleresponse3.png b/docs/course_authors/source/Images/multipleresponse3.png similarity index 100% rename from userdocs/source/Images/multipleresponse3.png rename to docs/course_authors/source/Images/multipleresponse3.png diff --git a/userdocs/source/Images/numericalresponse.png b/docs/course_authors/source/Images/numericalresponse.png similarity index 100% rename from userdocs/source/Images/numericalresponse.png rename to docs/course_authors/source/Images/numericalresponse.png diff --git a/userdocs/source/Images/numericalresponse2.png b/docs/course_authors/source/Images/numericalresponse2.png similarity index 100% rename from userdocs/source/Images/numericalresponse2.png rename to docs/course_authors/source/Images/numericalresponse2.png diff --git a/userdocs/source/Images/numericalresponse4.png b/docs/course_authors/source/Images/numericalresponse4.png similarity index 100% rename from userdocs/source/Images/numericalresponse4.png rename to docs/course_authors/source/Images/numericalresponse4.png diff --git a/userdocs/source/Images/numericalresponse5.png b/docs/course_authors/source/Images/numericalresponse5.png similarity index 100% rename from userdocs/source/Images/numericalresponse5.png rename to docs/course_authors/source/Images/numericalresponse5.png diff --git a/userdocs/source/Images/option_response1.png b/docs/course_authors/source/Images/option_response1.png similarity index 100% rename from userdocs/source/Images/option_response1.png rename to docs/course_authors/source/Images/option_response1.png diff --git a/userdocs/source/Images/optionresponse2.png b/docs/course_authors/source/Images/optionresponse2.png similarity index 100% rename from userdocs/source/Images/optionresponse2.png rename to docs/course_authors/source/Images/optionresponse2.png diff --git a/userdocs/source/Images/props0002.xml b/docs/course_authors/source/Images/props0002.xml similarity index 100% rename from userdocs/source/Images/props0002.xml rename to docs/course_authors/source/Images/props0002.xml diff --git a/userdocs/source/Images/stringresponse.png b/docs/course_authors/source/Images/stringresponse.png similarity index 100% rename from userdocs/source/Images/stringresponse.png rename to docs/course_authors/source/Images/stringresponse.png diff --git a/userdocs/source/Images/stringresponse2.png b/docs/course_authors/source/Images/stringresponse2.png similarity index 100% rename from userdocs/source/Images/stringresponse2.png rename to docs/course_authors/source/Images/stringresponse2.png diff --git a/userdocs/source/Images/themedata.xml b/docs/course_authors/source/Images/themedata.xml similarity index 100% rename from userdocs/source/Images/themedata.xml rename to docs/course_authors/source/Images/themedata.xml diff --git a/userdocs/source/add_syllabus.rst b/docs/course_authors/source/add_syllabus.rst similarity index 93% rename from userdocs/source/add_syllabus.rst rename to docs/course_authors/source/add_syllabus.rst index c310dd50f0..8c94f84946 100644 --- a/userdocs/source/add_syllabus.rst +++ b/docs/course_authors/source/add_syllabus.rst @@ -10,14 +10,14 @@ you want students to be able to access easily. Static pages usually apply to the whole course rather than a particular sequence. For example, your static pages might include your syllabus or information about your grading policy. -.. image:: images/image155.png +.. image:: Images/image155.png When you create a static page, the name of that page appears in your course's navigation bar at the top of the page, along with **Courseware**, **Course Info**, and other tabs. For example, the following navigation bar includes a **Syllabus** static page and a **Projects** static page. -.. image:: images/image157.png +.. image:: Images/image157.png To add a static page: @@ -25,17 +25,17 @@ To add a static page: 1. On the navigation bar, click **Course Content**, and then click **Static Pages**. -.. image:: images/image159.png +.. image:: Images/image159.png 2. In the top right corner, click **New Page**. The following entry appears. -.. image:: images/image161.png +.. image:: Images/image161.png 3. On the right side of the box, click **Edit**. The following dialog box opens. -.. image:: images/image163.png +.. image:: Images/image163.png 4. In the **display_name** box, type the name that you want to appear in the navigation bar for your course. @@ -66,7 +66,7 @@ click https://www.google.com/calendar/embed?src=edx.org_mcjhp2tv3ul2etfpb43hd388p4@group.calendar.g oogle.com&ctz=America/New_York_ -.. image:: images/image165.png +.. image:: Images/image165.png To create a Google calendar, access your Google account, and then click @@ -92,7 +92,7 @@ on Wednesdays, and are due on Sunday of the following week. 3. All quizzes are released on Fridays and due on Sunday of the following week (9 days later). -.. image:: images/image285.png +.. image:: Images/image285.png To create a dynamic HTML schedule: @@ -100,11 +100,11 @@ To create a dynamic HTML schedule: 1. On the navigation bar, click **Course Content**, and then click **Static Pages**. -.. image:: images/image159.png +.. image:: Images/image159.png 2. In the top right corner, click **New Page**. The following entry appears. -.. image:: images/image161.png +.. image:: Images/image161.png 3. On the right side of the box, click **Edit**. The following dialog box opens. @@ -113,10 +113,10 @@ Pages**. 5. Click the **HTML** tab. -.. image:: images/image163.png +.. image:: Images/image163.png -6. Go to `Appendix B <appendices/b.html>`_ and copy the code for the dynamic +6. Go to `Appendix B <appendices/b.html>` and copy the code for the dynamic schedule template. @@ -147,7 +147,7 @@ The **Files & Uploads** page lists handouts, images, and other content that you want to integrate into your course. -.. image:: images/image160.png +.. image:: Images/image160.png For example, if you want to include a cartoon in one of your weekly updates, you @@ -195,7 +195,7 @@ Uploads**. 2. On the **>Files & Uploads** page, click **Upload New File**. -.. image:: images/image162.png +.. image:: Images/image162.png 3. In the **Upload New File** dialog box, click **Choose File**. @@ -215,7 +215,7 @@ you can see the URL you will need to use to display an image or create a hyperlink. -.. image:: images/image164.png +.. image:: Images/image164.png .. note:: @@ -233,13 +233,13 @@ Add Items to the Handouts Sidebar 1. On the navigation bar, click **Course Content**, and then click **Updates**. -image:: images/image166.png +image:: Images/image166.png 2. Locate the **Course Handouts** sidebar on the right, and then click **Edit**. -.. image:: images/image168.png +.. image:: Images/image168.png 3. In the XML box that appears, create links to your files. @@ -284,18 +284,18 @@ Add an Announcement or Update page opens. - .. image:: images/image185.png + .. image:: Images/image185.png 2. Click **New Update**. The following dialog box opens. - .. image:: images/image187.png + .. image:: Images/image187.png The content for this box must be formatted in HTML. For a template that you - can use that includes placeholders, see `Appendix A <appendices/a.html>`_. + can use that includes placeholders, see `Appendix A <appendices/a.html>`. - 3. Enter your update formatted as HTML, and then click **Save**. \ No newline at end of file + 3. Enter your update formatted as HTML, and then click **Save**. diff --git a/userdocs/source/appendices/a.rst b/docs/course_authors/source/appendices/a.rst similarity index 100% rename from userdocs/source/appendices/a.rst rename to docs/course_authors/source/appendices/a.rst diff --git a/userdocs/source/appendices/b.rst b/docs/course_authors/source/appendices/b.rst similarity index 100% rename from userdocs/source/appendices/b.rst rename to docs/course_authors/source/appendices/b.rst diff --git a/userdocs/source/appendices/c.rst b/docs/course_authors/source/appendices/c.rst similarity index 96% rename from userdocs/source/appendices/c.rst rename to docs/course_authors/source/appendices/c.rst index 189b53d1a6..40c059aacf 100644 --- a/userdocs/source/appendices/c.rst +++ b/docs/course_authors/source/appendices/c.rst @@ -33,7 +33,7 @@ The above URL should bring you to the course registration page: [REPLACE WITH SC *Example* -.. image:: ../images/image302.png +.. image:: ../Images/image302.png :width: 600 @@ -42,12 +42,12 @@ The above URL should bring you to the course registration page: [REPLACE WITH SC Click on the blue Register for [NUMBER OF YOUR CLASS] button: [REPLACE WITH PART OF YOUR SCREENSHOT ABOVE] -.. image:: ../images/image303.png +.. image:: ../Images/image303.png :width: 600 A pop-up user authentication window will appear. It will ask you to log in or sign up for edX. (If you already have an account with edX, use it to log in. You should now be registered for the course. Skip to Step 5. Otherwise, go on with Step 3.) -.. image:: ../images/image305.png +.. image:: ../Images/image305.png :width: 600 diff --git a/userdocs/source/appendices/d.rst b/docs/course_authors/source/appendices/d.rst similarity index 100% rename from userdocs/source/appendices/d.rst rename to docs/course_authors/source/appendices/d.rst diff --git a/userdocs/source/appendices/e.rst b/docs/course_authors/source/appendices/e.rst similarity index 95% rename from userdocs/source/appendices/e.rst rename to docs/course_authors/source/appendices/e.rst index e78d6e3701..8531766d0b 100644 --- a/userdocs/source/appendices/e.rst +++ b/docs/course_authors/source/appendices/e.rst @@ -22,7 +22,7 @@ differences between the two include the following. Sample Problem: -.. image:: ../images/image287.png +.. image:: ../Images/image287.png :width: 600 **Problem Code:** @@ -77,12 +77,12 @@ Sample Problem: <optionresponse> - .. image:: ../images/option_response1.png + .. image:: ../Images/option_response1.png <optioninput> - .. image:: ../images/optionresponse2.png + .. image:: ../Images/optionresponse2.png .. raw:: latex @@ -112,7 +112,7 @@ differences between the two include the following. Sample Problem: -.. image:: ../images/image289.png +.. image:: ../Images/image289.png :width: 600 **Problem Code:** @@ -169,17 +169,17 @@ Sample Problem: <multiplechoiceresponse> -.. image:: ../images/multipleresponse.png +.. image:: ../Images/multipleresponse.png <choicegroup> - .. image:: ../images/multipleresponse2.png + .. image:: ../Images/multipleresponse2.png <choice> - .. image:: ../images/multipleresponse3.png + .. image:: ../Images/multipleresponse3.png .. raw:: latex @@ -203,7 +203,7 @@ have zero correct responses. Sample Problem: -.. image:: ../images/image290.png +.. image:: ../Images/image290.png :width: 600 @@ -263,7 +263,7 @@ clear. Sample Problem: -.. image:: ../images/image291.png +.. image:: ../Images/image291.png :width: 600 **Problem Code:** @@ -303,11 +303,11 @@ Sample Problem: <stringresponse> - .. image:: ../images/stringresponse.png + .. image:: ../Images/stringresponse.png <textline> - .. image:: ../images/stringresponse2.png + .. image:: ../Images/stringresponse2.png .. raw:: latex @@ -330,7 +330,7 @@ script. Sample Problem: -.. image:: ../images/image292.png +.. image:: ../Images/image292.png :width: 600 @@ -483,20 +483,20 @@ XML Attribute Information <script> - .. image:: ../images/numericalresponse.png + .. image:: ../Images/numericalresponse.png <numericalresponse> - .. image:: ../images/numericalresponse2.png + .. image:: ../Images/numericalresponse2.png <responseparam> - .. image:: ../images/numericalresponse4.png + .. image:: ../Images/numericalresponse4.png <textline> - .. image:: ../images/numericalresponse5.png + .. image:: ../Images/numericalresponse5.png .. raw:: latex @@ -524,7 +524,7 @@ order to test for correctness. Sample Problem: -.. image:: ../images/image293.png +.. image:: ../Images/image293.png :width: 600 **Problem Code**: @@ -592,18 +592,18 @@ XML Attribute Information <script> - .. image:: ../images/formularesponse.png + .. image:: ../Images/formularesponse.png <formularesponse> - .. image:: ../images/formularesponse3.png + .. image:: ../Images/formularesponse3.png <responseparam> - .. image:: ../images/formularesponse6.png + .. image:: ../Images/formularesponse6.png .. raw:: latex @@ -621,7 +621,7 @@ Images have to be uploaded to the courseware Assets directory. Response clicks a Sample Problem: -.. image:: ../images/image294.png +.. image:: ../Images/image294.png :width: 600 @@ -650,11 +650,11 @@ XML Attribute Information <imageresponse> - .. image:: ../images/imageresponse1.png + .. image:: ../Images/imageresponse1.png <imageinput> - .. image:: ../images/imageresponse2.png + .. image:: ../Images/imageresponse2.png .. raw:: latex @@ -668,7 +668,7 @@ A Custom Response input type accepts one or more lines of text input from the st Sample Problem: -.. image:: ../images/image295.png +.. image:: ../Images/image295.png :width: 600 @@ -796,7 +796,7 @@ that allows the student to enter chemical equations as answers. Sample Problem: -.. image:: ../images/image296.png +.. image:: ../Images/image296.png :width: 600 **Problem Code**: @@ -838,13 +838,13 @@ student can construct a schematic answer, such as a circuit. Sample Problem: -.. image:: ../images/image297.png +.. image:: ../Images/image297.png :width: 600 -.. image:: ../images/image298.png +.. image:: ../Images/image298.png :width: 600 -.. image:: ../images/image299.png +.. image:: ../Images/image299.png :width: 600 **Problem Code**: diff --git a/userdocs/source/change_log.rst b/docs/course_authors/source/change_log.rst similarity index 100% rename from userdocs/source/change_log.rst rename to docs/course_authors/source/change_log.rst diff --git a/userdocs/source/checking_student_progress.rst b/docs/course_authors/source/checking_student_progress.rst similarity index 97% rename from userdocs/source/checking_student_progress.rst rename to docs/course_authors/source/checking_student_progress.rst index cf68732c1d..01109bb853 100644 --- a/userdocs/source/checking_student_progress.rst +++ b/docs/course_authors/source/checking_student_progress.rst @@ -25,7 +25,7 @@ percent needed for each grade cutoff. Here is an example of a student's progress through edX101. -.. image:: images/image245.png +.. image:: Images/image245.png @@ -45,7 +45,7 @@ recorded for the student for all problems in the course. Here is a scrolled down view of the example Progress page for the student in the example above: -.. image:: images/image247.png +.. image:: Images/image247.png Again, note that point scores from graded sections are called "Problem @@ -67,7 +67,7 @@ more course-specific tools get added. Here is the current view of the top of the Grades page of the Instructor dashboard for edX101: -.. image:: images/image249.png +.. image:: Images/image249.png Here you see several options for viewing or downloading student grades, diff --git a/docs/course_authors/source/conf.py b/docs/course_authors/source/conf.py new file mode 100644 index 0000000000..90a78f48fd --- /dev/null +++ b/docs/course_authors/source/conf.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# + +import sys, os + +on_rtd = os.environ.get('READTHEDOCS', None) == 'True' + +sys.path.append(os.path.abspath('../../../')) +sys.path.append(os.path.abspath('../../')) + +from docs.shared.conf import * + +sys.path.insert(0, os.path.abspath('.')) + +master_doc = 'index' + +# Add any paths that contain templates here, relative to this directory. +templates_path.append('source/_templates') + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path.append('source/_static') + + diff --git a/userdocs/source/create_discussion.rst b/docs/course_authors/source/create_discussion.rst similarity index 96% rename from userdocs/source/create_discussion.rst rename to docs/course_authors/source/create_discussion.rst index dd89f39e7e..3fd7cd63ca 100644 --- a/userdocs/source/create_discussion.rst +++ b/docs/course_authors/source/create_discussion.rst @@ -40,20 +40,20 @@ that contains the question you want students to discuss. 4. Directly under this new HTML component, click **Discussion** under **Add New Component.** -.. image:: images/image057.png +.. image:: Images/image057.png 5. When the following box appears, click **Discussion Tag.** -.. image:: images/image059.png +.. image:: Images/image059.png 6. When the following box appears, click **Edit.** -.. image:: images/image061.png +.. image:: Images/image061.png The following editing box opens. You will change the values in the small boxes, but you will not change the text in the large box. -.. image:: images/image063.png +.. image:: Images/image063.png .. note:: @@ -74,7 +74,7 @@ and you set **discussion_target** to be “Online Instruction Methods,” the category and subcategory appear as follow in the category list in the discussion forum: -.. image:: images/image065.png +.. image:: Images/image065.png :width: 300 9. In the **display_name** box, type a name for the discussion. The display name diff --git a/userdocs/source/create_html_component.rst b/docs/course_authors/source/create_html_component.rst similarity index 94% rename from userdocs/source/create_html_component.rst rename to docs/course_authors/source/create_html_component.rst index 33d7205dbf..818873a528 100644 --- a/userdocs/source/create_html_component.rst +++ b/docs/course_authors/source/create_html_component.rst @@ -3,7 +3,7 @@ Create an HTML Component ************************ - .. image:: images/image067.png + .. image:: Images/image067.png The HTML component is the most basic component type. These components are the building blocks of text-based courses. They are used to add information such as @@ -34,11 +34,11 @@ Create a Basic HTML Component 1. Under Add New Component, click **html**, and then click **Empty.** The following blank component appears. -.. image:: images/image069.png +.. image:: Images/image069.png 2. In the blank component, click **Edit.** The HTML editor opens. -.. image:: images/image071.png +.. image:: Images/image071.png 3. Enter the information that you want, and then click **Save.** @@ -56,7 +56,7 @@ following blank component appears. 1. Under **Add New Component,** click **html** and then click **Announcement.** The following screen opens. -.. image:: images/image073.png +.. image:: Images/image073.png 2. Click **Edit.** @@ -68,7 +68,7 @@ The following screen opens. If you want to enter links to other pages or to images or to edit the HTML directly, switch to the HTML tab. -.. image:: images/image075.png +.. image:: Images/image075.png 3. Click **Save.** @@ -115,7 +115,7 @@ For example, to create a link to the CourseImage.jpg file whose URL is When you use this code, the following image appears. -.. image:: images/image078.png +.. image:: Images/image078.png :width: 800 3. Click **Save.** Your files or images appear in the component. @@ -137,7 +137,7 @@ HTML link to that unit. To do this: a. On the Course Settings tab, click the blue your course URL link under Basic Information. -.. image:: images/image079.png +.. image:: Images/image079.png :width: 800 The registration page for your course opens. @@ -170,7 +170,7 @@ syntax. :: to in Studio and look at the URL in the browser’s address bar. The location ID is the text in the URL after edit, as in the following example. -.. image:: images/image081.png +.. image:: Images/image081.png 3. Open the unit that you want to link from. @@ -178,7 +178,7 @@ syntax. :: 4. Under Add New Component, click html, and then click Empty. A new, blank component appears. -.. image:: images/image083.png +.. image:: Images/image083.png :width: 800 5. Click **edit**. @@ -215,24 +215,24 @@ You can create an HTML component from imported LaTeX code. 1. Under **Add New Component**, click **html**, and then click **E-text Written in LaTeX.** -.. image:: images/image067.png +.. image:: Images/image067.png :width: 800 2. In the component that appears, click Edit. -.. image:: images/image083.png +.. image:: Images/image083.png :width: 800 3. The component editor opens. In the top left corner of the editor, click the yellow **Edit High Level Source** text. -.. image:: images/image085.png +.. image:: Images/image085.png :width: 800 4. In the **High Level Source Editing** screen that opens, replace the sample code with your LaTeX code. -.. image:: images/image087.png +.. image:: Images/image087.png :width: 800 5. Click **Save and compile to edX XML** to convert the LaTeX code into edX XML diff --git a/userdocs/source/create_lesson.rst b/docs/course_authors/source/create_lesson.rst similarity index 96% rename from userdocs/source/create_lesson.rst rename to docs/course_authors/source/create_lesson.rst index f6682a9437..d0974ea8dc 100644 --- a/userdocs/source/create_lesson.rst +++ b/docs/course_authors/source/create_lesson.rst @@ -36,10 +36,10 @@ units in your course at a glance, as well as whether the subsections are public or private. - .. image:: images/image029.png + .. image:: Images/image029.png :width: 800 - .. image:: images/image031.png + .. image:: Images/image031.png :width: 800 .. raw:: latex @@ -71,7 +71,7 @@ A subsection is a subcategory of a section. Many instructors name subsections according to the topics in their courses. Subsection names appear along with section names in the left pane when you view your course on Edge. - .. image:: images/image033.png + .. image:: Images/image033.png You can set subsections to be one of the assignment types that you created when you set up grading. You can then include assignments in the body of that @@ -98,7 +98,7 @@ appear in the left pane with section and subsection headings. Instead, each unit appears as a part of the course accordion at the top of the page when you view your course on Edge. The following page shows a subsection that has two Units. - .. image:: images/image035.png + .. image:: Images/image035.png Note that by default, all units are set to **Private.** To make a unit visible to students, you have to explicitly change the unit’s visibility to **Public.** @@ -116,7 +116,7 @@ A component is the part of a unit that contains your actual course content. The names of all components in a unit appear when you hover over the unit in the course accordion at the top of the page. -.. image:: images/image037.png +.. image:: Images/image037.png :width: 800 There are four types of components: Discussion components, HTML components, diff --git a/userdocs/source/create_problem.rst b/docs/course_authors/source/create_problem.rst similarity index 94% rename from userdocs/source/create_problem.rst rename to docs/course_authors/source/create_problem.rst index 61d0a95747..3fe8264b4d 100644 --- a/userdocs/source/create_problem.rst +++ b/docs/course_authors/source/create_problem.rst @@ -28,7 +28,7 @@ This course contains several places with more information about creating exercis • `Writing Exercises <https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/courseware/a45de3baa8a9468cbfb1a301fdcd7e86/d15cfeaff0af4dd7be4765cd0988d172/1>`_ has more in-depth discussion about problem types, and some general pedagogical considerations for adapting to the online format and a `Gallery of Response Types <https://edge.edx.org/accounts/login?next=/courses/edX/edX101/How_to_Create_an_edX_Course/courseware/a45de3baa8a9468cbfb1a301fdcd7e86/3ba055e760d04f389150a75edfecb844/1>`_ -• `Appendix E <appendices/e.html>`_ contains XML documentaion for the different problem response types. +• `Appendix E <appendices/e.html>` contains XML documentaion for the different problem response types. • The `Discussion Forum <https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/discussion/forum">`_ for this class is a good place to ask questions about exercise types, report any errors or oddities that you may encounter, and get technical support. @@ -41,7 +41,7 @@ Studio offers two interfaces for editing problem components. • The **Simple Editor** allows you to edit problems visually, without having to work with XML. -• The **Advanced Editor** converts the problem to edX's XML standard and allows you to edit that XML directly. For more information about the XML for different problem types, see `Appendix E <appendices/e.html>`_ . +• The **Advanced Editor** converts the problem to edX's XML standard and allows you to edit that XML directly. For more information about the XML for different problem types, see `Appendix E <appendices/e.html>` . Some of the simpler problem templates, including multiple choice, open in the Simple Editor and allow you to switch to the Advanced Editor. The more complicated problem types, such as Circuit Response, open in the Advanced Editor. @@ -52,13 +52,13 @@ Some of the simpler problem templates, including multiple choice, open in the Si To open the Advanced Editor, click **Advanced Editor** in the top right corner of the Simple Editor. -.. image:: images/image275.png +.. image:: Images/image275.png :width: 600px The following is a multiple choice problem in the Advanced Editor. -.. image:: images/image276.png +.. image:: Images/image276.png :width: 600px .. raw:: latex @@ -214,7 +214,7 @@ If a student wants to save but not submit a response, the student can click **Sa In the following problem, enter a response, and then click **Check**. The problem tells you if your response is correct or incorrect. Additionally, although you don't see it, a point score is also automatically stored for the response you submit. -.. image:: images/image277.png +.. image:: Images/image277.png :width: 600px **Show Answer button** @@ -225,12 +225,12 @@ editor. It can be set to be never visible, always visible, or visible only when In the following problem, the **Show Answer ** button appears after the student has made at least one attempt to answer. Enter a response that you know is wrong, and then click **Check**. -.. image:: images/image278.png +.. image:: Images/image278.png :width: 600px Now, click **Show Answer** to view the correct answer and its explanation. -.. image:: images/image279.png +.. image:: Images/image279.png :width: 600px @@ -244,33 +244,33 @@ Create a Problem **************** .. note:: - -You can also include non-graded exercises throughout your course. + + You can also include non-graded exercises throughout your course. To add interactive, automatically graded exercises to your course content, use the Problem component. This component allows you to include an explanation that the student can see when the student clicks **Show Answer**. Studio offers several templates that you can use. Alternatively, you can create your own problem type in XML. - For detailed information about different problem types, see `Appendix E <appendices/e.html>`_. + For detailed information about different problem types, see `Appendix E <appendices/e.html>`. 1. Under **Add New Component**, click **Problem**. -.. image:: images/image096.png +.. image:: Images/image096.png :width: 600px The **Select Problem Component Type** screen appears. By default, the **Common Problem Types** tab is selected. -.. image:: images/image097.png +.. image:: Images/image097.png :width: 600px To see a list of more complex problem types, click the **Advanced** tab. -.. image:: images/image099.png +.. image:: Images/image099.png :width: 600px @@ -284,7 +284,7 @@ A new problem component with sample template text appears. For example, if you click **Multiple Choice**, the following problem component appears. -.. image:: images/image101.png +.. image:: Images/image101.png :width: 600px @@ -292,7 +292,7 @@ For example, if you click **Multiple Choice**, the following problem component a 3. Click **Edit**. This opens the Simple Editor for the problem component. The following example shows this view for a multiple choice problem. -.. image:: images/image103.jpg +.. image:: Images/image103.jpg :width: 600px @@ -371,4 +371,4 @@ Check your **Progress** view or the **Instructor** tab on Edge as described in t For a discussion of some trade-offs and some suggestions for cleaner solutions in the future, see the following `discussion thread <http://help.edge.edx.org/discussions/questions/73-what-if-you-discover-that-a-live-problem-is-wrong">`_ on the Studio help desk. -You can include multiple problems of different types inside a single Problem component, even if you select a particular template when you create a problem. A template is simply an XML editor with template text already filled in. You can add to or replace the template text. \ No newline at end of file +You can include multiple problems of different types inside a single Problem component, even if you select a particular template when you create a problem. A template is simply an XML editor with template text already filled in. You can add to or replace the template text. diff --git a/userdocs/source/create_section_sub_section.rst b/docs/course_authors/source/create_section_sub_section.rst similarity index 85% rename from userdocs/source/create_section_sub_section.rst rename to docs/course_authors/source/create_section_sub_section.rst index 3eb95dab8b..ebd509d394 100644 --- a/userdocs/source/create_section_sub_section.rst +++ b/docs/course_authors/source/create_section_sub_section.rst @@ -10,7 +10,7 @@ Create a Section and Subsection 2. On the **Course Outline** page, click **New Section.** -.. image:: images/image039.png +.. image:: Images/image039.png :width: 800 @@ -23,14 +23,14 @@ Create a Section and Subsection In most courses, the name of the first section is Week 1. The section that you have created appears on the **Course Outline** page. -.. image:: images/image041.png +.. image:: Images/image041.png :width: 800 The name you enter also appears in the navigation ribbon, as follows. -.. image:: images/image043.png +.. image:: Images/image043.png :width: 800 @@ -45,14 +45,14 @@ For example, if you enter **Week 1** as the section title and **Subsection 1** as the subsection title, you see the following. -.. image:: images/image045.png +.. image:: Images/image045.png :width: 800 If you view your course as a student would see it, you see the following. -.. image:: images/image047.png +.. image:: Images/image047.png :width: 800 @@ -60,7 +60,7 @@ If you view your course as a student would see it, you see the following. click **Subsection 1.** You see the following screen. -.. image:: images/image049.png +.. image:: Images/image049.png :width: 800 diff --git a/userdocs/source/create_seed_wiki b/docs/course_authors/source/create_seed_wiki similarity index 100% rename from userdocs/source/create_seed_wiki rename to docs/course_authors/source/create_seed_wiki diff --git a/userdocs/source/create_seed_wiki.rst b/docs/course_authors/source/create_seed_wiki.rst similarity index 98% rename from userdocs/source/create_seed_wiki.rst rename to docs/course_authors/source/create_seed_wiki.rst index 3eb688f505..c6c66c923e 100644 --- a/userdocs/source/create_seed_wiki.rst +++ b/docs/course_authors/source/create_seed_wiki.rst @@ -4,4 +4,4 @@ Create and Seed the Wiki ************************ Create wiki ("seed" the wiki) - \ No newline at end of file + diff --git a/userdocs/source/create_unit.rst b/docs/course_authors/source/create_unit.rst similarity index 95% rename from userdocs/source/create_unit.rst rename to docs/course_authors/source/create_unit.rst index e95bba0af1..5136b935e3 100644 --- a/userdocs/source/create_unit.rst +++ b/docs/course_authors/source/create_unit.rst @@ -7,7 +7,7 @@ Create a Unit 2. Click **New Unit.** The following screen appears. - .. image:: images/image051.png + .. image:: Images/image051.png :width: 800 diff --git a/userdocs/source/create_video.rst b/docs/course_authors/source/create_video.rst similarity index 97% rename from userdocs/source/create_video.rst rename to docs/course_authors/source/create_video.rst index 4fd2b3df5d..3423f93d8a 100644 --- a/userdocs/source/create_video.rst +++ b/docs/course_authors/source/create_video.rst @@ -19,7 +19,7 @@ You can include videos that run at 0.75 speed, 1.25 speed, and 1.50 speed as wel 1. Upload the video that you want to YouTube. Make note of the code that appears between **watch?v** = and **&feature** in the URL. This code appears in the green box below. -.. image:: images/image053.png +.. image:: Images/image053.png :width: 800 px 2. In Studio, go to the unit that you want. @@ -38,7 +38,7 @@ the mouse over the icon in the bar at the top of the page. This text also appear code (immediately to the right of "0.75:") corresponds to the video at 0.75 speed, the next corresponds to 1.0 speed, etc. -.. image:: images/image055.png +.. image:: Images/image055.png :width: 800 8. Click **Save.** diff --git a/userdocs/source/create_welcome_announcement.rst b/docs/course_authors/source/create_welcome_announcement.rst similarity index 92% rename from userdocs/source/create_welcome_announcement.rst rename to docs/course_authors/source/create_welcome_announcement.rst index 4275009cc6..4bf5bbd7ba 100644 --- a/userdocs/source/create_welcome_announcement.rst +++ b/docs/course_authors/source/create_welcome_announcement.rst @@ -11,4 +11,4 @@ Create welcome announcement Create landing page announcement (change "landing page" to "Course Info" page) -Create discussion forum \ No newline at end of file +Create discussion forum diff --git a/userdocs/source/establish_course_settings.rst b/docs/course_authors/source/establish_course_settings.rst similarity index 93% rename from userdocs/source/establish_course_settings.rst rename to docs/course_authors/source/establish_course_settings.rst index d6992d2d39..73b861aa07 100644 --- a/userdocs/source/establish_course_settings.rst +++ b/docs/course_authors/source/establish_course_settings.rst @@ -27,14 +27,14 @@ Add Collaborators 1. On the navigation bar, click **Course Settings**, and then click **Course Team**. - .. image:: images/image115.png + .. image:: Images/image115.png 2. Click **New User**. - .. image:: images/image117.png + .. image:: Images/image117.png 3. In the **email** box, type the mail address of the user, and then click **Add User**. @@ -68,7 +68,7 @@ Add Manual Policy Data 2. Click **New Manual Policy** . - .. image:: images/image119.png + .. image:: Images/image119.png 3. In the **Policy Key** box, enter the policy key. @@ -89,7 +89,7 @@ Add Course Catalog Information To add scheduling information, a description, and other information for your course, use the **Course Settings** menu. - .. image:: images/image121.png + .. image:: Images/image121.png This takes you to the @@ -100,7 +100,7 @@ Schedule and Details Page 1. At the top of this page, you will find a section with the **Basic Information** for your course. It is here that you can locate the title of your course and find the URL for your course, which you can mail to students to invite students to enroll in your course. - .. image:: images/image281.png + .. image:: Images/image281.png 2. In the **Course Schedule** section, enter the date you want your course to start in the **Course Start Date** box, and then enter the time you want your course to start in the **Course** **Start Time** box. @@ -144,7 +144,7 @@ Add a Course Overview 2. Scroll down to the **Introducing Your Course** section, and then locate the **Course Overview** box. -.. image:: images/image123.png +.. image:: Images/image123.png @@ -168,7 +168,7 @@ If your course has prerequisites, you can include that information in the course The following is example content for the **Course Overview** box: -.. image:: images/image125.png +.. image:: Images/image125.png Add an About Video @@ -181,7 +181,7 @@ You can create an About video that will appear on the **About** page for your co 1. Upload the video that you want to YouTube. Make note of the code that appears between ** watch?v =** and ** &feature** in the URL. This code appears in the green box below. -.. image:: images/image127.png +.. image:: Images/image127.png 2. On the navigation bar, click **Course Settings**, and then click **Schedule & Details** . @@ -191,7 +191,7 @@ You can create an About video that will appear on the **About** page for your co field. If you have not already added a video, you see a blank field above an **id** box. -.. image:: images/image129.png +.. image:: Images/image129.png 4. In the **your YouTube video's ID** box, enter your video code. When you add the code, the video automatically appears in the field above the **your YouTube video's ID** box. @@ -205,7 +205,7 @@ You can create an About video that will appear on the **About** page for your co For example, your course introduction video appears as follows. -.. image:: images/image131.png +.. image:: Images/image131.png Add Weekly Time Requirements Information @@ -218,4 +218,4 @@ Add Weekly Time Requirements Information 2. Scroll down to the **Requirments** section. -3. In the **Hours of Effort per Week** box, enter the number of hours you expect students to work on this course each week. \ No newline at end of file +3. In the **Hours of Effort per Week** box, enter the number of hours you expect students to work on this course each week. diff --git a/userdocs/source/establish_grading_policy.rst b/docs/course_authors/source/establish_grading_policy.rst similarity index 96% rename from userdocs/source/establish_grading_policy.rst rename to docs/course_authors/source/establish_grading_policy.rst index 062fb544ca..9e6c5f6fe8 100644 --- a/userdocs/source/establish_grading_policy.rst +++ b/docs/course_authors/source/establish_grading_policy.rst @@ -15,7 +15,7 @@ Setting up grading in edX Studio has several steps. These steps will be explaine 1. Establish an overall grading policy, also see :ref:`Set Grade Brackets<Set-Grade-Brackets>`. -.. image:: images/image139.png +.. image:: Images/image139.png This is done at the course level in the **Course Settings** menu. @@ -29,7 +29,7 @@ Create assignment types for the course and determine the weight of the student's 2. Create subsections that contain graded assignments in the body of the course, see :ref:`Create Subsections that Contain Graded Assignments<Create-Graded-Subsections>`. -.. image:: images/image135.png +.. image:: Images/image135.png Each subsection in your course can be designated as one of the assignment types that you have specified in the grading policy. You can also specify a release date and a due date. @@ -43,7 +43,7 @@ For more information on creating problems, see `Create a Problem <Create_Problem 3. In the assignment subsections, create individual problems -.. image:: images/image137.png +.. image:: Images/image137.png You can then establish the settings for these problems (including the number of attempts a student has and the problem's point value, or weight). @@ -69,7 +69,7 @@ To set the thresholds for course grades: The default grade divisions are Pass and Fail. To add more grade divisions (such as A, B, C, or D), click the plus sign (+). -.. image:: images/image133.png +.. image:: Images/image133.png To remove a grade division, hover the mouse over the grade division (shown above) and then click the **Remove** link that appears above the grade division. @@ -116,7 +116,7 @@ This is a general category of assessment (homework, exam, exercise). All assignm **Abbreviation:** This is the short name that will appear next to an assignment on every student's **Progress** tab (see below). -.. image:: images/image141.png +.. image:: Images/image141.png **Weight of Total Grade:** @@ -133,7 +133,7 @@ The number of assignments of that type that you plan to present in your course. For example, the following course has two types of assignments. The overall course grade is broken down as 40% Homework and 60% Final Exam. There are eight Homework assignments, and the grader will omit the lowest-scored assignment from the final grade. Thus, the seven remaining Homework assignments are each worth 40 7 = 5.8% of the final grade. -.. image:: images/image143.png +.. image:: Images/image143.png Troubleshooting +++++++++++++++ @@ -171,7 +171,7 @@ All assignments of a particular type are automatically worth the same amount. Th 1. On the navigation bar, click **Course Content**, and then click **Outline**. -.. image:: images/image145.png +.. image:: Images/image145.png 2. Under **Course Outline**, locate the section where you want to add an assignment. @@ -183,16 +183,16 @@ All assignments of a particular type are automatically worth the same amount. Th Click the subsection you want. The edit page for the subsection opens. In the top right corner of the page, locate the **Subsection Settings** box. -.. image:: images/image147.png +.. image:: Images/image147.png Set the assignment type. To do this, locate the blue link next to **Graded as**. Because all subsections are set to **Not Graded** by default, the text for this link is **NOT GRADED**. -.. image:: images/image149.png +.. image:: Images/image149.png Click this link to open a list of the assignment types that you specified in your grading rubric, and then click the assignment type that you want. -.. image:: images/image151.png +.. image:: Images/image151.png Set the assignment's release date and time. To set the date, click inside the **Release date** field, and then select the date that you want in the calendar that appears. To set the release time, click inside the time input field, and then specify the time you want. @@ -209,8 +209,8 @@ To set the assignment type for a subsection: 3. On the right side of the screen, click the blue check mark for the subsection, and then select the assignment type. -.. image:: images/image153.png +.. image:: Images/image153.png .. note:: - If you change an assignment type name in the Grading page, make sure the assignment type names on the Course Outline still match. \ No newline at end of file + If you change an assignment type name in the Grading page, make sure the assignment type names on the Course Outline still match. diff --git a/userdocs/source/export_import_course.rst b/docs/course_authors/source/export_import_course.rst similarity index 98% rename from userdocs/source/export_import_course.rst rename to docs/course_authors/source/export_import_course.rst index 7173008487..db45b4a225 100644 --- a/userdocs/source/export_import_course.rst +++ b/docs/course_authors/source/export_import_course.rst @@ -106,7 +106,7 @@ To import a course: 1. On the navigation bar, click **Tools**, and then click **Import**. -.. image:: images/image243.png +.. image:: Images/image243.png 2. Under **Course to Import**, click **Choose File**. diff --git a/userdocs/source/get_started.rst b/docs/course_authors/source/get_started.rst similarity index 91% rename from userdocs/source/get_started.rst rename to docs/course_authors/source/get_started.rst index 468ff71a33..86be49f33f 100644 --- a/userdocs/source/get_started.rst +++ b/docs/course_authors/source/get_started.rst @@ -1,5 +1,5 @@ -.. image:: images/image001.png +.. image:: Images/image001.png ########################### @@ -32,7 +32,7 @@ Studio (http://studio.edge.edx.org) is our web-based course authoring tool. It i 1. First, go to: https://studio.edge.edx.org. Sign up and create an account. -.. image:: images/image009.png +.. image:: Images/image009.png :width: 800 @@ -42,7 +42,7 @@ Studio (http://studio.edge.edx.org) is our web-based course authoring tool. It i 2. Create a course in Studio. -.. image:: images/image021.png +.. image:: Images/image021.png :width: 800 @@ -52,7 +52,7 @@ Studio (http://studio.edge.edx.org) is our web-based course authoring tool. It i 3. View your course on Edge. -.. image:: images/image027.png +.. image:: Images/image027.png :width: 800 .. raw:: latex @@ -70,7 +70,7 @@ When you create your account on Studio, an account on Edge is automatically crea Edge has two views - an Instructor view and a Student view. When you view your course on Edge, you view your course as an instructor, and you see the **Instructor** tab at the top of the page. -.. image:: images/image007.png +.. image:: Images/image007.png :width: 800 @@ -80,20 +80,20 @@ To create an account: 1. Go to http://studio.edge.edX.org. The Welcome to edX Studio page opens. -.. image:: images/image009.png +.. image:: Images/image009.png :width: 800 2. Scroll to the bottom of the page and click **Sign Up & Start Making an edX Course.** -.. image:: images/image011.png +.. image:: Images/image011.png :width: 800 3. In the page that opens, fill in the fields. Required fields are marked with an asterisk (*). -.. image:: images/image013.png +.. image:: Images/image013.png :width: 800 @@ -104,20 +104,20 @@ d. In the **Full Name** box, type your full name. This name only appears in Stud Your students will not see this name. e. Click to select I agree to the Terms of Service. -.. image:: images/image017.png +.. image:: Images/image017.png :width: 800 4. Click **Create My Account & Start Authoring Courses,** After you click this button, the following page opens. -.. image:: images/image015.png +.. image:: Images/image015.png :width: 800 5. To finish creating your account, click the link that you receive in the activation e-mail. When you click this link, the following page opens. -.. image:: images/image017.png +.. image:: Images/image017.png :width: 800 - .. raw:: latex +.. raw:: latex \newpage % @@ -127,12 +127,12 @@ Create a New Course The first time that you log in to Studio, the following page opens. -.. image:: images/image017.png +.. image:: Images/image017.png :width: 800 Click the **dashboard** link, and the **My Courses** page opens. -.. image:: images/image021.png +.. image:: Images/image021.png :width: 800 Once you have created a course in Studio, it will be listed on this page. From here, you can start creating courses immediately by clicking the **New Course** button. @@ -158,12 +158,12 @@ To create a new course: 5. Click **Save.** -.. image:: images/image025.png +.. image:: Images/image025.png :width: 800 If you click **View Live** your course appears as follows on Edge. -.. image:: images/image027.png +.. image:: Images/image027.png :width: 800 -*Note: Although the start date is set to the current date by default, your course will not be advertised, so it will not be visible to the general public. You can change the start date of your course in Studio.* \ No newline at end of file +*Note: Although the start date is set to the current date by default, your course will not be advertised, so it will not be visible to the general public. You can change the start date of your course in Studio.* diff --git a/userdocs/source/index.rst b/docs/course_authors/source/index.rst similarity index 100% rename from userdocs/source/index.rst rename to docs/course_authors/source/index.rst diff --git a/userdocs/source/invite_students_to_register.rst b/docs/course_authors/source/invite_students_to_register.rst similarity index 95% rename from userdocs/source/invite_students_to_register.rst rename to docs/course_authors/source/invite_students_to_register.rst index 4903cf3f2d..4efeee3cf8 100644 --- a/userdocs/source/invite_students_to_register.rst +++ b/docs/course_authors/source/invite_students_to_register.rst @@ -23,7 +23,7 @@ c. Click "**Invite Your Students**" link. Clicking the link creates an email template. -.. image:: images/image286.png +.. image:: Images/image286.png d. Email this to your chosen mail list. \ No newline at end of file diff --git a/userdocs/source/latex/Makefile b/docs/course_authors/source/latex/Makefile similarity index 100% rename from userdocs/source/latex/Makefile rename to docs/course_authors/source/latex/Makefile diff --git a/userdocs/source/modify_published_content.rst b/docs/course_authors/source/modify_published_content.rst similarity index 88% rename from userdocs/source/modify_published_content.rst rename to docs/course_authors/source/modify_published_content.rst index 9760147eb6..fe13490be7 100644 --- a/userdocs/source/modify_published_content.rst +++ b/docs/course_authors/source/modify_published_content.rst @@ -16,7 +16,7 @@ To create a draft, open the Unit that you want. Note that no **Edit** button appears on the page for that Unit, and you cannot make changes to the Unit. -.. image:: images/image231.png +.. image:: Images/image231.png :width: 600 @@ -24,7 +24,7 @@ In the right pane, click the blue **edit a draft** link in the **Unit Settings** box. -.. image:: images/image233.png +.. image:: Images/image233.png :width: 600 @@ -32,7 +32,7 @@ After you click **edit a draft**, you can make changes to the Unit. You can edit existing content or add new content. -.. image:: images/image235.png +.. image:: Images/image235.png :width: 600 @@ -41,7 +41,7 @@ click **Preview the published version **in the yellow banner at the top of the page. -.. image:: images/image237.png +.. image:: Images/image237.png :width: 600 @@ -50,7 +50,7 @@ If you want to view the draft version that you are working on, click mode.**** -.. image:: images/image239.png +.. image:: Images/image239.png :width: 600 @@ -58,5 +58,5 @@ When you are done making changes to the Unit, click the blue **replace it with this draft** link under **Unit Settings**. -.. image:: images/image241.png +.. image:: Images/image241.png :width: 600 diff --git a/userdocs/source/read_me.rst b/docs/course_authors/source/read_me.rst similarity index 100% rename from userdocs/source/read_me.rst rename to docs/course_authors/source/read_me.rst diff --git a/userdocs/source/set_content_releasedates.rst b/docs/course_authors/source/set_content_releasedates.rst similarity index 94% rename from userdocs/source/set_content_releasedates.rst rename to docs/course_authors/source/set_content_releasedates.rst index 80dcd53095..b55afc1e8c 100644 --- a/userdocs/source/set_content_releasedates.rst +++ b/docs/course_authors/source/set_content_releasedates.rst @@ -16,7 +16,7 @@ Section 2. Find the section you are looking for in the course outline. 3. Under **Will Release**, click **Edit**, and then change the date. - .. image:: images/image280.png + .. image:: Images/image280.png Subsection ********** diff --git a/userdocs/source/view_course_content.rst b/docs/course_authors/source/view_course_content.rst similarity index 88% rename from userdocs/source/view_course_content.rst rename to docs/course_authors/source/view_course_content.rst index 1b4876984b..9f5dac88af 100644 --- a/userdocs/source/view_course_content.rst +++ b/docs/course_authors/source/view_course_content.rst @@ -37,10 +37,10 @@ can change this date so that individual Subsections are released at different times after the Section has been released. -.. image:: images/image189.png +.. image:: Images/image189.png -.. image:: images/image191.png +.. image:: Images/image191.png 3. You set the Unit that contains the content to Public.** By default, all @@ -87,7 +87,7 @@ go to the **Course Outline **page. On the**Course Outline **page, you can see the "macro" outline of your course, down to individual Units. -.. image:: images/image193.png +.. image:: Images/image193.png .. raw:: latex @@ -105,7 +105,7 @@ are set to Public or Private. Private Units appear in light gray text with "PRIVATE" next to the Unit name. All other Units are Public. -.. image:: images/image195.png +.. image:: Images/image195.png .. raw:: latex @@ -129,14 +129,14 @@ The following Unit is set to Public. The release date for the Subsection has passed. -.. image:: images/image197.png +.. image:: Images/image197.png The following Unit is set to Private. The release date for the Subsection has passed. -.. image:: images/image199.png +.. image:: Images/image199.png If you change the release date for the "What Does an edX Course Look Like?" @@ -149,7 +149,7 @@ Public Unit -.. image:: images/image201.png +.. image:: Images/image201.png Private Unit @@ -157,7 +157,7 @@ Private Unit -.. image:: images/image203.png +.. image:: Images/image203.png @@ -184,7 +184,7 @@ You can enter Preview mode in two ways. 1. On any Subsection page, click** Preview Drafts**. -.. image:: images/image205.png +.. image:: Images/image205.png 2. On any Unit page, click **Preview**. @@ -194,14 +194,14 @@ The following example shows the **Preview** button on a page for a Unit that is set to Public. -.. image:: images/image207.png +.. image:: Images/image207.png The following example shows the **Preview** button on a page for a Unit that is set to Private. -.. image:: images/image209.png +.. image:: Images/image209.png Example ======= @@ -210,7 +210,7 @@ The following example shows the first Unit of the "What Does an edX Course Look Like?" Subsection in Preview mode. -.. image:: images/image211.png +.. image:: Images/image211.png Remember that the release date for the Subsection is in the past. However, @@ -224,12 +224,12 @@ edX 101") is set to Public, and Unit 2 ("New edX Information") is set to Private. Both Units appear in the course ribbon at the top of the screen. -.. image:: images/image213.png +.. image:: Images/image213.png When you click Unit 2 in the course ribbon, you see the content in Unit 2: -.. image:: images/image215.png +.. image:: Images/image215.png **On edX or Edge as an Instructor** @@ -253,20 +253,20 @@ To view your course on edX or Edge as an instructor, click **View Live**. The The **Course Outline** page. -.. image:: images/image217.png +.. image:: Images/image217.png Any Subsection page. -.. image:: images/image219.png +.. image:: Images/image219.png The Unit page, if the Unit is Public. -.. image:: images/image221.png +.. image:: Images/image221.png Example ======= @@ -276,7 +276,7 @@ Look Like?" Subsection as if you were viewing it on edX or Edge as an instructor. Notice the **Instructor** tab at the top of the page. -.. image:: images/image223.png +.. image:: Images/image223.png The release date for the "What Does an edX Course Look Like?" Subsection is @@ -289,7 +289,7 @@ to Private. Unit 2 does not appear in the course ribbon at the top of the screen. Instead, the next public unit, **Tabs**, appears. -.. image:: images/image225.png +.. image:: Images/image225.png **On edX or Edge as a Current Student** @@ -322,7 +322,7 @@ student. Notice that the **Instructor** tab does not appear at the top of the page. -.. image:: images/image227.png +.. image:: Images/image227.png Remember that Unit 1 is set to Public, and Unit 2 is set to Private. Unit 2 @@ -330,7 +330,7 @@ does not appear in the course ribbon at the top of the screen. Instead, the next public unit, **Tabs**, appears. -.. image:: images/image229.png +.. image:: Images/image229.png If you change the release date of the Subsection to a future date (such as diff --git a/doc/public/Makefile b/docs/data/Makefile similarity index 97% rename from doc/public/Makefile rename to docs/data/Makefile index 378a64b7fb..fd08639327 100644 --- a/doc/public/Makefile +++ b/docs/data/Makefile @@ -10,9 +10,9 @@ BUILDDIR = build # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source # the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext diff --git a/doc/README b/docs/data/README similarity index 100% rename from doc/README rename to docs/data/README diff --git a/docs/data/__init__.py b/docs/data/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docs/data/source/conf.py b/docs/data/source/conf.py new file mode 100644 index 0000000000..90a78f48fd --- /dev/null +++ b/docs/data/source/conf.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# + +import sys, os + +on_rtd = os.environ.get('READTHEDOCS', None) == 'True' + +sys.path.append(os.path.abspath('../../../')) +sys.path.append(os.path.abspath('../../')) + +from docs.shared.conf import * + +sys.path.insert(0, os.path.abspath('.')) + +master_doc = 'index' + +# Add any paths that contain templates here, relative to this directory. +templates_path.append('source/_templates') + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path.append('source/_static') + + diff --git a/doc/public/course_data_formats/conditional_module/conditional_module.rst b/docs/data/source/course_data_formats/conditional_module/conditional_module.rst similarity index 100% rename from doc/public/course_data_formats/conditional_module/conditional_module.rst rename to docs/data/source/course_data_formats/conditional_module/conditional_module.rst diff --git a/doc/public/course_data_formats/course_xml.rst b/docs/data/source/course_data_formats/course_xml.rst similarity index 100% rename from doc/public/course_data_formats/course_xml.rst rename to docs/data/source/course_data_formats/course_xml.rst diff --git a/doc/public/course_data_formats/custom_response.rst b/docs/data/source/course_data_formats/custom_response.rst similarity index 100% rename from doc/public/course_data_formats/custom_response.rst rename to docs/data/source/course_data_formats/custom_response.rst diff --git a/doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo.xml b/docs/data/source/course_data_formats/drag_and_drop/drag-n-drop-demo.xml similarity index 100% rename from doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo.xml rename to docs/data/source/course_data_formats/drag_and_drop/drag-n-drop-demo.xml diff --git a/doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo2.xml b/docs/data/source/course_data_formats/drag_and_drop/drag-n-drop-demo2.xml similarity index 100% rename from doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo2.xml rename to docs/data/source/course_data_formats/drag_and_drop/drag-n-drop-demo2.xml diff --git a/doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo3.xml b/docs/data/source/course_data_formats/drag_and_drop/drag-n-drop-demo3.xml similarity index 100% rename from doc/public/course_data_formats/drag_and_drop/drag-n-drop-demo3.xml rename to docs/data/source/course_data_formats/drag_and_drop/drag-n-drop-demo3.xml diff --git a/doc/public/course_data_formats/drag_and_drop/drag_and_drop_input.rst b/docs/data/source/course_data_formats/drag_and_drop/drag_and_drop_input.rst similarity index 100% rename from doc/public/course_data_formats/drag_and_drop/drag_and_drop_input.rst rename to docs/data/source/course_data_formats/drag_and_drop/drag_and_drop_input.rst diff --git a/doc/public/course_data_formats/drag_and_drop/draganddrop_logic_flow.png b/docs/data/source/course_data_formats/drag_and_drop/draganddrop_logic_flow.png similarity index 100% rename from doc/public/course_data_formats/drag_and_drop/draganddrop_logic_flow.png rename to docs/data/source/course_data_formats/drag_and_drop/draganddrop_logic_flow.png diff --git a/doc/public/course_data_formats/grading.rst b/docs/data/source/course_data_formats/grading.rst similarity index 100% rename from doc/public/course_data_formats/grading.rst rename to docs/data/source/course_data_formats/grading.rst diff --git a/doc/public/course_data_formats/graphical_slider_tool/graphical_slider_tool.rst b/docs/data/source/course_data_formats/graphical_slider_tool/graphical_slider_tool.rst similarity index 100% rename from doc/public/course_data_formats/graphical_slider_tool/graphical_slider_tool.rst rename to docs/data/source/course_data_formats/graphical_slider_tool/graphical_slider_tool.rst diff --git a/doc/public/course_data_formats/graphical_slider_tool/gst_example_bars.xml b/docs/data/source/course_data_formats/graphical_slider_tool/gst_example_bars.xml similarity index 100% rename from doc/public/course_data_formats/graphical_slider_tool/gst_example_bars.xml rename to docs/data/source/course_data_formats/graphical_slider_tool/gst_example_bars.xml diff --git a/doc/public/course_data_formats/graphical_slider_tool/gst_example_dynamic_labels.xml b/docs/data/source/course_data_formats/graphical_slider_tool/gst_example_dynamic_labels.xml similarity index 100% rename from doc/public/course_data_formats/graphical_slider_tool/gst_example_dynamic_labels.xml rename to docs/data/source/course_data_formats/graphical_slider_tool/gst_example_dynamic_labels.xml diff --git a/doc/public/course_data_formats/graphical_slider_tool/gst_example_dynamic_range.xml b/docs/data/source/course_data_formats/graphical_slider_tool/gst_example_dynamic_range.xml similarity index 100% rename from doc/public/course_data_formats/graphical_slider_tool/gst_example_dynamic_range.xml rename to docs/data/source/course_data_formats/graphical_slider_tool/gst_example_dynamic_range.xml diff --git a/doc/public/course_data_formats/graphical_slider_tool/gst_example_html_element_output.xml b/docs/data/source/course_data_formats/graphical_slider_tool/gst_example_html_element_output.xml similarity index 100% rename from doc/public/course_data_formats/graphical_slider_tool/gst_example_html_element_output.xml rename to docs/data/source/course_data_formats/graphical_slider_tool/gst_example_html_element_output.xml diff --git a/doc/public/course_data_formats/graphical_slider_tool/gst_example_with_documentation.xml b/docs/data/source/course_data_formats/graphical_slider_tool/gst_example_with_documentation.xml similarity index 100% rename from doc/public/course_data_formats/graphical_slider_tool/gst_example_with_documentation.xml rename to docs/data/source/course_data_formats/graphical_slider_tool/gst_example_with_documentation.xml diff --git a/doc/public/course_data_formats/jsinput.rst b/docs/data/source/course_data_formats/jsinput.rst similarity index 100% rename from doc/public/course_data_formats/jsinput.rst rename to docs/data/source/course_data_formats/jsinput.rst diff --git a/doc/public/course_data_formats/poll_module/poll_module.rst b/docs/data/source/course_data_formats/poll_module/poll_module.rst similarity index 100% rename from doc/public/course_data_formats/poll_module/poll_module.rst rename to docs/data/source/course_data_formats/poll_module/poll_module.rst diff --git a/doc/public/course_data_formats/symbolic_response.rst b/docs/data/source/course_data_formats/symbolic_response.rst similarity index 100% rename from doc/public/course_data_formats/symbolic_response.rst rename to docs/data/source/course_data_formats/symbolic_response.rst diff --git a/doc/public/course_data_formats/word_cloud/word_cloud.png b/docs/data/source/course_data_formats/word_cloud/word_cloud.png similarity index 100% rename from doc/public/course_data_formats/word_cloud/word_cloud.png rename to docs/data/source/course_data_formats/word_cloud/word_cloud.png diff --git a/doc/public/course_data_formats/word_cloud/word_cloud.rst b/docs/data/source/course_data_formats/word_cloud/word_cloud.rst similarity index 100% rename from doc/public/course_data_formats/word_cloud/word_cloud.rst rename to docs/data/source/course_data_formats/word_cloud/word_cloud.rst diff --git a/doc/public/index.rst b/docs/data/source/index.rst similarity index 100% rename from doc/public/index.rst rename to docs/data/source/index.rst diff --git a/doc/public/internal_data_formats/discussion_data.rst b/docs/data/source/internal_data_formats/discussion_data.rst similarity index 100% rename from doc/public/internal_data_formats/discussion_data.rst rename to docs/data/source/internal_data_formats/discussion_data.rst diff --git a/doc/public/internal_data_formats/sql_schema.rst b/docs/data/source/internal_data_formats/sql_schema.rst similarity index 100% rename from doc/public/internal_data_formats/sql_schema.rst rename to docs/data/source/internal_data_formats/sql_schema.rst diff --git a/doc/public/internal_data_formats/tracking_logs.rst b/docs/data/source/internal_data_formats/tracking_logs.rst similarity index 100% rename from doc/public/internal_data_formats/tracking_logs.rst rename to docs/data/source/internal_data_formats/tracking_logs.rst diff --git a/docs/developers/Makefile b/docs/developers/Makefile new file mode 100644 index 0000000000..168add14d6 --- /dev/null +++ b/docs/developers/Makefile @@ -0,0 +1,153 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +PAPER = +BUILDDIR = build + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source +# the i18n builder cannot share the environment and doctrees with the others +I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source + +.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext + +help: + @echo "Please use \`make <target>' where <target> is one of" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " singlehtml to make a single large HTML file" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " devhelp to make HTML files and a Devhelp project" + @echo " epub to make an epub" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " text to make text files" + @echo " man to make manual pages" + @echo " texinfo to make Texinfo files" + @echo " info to make Texinfo files and run them through makeinfo" + @echo " gettext to make PO message catalogs" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + +clean: + -rm -rf $(BUILDDIR)/* + +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." + +dirhtml: + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." + +singlehtml: + $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml + @echo + @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." + +pickle: + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle + @echo + @echo "Build finished; now you can process the pickle files." + +json: + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json + @echo + @echo "Build finished; now you can process the JSON files." + +htmlhelp: + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp + @echo + @echo "Build finished; now you can run HTML Help Workshop with the" \ + ".hhp project file in $(BUILDDIR)/htmlhelp." + +qthelp: + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp + @echo + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ + ".qhcp project file in $(BUILDDIR)/qthelp, like this:" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/MITx.qhcp" + @echo "To view the help file:" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/MITx.qhc" + +devhelp: + $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp + @echo + @echo "Build finished." + @echo "To view the help file:" + @echo "# mkdir -p $$HOME/.local/share/devhelp/MITx" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/MITx" + @echo "# devhelp" + +epub: + $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub + @echo + @echo "Build finished. The epub file is in $(BUILDDIR)/epub." + +latex: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." + @echo "Run \`make' in that directory to run these through (pdf)latex" \ + "(use \`make latexpdf' here to do that automatically)." + +latexpdf: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through pdflatex..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +text: + $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text + @echo + @echo "Build finished. The text files are in $(BUILDDIR)/text." + +man: + $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man + @echo + @echo "Build finished. The manual pages are in $(BUILDDIR)/man." + +texinfo: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo + @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." + @echo "Run \`make' in that directory to run these through makeinfo" \ + "(use \`make info' here to do that automatically)." + +info: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo "Running Texinfo files through makeinfo..." + make -C $(BUILDDIR)/texinfo info + @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." + +gettext: + $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale + @echo + @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." + +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes + @echo + @echo "The overview file is in $(BUILDDIR)/changes." + +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in $(BUILDDIR)/linkcheck/output.txt." + +doctest: + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in $(BUILDDIR)/doctest/output.txt." diff --git a/docs/developers/source/__init__.py b/docs/developers/source/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docs/source/_static/homepage-bg.jpg b/docs/developers/source/_static/homepage-bg.jpg similarity index 100% rename from docs/source/_static/homepage-bg.jpg rename to docs/developers/source/_static/homepage-bg.jpg diff --git a/docs/source/_templates/layout.html b/docs/developers/source/_templates/layout.html similarity index 100% rename from docs/source/_templates/layout.html rename to docs/developers/source/_templates/layout.html diff --git a/docs/source/calc.rst b/docs/developers/source/calc.rst similarity index 100% rename from docs/source/calc.rst rename to docs/developers/source/calc.rst diff --git a/docs/source/capa.rst b/docs/developers/source/capa.rst similarity index 100% rename from docs/source/capa.rst rename to docs/developers/source/capa.rst diff --git a/docs/source/chem.rst b/docs/developers/source/chem.rst similarity index 100% rename from docs/source/chem.rst rename to docs/developers/source/chem.rst diff --git a/docs/source/cms.rst b/docs/developers/source/cms.rst similarity index 100% rename from docs/source/cms.rst rename to docs/developers/source/cms.rst diff --git a/docs/source/common-lib.rst b/docs/developers/source/common-lib.rst similarity index 100% rename from docs/source/common-lib.rst rename to docs/developers/source/common-lib.rst diff --git a/docs/developers/source/conf.py b/docs/developers/source/conf.py new file mode 100644 index 0000000000..12e9cf822b --- /dev/null +++ b/docs/developers/source/conf.py @@ -0,0 +1,202 @@ +# -*- coding: utf-8 -*- +#pylint: disable=C0103 +#pylint: disable=W0622 +#pylint: disable=W0212 +#pylint: disable=W0613 + +import sys, os + +on_rtd = os.environ.get('READTHEDOCS', None) == 'True' + +sys.path.append('../../../') + +from docs.shared.conf import * + + +# Add any paths that contain templates here, relative to this directory. +templates_path.append('source/_templates') + + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path.append('source/_static') + + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.insert(0, os.path.abspath('../../..')) +root = os.path.abspath('../../..') + +sys.path.append(root) +sys.path.append(os.path.join(root, "common/djangoapps")) +sys.path.append(os.path.join(root, "common/lib")) +sys.path.append(os.path.join(root, "common/lib/sandbox-packages")) +sys.path.append(os.path.join(root, "lms/djangoapps")) +sys.path.append(os.path.join(root, "lms/lib")) +sys.path.append(os.path.join(root, "cms/djangoapps")) +sys.path.append(os.path.join(root, "cms/lib")) +sys.path.insert(0, os.path.abspath(os.path.normpath(os.path.dirname(__file__) + + '/../../'))) +sys.path.append('.') + +# django configuration - careful here +if on_rtd: + os.environ['DJANGO_SETTINGS_MODULE'] = 'lms' +else: + os.environ['DJANGO_SETTINGS_MODULE'] = 'lms.envs.test' + + +# -- General configuration ----------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = [ + 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', + 'sphinx.ext.pngmath', 'sphinx.ext.mathjax', 'sphinx.ext.viewcode'] + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +exclude_patterns = ['build'] + + +# Output file base name for HTML help builder. +htmlhelp_basename = 'edXDocs' + + +# from http://djangosnippets.org/snippets/2533/ +# autogenerate models definitions + +import inspect +import types +from HTMLParser import HTMLParser + + +def force_unicode(s, encoding='utf-8', strings_only=False, errors='strict'): + """ + Similar to smart_unicode, except that lazy instances are resolved to + strings, rather than kept as lazy objects. + + If strings_only is True, don't convert (some) non-string-like objects. + """ + if strings_only and isinstance(s, (types.NoneType, int)): + return s + if not isinstance(s, basestring,): + if hasattr(s, '__unicode__'): + s = unicode(s) + else: + s = unicode(str(s), encoding, errors) + elif not isinstance(s, unicode): + s = unicode(s, encoding, errors) + return s + + +class MLStripper(HTMLParser): + def __init__(self): + self.reset() + self.fed = [] + + def handle_data(self, d): + self.fed.append(d) + + def get_data(self): + return ''.join(self.fed) + + +def strip_tags(html): + s = MLStripper() + s.feed(html) + return s.get_data() + +class Mock(object): + def __init__(self, *args, **kwargs): + pass + + def __call__(self, *args, **kwargs): + return Mock() + + @classmethod + def __getattr__(cls, name): + if name in ('__file__', '__path__'): + return '/dev/null' + elif name[0] == name[0].upper(): + mockType = type(name, (), {}) + mockType.__module__ = __name__ + return mockType + else: + return Mock() + +MOCK_MODULES = ['scipy', 'numpy'] +for mod_name in MOCK_MODULES: + sys.modules[mod_name] = Mock() + +def process_docstring(app, what, name, obj, options, lines): + """Autodoc django models""" + + # This causes import errors if left outside the function + from django.db import models + + # If you want extract docs from django forms: + # from django import forms + # from django.forms.models import BaseInlineFormSet + + # Only look at objects that inherit from Django's base MODEL class + if inspect.isclass(obj) and issubclass(obj, models.Model): + # Grab the field list from the meta class + fields = obj._meta._fields() + + for field in fields: + # Decode and strip any html out of the field's help text + help_text = strip_tags(force_unicode(field.help_text)) + + # Decode and capitalize the verbose name, for use if there isn't + # any help text + verbose_name = force_unicode(field.verbose_name).capitalize() + + if help_text: + # Add the model field to the end of the docstring as a param + # using the help text as the description + lines.append(u':param %s: %s' % (field.attname, help_text)) + else: + # Add the model field to the end of the docstring as a param + # using the verbose name as the description + lines.append(u':param %s: %s' % (field.attname, verbose_name)) + + # Add the field's type to the docstring + lines.append(u':type %s: %s' % (field.attname, type(field).__name__)) + # Only look at objects that inherit from Django's base FORM class + # elif (inspect.isclass(obj) and issubclass(obj, forms.ModelForm) or issubclass(obj, forms.ModelForm) or issubclass(obj, BaseInlineFormSet)): + # pass + # # Grab the field list from the meta class + # import ipdb; ipdb.set_trace() + # fields = obj._meta._fields() + # import ipdb; ipdb.set_trace() + # for field in fields: + # import ipdb; ipdb.set_trace() + # # Decode and strip any html out of the field's help text + # help_text = strip_tags(force_unicode(field.help_text)) + + # # Decode and capitalize the verbose name, for use if there isn't + # # any help text + # verbose_name = force_unicode(field.verbose_name).capitalize() + + # if help_text: + # # Add the model field to the end of the docstring as a param + # # using the help text as the description + # lines.append(u':param %s: %s' % (field.attname, help_text)) + # else: + # # Add the model field to the end of the docstring as a param + # # using the verbose name as the description + # lines.append(u':param %s: %s' % (field.attname, verbose_name)) + + # # Add the field's type to the docstring + # lines.append(u':type %s: %s' % (field.attname, type(field).__name__)) + # Return the extended docstring + return lines + + +def setup(app): + """Setup docsting processors""" + #Register the docstring processor with sphinx + app.connect('autodoc-process-docstring', process_docstring) diff --git a/docs/source/djangoapps-common.rst b/docs/developers/source/djangoapps-common.rst similarity index 100% rename from docs/source/djangoapps-common.rst rename to docs/developers/source/djangoapps-common.rst diff --git a/docs/source/djangoapps.rst b/docs/developers/source/djangoapps.rst similarity index 100% rename from docs/source/djangoapps.rst rename to docs/developers/source/djangoapps.rst diff --git a/docs/source/index.rst b/docs/developers/source/index.rst similarity index 100% rename from docs/source/index.rst rename to docs/developers/source/index.rst diff --git a/docs/source/lms.rst b/docs/developers/source/lms.rst similarity index 100% rename from docs/source/lms.rst rename to docs/developers/source/lms.rst diff --git a/docs/source/overview.rst b/docs/developers/source/overview.rst similarity index 100% rename from docs/source/overview.rst rename to docs/developers/source/overview.rst diff --git a/docs/source/sandbox-packages.rst b/docs/developers/source/sandbox-packages.rst similarity index 100% rename from docs/source/sandbox-packages.rst rename to docs/developers/source/sandbox-packages.rst diff --git a/docs/source/symmath.rst b/docs/developers/source/symmath.rst similarity index 100% rename from docs/source/symmath.rst rename to docs/developers/source/symmath.rst diff --git a/docs/source/xmodule.rst b/docs/developers/source/xmodule.rst similarity index 100% rename from docs/source/xmodule.rst rename to docs/developers/source/xmodule.rst diff --git a/doc/code_standards.txt b/docs/internal/code_standards.txt similarity index 100% rename from doc/code_standards.txt rename to docs/internal/code_standards.txt diff --git a/doc/development.md b/docs/internal/development.md similarity index 100% rename from doc/development.md rename to docs/internal/development.md diff --git a/doc/discussion.md b/docs/internal/discussion.md similarity index 100% rename from doc/discussion.md rename to docs/internal/discussion.md diff --git a/doc/mongo.md b/docs/internal/mongo.md similarity index 100% rename from doc/mongo.md rename to docs/internal/mongo.md diff --git a/doc/overview.md b/docs/internal/overview.md similarity index 100% rename from doc/overview.md rename to docs/internal/overview.md diff --git a/doc/remote_gradebook.md b/docs/internal/remote_gradebook.md similarity index 100% rename from doc/remote_gradebook.md rename to docs/internal/remote_gradebook.md diff --git a/doc/test_pyramid.png b/docs/internal/test_pyramid.png similarity index 100% rename from doc/test_pyramid.png rename to docs/internal/test_pyramid.png diff --git a/doc/testing.md b/docs/internal/testing.md similarity index 97% rename from doc/testing.md rename to docs/internal/testing.md index cfca297f2b..9a2a5a0a8f 100644 --- a/doc/testing.md +++ b/docs/internal/testing.md @@ -186,8 +186,8 @@ uses [Selenium](http://docs.seleniumhq.org/) to control the Chrome browser. **Prerequisite**: You must have [ChromeDriver](https://code.google.com/p/selenium/wiki/ChromeDriver) installed to run the tests in Chrome. The tests are confirmed to run -with Chrome (not Chromium) version 26.0.0.1410.63 with ChromeDriver -version r195636. +with Chrome (not Chromium) version 28.0.1500.71 with ChromeDriver +version 2.1.210398. To run all the acceptance tests: @@ -196,7 +196,11 @@ To run all the acceptance tests: To test only a specific feature: - rake test_acceptance_lms[lms/djangoapps/courseware/features/problems.feature] + rake test_acceptance_lms["lms/djangoapps/courseware/features/problems.feature"] + +To test only a specific scenario + + rake test_acceptance_lms["lms/djangoapps/courseware/features/problems.feature -s 3"] To start the debugger on failure, add the `--pdb` option: diff --git a/docs/shared/__init__.py b/docs/shared/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/userdocs/source/conf.py b/docs/shared/conf.py old mode 100755 new mode 100644 similarity index 93% rename from userdocs/source/conf.py rename to docs/shared/conf.py index d416509d15..5f0a2abd89 --- a/userdocs/source/conf.py +++ b/docs/shared/conf.py @@ -11,8 +11,31 @@ # All configuration values have a default; values that are commented out # serve to show the default. + +# ----------------------------------------------------------------------------- +# Common config +# +# This file is imported by the different project conf.py files (in +# course_authors/, data/, and developers/). It includes configuration options +# common to all three. +# +# ----------------------------------------------------------------------------- + import sys, os +BASEDIR = os.path.dirname(os.path.abspath(__file__)) + +def add_base(paths): + """ + Returns a list of paths relative to BASEDIR. + + paths: a list of paths + """ + + return [os.path.join(BASEDIR, x) for x in paths] + + + # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. @@ -28,7 +51,7 @@ import sys, os extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.mathjax', 'sphinx.ext.ifconfig'] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = add_base(['_templates']) # The suffix of source filenames. source_suffix = '.rst' @@ -123,7 +146,7 @@ html_theme = 'default' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = add_base(['_static']) # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. diff --git a/docs/shared/requirements.txt b/docs/shared/requirements.txt new file mode 100644 index 0000000000..be4f8cb503 --- /dev/null +++ b/docs/shared/requirements.txt @@ -0,0 +1,76 @@ +# Read the docs requirements file +# ---------------------------------------- +# Installing modules with C dependencies on RTD can be tricky, and pip doesn't +# have an 'ignore-errors' option, so all requirements fail. Here we keep the +# maximal list of modules that still works. +# +beautifulsoup4==4.1.3 +beautifulsoup==3.2.1 +boto==2.6.0 +celery==3.0.19 +distribute>=0.6.28, <0.7 +django-celery==3.0.17 +django-countries==1.5 +django-filter==0.6.0 +django-followit==0.0.3 +django-keyedcache==1.4-6 +django-kombu==0.9.4 +django-mako==0.1.5pre +django-masquerade==0.1.6 +django-mptt==0.5.5 +django-openid-auth==0.4 +django-robots==0.9.1 +django-sekizai==0.6.1 +django-ses==0.4.1 +django-storages==1.1.5 +django-threaded-multihost==1.4-1 +django-method-override==0.1.0 +djangorestframework==2.3.5 +django==1.4.5 +feedparser==5.1.3 +fs==0.4.0 +GitPython==0.3.2.RC1 +glob2==0.3 +lxml==3.0.1 +mako==0.7.3 +Markdown==2.2.1 +networkx==1.7 +nltk==2.0.4 +paramiko==1.9.0 +path.py==3.0.1 +Pillow==1.7.8 +pip>=1.3 +polib==1.0.3 +pycrypto>=2.6 +pygments==1.5 +pymongo==2.4.1 +python-memcached==1.48 +python-openid==2.2.5 +pytz==2012h +PyYAML==3.10 +requests==0.14.2 +Shapely==1.2.16 +sorl-thumbnail==11.12 +South==0.7.6 +sympy==0.7.1 +xmltodict==0.4.1 + +# Metrics gathering and monitoring +dogapi==1.2.1 +dogstatsd-python==0.2.1 +newrelic==1.8.0.13 + +# Used for Internationalization and localization +Babel==1.3 +transifex-client==0.9.1 + + +-e common/lib/calc +-e common/lib/capa +-e common/lib/chem +-e common/lib/sandbox-packages +-e common/lib/symmath +-e common/lib/xmodule +-e . + +-e git+https://github.com/edx/XBlock.git@b697bebd45deebd0f868613fab6722a0460ca0c1#egg=XBlock diff --git a/i18n/tests/test_generate.py b/i18n/tests/test_generate.py index b9a36ada33..f18dff0320 100644 --- a/i18n/tests/test_generate.py +++ b/i18n/tests/test_generate.py @@ -46,7 +46,7 @@ class TestGenerate(TestCase): path = os.path.join(CONFIGURATION.get_messages_dir(locale), mofile) exists = os.path.exists(path) self.assertTrue(exists, msg='Missing file in locale %s: %s' % (locale, mofile)) - self.assertTrue(datetime.fromtimestamp(os.path.getmtime(path)) >= self.start_time, + self.assertTrue(datetime.fromtimestamp(os.path.getmtime(path), UTC) >= self.start_time, msg='File not recently modified: %s' % path) self.assert_merge_headers(locale) diff --git a/lms/djangoapps/analytics/__init__.py b/lms/djangoapps/analytics/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lms/djangoapps/analytics/basic.py b/lms/djangoapps/analytics/basic.py new file mode 100644 index 0000000000..0a8c6fec09 --- /dev/null +++ b/lms/djangoapps/analytics/basic.py @@ -0,0 +1,98 @@ +""" +Student and course analytics. + +Serve miscellaneous course and student data +""" + +from django.contrib.auth.models import User +import xmodule.graders as xmgraders + + +STUDENT_FEATURES = ('username', 'first_name', 'last_name', 'is_staff', 'email') +PROFILE_FEATURES = ('name', 'language', 'location', 'year_of_birth', 'gender', + 'level_of_education', 'mailing_address', 'goals') +AVAILABLE_FEATURES = STUDENT_FEATURES + PROFILE_FEATURES + + +def enrolled_students_features(course_id, features): + """ + Return list of student features as dictionaries. + + enrolled_students_features(course_id, ['username, first_name']) + would return [ + {'username': 'username1', 'first_name': 'firstname1'} + {'username': 'username2', 'first_name': 'firstname2'} + {'username': 'username3', 'first_name': 'firstname3'} + ] + """ + students = User.objects.filter(courseenrollment__course_id=course_id)\ + .order_by('username').select_related('profile') + + def extract_student(student, features): + """ convert student to dictionary """ + student_features = [x for x in STUDENT_FEATURES if x in features] + profile_features = [x for x in PROFILE_FEATURES if x in features] + + student_dict = dict((feature, getattr(student, feature)) + for feature in student_features) + profile = student.profile + if profile is not None: + profile_dict = dict((feature, getattr(profile, feature)) + for feature in profile_features) + student_dict.update(profile_dict) + return student_dict + + return [extract_student(student, features) for student in students] + + +def dump_grading_context(course): + """ + Render information about course grading context + (e.g. which problems are graded in what assignments) + Useful for debugging grading_policy.json and policy.json + + Returns HTML string + """ + hbar = "{}\n".format("-" * 77) + msg = hbar + msg += "Course grader:\n" + + msg += '%s\n' % course.grader.__class__ + graders = {} + if isinstance(course.grader, xmgraders.WeightedSubsectionsGrader): + msg += '\n' + msg += "Graded sections:\n" + for subgrader, category, weight in course.grader.sections: + msg += " subgrader=%s, type=%s, category=%s, weight=%s\n"\ + % (subgrader.__class__, subgrader.type, category, weight) + subgrader.index = 1 + graders[subgrader.type] = subgrader + msg += hbar + msg += "Listing grading context for course %s\n" % course.id + + gcontext = course.grading_context + msg += "graded sections:\n" + + msg += '%s\n' % gcontext['graded_sections'].keys() + for (gsomething, gsvals) in gcontext['graded_sections'].items(): + msg += "--> Section %s:\n" % (gsomething) + for sec in gsvals: + sdesc = sec['section_descriptor'] + frmat = getattr(sdesc.lms, 'format', None) + aname = '' + if frmat in graders: + gform = graders[frmat] + aname = '%s %02d' % (gform.short_label, gform.index) + gform.index += 1 + elif sdesc.display_name in graders: + gform = graders[sdesc.display_name] + aname = '%s' % gform.short_label + notes = '' + if getattr(sdesc, 'score_by_attempt', False): + notes = ', score by attempt!' + msg += " %s (format=%s, Assignment=%s%s)\n"\ + % (sdesc.display_name, frmat, aname, notes) + msg += "all descriptors:\n" + msg += "length=%d\n" % len(gcontext['all_descriptors']) + msg = '<pre>%s</pre>' % msg.replace('<', '<') + return msg diff --git a/lms/djangoapps/analytics/csvs.py b/lms/djangoapps/analytics/csvs.py new file mode 100644 index 0000000000..eb4cf69e30 --- /dev/null +++ b/lms/djangoapps/analytics/csvs.py @@ -0,0 +1,97 @@ +""" +Student and course analytics. + +Format and create csv responses +""" + +import csv +from django.http import HttpResponse + + +def create_csv_response(filename, header, datarows): + """ + Create an HttpResponse with an attached .csv file + + header e.g. ['Name', 'Email'] + datarows e.g. [['Jim', 'jim@edy.org'], ['Jake', 'jake@edy.org'], ...] + """ + response = HttpResponse(mimetype='text/csv') + response['Content-Disposition'] = 'attachment; filename={0}'\ + .format(filename) + csvwriter = csv.writer( + response, + dialect='excel', + quotechar='"', + quoting=csv.QUOTE_ALL) + + csvwriter.writerow(header) + for datarow in datarows: + encoded_row = [unicode(s).encode('utf-8') for s in datarow] + csvwriter.writerow(encoded_row) + return response + + +def format_dictlist(dictlist, features): + """ + Convert a list of dictionaries to be compatible with create_csv_response + + `dictlist` is a list of dictionaries + all dictionaries should have keys from features + `features` is a list of features + + example code: + dictlist = [ + { + 'label1': 'value-1,1', + 'label2': 'value-1,2', + 'label3': 'value-1,3', + 'label4': 'value-1,4', + }, + { + 'label1': 'value-2,1', + 'label2': 'value-2,2', + 'label3': 'value-2,3', + 'label4': 'value-2,4', + } + ] + + header, datarows = format_dictlist(dictlist, ['label1', 'label4']) + + # results in + header = ['label1', 'label4'] + datarows = [['value-1,1', 'value-1,4'], + ['value-2,1', 'value-2,4']] + } + """ + + def dict_to_entry(dct): + """ Convert dictionary to a list for a csv row """ + relevant_items = [(k, v) for (k, v) in dct.items() if k in features] + ordered = sorted(relevant_items, key=lambda (k, v): header.index(k)) + vals = [v for (_, v) in ordered] + return vals + + header = features + datarows = map(dict_to_entry, dictlist) + + return header, datarows + + +def format_instances(instances, features): + """ + Convert a list of instances into a header list and datarows list. + + `header` is just `features` e.g. ['username', 'email'] + `datarows` is a list of lists, each sublist representing a row in a table + e.g. [['username1', 'email1@email.com'], ['username2', 'email2@email.com']] + for `instances` of length 2. + + `instances` is a list of instances, e.g. list of User's + `features` is a list of features + a feature is a string for which getattr(obj, feature) is valid + + Returns header and datarows, formatted for input in create_csv_response + """ + header = features + datarows = [[getattr(x, f) for f in features] for x in instances] + return header, datarows diff --git a/lms/djangoapps/analytics/distributions.py b/lms/djangoapps/analytics/distributions.py new file mode 100644 index 0000000000..4f24d0308a --- /dev/null +++ b/lms/djangoapps/analytics/distributions.py @@ -0,0 +1,170 @@ +""" +Profile Distributions + +Aggregate sums for values of fields in students profiles. + +For example: +The distribution in a course for gender might look like: +'gender': { + 'type': 'EASY_CHOICE', + 'data': { + 'no_data': 1234, + 'm': 5678, + 'o': 2134, + 'f': 5678 + }, + 'display_names': { + 'no_data': 'No Data', + 'm': 'Male', + 'o': 'Other', + 'f': 'Female' +} +""" + +from django.db.models import Count +from student.models import CourseEnrollment, UserProfile + +# choices with a restricted domain, e.g. level_of_education +_EASY_CHOICE_FEATURES = ('gender', 'level_of_education') +# choices with a larger domain e.g. year_of_birth +_OPEN_CHOICE_FEATURES = ('year_of_birth',) + +AVAILABLE_PROFILE_FEATURES = _EASY_CHOICE_FEATURES + _OPEN_CHOICE_FEATURES +DISPLAY_NAMES = { + 'gender': 'Gender', + 'level_of_education': 'Level of Education', + 'year_of_birth': 'Year Of Birth', +} + + +class ProfileDistribution(object): + """ + Container for profile distribution data + + `feature` is the name of the distribution feature + `feature_display_name` is the display name of feature + `data` is a dictionary of the distribution + `type` is either 'EASY_CHOICE' or 'OPEN_CHOICE' + `choices_display_names` is a dict if the distribution is an 'EASY_CHOICE' + """ + + class ValidationError(ValueError): + """ Error thrown if validation fails. """ + pass + + def __init__(self, feature): + self.feature = feature + self.feature_display_name = DISPLAY_NAMES.get(feature, feature) + + # to be set later + self.type = None + self.data = None + self.choices_display_names = None + + def validate(self): + """ + Validate this profile distribution. + + Throws ProfileDistribution.ValidationError + """ + def validation_assert(predicate): + """ Throw a ValidationError if false. """ + if not predicate: + raise ProfileDistribution.ValidationError() + + validation_assert(isinstance(self.feature, str)) + validation_assert(self.feature in DISPLAY_NAMES) + validation_assert(isinstance(self.feature_display_name, str)) + validation_assert(self.type in ['EASY_CHOICE', 'OPEN_CHOICE']) + validation_assert(isinstance(self.data, dict)) + if self.type == 'EASY_CHOICE': + validation_assert(isinstance(self.choices_display_names, dict)) + + +def profile_distribution(course_id, feature): + """ + Retrieve distribution of students over a given feature. + feature is one of AVAILABLE_PROFILE_FEATURES. + + Returns a ProfileDistribution instance. + + NOTE: no_data will appear as a key instead of None/null to adhere to the json spec. + data types are EASY_CHOICE or OPEN_CHOICE + """ + + if not feature in AVAILABLE_PROFILE_FEATURES: + raise ValueError( + "unsupported feature requested for distribution '{}'".format( + feature) + ) + + prd = ProfileDistribution(feature) + + if feature in _EASY_CHOICE_FEATURES: + prd.type = 'EASY_CHOICE' + + if feature == 'gender': + raw_choices = UserProfile.GENDER_CHOICES + elif feature == 'level_of_education': + raw_choices = UserProfile.LEVEL_OF_EDUCATION_CHOICES + + # short name and display name (full) of the choices. + choices = [(short, full) + for (short, full) in raw_choices] + [('no_data', 'No Data')] + + def get_filter(feature, value): + """ Get the orm filter parameters for a feature. """ + return { + 'gender': {'user__profile__gender': value}, + 'level_of_education': {'user__profile__level_of_education': value}, + }[feature] + + def get_count(feature, value): + """ Get the count of enrolled students matching the feature value. """ + return CourseEnrollment.objects.filter( + course_id=course_id, + **get_filter(feature, value) + ).count() + + distribution = {} + for (short, full) in choices: + # handle no data case + if short == 'no_data': + distribution['no_data'] = 0 + distribution['no_data'] += get_count(feature, None) + distribution['no_data'] += get_count(feature, '') + else: + distribution[short] = get_count(feature, short) + + prd.data = distribution + prd.choices_display_names = dict(choices) + elif feature in _OPEN_CHOICE_FEATURES: + prd.type = 'OPEN_CHOICE' + profiles = UserProfile.objects.filter( + user__courseenrollment__course_id=course_id + ) + query_distribution = profiles.values( + feature).annotate(Count(feature)).order_by() + # query_distribution is of the form [{'featureval': 'value1', 'featureval__count': 4}, + # {'featureval': 'value2', 'featureval__count': 2}, ...] + + distribution = dict((vald[feature], vald[feature + '__count']) + for vald in query_distribution) + # distribution is of the form {'value1': 4, 'value2': 2, ...} + + # change none to no_data for valid json key + if None in distribution: + # django does not properly count NULL values when using annotate Count + # so + # distribution['no_data'] = distribution.pop(None) + # would always be 0. + + # Correctly count null values + distribution['no_data'] = profiles.filter( + **{feature: None} + ).count() + + prd.data = distribution + + prd.validate() + return prd diff --git a/lms/djangoapps/analytics/management/__init__.py b/lms/djangoapps/analytics/management/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lms/djangoapps/analytics/management/commands/__init__.py b/lms/djangoapps/analytics/management/commands/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lms/djangoapps/analytics/tests/__init__.py b/lms/djangoapps/analytics/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lms/djangoapps/analytics/tests/test_basic.py b/lms/djangoapps/analytics/tests/test_basic.py new file mode 100644 index 0000000000..e0251c4567 --- /dev/null +++ b/lms/djangoapps/analytics/tests/test_basic.py @@ -0,0 +1,42 @@ +""" +Tests for instructor.basic +""" + +from django.test import TestCase +from student.models import CourseEnrollment +from student.tests.factories import UserFactory + +from analytics.basic import enrolled_students_features, AVAILABLE_FEATURES, STUDENT_FEATURES, PROFILE_FEATURES + + +class TestAnalyticsBasic(TestCase): + """ Test basic analytics functions. """ + + def setUp(self): + self.course_id = 'some/robot/course/id' + self.users = tuple(UserFactory() for _ in xrange(30)) + self.ces = tuple(CourseEnrollment.objects.create(course_id=self.course_id, user=user) for user in self.users) + + def test_enrolled_students_features_username(self): + self.assertIn('username', AVAILABLE_FEATURES) + userreports = enrolled_students_features(self.course_id, ['username']) + self.assertEqual(len(userreports), len(self.users)) + for userreport in userreports: + self.assertEqual(userreport.keys(), ['username']) + self.assertIn(userreport['username'], [user.username for user in self.users]) + + def test_enrolled_students_features_keys(self): + query_features = ('username', 'name', 'email') + for feature in query_features: + self.assertIn(feature, AVAILABLE_FEATURES) + userreports = enrolled_students_features(self.course_id, query_features) + self.assertEqual(len(userreports), len(self.users)) + for userreport in userreports: + self.assertEqual(set(userreport.keys()), set(query_features)) + self.assertIn(userreport['username'], [user.username for user in self.users]) + self.assertIn(userreport['email'], [user.email for user in self.users]) + self.assertIn(userreport['name'], [user.profile.name for user in self.users]) + + def test_available_features(self): + self.assertEqual(len(AVAILABLE_FEATURES), len(STUDENT_FEATURES + PROFILE_FEATURES)) + self.assertEqual(set(AVAILABLE_FEATURES), set(STUDENT_FEATURES + PROFILE_FEATURES)) diff --git a/lms/djangoapps/analytics/tests/test_csvs.py b/lms/djangoapps/analytics/tests/test_csvs.py new file mode 100644 index 0000000000..d6673b95a4 --- /dev/null +++ b/lms/djangoapps/analytics/tests/test_csvs.py @@ -0,0 +1,124 @@ +""" Tests for analytics.csvs """ + +from django.test import TestCase +from nose.tools import raises + +from analytics.csvs import create_csv_response, format_dictlist, format_instances + + +class TestAnalyticsCSVS(TestCase): + """ Test analytics rendering of csv files.""" + + def test_create_csv_response_nodata(self): + header = ['Name', 'Email'] + datarows = [] + + res = create_csv_response('robot.csv', header, datarows) + self.assertEqual(res['Content-Type'], 'text/csv') + self.assertEqual(res['Content-Disposition'], 'attachment; filename={0}'.format('robot.csv')) + self.assertEqual(res.content.strip(), '"Name","Email"') + + def test_create_csv_response(self): + header = ['Name', 'Email'] + datarows = [['Jim', 'jim@edy.org'], ['Jake', 'jake@edy.org'], ['Jeeves', 'jeeves@edy.org']] + + res = create_csv_response('robot.csv', header, datarows) + self.assertEqual(res['Content-Type'], 'text/csv') + self.assertEqual(res['Content-Disposition'], 'attachment; filename={0}'.format('robot.csv')) + self.assertEqual(res.content.strip(), '"Name","Email"\r\n"Jim","jim@edy.org"\r\n"Jake","jake@edy.org"\r\n"Jeeves","jeeves@edy.org"') + + def test_create_csv_response_empty(self): + header = [] + datarows = [] + + res = create_csv_response('robot.csv', header, datarows) + self.assertEqual(res['Content-Type'], 'text/csv') + self.assertEqual(res['Content-Disposition'], 'attachment; filename={0}'.format('robot.csv')) + self.assertEqual(res.content.strip(), '') + + +class TestAnalyticsFormatDictlist(TestCase): + """ Test format_dictlist method """ + + def test_format_dictlist(self): + dictlist = [ + { + 'label1': 'value-1,1', + 'label2': 'value-1,2', + 'label3': 'value-1,3', + 'label4': 'value-1,4', + }, + { + 'label1': 'value-2,1', + 'label2': 'value-2,2', + 'label3': 'value-2,3', + 'label4': 'value-2,4', + } + ] + + features = ['label1', 'label4'] + header, datarows = format_dictlist(dictlist, features) + + ideal_header = ['label1', 'label4'] + ideal_datarows = [['value-1,1', 'value-1,4'], + ['value-2,1', 'value-2,4']] + + self.assertEqual(header, ideal_header) + self.assertEqual(datarows, ideal_datarows) + + def test_format_dictlist_empty(self): + header, datarows = format_dictlist([], []) + self.assertEqual(header, []) + self.assertEqual(datarows, []) + + def test_create_csv_response(self): + header = ['Name', 'Email'] + datarows = [['Jim', 'jim@edy.org'], ['Jake', 'jake@edy.org'], ['Jeeves', 'jeeves@edy.org']] + + res = create_csv_response('robot.csv', header, datarows) + self.assertEqual(res['Content-Type'], 'text/csv') + self.assertEqual(res['Content-Disposition'], 'attachment; filename={0}'.format('robot.csv')) + self.assertEqual(res.content.strip(), '"Name","Email"\r\n"Jim","jim@edy.org"\r\n"Jake","jake@edy.org"\r\n"Jeeves","jeeves@edy.org"') + + +class TestAnalyticsFormatInstances(TestCase): + """ test format_instances method """ + class TestDataClass(object): + """ Test class to generate objects for format_instances """ + def __init__(self): + self.a_var = 'aval' + self.b_var = 'bval' + self.c_var = 'cval' + + @property + def d_var(self): + """ accessor to see if they work too """ + return 'dval' + + def setUp(self): + self.instances = [self.TestDataClass() for _ in xrange(5)] + + def test_format_instances_response(self): + features = ['a_var', 'c_var', 'd_var'] + header, datarows = format_instances(self.instances, features) + self.assertEqual(header, ['a_var', 'c_var', 'd_var']) + self.assertEqual(datarows, [[ + 'aval', + 'cval', + 'dval', + ] for _ in xrange(len(self.instances))]) + + def test_format_instances_response_noinstances(self): + features = ['a_var'] + header, datarows = format_instances([], features) + self.assertEqual(header, features) + self.assertEqual(datarows, []) + + def test_format_instances_response_nofeatures(self): + header, datarows = format_instances(self.instances, []) + self.assertEqual(header, []) + self.assertEqual(datarows, [[] for _ in xrange(len(self.instances))]) + + @raises(AttributeError) + def test_format_instances_response_nonexistantfeature(self): + format_instances(self.instances, ['robot_not_a_real_feature']) diff --git a/lms/djangoapps/analytics/tests/test_distributions.py b/lms/djangoapps/analytics/tests/test_distributions.py new file mode 100644 index 0000000000..61f948c26d --- /dev/null +++ b/lms/djangoapps/analytics/tests/test_distributions.py @@ -0,0 +1,93 @@ +""" Tests for analytics.distributions """ + +from django.test import TestCase +from nose.tools import raises +from student.models import CourseEnrollment +from student.tests.factories import UserFactory + +from analytics.distributions import profile_distribution, AVAILABLE_PROFILE_FEATURES + + +class TestAnalyticsDistributions(TestCase): + '''Test analytics distribution gathering.''' + + def setUp(self): + self.course_id = 'some/robot/course/id' + + self.users = [UserFactory( + profile__gender=['m', 'f', 'o'][i % 3], + profile__year_of_birth=i + 1930 + ) for i in xrange(30)] + + self.ces = [CourseEnrollment.objects.create( + course_id=self.course_id, + user=user + ) for user in self.users] + + @raises(ValueError) + def test_profile_distribution_bad_feature(self): + feature = 'robot-not-a-real-feature' + self.assertNotIn(feature, AVAILABLE_PROFILE_FEATURES) + profile_distribution(self.course_id, feature) + + def test_profile_distribution_easy_choice(self): + feature = 'gender' + self.assertIn(feature, AVAILABLE_PROFILE_FEATURES) + distribution = profile_distribution(self.course_id, feature) + self.assertEqual(distribution.type, 'EASY_CHOICE') + self.assertEqual(distribution.data['no_data'], 0) + self.assertEqual(distribution.data['m'], len(self.users) / 3) + self.assertEqual(distribution.choices_display_names['m'], 'Male') + + def test_profile_distribution_open_choice(self): + feature = 'year_of_birth' + self.assertIn(feature, AVAILABLE_PROFILE_FEATURES) + distribution = profile_distribution(self.course_id, feature) + print distribution + self.assertEqual(distribution.type, 'OPEN_CHOICE') + self.assertTrue(hasattr(distribution, 'choices_display_names')) + self.assertEqual(distribution.choices_display_names, None) + self.assertNotIn('no_data', distribution.data) + self.assertEqual(distribution.data[1930], 1) + + +class TestAnalyticsDistributionsNoData(TestCase): + '''Test analytics distribution gathering.''' + + def setUp(self): + self.course_id = 'some/robot/course/id' + + self.users = [UserFactory( + profile__year_of_birth=i + 1930, + ) for i in xrange(5)] + + self.nodata_users = [UserFactory( + profile__year_of_birth=None, + profile__gender=[None, ''][i % 2] + ) for i in xrange(4)] + + self.users += self.nodata_users + + self.ces = tuple(CourseEnrollment.objects.create(course_id=self.course_id, user=user) for user in self.users) + + def test_profile_distribution_easy_choice_nodata(self): + feature = 'gender' + self.assertIn(feature, AVAILABLE_PROFILE_FEATURES) + distribution = profile_distribution(self.course_id, feature) + print distribution + self.assertEqual(distribution.type, 'EASY_CHOICE') + self.assertTrue(hasattr(distribution, 'choices_display_names')) + self.assertNotEqual(distribution.choices_display_names, None) + self.assertIn('no_data', distribution.data) + self.assertEqual(distribution.data['no_data'], len(self.nodata_users)) + + def test_profile_distribution_open_choice_nodata(self): + feature = 'year_of_birth' + self.assertIn(feature, AVAILABLE_PROFILE_FEATURES) + distribution = profile_distribution(self.course_id, feature) + print distribution + self.assertEqual(distribution.type, 'OPEN_CHOICE') + self.assertTrue(hasattr(distribution, 'choices_display_names')) + self.assertEqual(distribution.choices_display_names, None) + self.assertIn('no_data', distribution.data) + self.assertEqual(distribution.data['no_data'], len(self.nodata_users)) diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py index dd57e8d4d4..6a8ef8056b 100644 --- a/lms/djangoapps/branding/views.py +++ b/lms/djangoapps/branding/views.py @@ -2,6 +2,7 @@ from django.conf import settings from django.core.urlresolvers import reverse from django.shortcuts import redirect from django_future.csrf import ensure_csrf_cookie +from mitxmako.shortcuts import render_to_response import student.views import branding @@ -24,13 +25,16 @@ def index(request): from external_auth.views import ssl_login return ssl_login(request) if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'): - return redirect(settings.MKTG_URLS.get('ROOT')) + return redirect(settings.MKTG_URLS.get('ROOT')) university = branding.get_university(request.META.get('HTTP_HOST')) - if university is None: - return student.views.index(request, user=request.user) + if university == 'edge': + return render_to_response('university_profile/edge.html', {}) + + # we do not expect this case to be reached in cases where + # marketing and edge are enabled + return student.views.index(request, user=request.user) - return courseware.views.university_profile(request, university) @ensure_csrf_cookie @@ -45,7 +49,9 @@ def courses(request): return redirect(marketing_link('COURSES'), permanent=True) university = branding.get_university(request.META.get('HTTP_HOST')) - if university is None: - return courseware.views.courses(request) + if university == 'edge': + return render_to_response('university_profile/edge.html', {}) - return courseware.views.university_profile(request, university) + # we do not expect this case to be reached in cases where + # marketing and edge are enabled + return courseware.views.courses(request) diff --git a/lms/djangoapps/course_wiki/tests/tests.py b/lms/djangoapps/course_wiki/tests/tests.py index 663d6b53b2..6bbd8011d6 100644 --- a/lms/djangoapps/course_wiki/tests/tests.py +++ b/lms/djangoapps/course_wiki/tests/tests.py @@ -90,8 +90,8 @@ class WikiRedirectTestCase(LoginEnrollmentTestCase): """ Ensure that the response has the course navigator. """ - self.assertTrue("course info" in resp.content.lower()) - self.assertTrue("courseware" in resp.content.lower()) + self.assertContains(resp, "Course Info") + self.assertContains(resp, "courseware") def test_course_navigator(self): """" diff --git a/lms/djangoapps/course_wiki/views.py b/lms/djangoapps/course_wiki/views.py index 74ef7d4a74..1884ab7f11 100644 --- a/lms/djangoapps/course_wiki/views.py +++ b/lms/djangoapps/course_wiki/views.py @@ -1,5 +1,6 @@ import logging import re +import cgi from django.conf import settings from django.contrib.sites.models import Site @@ -95,7 +96,7 @@ def course_wiki_redirect(request, course_id): root, course_slug, title=course_slug, - content="This is the wiki for **{0}**'s _{1}_.".format(course.org, course.display_name_with_default), + content=cgi.escape("This is the wiki for **{0}**'s _{1}_.".format(course.display_org_with_default, course.display_name_with_default)), user_message="Course page automatically created.", user=None, ip_address=None, diff --git a/lms/djangoapps/courseware/admin.py b/lms/djangoapps/courseware/admin.py index 743d1fed52..147630dbc5 100644 --- a/lms/djangoapps/courseware/admin.py +++ b/lms/djangoapps/courseware/admin.py @@ -3,7 +3,7 @@ django admin pages for courseware model ''' from courseware.models import StudentModule, OfflineComputedGrade, OfflineComputedGradeLog -from django.contrib import admin +from ratelimitbackend import admin from django.contrib.auth.models import User admin.site.register(StudentModule) diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py index ef1b786645..086f92a123 100644 --- a/lms/djangoapps/courseware/courses.py +++ b/lms/djangoapps/courseware/courses.py @@ -163,7 +163,7 @@ def get_course_about_section(course, section_key): html = '' if about_module is not None: - html = about_module.get_html() + html = about_module.runtime.render(about_module, None, 'student_view').content return html @@ -174,9 +174,9 @@ def get_course_about_section(course, section_key): elif section_key == "title": return course.display_name_with_default elif section_key == "university": - return course.location.org + return course.display_org_with_default elif section_key == "number": - return course.number + return course.display_number_with_default raise KeyError("Invalid about key " + str(section_key)) @@ -211,7 +211,7 @@ def get_course_info_section(request, course, section_key): html = '' if info_module is not None: - html = info_module.get_html() + html = info_module.runtime.render(info_module, None, 'student_view').content return html diff --git a/lms/djangoapps/courseware/features/common.py b/lms/djangoapps/courseware/features/common.py index 7632f22d6a..8b934e435d 100644 --- a/lms/djangoapps/courseware/features/common.py +++ b/lms/djangoapps/courseware/features/common.py @@ -55,7 +55,7 @@ def i_am_registered_for_the_course(step, course): # TODO: change to factory CourseEnrollment.objects.get_or_create(user=u, course_id=course_id(course)) - world.log_in('robot', 'test') + world.log_in(username='robot', password='test') @step(u'The course "([^"]*)" has extra tab "([^"]*)"$') diff --git a/lms/djangoapps/courseware/features/high-level-tabs.py b/lms/djangoapps/courseware/features/high-level-tabs.py index 056c627803..4e6ebb70dd 100644 --- a/lms/djangoapps/courseware/features/high-level-tabs.py +++ b/lms/djangoapps/courseware/features/high-level-tabs.py @@ -8,4 +8,5 @@ def i_click_on_the_tab_and_check(step): tab_text = tab_title['TabName'] title = tab_title['PageTitle'] world.click_link(tab_text) + world.wait_for(lambda _driver:title in world.browser.title) assert(title in world.browser.title) diff --git a/lms/djangoapps/courseware/features/homepage.py b/lms/djangoapps/courseware/features/homepage.py index 585d1582d7..51c3277e69 100644 --- a/lms/djangoapps/courseware/features/homepage.py +++ b/lms/djangoapps/courseware/features/homepage.py @@ -8,7 +8,7 @@ from nose.tools import assert_in, assert_equals @step(u'I should see the following Partners in the Partners section') def i_should_see_partner(step): partners = world.browser.find_by_css(".partner .name span") - names = set(span.text for span in partners) + names = set(span.html for span in partners) for partner in step.hashes: assert_in(partner['Partner'], names) diff --git a/lms/djangoapps/courseware/features/login.feature b/lms/djangoapps/courseware/features/login.feature index a1b788a7b2..2b90c56f2d 100644 --- a/lms/djangoapps/courseware/features/login.feature +++ b/lms/djangoapps/courseware/features/login.feature @@ -11,6 +11,7 @@ Feature: Login in as a registered user And I submit my credentials on the login form Then I should see the login error message "This account has not been activated" + # CHROME ONLY, firefox will not redirect properly Scenario: Login to an activated account Given I am an edX user And I am an activated user @@ -25,3 +26,21 @@ Feature: Login in as a registered user And I click the link with the text "Log Out" Then I should see a link with the text "Log in" And I should see that the path is "/" + + Scenario: Login with valid redirect + Given I am an edX user + And The course "6.002x" exists + And I am registered for the course "6.002x" + And I am not logged in + And I visit the url "/courses/edx/6.002x/Test_Course/courseware" + And I should see that the path is "/accounts/login?next=/courses/edx/6.002x/Test_Course/courseware" + When I submit my credentials on the login form + And I wait for "2" seconds + Then the page title should contain "6.002x Courseware" + + Scenario: Login with an invalid redirect + Given I am an edX user + And I am not logged in + And I visit the url "/login?next=http://www.google.com/" + When I submit my credentials on the login form + Then I should be on the dashboard page diff --git a/lms/djangoapps/courseware/features/navigation.py b/lms/djangoapps/courseware/features/navigation.py index c87e6122a4..d4ac7060c4 100644 --- a/lms/djangoapps/courseware/features/navigation.py +++ b/lms/djangoapps/courseware/features/navigation.py @@ -151,7 +151,7 @@ def create_user_and_visit_course(): CourseEnrollment.objects.get_or_create(user=u, course_id=course_id(world.scenario_dict['COURSE'].number)) - world.log_in('robot', 'test') + world.log_in(username='robot', password='test') chapter_name = (TEST_SECTION_NAME + "1").replace(" ", "_") section_name = (TEST_SUBSECTION_NAME + "1").replace(" ", "_") url = django_url('/courses/edx/model_course/Test_Course/courseware/%s/%s' % diff --git a/lms/djangoapps/courseware/features/openended.py b/lms/djangoapps/courseware/features/openended.py index d848eb55d7..f7265be23c 100644 --- a/lms/djangoapps/courseware/features/openended.py +++ b/lms/djangoapps/courseware/features/openended.py @@ -11,7 +11,7 @@ logger = getLogger(__name__) @step('I navigate to an openended question$') def navigate_to_an_openended_question(step): world.register_by_course_id('MITx/3.091x/2012_Fall') - world.log_in('robot@edx.org', 'test') + world.log_in(email='robot@edx.org', password='test') problem = '/courses/MITx/3.091x/2012_Fall/courseware/Week_10/Polymer_Synthesis/' world.browser.visit(django_url(problem)) tab_css = 'ol#sequence-list > li > a[data-element="5"]' @@ -21,7 +21,7 @@ def navigate_to_an_openended_question(step): @step('I navigate to an openended question as staff$') def navigate_to_an_openended_question_as_staff(step): world.register_by_course_id('MITx/3.091x/2012_Fall', True) - world.log_in('robot@edx.org', 'test') + world.log_in(email='robot@edx.org', password='test') problem = '/courses/MITx/3.091x/2012_Fall/courseware/Week_10/Polymer_Synthesis/' world.browser.visit(django_url(problem)) tab_css = 'ol#sequence-list > li > a[data-element="5"]' diff --git a/lms/djangoapps/courseware/features/problems_setup.py b/lms/djangoapps/courseware/features/problems_setup.py index 67dfbf0dc5..2ddbbcdeb8 100644 --- a/lms/djangoapps/courseware/features/problems_setup.py +++ b/lms/djangoapps/courseware/features/problems_setup.py @@ -226,7 +226,6 @@ def answer_problem(problem_type, correctness): input_value = "8" if correctness == 'correct' else "5" choice = "choiceinput_0bc" if correctness == 'correct' else "choiceinput_1bc" - world.css_check(inputfield(problem_type, choice=choice)) world.css_fill( inputfield( problem_type, @@ -234,6 +233,7 @@ def answer_problem(problem_type, correctness): ), input_value ) + world.css_check(inputfield(problem_type, choice=choice)) def problem_has_answer(problem_type, answer_class): diff --git a/lms/djangoapps/courseware/features/signup.feature b/lms/djangoapps/courseware/features/signup.feature index cfc8b6e924..19dfd74f1c 100644 --- a/lms/djangoapps/courseware/features/signup.feature +++ b/lms/djangoapps/courseware/features/signup.feature @@ -3,6 +3,7 @@ Feature: Sign in As a new user I want to signup for a student account + # CHROME ONLY, firefox will not redirect properly Scenario: Sign up from the homepage Given I visit the homepage When I click the link with the text "Register Now" diff --git a/lms/djangoapps/courseware/features/video.feature b/lms/djangoapps/courseware/features/video.feature index 2b8d0f013a..7ba60c4f92 100644 --- a/lms/djangoapps/courseware/features/video.feature +++ b/lms/djangoapps/courseware/features/video.feature @@ -7,4 +7,4 @@ Feature: Video component Scenario: Autoplay is enabled in the LMS for a VideoAlpha component Given the course has a VideoAlpha component - Then when I view the video it has autoplay enabled + Then when I view the videoalpha it has autoplay enabled diff --git a/lms/djangoapps/courseware/features/video.py b/lms/djangoapps/courseware/features/video.py index f95ffd9917..2e6665f6e8 100644 --- a/lms/djangoapps/courseware/features/video.py +++ b/lms/djangoapps/courseware/features/video.py @@ -8,10 +8,15 @@ from common import i_am_registered_for_the_course, section_location @step('when I view the video it has autoplay enabled') -def does_autoplay(_step): +def does_autoplay_video(_step): assert(world.css_find('.video')[0]['data-autoplay'] == 'True') +@step('when I view the videoalpha it has autoplay enabled') +def does_autoplay_videoalpha(_step): + assert(world.css_find('.videoalpha')[0]['data-autoplay'] == 'True') + + @step('the course has a Video component') def view_video(_step): coursenum = 'test_course' diff --git a/lms/djangoapps/courseware/features/word_cloud.feature b/lms/djangoapps/courseware/features/word_cloud.feature new file mode 100644 index 0000000000..0d5baa46e1 --- /dev/null +++ b/lms/djangoapps/courseware/features/word_cloud.feature @@ -0,0 +1,15 @@ +Feature: World Cloud component + As a student, I want to view Word Cloud component in LMS. + + Scenario: Word Cloud component in LMS is rendered with empty result + Given the course has a Word Cloud component + Then I view the word cloud and it has rendered + When I press the Save button + Then I see the empty result + + Scenario: Word Cloud component in LMS is rendered with result + Given the course has a Word Cloud component + Then I view the word cloud and it has rendered + When I fill inputs + And I press the Save button + Then I see the result with words count \ No newline at end of file diff --git a/lms/djangoapps/courseware/features/word_cloud.py b/lms/djangoapps/courseware/features/word_cloud.py new file mode 100644 index 0000000000..accc4d6c03 --- /dev/null +++ b/lms/djangoapps/courseware/features/word_cloud.py @@ -0,0 +1,66 @@ +#pylint: disable=C0111 + +from time import sleep + +from lettuce import world, step +from lettuce.django import django_url +from common import i_am_registered_for_the_course, section_location + + +@step('I view the word cloud and it has rendered') +def word_cloud_is_rendered(_step): + assert world.is_css_present('.word_cloud') + + +@step('the course has a Word Cloud component') +def view_word_cloud(_step): + coursenum = 'test_course' + i_am_registered_for_the_course(_step, coursenum) + + add_word_cloud_to_course(coursenum) + chapter_name = world.scenario_dict['SECTION'].display_name.replace( + " ", "_") + section_name = chapter_name + url = django_url('/courses/%s/%s/%s/courseware/%s/%s' % ( + world.scenario_dict['COURSE'].org, + world.scenario_dict['COURSE'].number, + world.scenario_dict['COURSE'].display_name.replace(' ', '_'), + chapter_name, section_name,) + ) + world.browser.visit(url) + + +@step('I press the Save button') +def press_the_save_button(_step): + button_css = '.input_cloud_section input.save' + elem = world.css_find(button_css).first + world.css_has_text(button_css, elem) + world.css_click(button_css) + + +@step('I see the empty result') +def see_empty_result(_step): + assert (world.css_text('.your_words', 0) == '') + + +@step('I fill inputs') +def fill_inputs(_step): + input_css = '.input_cloud_section .input-cloud' + world.css_fill(input_css, 'text1', 0) + + for index in range(1, 4): + world.css_fill('.input_cloud_section .input-cloud', 'text2', index) + + +@step('I see the result with words count') +def see_result(_step): + strong_css = '.your_words strong' + target_text = set([world.css_text(strong_css, i) for i in range(2)]) + assert set(['text1', 'text2']) == target_text + + +def add_word_cloud_to_course(course): + category = 'word_cloud' + world.ItemFactory.create(parent_location=section_location(course), + category=category, + display_name='Word Cloud') diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py index dacd495da2..0a48c56f87 100644 --- a/lms/djangoapps/courseware/module_render.py +++ b/lms/djangoapps/courseware/module_render.py @@ -1,6 +1,5 @@ import json import logging -import re import sys from functools import partial @@ -13,7 +12,6 @@ from django.http import Http404 from django.http import HttpResponse from django.views.decorators.csrf import csrf_exempt -import pyparsing from requests.auth import HTTPBasicAuth from statsd import statsd @@ -351,6 +349,15 @@ def get_module_for_descriptor_internal(user, descriptor, model_data_cache, cours data_directory=getattr(descriptor, 'data_dir', None), course_namespace=descriptor.location._replace(category=None, name=None), ), + replace_course_urls=partial( + static_replace.replace_course_urls, + course_id=course_id + ), + replace_jump_to_id_urls=partial( + static_replace.replace_jump_to_id_urls, + course_id=course_id, + jump_to_id_base_url=reverse('jump_to_id', kwargs={'course_id': course_id, 'module_id': ''}) + ), node_path=settings.NODE_PATH, xblock_model_data=xblock_model_data, publish=publish, @@ -599,14 +606,14 @@ def _check_files_limits(files): # Check number of files submitted if len(inputfiles) > settings.MAX_FILEUPLOADS_PER_INPUT: - msg = 'Submission aborted! Maximum %d files may be submitted at once' %\ + msg = 'Submission aborted! Maximum %d files may be submitted at once' % \ settings.MAX_FILEUPLOADS_PER_INPUT return msg # Check file sizes for inputfile in inputfiles: - if inputfile.size > settings.STUDENT_FILEUPLOAD_MAX_SIZE: # Bytes - msg = 'Submission aborted! Your file "%s" is too large (max size: %d MB)' %\ + if inputfile.size > settings.STUDENT_FILEUPLOAD_MAX_SIZE: # Bytes + msg = 'Submission aborted! Your file "%s" is too large (max size: %d MB)' % \ (inputfile.name, settings.STUDENT_FILEUPLOAD_MAX_SIZE / (1000 ** 2)) return msg diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py index 149542c344..38f81a476c 100644 --- a/lms/djangoapps/courseware/tabs.py +++ b/lms/djangoapps/courseware/tabs.py @@ -91,6 +91,13 @@ def _discussion(tab, user, course, active_page): return [] +def _external_discussion(tab, user, course, active_page): + """ + This returns a tab that links to an external discussion service + """ + return [CourseTab('Discussion', tab['link'], active_page == 'discussion')] + + def _external_link(tab, user, course, active_page): # external links are never active return [CourseTab(tab['name'], tab['link'], False)] @@ -150,6 +157,12 @@ def _staff_grading(tab, user, course, active_page): return [] +def _syllabus(tab, user, course, active_page): + """Display the syllabus tab""" + link = reverse('syllabus', args=[course.id]) + return [CourseTab('Syllabus', link, active_page == 'syllabus')] + + def _peer_grading(tab, user, course, active_page): if user.is_authenticated(): @@ -216,6 +229,7 @@ VALID_TAB_TYPES = { 'course_info': TabImpl(need_name, _course_info), 'wiki': TabImpl(need_name, _wiki), 'discussion': TabImpl(need_name, _discussion), + 'external_discussion': TabImpl(key_checker(['link']), _external_discussion), 'external_link': TabImpl(key_checker(['name', 'link']), _external_link), 'textbooks': TabImpl(null_validator, _textbooks), 'pdf_textbooks': TabImpl(null_validator, _pdf_textbooks), @@ -225,7 +239,8 @@ VALID_TAB_TYPES = { 'peer_grading': TabImpl(null_validator, _peer_grading), 'staff_grading': TabImpl(null_validator, _staff_grading), 'open_ended': TabImpl(null_validator, _combined_open_ended_grading), - 'notes': TabImpl(null_validator, _notes_tab) + 'notes': TabImpl(null_validator, _notes_tab), + 'syllabus': TabImpl(null_validator, _syllabus) } @@ -290,6 +305,7 @@ def get_course_tabs(user, course, active_page): tabs.append(CourseTab('Instructor', reverse('instructor_dashboard', args=[course.id]), active_page == 'instructor')) + return tabs @@ -371,6 +387,6 @@ def get_static_tab_contents(request, course, tab): html = '' if tab_module is not None: - html = tab_module.get_html() + html = tab_module.runtime.render(tab_module, None, 'student_view').content return html diff --git a/lms/djangoapps/courseware/tests/__init__.py b/lms/djangoapps/courseware/tests/__init__.py index 33c8d12701..40f1df0fbc 100644 --- a/lms/djangoapps/courseware/tests/__init__.py +++ b/lms/djangoapps/courseware/tests/__init__.py @@ -77,14 +77,20 @@ class BaseTestXmodule(ModuleStoreTestCase): data=self.DATA ) - system = get_test_system() - system.render_template = lambda template, context: context + self.runtime = get_test_system() + # Allow us to assert that the template was called in the same way from + # different code paths while maintaining the type returned by render_template + self.runtime.render_template = lambda template, context: u'{!r}, {!r}'.format(template, sorted(context.items())) + model_data = {'location': self.item_descriptor.location} model_data.update(self.MODEL_DATA) self.item_module = self.item_descriptor.module_class( - system, self.item_descriptor, model_data + self.runtime, + self.item_descriptor, + model_data ) + self.item_url = Location(self.item_module.location).url() # login all users for acces to Xmodule diff --git a/lms/djangoapps/courseware/tests/test_login.py b/lms/djangoapps/courseware/tests/test_login.py deleted file mode 100644 index 9f1cd23b27..0000000000 --- a/lms/djangoapps/courseware/tests/test_login.py +++ /dev/null @@ -1,107 +0,0 @@ -''' -Tests for student activation and login -''' -from django.test import TestCase -from django.test.client import Client -from django.core.urlresolvers import reverse -from courseware.tests.factories import UserFactory, RegistrationFactory, UserProfileFactory -import json - - -class LoginTest(TestCase): - ''' - Test student.views.login_user() view - ''' - - def setUp(self): - # Create one user and save it to the database - self.user = UserFactory.build(username='test', email='test@edx.org') - self.user.set_password('test_password') - self.user.save() - - # Create a registration for the user - RegistrationFactory(user=self.user) - - # Create a profile for the user - UserProfileFactory(user=self.user) - - # Create the test client - self.client = Client() - - # Store the login url - self.url = reverse('login') - - def test_login_success(self): - response = self._login_response('test@edx.org', 'test_password') - self._assert_response(response, success=True) - - def test_login_success_unicode_email(self): - unicode_email = u'test@edx.org' + unichr(40960) - - self.user.email = unicode_email - self.user.save() - - response = self._login_response(unicode_email, 'test_password') - self._assert_response(response, success=True) - - def test_login_fail_no_user_exists(self): - response = self._login_response('not_a_user@edx.org', 'test_password') - self._assert_response(response, success=False, - value='Email or password is incorrect') - - def test_login_fail_wrong_password(self): - response = self._login_response('test@edx.org', 'wrong_password') - self._assert_response(response, success=False, - value='Email or password is incorrect') - - def test_login_not_activated(self): - # De-activate the user - self.user.is_active = False - self.user.save() - - # Should now be unable to login - response = self._login_response('test@edx.org', 'test_password') - self._assert_response(response, success=False, - value="This account has not been activated") - - def test_login_unicode_email(self): - unicode_email = u'test@edx.org' + unichr(40960) - response = self._login_response(unicode_email, 'test_password') - self._assert_response(response, success=False) - - def test_login_unicode_password(self): - unicode_password = u'test_password' + unichr(1972) - response = self._login_response('test@edx.org', unicode_password) - self._assert_response(response, success=False) - - def _login_response(self, email, password): - ''' Post the login info ''' - post_params = {'email': email, 'password': password} - return self.client.post(self.url, post_params) - - def _assert_response(self, response, success=None, value=None): - ''' - Assert that the response had status 200 and returned a valid - JSON-parseable dict. - - If success is provided, assert that the response had that - value for 'success' in the JSON dict. - - If value is provided, assert that the response contained that - value for 'value' in the JSON dict. - ''' - self.assertEqual(response.status_code, 200) - - try: - response_dict = json.loads(response.content) - except ValueError: - self.fail("Could not parse response content as JSON: %s" - % str(response.content)) - - if success is not None: - self.assertEqual(response_dict['success'], success) - - if value is not None: - msg = ("'%s' did not contain '%s'" % - (str(response_dict['value']), str(value))) - self.assertTrue(value in response_dict['value'], msg) diff --git a/lms/djangoapps/courseware/tests/test_module_render.py b/lms/djangoapps/courseware/tests/test_module_render.py index 6b409f677b..25056ba100 100644 --- a/lms/djangoapps/courseware/tests/test_module_render.py +++ b/lms/djangoapps/courseware/tests/test_module_render.py @@ -1,7 +1,7 @@ """ Test for lms courseware app, module render unit """ -from mock import MagicMock, patch +from mock import MagicMock, patch, Mock import json from django.http import Http404, HttpResponse @@ -12,8 +12,10 @@ from django.test.client import RequestFactory from django.test.utils import override_settings from xmodule.modulestore.django import modulestore +from xmodule.modulestore.tests.factories import ItemFactory, CourseFactory +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase import courseware.module_render as render -from courseware.tests.tests import LoginEnrollmentTestCase +from courseware.tests.tests import LoginEnrollmentTestCase, TEST_DATA_MONGO_MODULESTORE from courseware.model_data import ModelDataCache from modulestore_config import TEST_DATA_XML_MODULESTORE @@ -49,8 +51,10 @@ class ModuleRenderTestCase(LoginEnrollmentTestCase): dispatch=self.dispatch)) def test_get_module(self): - self.assertIsNone(render.get_module('dummyuser', None, - 'invalid location', None, None)) + self.assertEqual( + None, + render.get_module('dummyuser', None, 'invalid location', None, None) + ) def test_module_render_with_jump_to_id(self): """ @@ -230,7 +234,8 @@ class TestTOC(TestCase): 'url_name': 'secret:magic', 'display_name': 'secret:magic'}]) actual = render.toc_for_course(self.portal_user, request, self.toy_course, chapter, None, model_data_cache) - assert reduce(lambda x, y: x and (y in actual), expected, True) + for toc_section in expected: + self.assertIn(toc_section, actual) def test_toc_toy_from_section(self): chapter = 'Overview' @@ -257,4 +262,109 @@ class TestTOC(TestCase): 'url_name': 'secret:magic', 'display_name': 'secret:magic'}]) actual = render.toc_for_course(self.portal_user, request, self.toy_course, chapter, section, model_data_cache) - assert reduce(lambda x, y: x and (y in actual), expected, True) + for toc_section in expected: + self.assertIn(toc_section, actual) + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestHtmlModifiers(ModuleStoreTestCase): + """ + Tests to verify that standard modifications to the output of XModule/XBlock + student_view are taking place + """ + def setUp(self): + self.user = UserFactory.create() + self.request = RequestFactory().get('/') + self.request.user = self.user + self.request.session = {} + self.course = CourseFactory.create() + self.content_string = '<p>This is the content<p>' + self.rewrite_link = '<a href="/static/foo/content">Test rewrite</a>' + self.course_link = '<a href="/course/bar/content">Test course rewrite</a>' + self.descriptor = ItemFactory.create( + category='html', + data=self.content_string + self.rewrite_link + self.course_link + ) + self.location = self.descriptor.location + self.model_data_cache = ModelDataCache.cache_for_descriptor_descendents( + self.course.id, + self.user, + self.descriptor + ) + + def test_xmodule_display_wrapper_enabled(self): + module = render.get_module( + self.user, + self.request, + self.location, + self.model_data_cache, + self.course.id, + wrap_xmodule_display=True, + ) + result_fragment = module.runtime.render(module, None, 'student_view') + + self.assertIn('section class="xmodule_display xmodule_HtmlModule"', result_fragment.content) + + def test_xmodule_display_wrapper_disabled(self): + module = render.get_module( + self.user, + self.request, + self.location, + self.model_data_cache, + self.course.id, + wrap_xmodule_display=False, + ) + result_fragment = module.runtime.render(module, None, 'student_view') + + self.assertNotIn('section class="xmodule_display xmodule_HtmlModule"', result_fragment.content) + + def test_static_link_rewrite(self): + module = render.get_module( + self.user, + self.request, + self.location, + self.model_data_cache, + self.course.id, + ) + result_fragment = module.runtime.render(module, None, 'student_view') + + self.assertIn( + '/c4x/{org}/{course}/asset/foo_content'.format( + org=self.course.location.org, + course=self.course.location.course, + ), + result_fragment.content + ) + + def test_course_link_rewrite(self): + module = render.get_module( + self.user, + self.request, + self.location, + self.model_data_cache, + self.course.id, + ) + result_fragment = module.runtime.render(module, None, 'student_view') + + self.assertIn( + '/courses/{course_id}/bar/content'.format( + course_id=self.course.id + ), + result_fragment.content + ) + + @patch('courseware.module_render.has_access', Mock(return_value=True)) + def test_histogram(self): + module = render.get_module( + self.user, + self.request, + self.location, + self.model_data_cache, + self.course.id, + ) + result_fragment = module.runtime.render(module, None, 'student_view') + + self.assertIn( + 'Staff Debug', + result_fragment.content + ) diff --git a/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py b/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py index d5afb1a78c..38b2b6fb8d 100644 --- a/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py +++ b/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py @@ -4,6 +4,7 @@ from . import BaseTestXmodule from .test_videoalpha_xml import SOURCE_XML from django.conf import settings +from xmodule.videoalpha_module import _create_youtube_string class TestVideo(BaseTestXmodule): @@ -15,6 +16,14 @@ class TestVideo(BaseTestXmodule): 'data': DATA } + def setUp(self): + # Since the VideoAlphaDescriptor changes `self._model_data`, + # we need to instantiate `self.item_module` through + # `self.item_descriptor` rather than directly constructing it + super(TestVideo, self).setUp() + self.item_module = self.item_descriptor.xmodule(self.runtime) + self.item_module.runtime.render_template = lambda template, context: context + def test_handle_ajax_dispatch(self): responses = { user.username: self.clients[user.username].post( @@ -34,24 +43,31 @@ class TestVideo(BaseTestXmodule): def test_videoalpha_constructor(self): """Make sure that all parameters extracted correclty from xml""" - # `get_html` return only context, cause we - # overwrite `system.render_template` context = self.item_module.get_html() + + sources = { + 'main': 'example.mp4', + 'mp4': 'example.mp4', + 'webm': 'example.webm', + 'ogv': 'example.ogv' + } + expected_context = { 'data_dir': getattr(self, 'data_dir', None), 'caption_asset_path': '/c4x/MITx/999/asset/subs_', - 'show_captions': self.item_module.show_captions, - 'display_name': self.item_module.display_name_with_default, - 'end': self.item_module.end_time, + 'show_captions': 'true', + 'display_name': 'A Name', + 'end': 3610.0, 'id': self.item_module.location.html_id(), - 'sources': self.item_module.sources, - 'start': self.item_module.start_time, - 'sub': self.item_module.sub, - 'track': self.item_module.track, - 'youtube_streams': self.item_module.youtube_streams, + 'sources': sources, + 'start': 3603.0, + 'sub': 'a_sub_file.srt.sjson', + 'track': '', + 'youtube_streams': _create_youtube_string(self.item_module), 'autoplay': settings.MITX_FEATURES.get('AUTOPLAY_VIDEOS', True) } - self.assertDictEqual(context, expected_context) + + self.assertEqual(context, expected_context) class TestVideoNonYouTube(TestVideo): @@ -59,14 +75,13 @@ class TestVideoNonYouTube(TestVideo): DATA = """ <videoalpha show_captions="true" - data_dir="" - caption_asset_path="" - autoplay="true" + display_name="A Name" + sub="a_sub_file.srt.sjson" start_time="01:00:03" end_time="01:00:10" > - <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.mp4"/> - <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.webm"/> - <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.ogv"/> + <source src="example.mp4"/> + <source src="example.webm"/> + <source src="example.ogv"/> </videoalpha> """ MODEL_DATA = { @@ -77,22 +92,28 @@ class TestVideoNonYouTube(TestVideo): """Make sure that if the 'youtube' attribute is omitted in XML, then the template generates an empty string for the YouTube streams. """ + sources = { + u'main': u'example.mp4', + u'mp4': u'example.mp4', + u'webm': u'example.webm', + u'ogv': u'example.ogv' + } - # `get_html` return only context, cause we - # overwrite `system.render_template` context = self.item_module.get_html() + expected_context = { 'data_dir': getattr(self, 'data_dir', None), 'caption_asset_path': '/c4x/MITx/999/asset/subs_', - 'show_captions': self.item_module.show_captions, - 'display_name': self.item_module.display_name_with_default, - 'end': self.item_module.end_time, + 'show_captions': 'true', + 'display_name': 'A Name', + 'end': 3610.0, 'id': self.item_module.location.html_id(), - 'sources': self.item_module.sources, - 'start': self.item_module.start_time, - 'sub': self.item_module.sub, - 'track': self.item_module.track, - 'youtube_streams': '', + 'sources': sources, + 'start': 3603.0, + 'sub': 'a_sub_file.srt.sjson', + 'track': '', + 'youtube_streams': '1.00:OEoXaMPEzfM', 'autoplay': settings.MITX_FEATURES.get('AUTOPLAY_VIDEOS', True) } - self.assertDictEqual(context, expected_context) + + self.assertEqual(context, expected_context) diff --git a/lms/djangoapps/courseware/tests/test_videoalpha_xml.py b/lms/djangoapps/courseware/tests/test_videoalpha_xml.py index a14fc6cac6..bd5010d16e 100644 --- a/lms/djangoapps/courseware/tests/test_videoalpha_xml.py +++ b/lms/djangoapps/courseware/tests/test_videoalpha_xml.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Test for VideoAlpha 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 common/lib/xmodule/xmodule/modulestore/tests/django_utils.py. @@ -15,28 +15,24 @@ course, section, subsection, unit, etc. import json import unittest -from mock import Mock -from lxml import etree from django.conf import settings -from xmodule.videoalpha_module import VideoAlphaDescriptor, VideoAlphaModule +from xmodule.videoalpha_module import VideoAlphaDescriptor, _create_youtube_string from xmodule.modulestore import Location from xmodule.tests import get_test_system -from xmodule.tests.test_logic import LogicTest SOURCE_XML = """ <videoalpha show_captions="true" + display_name="A Name" youtube="0.75:jNCf2gIqpeE,1.0:ZwkTiUPN0mg,1.25:rsq9auxASqI,1.50:kMyNdzVHHgg" - data_dir="" - caption_asset_path="" - autoplay="true" + sub="a_sub_file.srt.sjson" start_time="01:00:03" end_time="01:00:10" > - <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.mp4"/> - <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.webm"/> - <source src=".../mit-3091x/M-3091X-FA12-L21-3_100.ogv"/> + <source src="example.mp4"/> + <source src="example.webm"/> + <source src="example.ogv"/> </videoalpha> """ @@ -54,75 +50,53 @@ class VideoAlphaFactory(object): """Method return VideoAlpha Xmodule instance.""" location = Location(["i4x", "edX", "videoalpha", "default", "SampleProblem1"]) - model_data = {'data': VideoAlphaFactory.sample_problem_xml_youtube} - - descriptor = Mock(weight="1") + model_data = {'data': VideoAlphaFactory.sample_problem_xml_youtube, + 'location': location} system = get_test_system() system.render_template = lambda template, context: context - VideoAlphaModule.location = location - module = VideoAlphaModule(system, descriptor, model_data) + + descriptor = VideoAlphaDescriptor(system, model_data) + + module = descriptor.xmodule(system) return module -class VideoAlphaModuleTest(LogicTest): - """Tests for logic of VideoAlpha Xmodule.""" - - descriptor_class = VideoAlphaDescriptor - - raw_model_data = { - 'data': '<videoalpha />' - } - - def test_get_timeframe_no_parameters(self): - xmltree = etree.fromstring('<videoalpha>test</videoalpha>') - output = self.xmodule.get_timeframe(xmltree) - self.assertEqual(output, ('', '')) - - def test_get_timeframe_with_one_parameter(self): - xmltree = etree.fromstring( - '<videoalpha start_time="00:04:07">test</videoalpha>' - ) - output = self.xmodule.get_timeframe(xmltree) - self.assertEqual(output, (247, '')) - - def test_get_timeframe_with_two_parameters(self): - xmltree = etree.fromstring( - '''<videoalpha - start_time="00:04:07" - end_time="13:04:39" - >test</videoalpha>''' - ) - output = self.xmodule.get_timeframe(xmltree) - self.assertEqual(output, (247, 47079)) - - class VideoAlphaModuleUnitTest(unittest.TestCase): """Unit tests for VideoAlpha Xmodule.""" - def test_videoalpha_constructor(self): + def test_videoalpha_get_html(self): """Make sure that all parameters extracted correclty from xml""" module = VideoAlphaFactory.create() + module.runtime.render_template = lambda template, context: context + + sources = { + 'main': 'example.mp4', + 'mp4': 'example.mp4', + 'webm': 'example.webm', + 'ogv': 'example.ogv' + } - # `get_html` return only context, cause we - # overwrite `system.render_template` - context = module.get_html() expected_context = { 'caption_asset_path': '/static/subs/', - 'sub': module.sub, + 'sub': 'a_sub_file.srt.sjson', 'data_dir': getattr(self, 'data_dir', None), - 'display_name': module.display_name_with_default, - 'end': module.end_time, - 'start': module.start_time, + 'display_name': 'A Name', + 'end': 3610.0, + 'start': 3603.0, 'id': module.location.html_id(), - 'show_captions': module.show_captions, - 'sources': module.sources, - 'youtube_streams': module.youtube_streams, - 'track': module.track, + 'show_captions': 'true', + 'sources': sources, + 'youtube_streams': _create_youtube_string(module), + 'track': '', 'autoplay': settings.MITX_FEATURES.get('AUTOPLAY_VIDEOS', True) } - self.assertDictEqual(context, expected_context) + + self.assertEqual(module.get_html(), expected_context) + + def test_videoalpha_instance_state(self): + module = VideoAlphaFactory.create() self.assertDictEqual( json.loads(module.get_instance_state()), diff --git a/lms/djangoapps/courseware/tests/test_word_cloud.py b/lms/djangoapps/courseware/tests/test_word_cloud.py index 7c214f3458..6b01ae94f4 100644 --- a/lms/djangoapps/courseware/tests/test_word_cloud.py +++ b/lms/djangoapps/courseware/tests/test_word_cloud.py @@ -242,9 +242,7 @@ class TestWordCloud(BaseTestXmodule): def test_word_cloud_constructor(self): """Make sure that all parameters extracted correclty from xml""" - # `get_html` return only context, cause we - # overwrite `system.render_template` - context = self.item_module.get_html() + fragment = self.runtime.render(self.item_module, None, 'student_view') expected_context = { 'ajax_url': self.item_module.system.ajax_url, @@ -253,4 +251,4 @@ class TestWordCloud(BaseTestXmodule): 'num_inputs': 5, # default value 'submitted': False # default value } - self.assertDictEqual(context, expected_context) + self.assertEqual(fragment.content, self.runtime.render_template('word_cloud.html', expected_context)) diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py index fbe2c05ada..cd245d2610 100644 --- a/lms/djangoapps/courseware/tests/tests.py +++ b/lms/djangoapps/courseware/tests/tests.py @@ -120,9 +120,8 @@ class PageLoaderTestCase(LoginEnrollmentTestCase): self.assertEqual(response.redirect_chain[0][1], 302) if check_content: - unavailable_msg = "this module is temporarily unavailable" - self.assertEqual(response.content.find(unavailable_msg), -1) - self.assertFalse(isinstance(descriptor, ErrorDescriptor)) + self.assertNotContains(response, "this module is temporarily unavailable") + self.assertNotIsInstance(descriptor, ErrorDescriptor) @override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE) diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py index b675f4dfc3..7815188227 100644 --- a/lms/djangoapps/courseware/views.py +++ b/lms/djangoapps/courseware/views.py @@ -400,7 +400,7 @@ def index(request, course_id, chapter=None, section=None, # add in the appropriate timer information to the rendering context: context.update(check_for_active_timelimit_module(request, course_id, course)) - context['content'] = section_module.get_html() + context['content'] = section_module.runtime.render(section_module, None, 'student_view').content else: # section is none, so display a message prev_section = get_current_child(chapter_module) @@ -632,57 +632,6 @@ def mktg_course_about(request, course_id): 'show_courseware_link': show_courseware_link}) - -@ensure_csrf_cookie -@cache_if_anonymous -def static_university_profile(request, org_id): - """ - Return the profile for the particular org_id that does not have any courses. - """ - # Redirect to the properly capitalized org_id - last_path = request.path.split('/')[-1] - if last_path != org_id: - return redirect('static_university_profile', org_id=org_id) - - # Render template - template_file = "university_profile/{0}.html".format(org_id).lower() - context = dict(courses=[], org_id=org_id) - return render_to_response(template_file, context) - - -@ensure_csrf_cookie -@cache_if_anonymous -def university_profile(request, org_id): - """ - Return the profile for the particular org_id. 404 if it's not valid. - """ - virtual_orgs_ids = settings.VIRTUAL_UNIVERSITIES - meta_orgs = getattr(settings, 'META_UNIVERSITIES', {}) - - # Get all the ids associated with this organization - all_courses = modulestore().get_courses() - valid_orgs_ids = set(c.org for c in all_courses) - valid_orgs_ids.update(virtual_orgs_ids + meta_orgs.keys()) - - if org_id not in valid_orgs_ids: - raise Http404("University Profile not found for {0}".format(org_id)) - - # Grab all courses for this organization(s) - org_ids = set([org_id] + meta_orgs.get(org_id, [])) - org_courses = [] - domain = request.META.get('HTTP_HOST') - for key in org_ids: - cs = get_courses_by_university(request.user, domain=domain)[key] - org_courses.extend(cs) - - org_courses = sort_by_announcement(org_courses) - - context = dict(courses=org_courses, org_id=org_id) - template_file = "university_profile/{0}.html".format(org_id).lower() - - return render_to_response(template_file, context) - - def render_notifications(request, course, notifications): context = { 'notifications': notifications, @@ -779,12 +728,16 @@ def submission_history(request, course_id, student_username, location): except StudentModule.DoesNotExist: return HttpResponse(escape("{0} has never accessed problem {1}".format(student_username, location))) - history_entries = StudentModuleHistory.objects.filter(student_module=student_module).order_by('-id') + history_entries = StudentModuleHistory.objects.filter( + student_module=student_module + ).order_by('-id') # If no history records exist, let's force a save to get history started. if not history_entries: student_module.save() - history_entries = StudentModuleHistory.objects.filter(student_module=student_module).order_by('-id') + history_entries = StudentModuleHistory.objects.filter( + student_module=student_module + ).order_by('-id') context = { 'history_entries': history_entries, diff --git a/lms/djangoapps/django_comment_client/base/urls.py b/lms/djangoapps/django_comment_client/base/urls.py index 41bf568012..5b653e1c68 100644 --- a/lms/djangoapps/django_comment_client/base/urls.py +++ b/lms/djangoapps/django_comment_client/base/urls.py @@ -17,7 +17,6 @@ urlpatterns = patterns('django_comment_client.base.views', # nopep8 url(r'threads/(?P<thread_id>[\w\-]+)/follow$', 'follow_thread', name='follow_thread'), url(r'threads/(?P<thread_id>[\w\-]+)/unfollow$', 'unfollow_thread', name='unfollow_thread'), url(r'threads/(?P<thread_id>[\w\-]+)/close$', 'openclose_thread', name='openclose_thread'), - url(r'comments/(?P<comment_id>[\w\-]+)/update$', 'update_comment', name='update_comment'), url(r'comments/(?P<comment_id>[\w\-]+)/endorse$', 'endorse_comment', name='endorse_comment'), url(r'comments/(?P<comment_id>[\w\-]+)/reply$', 'create_sub_comment', name='create_sub_comment'), diff --git a/lms/djangoapps/django_comment_client/utils.py b/lms/djangoapps/django_comment_client/utils.py index 6668826b67..c3e2708f67 100644 --- a/lms/djangoapps/django_comment_client/utils.py +++ b/lms/djangoapps/django_comment_client/utils.py @@ -387,7 +387,8 @@ def safe_content(content): 'updated_at', 'depth', 'type', 'commentable_id', 'comments_count', 'at_position_list', 'children', 'highlighted_title', 'highlighted_body', 'courseware_title', 'courseware_url', 'tags', 'unread_comments_count', - 'read', 'group_id', 'group_name', 'group_string', 'pinned', 'abuse_flaggers' + 'read', 'group_id', 'group_name', 'group_string', 'pinned', 'abuse_flaggers', + 'stats' ] diff --git a/lms/djangoapps/instructor/access.py b/lms/djangoapps/instructor/access.py new file mode 100644 index 0000000000..dfe8eed23b --- /dev/null +++ b/lms/djangoapps/instructor/access.py @@ -0,0 +1,102 @@ +""" +Access control operations for use by instructor APIs. + +Does not include any access control, be sure to check access before calling. + +TO DO sync instructor and staff flags + e.g. should these be possible? + {instructor: true, staff: false} + {instructor: true, staff: true} +""" + +import logging +from django.contrib.auth.models import Group +from courseware.access import (get_access_group_name, + course_beta_test_group_name) +from django_comment_common.models import Role + +log = logging.getLogger(__name__) + + +def list_with_level(course, level): + """ + List users who have 'level' access. + + `level` is in ['instructor', 'staff', 'beta'] for standard courses. + There could be other levels specific to the course. + If there is no Group for that course-level, returns an empty list + """ + if level == 'beta': + grpname = course_beta_test_group_name(course.location) + else: + grpname = get_access_group_name(course, level) + + try: + return Group.objects.get(name=grpname).user_set.all() + except Group.DoesNotExist: + log.info("list_with_level called with non-existant group named {}".format(grpname)) + return [] + + +def allow_access(course, user, level): + """ + Allow user access to course modification. + + `level` is one of ['instructor', 'staff', 'beta'] + """ + _change_access(course, user, level, 'allow') + + +def revoke_access(course, user, level): + """ + Revoke access from user to course modification. + + `level` is one of ['instructor', 'staff', 'beta'] + """ + _change_access(course, user, level, 'revoke') + + +def _change_access(course, user, level, action): + """ + Change access of user. + + `level` is one of ['instructor', 'staff', 'beta'] + action is one of ['allow', 'revoke'] + + NOTE: will create a group if it does not yet exist. + """ + + if level == 'beta': + grpname = course_beta_test_group_name(course.location) + elif level in ['instructor', 'staff']: + grpname = get_access_group_name(course, level) + else: + raise ValueError("unrecognized level '{}'".format(level)) + group, _ = Group.objects.get_or_create(name=grpname) + + if action == 'allow': + user.groups.add(group) + elif action == 'revoke': + user.groups.remove(group) + else: + raise ValueError("unrecognized action '{}'".format(action)) + + +def update_forum_role_membership(course_id, user, rolename, action): + """ + Change forum access of user. + + `rolename` is one of [FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_MODERATOR, FORUM_ROLE_COMMUNITY_TA] + `action` is one of ['allow', 'revoke'] + + if `action` is bad, raises ValueError + if `rolename` does not exist, raises Role.DoesNotExist + """ + role = Role.objects.get(course_id=course_id, name=rolename) + + if action == 'allow': + role.users.add(user) + elif action == 'revoke': + role.users.remove(user) + else: + raise ValueError("unrecognized action '{}'".format(action)) diff --git a/lms/djangoapps/instructor/enrollment.py b/lms/djangoapps/instructor/enrollment.py new file mode 100644 index 0000000000..0b462957ec --- /dev/null +++ b/lms/djangoapps/instructor/enrollment.py @@ -0,0 +1,140 @@ +""" +Enrollment operations for use by instructor APIs. + +Does not include any access control, be sure to check access before calling. +""" + +import json +from django.contrib.auth.models import User +from student.models import CourseEnrollment, CourseEnrollmentAllowed +from courseware.models import StudentModule + + +class EmailEnrollmentState(object): + """ Store the complete enrollment state of an email in a class """ + def __init__(self, course_id, email): + exists_user = User.objects.filter(email=email).exists() + exists_ce = CourseEnrollment.objects.filter(course_id=course_id, user__email=email).exists() + ceas = CourseEnrollmentAllowed.objects.filter(course_id=course_id, email=email).all() + exists_allowed = len(ceas) > 0 + state_auto_enroll = exists_allowed and ceas[0].auto_enroll + + self.user = exists_user + self.enrollment = exists_ce + self.allowed = exists_allowed + self.auto_enroll = bool(state_auto_enroll) + + def __repr__(self): + return "{}(user={}, enrollment={}, allowed={}, auto_enroll={})".format( + self.__class__.__name__, + self.user, + self.enrollment, + self.allowed, + self.auto_enroll, + ) + + def to_dict(self): + """ + example: { + 'user': False, + 'enrollment': False, + 'allowed': True, + 'auto_enroll': True, + } + """ + return { + 'user': self.user, + 'enrollment': self.enrollment, + 'allowed': self.allowed, + 'auto_enroll': self.auto_enroll, + } + + +def enroll_email(course_id, student_email, auto_enroll=False): + """ + Enroll a student by email. + + `student_email` is student's emails e.g. "foo@bar.com" + `auto_enroll` determines what is put in CourseEnrollmentAllowed.auto_enroll + if auto_enroll is set, then when the email registers, they will be + enrolled in the course automatically. + + returns two EmailEnrollmentState's + representing state before and after the action. + """ + + previous_state = EmailEnrollmentState(course_id, student_email) + + if previous_state.user: + user = User.objects.get(email=student_email) + CourseEnrollment.objects.get_or_create(course_id=course_id, user=user) + else: + cea, _ = CourseEnrollmentAllowed.objects.get_or_create(course_id=course_id, email=student_email) + cea.auto_enroll = auto_enroll + cea.save() + + after_state = EmailEnrollmentState(course_id, student_email) + + return previous_state, after_state + + +def unenroll_email(course_id, student_email): + """ + Unenroll a student by email. + + `student_email` is student's emails e.g. "foo@bar.com" + + returns two EmailEnrollmentState's + representing state before and after the action. + """ + + previous_state = EmailEnrollmentState(course_id, student_email) + + if previous_state.enrollment: + CourseEnrollment.objects.get(course_id=course_id, user__email=student_email).delete() + + if previous_state.allowed: + CourseEnrollmentAllowed.objects.get(course_id=course_id, email=student_email).delete() + + after_state = EmailEnrollmentState(course_id, student_email) + + return previous_state, after_state + + +def reset_student_attempts(course_id, student, module_state_key, delete_module=False): + """ + Reset student attempts for a problem. Optionally deletes all student state for the specified problem. + + In the previous instructor dashboard it was possible to modify/delete + modules that were not problems. That has been disabled for safety. + + `student` is a User + `problem_to_reset` is the name of a problem e.g. 'L2Node1'. + To build the module_state_key 'problem/' and course information will be appended to `problem_to_reset`. + + Throws ValueError if `problem_state` is invalid JSON. + """ + module_to_reset = StudentModule.objects.get(student_id=student.id, + course_id=course_id, + module_state_key=module_state_key) + + if delete_module: + module_to_reset.delete() + else: + _reset_module_attempts(module_to_reset) + + +def _reset_module_attempts(studentmodule): + """ + Reset the number of attempts on a studentmodule. + + Throws ValueError if `problem_state` is invalid JSON. + """ + # load the state json + problem_state = json.loads(studentmodule.state) + # old_number_of_attempts = problem_state["attempts"] + problem_state["attempts"] = 0 + + # save + studentmodule.state = json.dumps(problem_state) + studentmodule.save() diff --git a/lms/djangoapps/instructor/management/commands/dump_grades.py b/lms/djangoapps/instructor/management/commands/dump_grades.py index 3707ad33ed..ff4edd02e0 100644 --- a/lms/djangoapps/instructor/management/commands/dump_grades.py +++ b/lms/djangoapps/instructor/management/commands/dump_grades.py @@ -5,7 +5,7 @@ import csv -from instructor.views import get_student_grade_summary_data +from instructor.views.legacy import get_student_grade_summary_data from courseware.courses import get_course_by_id from xmodule.modulestore.django import modulestore diff --git a/lms/djangoapps/instructor/offline_gradecalc.py b/lms/djangoapps/instructor/offline_gradecalc.py index fe5b95c3b9..97f252e3a9 100644 --- a/lms/djangoapps/instructor/offline_gradecalc.py +++ b/lms/djangoapps/instructor/offline_gradecalc.py @@ -44,12 +44,14 @@ def offline_grade_calculation(course_id): def is_secure(self): return False - request = DummyRequest() - print "%d enrolled students" % len(enrolled_students) course = get_course_by_id(course_id) for student in enrolled_students: + request = DummyRequest() + request.user = student + request.session = {} + gradeset = grades.grade(student, request, course, keep_raw_scores=True) gs = enc.encode(gradeset) ocg, created = models.OfflineComputedGrade.objects.get_or_create(user=student, course_id=course_id) diff --git a/lms/djangoapps/instructor/tests/test_access.py b/lms/djangoapps/instructor/tests/test_access.py new file mode 100644 index 0000000000..688ed89dad --- /dev/null +++ b/lms/djangoapps/instructor/tests/test_access.py @@ -0,0 +1,190 @@ +""" +Test instructor.access +""" + +from nose.tools import raises +from django.contrib.auth.models import Group +from student.tests.factories import UserFactory +from xmodule.modulestore.tests.factories import CourseFactory +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase + +from django.test.utils import override_settings +from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE + +from courseware.access import get_access_group_name +from django_comment_common.models import (Role, + FORUM_ROLE_MODERATOR) +from instructor.access import (allow_access, + revoke_access, + list_with_level, + update_forum_role_membership) + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorAccessList(ModuleStoreTestCase): + """ Test access listings. """ + def setUp(self): + self.course = CourseFactory.create() + + self.instructors = [UserFactory.create() for _ in xrange(4)] + for user in self.instructors: + allow_access(self.course, user, 'instructor') + self.beta_testers = [UserFactory.create() for _ in xrange(4)] + for user in self.beta_testers: + allow_access(self.course, user, 'beta') + + def test_list_instructors(self): + instructors = list_with_level(self.course, 'instructor') + self.assertEqual(set(instructors), set(self.instructors)) + + def test_list_beta(self): + beta_testers = list_with_level(self.course, 'beta') + self.assertEqual(set(beta_testers), set(self.beta_testers)) + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorAccessAllow(ModuleStoreTestCase): + """ Test access allow. """ + def setUp(self): + self.course = CourseFactory.create() + + def test_allow(self): + user = UserFactory() + allow_access(self.course, user, 'staff') + group = Group.objects.get( + name=get_access_group_name(self.course, 'staff') + ) + self.assertIn(user, group.user_set.all()) + + def test_allow_twice(self): + user = UserFactory() + allow_access(self.course, user, 'staff') + allow_access(self.course, user, 'staff') + group = Group.objects.get( + name=get_access_group_name(self.course, 'staff') + ) + self.assertIn(user, group.user_set.all()) + + def test_allow_beta(self): + """ Test allow beta against list beta. """ + user = UserFactory() + allow_access(self.course, user, 'beta') + self.assertIn(user, list_with_level(self.course, 'beta')) + + @raises(ValueError) + def test_allow_badlevel(self): + user = UserFactory() + allow_access(self.course, user, 'robot-not-a-level') + group = Group.objects.get(name=get_access_group_name(self.course, 'robot-not-a-level')) + self.assertIn(user, group.user_set.all()) + + @raises(Exception) + def test_allow_noneuser(self): + user = None + allow_access(self.course, user, 'staff') + group = Group.objects.get(name=get_access_group_name(self.course, 'staff')) + self.assertIn(user, group.user_set.all()) + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorAccessRevoke(ModuleStoreTestCase): + """ Test access revoke. """ + def setUp(self): + self.course = CourseFactory.create() + + self.staff = [UserFactory.create() for _ in xrange(4)] + for user in self.staff: + allow_access(self.course, user, 'staff') + self.beta_testers = [UserFactory.create() for _ in xrange(4)] + for user in self.beta_testers: + allow_access(self.course, user, 'beta') + + def test_revoke(self): + user = self.staff[0] + revoke_access(self.course, user, 'staff') + group = Group.objects.get( + name=get_access_group_name(self.course, 'staff') + ) + self.assertNotIn(user, group.user_set.all()) + + def test_revoke_twice(self): + user = self.staff[0] + revoke_access(self.course, user, 'staff') + group = Group.objects.get( + name=get_access_group_name(self.course, 'staff') + ) + self.assertNotIn(user, group.user_set.all()) + + def test_revoke_beta(self): + user = self.beta_testers[0] + revoke_access(self.course, user, 'beta') + self.assertNotIn(user, list_with_level(self.course, 'beta')) + + @raises(ValueError) + def test_revoke_badrolename(self): + user = UserFactory() + revoke_access(self.course, user, 'robot-not-a-level') + group = Group.objects.get( + name=get_access_group_name(self.course, 'robot-not-a-level') + ) + self.assertNotIn(user, group.user_set.all()) + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorAccessForum(ModuleStoreTestCase): + """ + Test forum access control. + """ + def setUp(self): + self.course = CourseFactory.create() + + self.mod_role = Role.objects.create( + course_id=self.course.id, + name=FORUM_ROLE_MODERATOR + ) + self.moderators = [UserFactory.create() for _ in xrange(4)] + for user in self.moderators: + self.mod_role.users.add(user) + + def test_allow(self): + user = UserFactory.create() + update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'allow') + self.assertIn(user, self.mod_role.users.all()) + + def test_allow_twice(self): + user = UserFactory.create() + update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'allow') + self.assertIn(user, self.mod_role.users.all()) + update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'allow') + self.assertIn(user, self.mod_role.users.all()) + + @raises(Role.DoesNotExist) + def test_allow_badrole(self): + user = UserFactory.create() + update_forum_role_membership(self.course.id, user, 'robot-not-a-real-role', 'allow') + + def test_revoke(self): + user = self.moderators[0] + update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') + self.assertNotIn(user, self.mod_role.users.all()) + + def test_revoke_twice(self): + user = self.moderators[0] + update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') + self.assertNotIn(user, self.mod_role.users.all()) + update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') + self.assertNotIn(user, self.mod_role.users.all()) + + def test_revoke_notallowed(self): + user = UserFactory() + update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'revoke') + self.assertNotIn(user, self.mod_role.users.all()) + + @raises(Role.DoesNotExist) + def test_revoke_badrole(self): + user = self.moderators[0] + update_forum_role_membership(self.course.id, user, 'robot-not-a-real-role', 'allow') + + @raises(ValueError) + def test_bad_mode(self): + user = UserFactory() + update_forum_role_membership(self.course.id, user, FORUM_ROLE_MODERATOR, 'robot-not-a-mode') diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py new file mode 100644 index 0000000000..cc2e23e8fe --- /dev/null +++ b/lms/djangoapps/instructor/tests/test_api.py @@ -0,0 +1,782 @@ +""" +Unit tests for instructor.api methods. +""" +# pylint: disable=E1111 +import unittest +import json +from urllib import quote +from django.test import TestCase +from nose.tools import raises +from mock import Mock +from django.test.utils import override_settings +from django.core.urlresolvers import reverse +from django.http import HttpRequest, HttpResponse + +from django.contrib.auth.models import User +from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase +from courseware.tests.helpers import LoginEnrollmentTestCase +from xmodule.modulestore.tests.factories import CourseFactory +from student.tests.factories import UserFactory, AdminFactory + +from student.models import CourseEnrollment +from courseware.models import StudentModule + +from instructor.access import allow_access +from instructor.views.api import ( + _split_input_list, _msk_from_problem_urlname, common_exceptions_400) +from instructor_task.api_helper import AlreadyRunningError + + +@common_exceptions_400 +def view_success(request): # pylint: disable=W0613 + "A dummy view for testing that returns a simple HTTP response" + return HttpResponse('success') + + +@common_exceptions_400 +def view_user_doesnotexist(request): # pylint: disable=W0613 + "A dummy view that raises a User.DoesNotExist exception" + raise User.DoesNotExist() + + +@common_exceptions_400 +def view_alreadyrunningerror(request): # pylint: disable=W0613 + "A dummy view that raises an AlreadyRunningError exception" + raise AlreadyRunningError() + + +class TestCommonExceptions400(unittest.TestCase): + """ + Testing the common_exceptions_400 decorator. + """ + def setUp(self): + self.request = Mock(spec=HttpRequest) + self.request.META = {} + + def test_happy_path(self): + resp = view_success(self.request) + self.assertEqual(resp.status_code, 200) + + def test_user_doesnotexist(self): + self.request.is_ajax.return_value = False + resp = view_user_doesnotexist(self.request) + self.assertEqual(resp.status_code, 400) + self.assertIn("User does not exist", resp.content) + + def test_user_doesnotexist_ajax(self): + self.request.is_ajax.return_value = True + resp = view_user_doesnotexist(self.request) + self.assertEqual(resp.status_code, 400) + result = json.loads(resp.content) + self.assertIn("User does not exist", result["error"]) + + def test_alreadyrunningerror(self): + self.request.is_ajax.return_value = False + resp = view_alreadyrunningerror(self.request) + self.assertEqual(resp.status_code, 400) + self.assertIn("Task is already running", resp.content) + + def test_alreadyrunningerror_ajax(self): + self.request.is_ajax.return_value = True + resp = view_alreadyrunningerror(self.request) + self.assertEqual(resp.status_code, 400) + result = json.loads(resp.content) + self.assertIn("Task is already running", result["error"]) + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorAPIDenyLevels(ModuleStoreTestCase, LoginEnrollmentTestCase): + """ + Ensure that users cannot access endpoints they shouldn't be able to. + """ + def setUp(self): + self.user = UserFactory.create() + self.course = CourseFactory.create() + CourseEnrollment.objects.create(user=self.user, course_id=self.course.id) + self.client.login(username=self.user.username, password='test') + + def test_deny_students_update_enrollment(self): + url = reverse('students_update_enrollment', kwargs={'course_id': self.course.id}) + response = self.client.get(url, {}) + self.assertEqual(response.status_code, 403) + + def test_staff_level(self): + """ + Ensure that an enrolled student can't access staff or instructor endpoints. + """ + staff_level_endpoints = [ + 'students_update_enrollment', + 'modify_access', + 'list_course_role_members', + 'get_grading_config', + 'get_students_features', + 'get_distribution', + 'get_student_progress_url', + 'reset_student_attempts', + 'rescore_problem', + 'list_instructor_tasks', + 'list_forum_members', + 'update_forum_role_membership', + ] + for endpoint in staff_level_endpoints: + url = reverse(endpoint, kwargs={'course_id': self.course.id}) + response = self.client.get(url, {}) + self.assertEqual(response.status_code, 403) + + def test_instructor_level(self): + """ + Ensure that a staff member can't access instructor endpoints. + """ + instructor_level_endpoints = [ + 'modify_access', + 'list_course_role_members', + 'reset_student_attempts', + 'list_instructor_tasks', + 'update_forum_role_membership', + ] + for endpoint in instructor_level_endpoints: + url = reverse(endpoint, kwargs={'course_id': self.course.id}) + response = self.client.get(url, {}) + self.assertEqual(response.status_code, 403) + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorAPIEnrollment(ModuleStoreTestCase, LoginEnrollmentTestCase): + """ + Test enrollment modification endpoint. + + This test does NOT exhaustively test state changes, that is the + job of test_enrollment. This tests the response and action switch. + """ + def setUp(self): + self.instructor = AdminFactory.create() + self.course = CourseFactory.create() + self.client.login(username=self.instructor.username, password='test') + + self.enrolled_student = UserFactory() + CourseEnrollment.objects.create( + user=self.enrolled_student, + course_id=self.course.id + ) + self.notenrolled_student = UserFactory() + + self.notregistered_email = 'robot-not-an-email-yet@robot.org' + self.assertEqual(User.objects.filter(email=self.notregistered_email).count(), 0) + + # uncomment to enable enable printing of large diffs + # from failed assertions in the event of a test failure. + # (comment because pylint C0103) + # self.maxDiff = None + + def test_missing_params(self): + """ Test missing all query parameters. """ + url = reverse('students_update_enrollment', kwargs={'course_id': self.course.id}) + response = self.client.get(url) + self.assertEqual(response.status_code, 400) + + def test_bad_action(self): + """ Test with an invalid action. """ + action = 'robot-not-an-action' + url = reverse('students_update_enrollment', kwargs={'course_id': self.course.id}) + response = self.client.get(url, {'emails': self.enrolled_student.email, 'action': action}) + self.assertEqual(response.status_code, 400) + + def test_enroll(self): + url = reverse('students_update_enrollment', kwargs={'course_id': self.course.id}) + response = self.client.get(url, {'emails': self.notenrolled_student.email, 'action': 'enroll'}) + print "type(self.notenrolled_student.email): {}".format(type(self.notenrolled_student.email)) + self.assertEqual(response.status_code, 200) + # test that the user is now enrolled + + self.assertEqual( + self.notenrolled_student.courseenrollment_set.filter( + course_id=self.course.id + ).count(), + 1 + ) + + # test the response data + expected = { + "action": "enroll", + "auto_enroll": False, + "results": [ + { + "email": self.notenrolled_student.email, + "before": { + "enrollment": False, + "auto_enroll": False, + "user": True, + "allowed": False, + }, + "after": { + "enrollment": True, + "auto_enroll": False, + "user": True, + "allowed": False, + } + } + ] + } + + res_json = json.loads(response.content) + self.assertEqual(res_json, expected) + + def test_unenroll(self): + url = reverse('students_update_enrollment', kwargs={'course_id': self.course.id}) + response = self.client.get(url, {'emails': self.enrolled_student.email, 'action': 'unenroll'}) + print "type(self.enrolled_student.email): {}".format(type(self.enrolled_student.email)) + self.assertEqual(response.status_code, 200) + # test that the user is now unenrolled + + self.assertEqual( + self.enrolled_student.courseenrollment_set.filter( + course_id=self.course.id + ).count(), + 0 + ) + + # test the response data + expected = { + "action": "unenroll", + "auto_enroll": False, + "results": [ + { + "email": self.enrolled_student.email, + "before": { + "enrollment": True, + "auto_enroll": False, + "user": True, + "allowed": False, + }, + "after": { + "enrollment": False, + "auto_enroll": False, + "user": True, + "allowed": False, + } + } + ] + } + + res_json = json.loads(response.content) + self.assertEqual(res_json, expected) + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorAPILevelsAccess(ModuleStoreTestCase, LoginEnrollmentTestCase): + """ + Test endpoints whereby instructors can change permissions + of other users. + + This test does NOT test whether the actions had an effect on the + database, that is the job of test_access. + This tests the response and action switch. + Actually, modify_access does not having a very meaningful + response yet, so only the status code is tested. + """ + def setUp(self): + self.instructor = AdminFactory.create() + self.course = CourseFactory.create() + self.client.login(username=self.instructor.username, password='test') + + self.other_instructor = UserFactory() + allow_access(self.course, self.other_instructor, 'instructor') + self.other_staff = UserFactory() + allow_access(self.course, self.other_staff, 'staff') + self.other_user = UserFactory() + + def test_modify_access_noparams(self): + """ Test missing all query parameters. """ + url = reverse('modify_access', kwargs={'course_id': self.course.id}) + response = self.client.get(url) + self.assertEqual(response.status_code, 400) + + def test_modify_access_bad_action(self): + """ Test with an invalid action parameter. """ + url = reverse('modify_access', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'email': self.other_staff.email, + 'rolename': 'staff', + 'action': 'robot-not-an-action', + }) + self.assertEqual(response.status_code, 400) + + def test_modify_access_bad_role(self): + """ Test with an invalid action parameter. """ + url = reverse('modify_access', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'email': self.other_staff.email, + 'rolename': 'robot-not-a-roll', + 'action': 'revoke', + }) + self.assertEqual(response.status_code, 400) + + def test_modify_access_allow(self): + url = reverse('modify_access', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'email': self.other_instructor.email, + 'rolename': 'staff', + 'action': 'allow', + }) + self.assertEqual(response.status_code, 200) + + def test_modify_access_revoke(self): + url = reverse('modify_access', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'email': self.other_staff.email, + 'rolename': 'staff', + 'action': 'revoke', + }) + self.assertEqual(response.status_code, 200) + + def test_modify_access_revoke_not_allowed(self): + """ Test revoking access that a user does not have. """ + url = reverse('modify_access', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'email': self.other_staff.email, + 'rolename': 'instructor', + 'action': 'revoke', + }) + self.assertEqual(response.status_code, 200) + + def test_modify_access_revoke_self(self): + """ + Test that an instructor cannot remove instructor privelages from themself. + """ + url = reverse('modify_access', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'email': self.instructor.email, + 'rolename': 'instructor', + 'action': 'revoke', + }) + self.assertEqual(response.status_code, 400) + + def test_list_course_role_members_noparams(self): + """ Test missing all query parameters. """ + url = reverse('list_course_role_members', kwargs={'course_id': self.course.id}) + response = self.client.get(url) + self.assertEqual(response.status_code, 400) + + def test_list_course_role_members_bad_rolename(self): + """ Test with an invalid rolename parameter. """ + url = reverse('list_course_role_members', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'rolename': 'robot-not-a-rolename', + }) + print response + self.assertEqual(response.status_code, 400) + + def test_list_course_role_members_staff(self): + url = reverse('list_course_role_members', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'rolename': 'staff', + }) + print response + self.assertEqual(response.status_code, 200) + + # check response content + expected = { + 'course_id': self.course.id, + 'staff': [ + { + 'username': self.other_staff.username, + 'email': self.other_staff.email, + 'first_name': self.other_staff.first_name, + 'last_name': self.other_staff.last_name, + } + ] + } + res_json = json.loads(response.content) + self.assertEqual(res_json, expected) + + def test_list_course_role_members_beta(self): + url = reverse('list_course_role_members', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'rolename': 'beta', + }) + print response + self.assertEqual(response.status_code, 200) + + # check response content + expected = { + 'course_id': self.course.id, + 'beta': [] + } + res_json = json.loads(response.content) + self.assertEqual(res_json, expected) + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorAPILevelsDataDump(ModuleStoreTestCase, LoginEnrollmentTestCase): + """ + Test endpoints that show data without side effects. + """ + def setUp(self): + self.instructor = AdminFactory.create() + self.course = CourseFactory.create() + self.client.login(username=self.instructor.username, password='test') + + self.students = [UserFactory() for _ in xrange(6)] + for student in self.students: + CourseEnrollment.objects.create(user=student, course_id=self.course.id) + + def test_get_students_features(self): + """ + Test that some minimum of information is formatted + correctly in the response to get_students_features. + """ + url = reverse('get_students_features', kwargs={'course_id': self.course.id}) + response = self.client.get(url, {}) + res_json = json.loads(response.content) + self.assertIn('students', res_json) + for student in self.students: + student_json = [ + x for x in res_json['students'] + if x['username'] == student.username + ][0] + self.assertEqual(student_json['username'], student.username) + self.assertEqual(student_json['email'], student.email) + + def test_get_students_features_csv(self): + """ + Test that some minimum of information is formatted + correctly in the response to get_students_features. + """ + url = reverse('get_students_features', kwargs={'course_id': self.course.id}) + response = self.client.get(url + '/csv', {}) + self.assertEqual(response['Content-Type'], 'text/csv') + + def test_get_distribution_no_feature(self): + """ + Test that get_distribution lists available features + when supplied no feature quparameter. + """ + url = reverse('get_distribution', kwargs={'course_id': self.course.id}) + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + res_json = json.loads(response.content) + self.assertEqual(type(res_json['available_features']), list) + + url = reverse('get_distribution', kwargs={'course_id': self.course.id}) + response = self.client.get(url + u'?feature=') + self.assertEqual(response.status_code, 200) + res_json = json.loads(response.content) + self.assertEqual(type(res_json['available_features']), list) + + def test_get_distribution_unavailable_feature(self): + """ + Test that get_distribution fails gracefully with + an unavailable feature. + """ + url = reverse('get_distribution', kwargs={'course_id': self.course.id}) + response = self.client.get(url, {'feature': 'robot-not-a-real-feature'}) + self.assertEqual(response.status_code, 400) + + def test_get_distribution_gender(self): + """ + Test that get_distribution fails gracefully with + an unavailable feature. + """ + url = reverse('get_distribution', kwargs={'course_id': self.course.id}) + response = self.client.get(url, {'feature': 'gender'}) + self.assertEqual(response.status_code, 200) + res_json = json.loads(response.content) + print res_json + self.assertEqual(res_json['feature_results']['data']['m'], 6) + self.assertEqual(res_json['feature_results']['choices_display_names']['m'], 'Male') + self.assertEqual(res_json['feature_results']['data']['no_data'], 0) + self.assertEqual(res_json['feature_results']['choices_display_names']['no_data'], 'No Data') + + def test_get_student_progress_url(self): + """ Test that progress_url is in the successful response. """ + url = reverse('get_student_progress_url', kwargs={'course_id': self.course.id}) + url += "?student_email={}".format( + quote(self.students[0].email.encode("utf-8")) + ) + print url + response = self.client.get(url) + print response + self.assertEqual(response.status_code, 200) + res_json = json.loads(response.content) + self.assertIn('progress_url', res_json) + + def test_get_student_progress_url_noparams(self): + """ Test that the endpoint 404's without the required query params. """ + url = reverse('get_student_progress_url', kwargs={'course_id': self.course.id}) + response = self.client.get(url) + self.assertEqual(response.status_code, 400) + + def test_get_student_progress_url_nostudent(self): + """ Test that the endpoint 400's when requesting an unknown email. """ + url = reverse('get_student_progress_url', kwargs={'course_id': self.course.id}) + response = self.client.get(url) + self.assertEqual(response.status_code, 400) + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorAPIRegradeTask(ModuleStoreTestCase, LoginEnrollmentTestCase): + """ + Test endpoints whereby instructors can change student grades. + This includes resetting attempts and starting rescore tasks. + + This test does NOT test whether the actions had an effect on the + database, that is the job of task tests and test_enrollment. + """ + def setUp(self): + self.instructor = AdminFactory.create() + self.course = CourseFactory.create() + self.client.login(username=self.instructor.username, password='test') + + self.student = UserFactory() + CourseEnrollment.objects.create(course_id=self.course.id, user=self.student) + + self.problem_urlname = 'robot-some-problem-urlname' + self.module_to_reset = StudentModule.objects.create( + student=self.student, + course_id=self.course.id, + module_state_key=_msk_from_problem_urlname( + self.course.id, + self.problem_urlname + ), + state=json.dumps({'attempts': 10}), + ) + + def test_reset_student_attempts_deletall(self): + """ Make sure no one can delete all students state on a problem. """ + url = reverse('reset_student_attempts', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'problem_to_reset': self.problem_urlname, + 'all_students': True, + 'delete_module': True, + }) + print response.content + self.assertEqual(response.status_code, 400) + + def test_reset_student_attempts_single(self): + """ Test reset single student attempts. """ + url = reverse('reset_student_attempts', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'problem_to_reset': self.problem_urlname, + 'student_email': self.student.email, + }) + print response.content + self.assertEqual(response.status_code, 200) + # make sure problem attempts have been reset. + changed_module = StudentModule.objects.get(pk=self.module_to_reset.pk) + self.assertEqual( + json.loads(changed_module.state)['attempts'], + 0 + ) + + def test_reset_student_attempts_all(self): + """ Test reset all student attempts. """ + # mock out the function which should be called to execute the action. + import instructor_task.api + act = Mock(return_value=None) + instructor_task.api.submit_reset_problem_attempts_for_all_students = act + + url = reverse('reset_student_attempts', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'problem_to_reset': self.problem_urlname, + 'all_students': True, + }) + print response.content + self.assertEqual(response.status_code, 200) + self.assertTrue(act.called) + + def test_reset_student_attempts_missingmodule(self): + """ Test reset for non-existant problem. """ + url = reverse('reset_student_attempts', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'problem_to_reset': 'robot-not-a-real-module', + 'student_email': self.student.email, + }) + print response.content + self.assertEqual(response.status_code, 400) + + def test_reset_student_attempts_delete(self): + """ Test delete single student state. """ + url = reverse('reset_student_attempts', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'problem_to_reset': self.problem_urlname, + 'student_email': self.student.email, + 'delete_module': True, + }) + print response.content + self.assertEqual(response.status_code, 200) + # make sure the module has been deleted + self.assertEqual( + StudentModule.objects.filter( + student=self.module_to_reset.student, + course_id=self.module_to_reset.course_id, + # module_state_key=self.module_to_reset.module_state_key, + ).count(), + 0 + ) + + def test_reset_student_attempts_nonsense(self): + """ Test failure with both student_email and all_students. """ + url = reverse('reset_student_attempts', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'problem_to_reset': self.problem_urlname, + 'student_email': self.student.email, + 'all_students': True, + }) + print response.content + self.assertEqual(response.status_code, 400) + + def test_rescore_problem_single(self): + """ Test rescoring of a single student. """ + import instructor_task.api + act = Mock(return_value=None) + instructor_task.api.submit_rescore_problem_for_student = act + + url = reverse('rescore_problem', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'problem_to_reset': self.problem_urlname, + 'student_email': self.student.email, + }) + print response.content + self.assertEqual(response.status_code, 200) + self.assertTrue(act.called) + + def test_rescore_problem_all(self): + """ Test rescoring for all students. """ + import instructor_task.api + act = Mock(return_value=None) + instructor_task.api.submit_rescore_problem_for_all_students = act + + url = reverse('rescore_problem', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'problem_to_reset': self.problem_urlname, + 'all_students': True, + }) + print response.content + self.assertEqual(response.status_code, 200) + self.assertTrue(act.called) + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorAPITaskLists(ModuleStoreTestCase, LoginEnrollmentTestCase): + """ + Test instructor task list endpoint. + """ + + class FakeTask(object): + """ Fake task object """ + FEATURES = ['task_type', 'task_input', 'task_id', 'requester', 'created', 'task_state'] + + def __init__(self): + for feature in self.FEATURES: + setattr(self, feature, 'expected') + + def to_dict(self): + """ Convert fake task to dictionary representation. """ + return {key: 'expected' for key in self.FEATURES} + + def setUp(self): + self.instructor = AdminFactory.create() + self.course = CourseFactory.create() + self.client.login(username=self.instructor.username, password='test') + + self.student = UserFactory() + CourseEnrollment.objects.create(course_id=self.course.id, user=self.student) + + self.problem_urlname = 'robot-some-problem-urlname' + self.module = StudentModule.objects.create( + student=self.student, + course_id=self.course.id, + module_state_key=_msk_from_problem_urlname( + self.course.id, + self.problem_urlname + ), + state=json.dumps({'attempts': 10}), + ) + + self.tasks = [self.FakeTask() for _ in xrange(6)] + + def test_list_instructor_tasks_running(self): + """ Test list of all running tasks. """ + import instructor_task.api + act = Mock(return_value=self.tasks) + instructor_task.api.get_running_instructor_tasks = act + + url = reverse('list_instructor_tasks', kwargs={'course_id': self.course.id}) + response = self.client.get(url, {}) + print response.content + self.assertEqual(response.status_code, 200) + + # check response + self.assertTrue(act.called) + expected_tasks = [ftask.to_dict() for ftask in self.tasks] + expected_res = {'tasks': expected_tasks} + self.assertEqual(json.loads(response.content), expected_res) + + def test_list_instructor_tasks_problem(self): + """ Test list task history for problem. """ + import instructor_task.api + act = Mock(return_value=self.tasks) + instructor_task.api.get_instructor_task_history = act + + url = reverse('list_instructor_tasks', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'problem_urlname': self.problem_urlname, + }) + print response.content + self.assertEqual(response.status_code, 200) + + # check response + self.assertTrue(act.called) + expected_tasks = [ftask.to_dict() for ftask in self.tasks] + expected_res = {'tasks': expected_tasks} + self.assertEqual(json.loads(response.content), expected_res) + + def test_list_instructor_tasks_problem_student(self): + """ Test list task history for problem AND student. """ + import instructor_task.api + act = Mock(return_value=self.tasks) + instructor_task.api.get_instructor_task_history = act + + url = reverse('list_instructor_tasks', kwargs={'course_id': self.course.id}) + response = self.client.get(url, { + 'problem_urlname': self.problem_urlname, + 'student_email': self.student.email, + }) + print response.content + self.assertEqual(response.status_code, 200) + + # check response + self.assertTrue(act.called) + expected_tasks = [ftask.to_dict() for ftask in self.tasks] + expected_res = {'tasks': expected_tasks} + self.assertEqual(json.loads(response.content), expected_res) + + +class TestInstructorAPIHelpers(TestCase): + """ Test helpers for instructor.api """ + def test_split_input_list(self): + strings = [] + lists = [] + strings.append("Lorem@ipsum.dolor, sit@amet.consectetur\nadipiscing@elit.Aenean\r convallis@at.lacus\r, ut@lacinia.Sed") + lists.append(['Lorem@ipsum.dolor', 'sit@amet.consectetur', 'adipiscing@elit.Aenean', 'convallis@at.lacus', 'ut@lacinia.Sed']) + + for (stng, lst) in zip(strings, lists): + self.assertEqual(_split_input_list(stng), lst) + + def test_split_input_list_unicode(self): + self.assertEqual(_split_input_list('robot@robot.edu, robot2@robot.edu'), ['robot@robot.edu', 'robot2@robot.edu']) + self.assertEqual(_split_input_list(u'robot@robot.edu, robot2@robot.edu'), ['robot@robot.edu', 'robot2@robot.edu']) + self.assertEqual(_split_input_list(u'robot@robot.edu, robot2@robot.edu'), [u'robot@robot.edu', 'robot2@robot.edu']) + scary_unistuff = unichr(40960) + u'abcd' + unichr(1972) + self.assertEqual(_split_input_list(scary_unistuff), [scary_unistuff]) + + def test_msk_from_problem_urlname(self): + args = ('MITx/6.002x/2013_Spring', 'L2Node1') + output = 'i4x://MITx/6.002x/problem/L2Node1' + self.assertEqual(_msk_from_problem_urlname(*args), output) + + @raises(ValueError) + def test_msk_from_problem_urlname_error(self): + args = ('notagoodcourse', 'L2Node1') + _msk_from_problem_urlname(*args) diff --git a/lms/djangoapps/instructor/tests/test_enrollment.py b/lms/djangoapps/instructor/tests/test_enrollment.py index 964441c094..46f677fe88 100644 --- a/lms/djangoapps/instructor/tests/test_enrollment.py +++ b/lms/djangoapps/instructor/tests/test_enrollment.py @@ -1,258 +1,371 @@ """ -Unit tests for enrollment methods in views.py - +Unit tests for instructor.enrollment methods. """ -from django.test.utils import override_settings +import json +from abc import ABCMeta from django.contrib.auth.models import User -from django.core.urlresolvers import reverse -from courseware.tests.helpers import LoginEnrollmentTestCase -from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE -from xmodule.modulestore.tests.factories import CourseFactory -from student.tests.factories import UserFactory, CourseEnrollmentFactory, AdminFactory -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase +from courseware.models import StudentModule +from django.test import TestCase +from student.tests.factories import UserFactory + from student.models import CourseEnrollment, CourseEnrollmentAllowed -from instructor.views import get_and_clean_student_list, send_mail_to_student -from django.core import mail - -USER_COUNT = 4 +from instructor.enrollment import (EmailEnrollmentState, + enroll_email, unenroll_email, + reset_student_attempts) -@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) -class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase): +class TestSettableEnrollmentState(TestCase): + """ Test the basis class for enrollment tests. """ + def setUp(self): + self.course_id = 'robot:/a/fake/c::rse/id' + + def test_mes_create(self): + """ + Test SettableEnrollmentState creation of user. + """ + mes = SettableEnrollmentState( + user=True, + enrollment=True, + allowed=False, + auto_enroll=False + ) + # enrollment objects + eobjs = mes.create_user(self.course_id) + ees = EmailEnrollmentState(self.course_id, eobjs.email) + self.assertEqual(mes, ees) + + +class TestEnrollmentChangeBase(TestCase): """ - Check Enrollment/Unenrollment with/without auto-enrollment on activation and with/without email notification + Test instructor enrollment administration against database effects. + + Test methods in derived classes follow a strict format. + `action` is a function which is run + the test will pass if `action` mutates state from `before_ideal` to `after_ideal` """ + __metaclass__ = ABCMeta + def setUp(self): + self.course_id = 'robot:/a/fake/c::rse/id' - instructor = AdminFactory.create() - self.client.login(username=instructor.username, password='test') - - self.course = CourseFactory.create() - - self.users = [ - UserFactory.create(username="student%d" % i, email="student%d@test.com" % i) - for i in xrange(USER_COUNT) - ] - - for user in self.users: - CourseEnrollmentFactory.create(user=user, course_id=self.course.id) - - # Empty the test outbox - mail.outbox = [] - - def test_unenrollment_email_off(self): + def _run_state_change_test(self, before_ideal, after_ideal, action): """ - Do un-enrollment email off test + Runs a state change test. + + `before_ideal` and `after_ideal` are SettableEnrollmentState's + `action` is a function which will be run in the middle. + `action` should transition the world from before_ideal to after_ideal + `action` will be supplied the following arguments (None-able arguments) + `email` is an email string """ + # initialize & check before + print "checking initialization..." + eobjs = before_ideal.create_user(self.course_id) + before = EmailEnrollmentState(self.course_id, eobjs.email) + self.assertEqual(before, before_ideal) - course = self.course + # do action + print "running action..." + action(eobjs.email) - #Run the Un-enroll students command - url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) - response = self.client.post(url, {'action': 'Unenroll multiple students', 'multiple_students': 'student0@test.com student1@test.com'}) + # check after + print "checking effects..." + after = EmailEnrollmentState(self.course_id, eobjs.email) + self.assertEqual(after, after_ideal) - #Check the page output - self.assertContains(response, '<td>student0@test.com</td>') - self.assertContains(response, '<td>student1@test.com</td>') - self.assertContains(response, '<td>un-enrolled</td>') - #Check the enrollment table - user = User.objects.get(email='student0@test.com') - ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) - self.assertEqual(0, len(ce)) +class TestInstructorEnrollDB(TestEnrollmentChangeBase): + """ Test instructor.enrollment.enroll_email """ + def test_enroll(self): + before_ideal = SettableEnrollmentState( + user=True, + enrollment=False, + allowed=False, + auto_enroll=False + ) - user = User.objects.get(email='student1@test.com') - ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) - self.assertEqual(0, len(ce)) + after_ideal = SettableEnrollmentState( + user=True, + enrollment=True, + allowed=False, + auto_enroll=False + ) - #Check the outbox - self.assertEqual(len(mail.outbox), 0) + action = lambda email: enroll_email(self.course_id, email) - def test_enrollment_new_student_autoenroll_on_email_off(self): + return self._run_state_change_test(before_ideal, after_ideal, action) + + def test_enroll_again(self): + before_ideal = SettableEnrollmentState( + user=True, + enrollment=True, + allowed=False, + auto_enroll=False, + ) + + after_ideal = SettableEnrollmentState( + user=True, + enrollment=True, + allowed=False, + auto_enroll=False, + ) + + action = lambda email: enroll_email(self.course_id, email) + + return self._run_state_change_test(before_ideal, after_ideal, action) + + def test_enroll_nouser(self): + before_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=False, + auto_enroll=False, + ) + + after_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=True, + auto_enroll=False, + ) + + action = lambda email: enroll_email(self.course_id, email) + + return self._run_state_change_test(before_ideal, after_ideal, action) + + def test_enroll_nouser_again(self): + before_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=True, + auto_enroll=False + ) + + after_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=True, + auto_enroll=False, + ) + + action = lambda email: enroll_email(self.course_id, email) + + return self._run_state_change_test(before_ideal, after_ideal, action) + + def test_enroll_nouser_autoenroll(self): + before_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=False, + auto_enroll=False, + ) + + after_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=True, + auto_enroll=True, + ) + + action = lambda email: enroll_email(self.course_id, email, auto_enroll=True) + + return self._run_state_change_test(before_ideal, after_ideal, action) + + def test_enroll_nouser_change_autoenroll(self): + before_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=True, + auto_enroll=True, + ) + + after_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=True, + auto_enroll=False, + ) + + action = lambda email: enroll_email(self.course_id, email, auto_enroll=False) + + return self._run_state_change_test(before_ideal, after_ideal, action) + + +class TestInstructorUnenrollDB(TestEnrollmentChangeBase): + """ Test instructor.enrollment.unenroll_email """ + def test_unenroll(self): + before_ideal = SettableEnrollmentState( + user=True, + enrollment=True, + allowed=False, + auto_enroll=False + ) + + after_ideal = SettableEnrollmentState( + user=True, + enrollment=False, + allowed=False, + auto_enroll=False + ) + + action = lambda email: unenroll_email(self.course_id, email) + + return self._run_state_change_test(before_ideal, after_ideal, action) + + def test_unenroll_notenrolled(self): + before_ideal = SettableEnrollmentState( + user=True, + enrollment=False, + allowed=False, + auto_enroll=False + ) + + after_ideal = SettableEnrollmentState( + user=True, + enrollment=False, + allowed=False, + auto_enroll=False + ) + + action = lambda email: unenroll_email(self.course_id, email) + + return self._run_state_change_test(before_ideal, after_ideal, action) + + def test_unenroll_disallow(self): + before_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=True, + auto_enroll=True + ) + + after_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=False, + auto_enroll=False + ) + + action = lambda email: unenroll_email(self.course_id, email) + + return self._run_state_change_test(before_ideal, after_ideal, action) + + def test_unenroll_norecord(self): + before_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=False, + auto_enroll=False + ) + + after_ideal = SettableEnrollmentState( + user=False, + enrollment=False, + allowed=False, + auto_enroll=False + ) + + action = lambda email: unenroll_email(self.course_id, email) + + return self._run_state_change_test(before_ideal, after_ideal, action) + + +class TestInstructorEnrollmentStudentModule(TestCase): + """ Test student module manipulations. """ + def setUp(self): + self.course_id = 'robot:/a/fake/c::rse/id' + + def test_reset_student_attempts(self): + user = UserFactory() + msk = 'robot/module/state/key' + original_state = json.dumps({'attempts': 32, 'otherstuff': 'alsorobots'}) + module = StudentModule.objects.create(student=user, course_id=self.course_id, module_state_key=msk, state=original_state) + # lambda to reload the module state from the database + module = lambda: StudentModule.objects.get(student=user, course_id=self.course_id, module_state_key=msk) + self.assertEqual(json.loads(module().state)['attempts'], 32) + reset_student_attempts(self.course_id, user, msk) + self.assertEqual(json.loads(module().state)['attempts'], 0) + + def test_delete_student_attempts(self): + user = UserFactory() + msk = 'robot/module/state/key' + original_state = json.dumps({'attempts': 32, 'otherstuff': 'alsorobots'}) + StudentModule.objects.create(student=user, course_id=self.course_id, module_state_key=msk, state=original_state) + self.assertEqual(StudentModule.objects.filter(student=user, course_id=self.course_id, module_state_key=msk).count(), 1) + reset_student_attempts(self.course_id, user, msk, delete_module=True) + self.assertEqual(StudentModule.objects.filter(student=user, course_id=self.course_id, module_state_key=msk).count(), 0) + + +class EnrollmentObjects(object): + """ + Container for enrollment objects. + + `email` - student email + `user` - student User object + `cenr` - CourseEnrollment object + `cea` - CourseEnrollmentAllowed object + + Any of the objects except email can be None. + """ + def __init__(self, email, user, cenr, cea): + self.email = email + self.user = user + self.cenr = cenr + self.cea = cea + + +class SettableEnrollmentState(EmailEnrollmentState): + """ + Settable enrollment state. + Used for testing state changes. + SettableEnrollmentState can be constructed and then + a call to create_user will make objects which + correspond to the state represented in the SettableEnrollmentState. + """ + def __init__(self, user=False, enrollment=False, allowed=False, auto_enroll=False): # pylint: disable=W0231 + self.user = user + self.enrollment = enrollment + self.allowed = allowed + self.auto_enroll = auto_enroll + + def __eq__(self, other): + return self.to_dict() == other.to_dict() + + def __neq__(self, other): + return not self == other + + def create_user(self, course_id=None): """ - Do auto-enroll on, email off test + Utility method to possibly create and possibly enroll a user. + Creates a state matching the SettableEnrollmentState properties. + Returns a tuple of ( + email, + User, (optionally None) + CourseEnrollment, (optionally None) + CourseEnrollmentAllowed, (optionally None) + ) """ - - course = self.course - - #Run the Enroll students command - url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) - response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student1_1@test.com, student1_2@test.com', 'auto_enroll': 'on'}) - - #Check the page output - self.assertContains(response, '<td>student1_1@test.com</td>') - self.assertContains(response, '<td>student1_2@test.com</td>') - self.assertContains(response, '<td>user does not exist, enrollment allowed, pending with auto enrollment on</td>') - - #Check the outbox - self.assertEqual(len(mail.outbox), 0) - - #Check the enrollmentallowed db entries - cea = CourseEnrollmentAllowed.objects.filter(email='student1_1@test.com', course_id=course.id) - self.assertEqual(1, cea[0].auto_enroll) - cea = CourseEnrollmentAllowed.objects.filter(email='student1_2@test.com', course_id=course.id) - self.assertEqual(1, cea[0].auto_enroll) - - #Check there is no enrollment db entry other than for the other students - ce = CourseEnrollment.objects.filter(course_id=course.id) - self.assertEqual(4, len(ce)) - - #Create and activate student accounts with same email - self.student1 = 'student1_1@test.com' - self.password = 'bar' - self.create_account('s1_1', self.student1, self.password) - self.activate_user(self.student1) - - self.student2 = 'student1_2@test.com' - self.create_account('s1_2', self.student2, self.password) - self.activate_user(self.student2) - - #Check students are enrolled - user = User.objects.get(email='student1_1@test.com') - ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) - self.assertEqual(1, len(ce)) - - user = User.objects.get(email='student1_2@test.com') - ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) - self.assertEqual(1, len(ce)) - - def test_repeat_enroll(self): - """ - Try to enroll an already enrolled student - """ - - course = self.course - - url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) - response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student0@test.com', 'auto_enroll': 'on'}) - self.assertContains(response, '<td>student0@test.com</td>') - self.assertContains(response, '<td>already enrolled</td>') - - def test_enrollmemt_new_student_autoenroll_off_email_off(self): - """ - Do auto-enroll off, email off test - """ - - course = self.course - - #Run the Enroll students command - url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) - response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student2_1@test.com, student2_2@test.com'}) - - #Check the page output - self.assertContains(response, '<td>student2_1@test.com</td>') - self.assertContains(response, '<td>student2_2@test.com</td>') - self.assertContains(response, '<td>user does not exist, enrollment allowed, pending with auto enrollment off</td>') - - #Check the outbox - self.assertEqual(len(mail.outbox), 0) - - #Check the enrollmentallowed db entries - cea = CourseEnrollmentAllowed.objects.filter(email='student2_1@test.com', course_id=course.id) - self.assertEqual(0, cea[0].auto_enroll) - cea = CourseEnrollmentAllowed.objects.filter(email='student2_2@test.com', course_id=course.id) - self.assertEqual(0, cea[0].auto_enroll) - - #Check there is no enrollment db entry other than for the setup instructor and students - ce = CourseEnrollment.objects.filter(course_id=course.id) - self.assertEqual(4, len(ce)) - - #Create and activate student accounts with same email - self.student = 'student2_1@test.com' - self.password = 'bar' - self.create_account('s2_1', self.student, self.password) - self.activate_user(self.student) - - self.student = 'student2_2@test.com' - self.create_account('s2_2', self.student, self.password) - self.activate_user(self.student) - - #Check students are not enrolled - user = User.objects.get(email='student2_1@test.com') - ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) - self.assertEqual(0, len(ce)) - user = User.objects.get(email='student2_2@test.com') - ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) - self.assertEqual(0, len(ce)) - - def test_get_and_clean_student_list(self): - """ - Clean user input test - """ - - string = "abc@test.com, def@test.com ghi@test.com \n \n jkl@test.com \n mno@test.com " - cleaned_string, cleaned_string_lc = get_and_clean_student_list(string) - self.assertEqual(cleaned_string, ['abc@test.com', 'def@test.com', 'ghi@test.com', 'jkl@test.com', 'mno@test.com']) - - def test_enrollment_email_on(self): - """ - Do email on enroll test - """ - - course = self.course - - #Create activated, but not enrolled, user - UserFactory.create(username="student3_0", email="student3_0@test.com", first_name="Jim", last_name="Tester") - - url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) - response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student3_0@test.com, student3_1@test.com, student3_2@test.com', 'auto_enroll': 'on', 'email_students': 'on'}) - - #Check the page output - self.assertContains(response, '<td>student3_0@test.com</td>') - self.assertContains(response, '<td>student3_1@test.com</td>') - self.assertContains(response, '<td>student3_2@test.com</td>') - self.assertContains(response, '<td>added, email sent</td>') - self.assertContains(response, '<td>user does not exist, enrollment allowed, pending with auto enrollment on, email sent</td>') - - #Check the outbox - self.assertEqual(len(mail.outbox), 3) - self.assertEqual(mail.outbox[0].subject, 'You have been enrolled in MITx/999/Robot_Super_Course') - self.assertEqual(mail.outbox[0].body, "Dear Jim Tester\n\nYou have been enrolled in MITx/999/Robot_Super_Course at edx.org by a member of the course staff. " + - "The course should now appear on your edx.org dashboard.\n\n" + - "To start accessing course materials, please visit https://edx.org/courses/MITx/999/Robot_Super_Course\n\n" + - "----\nThis email was automatically sent from edx.org to Jim Tester") - - self.assertEqual(mail.outbox[1].subject, 'You have been invited to register for MITx/999/Robot_Super_Course') - self.assertEqual(mail.outbox[1].body, "Dear student,\n\nYou have been invited to join MITx/999/Robot_Super_Course at edx.org by a member of the course staff.\n\n" + - "To finish your registration, please visit https://edx.org/register and fill out the registration form.\n" + - "Once you have registered and activated your account, you will see MITx/999/Robot_Super_Course listed on your dashboard.\n\n" + - "----\nThis email was automatically sent from edx.org to student3_1@test.com") - - def test_unenrollment_email_on(self): - """ - Do email on unenroll test - """ - - course = self.course - - #Create invited, but not registered, user - cea = CourseEnrollmentAllowed(email='student4_0@test.com', course_id=course.id) - cea.save() - - url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) - response = self.client.post(url, {'action': 'Unenroll multiple students', 'multiple_students': 'student4_0@test.com, student2@test.com, student3@test.com', 'email_students': 'on'}) - - #Check the page output - self.assertContains(response, '<td>student2@test.com</td>') - self.assertContains(response, '<td>student3@test.com</td>') - self.assertContains(response, '<td>un-enrolled, email sent</td>') - - #Check the outbox - self.assertEqual(len(mail.outbox), 3) - self.assertEqual(mail.outbox[0].subject, 'You have been un-enrolled from MITx/999/Robot_Super_Course') - self.assertEqual(mail.outbox[0].body, "Dear Student,\n\nYou have been un-enrolled from course MITx/999/Robot_Super_Course by a member of the course staff. " + - "Please disregard the invitation previously sent.\n\n" + - "----\nThis email was automatically sent from edx.org to student4_0@test.com") - self.assertEqual(mail.outbox[1].subject, 'You have been un-enrolled from MITx/999/Robot_Super_Course') - - def test_send_mail_to_student(self): - """ - Do invalid mail template test - """ - - d = {'message': 'message_type_that_doesn\'t_exist'} - - send_mail_ret = send_mail_to_student('student0@test.com', d) - self.assertFalse(send_mail_ret) + # if self.user=False, then this will just be used to generate an email. + email = "robot_no_user_exists_with_this_email@edx.org" + if self.user: + user = UserFactory() + email = user.email + if self.enrollment: + cenr = CourseEnrollment.objects.create( + user=user, + course_id=course_id + ) + return EnrollmentObjects(email, user, cenr, None) + else: + return EnrollmentObjects(email, user, None, None) + elif self.allowed: + cea = CourseEnrollmentAllowed.objects.create( + email=email, + course_id=course_id, + auto_enroll=self.auto_enroll, + ) + return EnrollmentObjects(email, None, None, cea) + else: + return EnrollmentObjects(email, None, None, None) diff --git a/lms/djangoapps/instructor/tests/test_download_csv.py b/lms/djangoapps/instructor/tests/test_legacy_download_csv.py similarity index 94% rename from lms/djangoapps/instructor/tests/test_download_csv.py rename to lms/djangoapps/instructor/tests/test_legacy_download_csv.py index 5a934d7a23..b05746f015 100644 --- a/lms/djangoapps/instructor/tests/test_download_csv.py +++ b/lms/djangoapps/instructor/tests/test_legacy_download_csv.py @@ -44,9 +44,10 @@ class TestInstructorDashboardGradeDownloadCSV(LoginEnrollmentTestCase): self.activate_user(self.instructor) def make_instructor(course): + """ Create an instructor for the course. """ group_name = _course_staff_group_name(course.location) - g = Group.objects.create(name=group_name) - g.user_set.add(User.objects.get(email=self.instructor)) + group = Group.objects.create(name=group_name) + group.user_set.add(User.objects.get(email=self.instructor)) make_instructor(self.toy) diff --git a/lms/djangoapps/instructor/tests/test_legacy_enrollment.py b/lms/djangoapps/instructor/tests/test_legacy_enrollment.py new file mode 100644 index 0000000000..c6ee82bfb1 --- /dev/null +++ b/lms/djangoapps/instructor/tests/test_legacy_enrollment.py @@ -0,0 +1,258 @@ +""" +Unit tests for enrollment methods in views.py + +""" + +from django.test.utils import override_settings +from django.contrib.auth.models import User +from django.core.urlresolvers import reverse +from courseware.tests.helpers import LoginEnrollmentTestCase +from courseware.tests.modulestore_config import TEST_DATA_MONGO_MODULESTORE +from xmodule.modulestore.tests.factories import CourseFactory +from student.tests.factories import UserFactory, CourseEnrollmentFactory, AdminFactory +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase +from student.models import CourseEnrollment, CourseEnrollmentAllowed +from instructor.views.legacy import get_and_clean_student_list, send_mail_to_student +from django.core import mail + +USER_COUNT = 4 + + +@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) +class TestInstructorEnrollsStudent(ModuleStoreTestCase, LoginEnrollmentTestCase): + """ + Check Enrollment/Unenrollment with/without auto-enrollment on activation and with/without email notification + """ + + def setUp(self): + + instructor = AdminFactory.create() + self.client.login(username=instructor.username, password='test') + + self.course = CourseFactory.create() + + self.users = [ + UserFactory.create(username="student%d" % i, email="student%d@test.com" % i) + for i in xrange(USER_COUNT) + ] + + for user in self.users: + CourseEnrollmentFactory.create(user=user, course_id=self.course.id) + + # Empty the test outbox + mail.outbox = [] + + def test_unenrollment_email_off(self): + """ + Do un-enrollment email off test + """ + + course = self.course + + # Run the Un-enroll students command + url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) + response = self.client.post(url, {'action': 'Unenroll multiple students', 'multiple_students': 'student0@test.com student1@test.com'}) + + # Check the page output + self.assertContains(response, '<td>student0@test.com</td>') + self.assertContains(response, '<td>student1@test.com</td>') + self.assertContains(response, '<td>un-enrolled</td>') + + # Check the enrollment table + user = User.objects.get(email='student0@test.com') + ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) + self.assertEqual(0, len(ce)) + + user = User.objects.get(email='student1@test.com') + ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) + self.assertEqual(0, len(ce)) + + # Check the outbox + self.assertEqual(len(mail.outbox), 0) + + def test_enrollment_new_student_autoenroll_on_email_off(self): + """ + Do auto-enroll on, email off test + """ + + course = self.course + + # Run the Enroll students command + url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) + response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student1_1@test.com, student1_2@test.com', 'auto_enroll': 'on'}) + + # Check the page output + self.assertContains(response, '<td>student1_1@test.com</td>') + self.assertContains(response, '<td>student1_2@test.com</td>') + self.assertContains(response, '<td>user does not exist, enrollment allowed, pending with auto enrollment on</td>') + + # Check the outbox + self.assertEqual(len(mail.outbox), 0) + + # Check the enrollmentallowed db entries + cea = CourseEnrollmentAllowed.objects.filter(email='student1_1@test.com', course_id=course.id) + self.assertEqual(1, cea[0].auto_enroll) + cea = CourseEnrollmentAllowed.objects.filter(email='student1_2@test.com', course_id=course.id) + self.assertEqual(1, cea[0].auto_enroll) + + # Check there is no enrollment db entry other than for the other students + ce = CourseEnrollment.objects.filter(course_id=course.id) + self.assertEqual(4, len(ce)) + + # Create and activate student accounts with same email + self.student1 = 'student1_1@test.com' + self.password = 'bar' + self.create_account('s1_1', self.student1, self.password) + self.activate_user(self.student1) + + self.student2 = 'student1_2@test.com' + self.create_account('s1_2', self.student2, self.password) + self.activate_user(self.student2) + + # Check students are enrolled + user = User.objects.get(email='student1_1@test.com') + ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) + self.assertEqual(1, len(ce)) + + user = User.objects.get(email='student1_2@test.com') + ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) + self.assertEqual(1, len(ce)) + + def test_repeat_enroll(self): + """ + Try to enroll an already enrolled student + """ + + course = self.course + + url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) + response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student0@test.com', 'auto_enroll': 'on'}) + self.assertContains(response, '<td>student0@test.com</td>') + self.assertContains(response, '<td>already enrolled</td>') + + def test_enrollmemt_new_student_autoenroll_off_email_off(self): + """ + Do auto-enroll off, email off test + """ + + course = self.course + + # Run the Enroll students command + url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) + response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student2_1@test.com, student2_2@test.com'}) + + # Check the page output + self.assertContains(response, '<td>student2_1@test.com</td>') + self.assertContains(response, '<td>student2_2@test.com</td>') + self.assertContains(response, '<td>user does not exist, enrollment allowed, pending with auto enrollment off</td>') + + # Check the outbox + self.assertEqual(len(mail.outbox), 0) + + # Check the enrollmentallowed db entries + cea = CourseEnrollmentAllowed.objects.filter(email='student2_1@test.com', course_id=course.id) + self.assertEqual(0, cea[0].auto_enroll) + cea = CourseEnrollmentAllowed.objects.filter(email='student2_2@test.com', course_id=course.id) + self.assertEqual(0, cea[0].auto_enroll) + + # Check there is no enrollment db entry other than for the setup instructor and students + ce = CourseEnrollment.objects.filter(course_id=course.id) + self.assertEqual(4, len(ce)) + + # Create and activate student accounts with same email + self.student = 'student2_1@test.com' + self.password = 'bar' + self.create_account('s2_1', self.student, self.password) + self.activate_user(self.student) + + self.student = 'student2_2@test.com' + self.create_account('s2_2', self.student, self.password) + self.activate_user(self.student) + + # Check students are not enrolled + user = User.objects.get(email='student2_1@test.com') + ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) + self.assertEqual(0, len(ce)) + user = User.objects.get(email='student2_2@test.com') + ce = CourseEnrollment.objects.filter(course_id=course.id, user=user) + self.assertEqual(0, len(ce)) + + def test_get_and_clean_student_list(self): + """ + Clean user input test + """ + + string = "abc@test.com, def@test.com ghi@test.com \n \n jkl@test.com \n mno@test.com " + cleaned_string, cleaned_string_lc = get_and_clean_student_list(string) + self.assertEqual(cleaned_string, ['abc@test.com', 'def@test.com', 'ghi@test.com', 'jkl@test.com', 'mno@test.com']) + + def test_enrollment_email_on(self): + """ + Do email on enroll test + """ + + course = self.course + + # Create activated, but not enrolled, user + UserFactory.create(username="student3_0", email="student3_0@test.com", first_name="Jim", last_name="Tester") + + url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) + response = self.client.post(url, {'action': 'Enroll multiple students', 'multiple_students': 'student3_0@test.com, student3_1@test.com, student3_2@test.com', 'auto_enroll': 'on', 'email_students': 'on'}) + + # Check the page output + self.assertContains(response, '<td>student3_0@test.com</td>') + self.assertContains(response, '<td>student3_1@test.com</td>') + self.assertContains(response, '<td>student3_2@test.com</td>') + self.assertContains(response, '<td>added, email sent</td>') + self.assertContains(response, '<td>user does not exist, enrollment allowed, pending with auto enrollment on, email sent</td>') + + # Check the outbox + self.assertEqual(len(mail.outbox), 3) + self.assertEqual(mail.outbox[0].subject, 'You have been enrolled in MITx/999/Robot_Super_Course') + self.assertEqual(mail.outbox[0].body, "Dear Jim Tester\n\nYou have been enrolled in MITx/999/Robot_Super_Course at edx.org by a member of the course staff. " + + "The course should now appear on your edx.org dashboard.\n\n" + + "To start accessing course materials, please visit https://edx.org/courses/MITx/999/Robot_Super_Course\n\n" + + "----\nThis email was automatically sent from edx.org to Jim Tester") + + self.assertEqual(mail.outbox[1].subject, 'You have been invited to register for MITx/999/Robot_Super_Course') + self.assertEqual(mail.outbox[1].body, "Dear student,\n\nYou have been invited to join MITx/999/Robot_Super_Course at edx.org by a member of the course staff.\n\n" + + "To finish your registration, please visit https://edx.org/register and fill out the registration form.\n" + + "Once you have registered and activated your account, you will see MITx/999/Robot_Super_Course listed on your dashboard.\n\n" + + "----\nThis email was automatically sent from edx.org to student3_1@test.com") + + def test_unenrollment_email_on(self): + """ + Do email on unenroll test + """ + + course = self.course + + # Create invited, but not registered, user + cea = CourseEnrollmentAllowed(email='student4_0@test.com', course_id=course.id) + cea.save() + + url = reverse('instructor_dashboard', kwargs={'course_id': course.id}) + response = self.client.post(url, {'action': 'Unenroll multiple students', 'multiple_students': 'student4_0@test.com, student2@test.com, student3@test.com', 'email_students': 'on'}) + + # Check the page output + self.assertContains(response, '<td>student2@test.com</td>') + self.assertContains(response, '<td>student3@test.com</td>') + self.assertContains(response, '<td>un-enrolled, email sent</td>') + + # Check the outbox + self.assertEqual(len(mail.outbox), 3) + self.assertEqual(mail.outbox[0].subject, 'You have been un-enrolled from MITx/999/Robot_Super_Course') + self.assertEqual(mail.outbox[0].body, "Dear Student,\n\nYou have been un-enrolled from course MITx/999/Robot_Super_Course by a member of the course staff. " + + "Please disregard the invitation previously sent.\n\n" + + "----\nThis email was automatically sent from edx.org to student4_0@test.com") + self.assertEqual(mail.outbox[1].subject, 'You have been un-enrolled from MITx/999/Robot_Super_Course') + + def test_send_mail_to_student(self): + """ + Do invalid mail template test + """ + + d = {'message': 'message_type_that_doesn\'t_exist'} + + send_mail_ret = send_mail_to_student('student0@test.com', d) + self.assertFalse(send_mail_ret) diff --git a/lms/djangoapps/instructor/tests/test_forum_admin.py b/lms/djangoapps/instructor/tests/test_legacy_forum_admin.py similarity index 100% rename from lms/djangoapps/instructor/tests/test_forum_admin.py rename to lms/djangoapps/instructor/tests/test_legacy_forum_admin.py diff --git a/lms/djangoapps/instructor/tests/test_gradebook.py b/lms/djangoapps/instructor/tests/test_legacy_gradebook.py similarity index 98% rename from lms/djangoapps/instructor/tests/test_gradebook.py rename to lms/djangoapps/instructor/tests/test_legacy_gradebook.py index 2677df59b2..8be648a930 100644 --- a/lms/djangoapps/instructor/tests/test_gradebook.py +++ b/lms/djangoapps/instructor/tests/test_legacy_gradebook.py @@ -42,7 +42,7 @@ class TestGradebook(ModuleStoreTestCase): metadata={'graded': True, 'format': 'Homework'} ) - self.users = [UserFactory() for _ in xrange(USER_COUNT)] + self.users = [UserFactory.create() for _ in xrange(USER_COUNT)] for user in self.users: CourseEnrollmentFactory.create(user=user, course_id=self.course.id) diff --git a/lms/djangoapps/instructor/tests/test_xss.py b/lms/djangoapps/instructor/tests/test_legacy_xss.py similarity index 95% rename from lms/djangoapps/instructor/tests/test_xss.py rename to lms/djangoapps/instructor/tests/test_legacy_xss.py index 87bd2ee16b..7df6511b3c 100644 --- a/lms/djangoapps/instructor/tests/test_xss.py +++ b/lms/djangoapps/instructor/tests/test_legacy_xss.py @@ -12,7 +12,7 @@ from student.tests.factories import UserFactory, CourseEnrollmentFactory from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory -from instructor import views +from instructor.views import legacy @override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) class TestXss(ModuleStoreTestCase): @@ -47,7 +47,7 @@ class TestXss(ModuleStoreTestCase): ) req.user = self._instructor req.session = {} - resp = views.instructor_dashboard(req, self._course.id) + resp = legacy.instructor_dashboard(req, self._course.id) respUnicode = resp.content.decode(settings.DEFAULT_CHARSET) self.assertNotIn(self._evil_student.profile.name, respUnicode) self.assertIn(escape(self._evil_student.profile.name), respUnicode) diff --git a/lms/djangoapps/instructor/views/__init__.py b/lms/djangoapps/instructor/views/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py new file mode 100644 index 0000000000..7655fd5b13 --- /dev/null +++ b/lms/djangoapps/instructor/views/api.py @@ -0,0 +1,759 @@ +""" +Instructor Dashboard API views + +JSON views which the instructor dashboard requests. + +Many of these GETs may become PUTs in the future. +""" + +import re +import logging +from django_future.csrf import ensure_csrf_cookie +from django.views.decorators.cache import cache_control +from django.core.urlresolvers import reverse +from django.utils.translation import ugettext as _ +from django.http import HttpResponseBadRequest, HttpResponseForbidden +from util.json_request import JsonResponse + +from courseware.access import has_access +from courseware.courses import get_course_with_access, get_course_by_id +from django.contrib.auth.models import User +from django_comment_client.utils import has_forum_access +from django_comment_common.models import (Role, + FORUM_ROLE_ADMINISTRATOR, + FORUM_ROLE_MODERATOR, + FORUM_ROLE_COMMUNITY_TA) + +from courseware.models import StudentModule +import instructor_task.api +from instructor_task.api_helper import AlreadyRunningError +import instructor.enrollment as enrollment +from instructor.enrollment import enroll_email, unenroll_email +import instructor.access as access +import analytics.basic +import analytics.distributions +import analytics.csvs + +log = logging.getLogger(__name__) + + +def common_exceptions_400(func): + """ + Catches common exceptions and renders matching 400 errors. + (decorator without arguments) + """ + def wrapped(request, *args, **kwargs): # pylint: disable=C0111 + use_json = (request.is_ajax() or + request.META.get("HTTP_ACCEPT", "").startswith("application/json")) + try: + return func(request, *args, **kwargs) + except User.DoesNotExist: + message = _("User does not exist.") + if use_json: + return JsonResponse({"error": message}, 400) + else: + return HttpResponseBadRequest(message) + except AlreadyRunningError: + message = _("Task is already running.") + if use_json: + return JsonResponse({"error": message}, 400) + else: + return HttpResponseBadRequest(message) + return wrapped + + +def require_query_params(*args, **kwargs): + """ + Checks for required paremters or renders a 400 error. + (decorator with arguments) + + `args` is a *list of required GET parameter names. + `kwargs` is a **dict of required GET parameter names + to string explanations of the parameter + """ + required_params = [] + required_params += [(arg, None) for arg in args] + required_params += [(key, kwargs[key]) for key in kwargs] + # required_params = e.g. [('action', 'enroll or unenroll'), ['emails', None]] + + def decorator(func): # pylint: disable=C0111 + def wrapped(*args, **kwargs): # pylint: disable=C0111 + request = args[0] + + error_response_data = { + 'error': 'Missing required query parameter(s)', + 'parameters': [], + 'info': {}, + } + + for (param, extra) in required_params: + default = object() + if request.GET.get(param, default) == default: + error_response_data['parameters'] += [param] + error_response_data['info'][param] = extra + + if len(error_response_data['parameters']) > 0: + return JsonResponse(error_response_data, status=400) + else: + return func(*args, **kwargs) + return wrapped + return decorator + + +def require_level(level): + """ + Decorator with argument that requires an access level of the requesting + user. If the requirement is not satisfied, returns an + HttpResponseForbidden (403). + + Assumes that request is in args[0]. + Assumes that course_id is in kwargs['course_id']. + + `level` is in ['instructor', 'staff'] + if `level` is 'staff', instructors will also be allowed, even + if they are not int he staff group. + """ + if level not in ['instructor', 'staff']: + raise ValueError("unrecognized level '{}'".format(level)) + + def decorator(func): # pylint: disable=C0111 + def wrapped(*args, **kwargs): # pylint: disable=C0111 + request = args[0] + course = get_course_by_id(kwargs['course_id']) + + if has_access(request.user, course, level): + return func(*args, **kwargs) + else: + return HttpResponseForbidden() + return wrapped + return decorator + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('staff') +@require_query_params(action="enroll or unenroll", emails="stringified list of emails") +def students_update_enrollment(request, course_id): + """ + Enroll or unenroll students by email. + Requires staff access. + + Query Parameters: + - action in ['enroll', 'unenroll'] + - emails is string containing a list of emails separated by anything split_input_list can handle. + - auto_enroll is a boolean (defaults to false) + If auto_enroll is false, students will be allowed to enroll. + If auto_enroll is true, students will be enroled as soon as they register. + + Returns an analog to this JSON structure: { + "action": "enroll", + "auto_enroll": false, + "results": [ + { + "email": "testemail@test.org", + "before": { + "enrollment": false, + "auto_enroll": false, + "user": true, + "allowed": false + }, + "after": { + "enrollment": true, + "auto_enroll": false, + "user": true, + "allowed": false + } + } + ] + } + """ + action = request.GET.get('action') + emails_raw = request.GET.get('emails') + emails = _split_input_list(emails_raw) + auto_enroll = request.GET.get('auto_enroll') in ['true', 'True', True] + + results = [] + for email in emails: + try: + if action == 'enroll': + before, after = enroll_email(course_id, email, auto_enroll) + elif action == 'unenroll': + before, after = unenroll_email(course_id, email) + else: + return HttpResponseBadRequest("Unrecognized action '{}'".format(action)) + + results.append({ + 'email': email, + 'before': before.to_dict(), + 'after': after.to_dict(), + }) + # catch and log any exceptions + # so that one error doesn't cause a 500. + except Exception as exc: # pylint: disable=W0703 + log.exception("Error while #{}ing student") + log.exception(exc) + results.append({ + 'email': email, + 'error': True, + }) + + response_payload = { + 'action': action, + 'results': results, + 'auto_enroll': auto_enroll, + } + return JsonResponse(response_payload) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('instructor') +@common_exceptions_400 +@require_query_params( + email="user email", + rolename="'instructor', 'staff', or 'beta'", + action="'allow' or 'revoke'" +) +def modify_access(request, course_id): + """ + Modify staff/instructor access of other user. + Requires instructor access. + + NOTE: instructors cannot remove their own instructor access. + + Query parameters: + email is the target users email + rolename is one of ['instructor', 'staff', 'beta'] + action is one of ['allow', 'revoke'] + """ + course = get_course_with_access( + request.user, course_id, 'instructor', depth=None + ) + + email = request.GET.get('email') + rolename = request.GET.get('rolename') + action = request.GET.get('action') + + if not rolename in ['instructor', 'staff', 'beta']: + return HttpResponseBadRequest( + "unknown rolename '{}'".format(rolename) + ) + + user = User.objects.get(email=email) + + # disallow instructors from removing their own instructor access. + if rolename == 'instructor' and user == request.user and action != 'allow': + return HttpResponseBadRequest( + "An instructor cannot remove their own instructor access." + ) + + if action == 'allow': + access.allow_access(course, user, rolename) + elif action == 'revoke': + access.revoke_access(course, user, rolename) + else: + return HttpResponseBadRequest("unrecognized action '{}'".format(action)) + + response_payload = { + 'email': email, + 'rolename': rolename, + 'action': action, + 'success': 'yes', + } + return JsonResponse(response_payload) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('instructor') +@require_query_params(rolename="'instructor', 'staff', or 'beta'") +def list_course_role_members(request, course_id): + """ + List instructors and staff. + Requires instructor access. + + rolename is one of ['instructor', 'staff', 'beta'] + + Returns JSON of the form { + "course_id": "some/course/id", + "staff": [ + { + "username": "staff1", + "email": "staff1@example.org", + "first_name": "Joe", + "last_name": "Shmoe", + } + ] + } + """ + course = get_course_with_access( + request.user, course_id, 'instructor', depth=None + ) + + rolename = request.GET.get('rolename') + + if not rolename in ['instructor', 'staff', 'beta']: + return HttpResponseBadRequest() + + def extract_user_info(user): + """ convert user into dicts for json view """ + return { + 'username': user.username, + 'email': user.email, + 'first_name': user.first_name, + 'last_name': user.last_name, + } + + response_payload = { + 'course_id': course_id, + rolename: map(extract_user_info, access.list_with_level( + course, rolename + )), + } + return JsonResponse(response_payload) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('staff') +def get_grading_config(request, course_id): + """ + Respond with json which contains a html formatted grade summary. + """ + course = get_course_with_access( + request.user, course_id, 'staff', depth=None + ) + grading_config_summary = analytics.basic.dump_grading_context(course) + + response_payload = { + 'course_id': course_id, + 'grading_config_summary': grading_config_summary, + } + return JsonResponse(response_payload) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('staff') +def get_students_features(request, course_id, csv=False): # pylint: disable=W0613 + """ + Respond with json which contains a summary of all enrolled students profile information. + + Responds with JSON + {"students": [{-student-info-}, ...]} + + TO DO accept requests for different attribute sets. + """ + available_features = analytics.basic.AVAILABLE_FEATURES + query_features = ['username', 'name', 'email', 'language', 'location', 'year_of_birth', 'gender', + 'level_of_education', 'mailing_address', 'goals'] + + student_data = analytics.basic.enrolled_students_features(course_id, query_features) + + if not csv: + response_payload = { + 'course_id': course_id, + 'students': student_data, + 'students_count': len(student_data), + 'queried_features': query_features, + 'available_features': available_features, + } + return JsonResponse(response_payload) + else: + header, datarows = analytics.csvs.format_dictlist(student_data, query_features) + return analytics.csvs.create_csv_response("enrolled_profiles.csv", header, datarows) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('staff') +def get_distribution(request, course_id): + """ + Respond with json of the distribution of students over selected features which have choices. + + Ask for a feature through the `feature` query parameter. + If no `feature` is supplied, will return response with an + empty response['feature_results'] object. + A list of available will be available in the response['available_features'] + """ + feature = request.GET.get('feature') + # alternate notations of None + if feature in (None, 'null', ''): + feature = None + else: + feature = str(feature) + + available_features = analytics.distributions.AVAILABLE_PROFILE_FEATURES + # allow None so that requests for no feature can list available features + if not feature in available_features + (None,): + return HttpResponseBadRequest( + "feature '{}' not available.".format(feature) + ) + + response_payload = { + 'course_id': course_id, + 'queried_feature': feature, + 'available_features': available_features, + 'feature_display_names': analytics.distributions.DISPLAY_NAMES, + } + + p_dist = None + if not feature is None: + p_dist = analytics.distributions.profile_distribution(course_id, feature) + response_payload['feature_results'] = { + 'feature': p_dist.feature, + 'feature_display_name': p_dist.feature_display_name, + 'data': p_dist.data, + 'type': p_dist.type, + } + + if p_dist.type == 'EASY_CHOICE': + response_payload['feature_results']['choices_display_names'] = p_dist.choices_display_names + + return JsonResponse(response_payload) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@common_exceptions_400 +@require_level('staff') +@require_query_params( + student_email="email of student for whom to get progress url" +) +def get_student_progress_url(request, course_id): + """ + Get the progress url of a student. + Limited to staff access. + + Takes query paremeter student_email and if the student exists + returns e.g. { + 'progress_url': '/../...' + } + """ + student_email = request.GET.get('student_email') + user = User.objects.get(email=student_email) + + progress_url = reverse('student_progress', kwargs={'course_id': course_id, 'student_id': user.id}) + + response_payload = { + 'course_id': course_id, + 'progress_url': progress_url, + } + return JsonResponse(response_payload) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('staff') +@require_query_params( + problem_to_reset="problem urlname to reset" +) +@common_exceptions_400 +def reset_student_attempts(request, course_id): + """ + + Resets a students attempts counter or starts a task to reset all students + attempts counters. Optionally deletes student state for a problem. Limited + to staff access. Some sub-methods limited to instructor access. + + Takes some of the following query paremeters + - problem_to_reset is a urlname of a problem + - student_email is an email + - all_students is a boolean + requires instructor access + mutually exclusive with delete_module + mutually exclusive with delete_module + - delete_module is a boolean + requires instructor access + mutually exclusive with all_students + """ + course = get_course_with_access( + request.user, course_id, 'staff', depth=None + ) + + problem_to_reset = request.GET.get('problem_to_reset') + student_email = request.GET.get('student_email') + all_students = request.GET.get('all_students', False) in ['true', 'True', True] + delete_module = request.GET.get('delete_module', False) in ['true', 'True', True] + + # parameter combinations + if all_students and student_email: + return HttpResponseBadRequest( + "all_students and student_email are mutually exclusive." + ) + if all_students and delete_module: + return HttpResponseBadRequest( + "all_students and delete_module are mutually exclusive." + ) + + # instructor authorization + if all_students or delete_module: + if not has_access(request.user, course, 'instructor'): + return HttpResponseForbidden("Requires instructor access.") + + module_state_key = _msk_from_problem_urlname(course_id, problem_to_reset) + + response_payload = {} + response_payload['problem_to_reset'] = problem_to_reset + + if student_email: + try: + student = User.objects.get(email=student_email) + enrollment.reset_student_attempts(course_id, student, module_state_key, delete_module=delete_module) + except StudentModule.DoesNotExist: + return HttpResponseBadRequest("Module does not exist.") + elif all_students: + instructor_task.api.submit_reset_problem_attempts_for_all_students(request, course_id, module_state_key) + response_payload['task'] = 'created' + else: + return HttpResponseBadRequest() + + return JsonResponse(response_payload) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('instructor') +@require_query_params(problem_to_reset="problem urlname to reset") +@common_exceptions_400 +def rescore_problem(request, course_id): + """ + Starts a background process a students attempts counter. Optionally deletes student state for a problem. + Limited to instructor access. + + Takes either of the following query paremeters + - problem_to_reset is a urlname of a problem + - student_email is an email + - all_students is a boolean + + all_students and student_email cannot both be present. + """ + problem_to_reset = request.GET.get('problem_to_reset') + student_email = request.GET.get('student_email', False) + all_students = request.GET.get('all_students') in ['true', 'True', True] + + if not (problem_to_reset and (all_students or student_email)): + return HttpResponseBadRequest("Missing query parameters.") + + if all_students and student_email: + return HttpResponseBadRequest( + "Cannot rescore with all_students and student_email." + ) + + module_state_key = _msk_from_problem_urlname(course_id, problem_to_reset) + + response_payload = {} + response_payload['problem_to_reset'] = problem_to_reset + + if student_email: + response_payload['student_email'] = student_email + student = User.objects.get(email=student_email) + instructor_task.api.submit_rescore_problem_for_student(request, course_id, module_state_key, student) + response_payload['task'] = 'created' + elif all_students: + instructor_task.api.submit_rescore_problem_for_all_students(request, course_id, module_state_key) + response_payload['task'] = 'created' + else: + return HttpResponseBadRequest() + + return JsonResponse(response_payload) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('instructor') +def list_instructor_tasks(request, course_id): + """ + List instructor tasks. + Limited to instructor access. + + Takes optional query paremeters. + - With no arguments, lists running tasks. + - `problem_urlname` lists task history for problem + - `problem_urlname` and `student_email` lists task + history for problem AND student (intersection) + """ + problem_urlname = request.GET.get('problem_urlname', False) + student_email = request.GET.get('student_email', False) + + if student_email and not problem_urlname: + return HttpResponseBadRequest( + "student_email must accompany problem_urlname" + ) + + if problem_urlname: + module_state_key = _msk_from_problem_urlname(course_id, problem_urlname) + if student_email: + student = User.objects.get(email=student_email) + tasks = instructor_task.api.get_instructor_task_history(course_id, module_state_key, student) + else: + tasks = instructor_task.api.get_instructor_task_history(course_id, module_state_key) + else: + tasks = instructor_task.api.get_running_instructor_tasks(course_id) + + def extract_task_features(task): + """ Convert task to dict for json rendering """ + features = ['task_type', 'task_input', 'task_id', 'requester', 'created', 'task_state'] + return dict((feature, str(getattr(task, feature))) for feature in features) + + response_payload = { + 'tasks': map(extract_task_features, tasks), + } + return JsonResponse(response_payload) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('staff') +@require_query_params('rolename') +def list_forum_members(request, course_id): + """ + Lists forum members of a certain rolename. + Limited to staff access. + + The requesting user must be at least staff. + Staff forum admins can access all roles EXCEPT for FORUM_ROLE_ADMINISTRATOR + which is limited to instructors. + + Takes query parameter `rolename`. + """ + course = get_course_by_id(course_id) + has_instructor_access = has_access(request.user, course, 'instructor') + has_forum_admin = has_forum_access( + request.user, course_id, FORUM_ROLE_ADMINISTRATOR + ) + + rolename = request.GET.get('rolename') + + # default roles require either (staff & forum admin) or (instructor) + if not (has_forum_admin or has_instructor_access): + return HttpResponseBadRequest( + "Operation requires staff & forum admin or instructor access" + ) + + # EXCEPT FORUM_ROLE_ADMINISTRATOR requires (instructor) + if rolename == FORUM_ROLE_ADMINISTRATOR and not has_instructor_access: + return HttpResponseBadRequest("Operation requires instructor access.") + + # filter out unsupported for roles + if not rolename in [FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_MODERATOR, FORUM_ROLE_COMMUNITY_TA]: + return HttpResponseBadRequest("Unrecognized rolename '{}'.".format(rolename)) + + try: + role = Role.objects.get(name=rolename, course_id=course_id) + users = role.users.all().order_by('username') + except Role.DoesNotExist: + users = [] + + def extract_user_info(user): + """ Convert user to dict for json rendering. """ + return { + 'username': user.username, + 'email': user.email, + 'first_name': user.first_name, + 'last_name': user.last_name, + } + + response_payload = { + 'course_id': course_id, + rolename: map(extract_user_info, users), + } + return JsonResponse(response_payload) + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +@require_level('staff') +@require_query_params( + email="the target users email", + rolename="the forum role", + action="'allow' or 'revoke'", +) +@common_exceptions_400 +def update_forum_role_membership(request, course_id): + """ + Modify user's forum role. + + The requesting user must be at least staff. + Staff forum admins can access all roles EXCEPT for FORUM_ROLE_ADMINISTRATOR + which is limited to instructors. + No one can revoke an instructors FORUM_ROLE_ADMINISTRATOR status. + + Query parameters: + - `email` is the target users email + - `rolename` is one of [FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_MODERATOR, FORUM_ROLE_COMMUNITY_TA] + - `action` is one of ['allow', 'revoke'] + """ + course = get_course_by_id(course_id) + has_instructor_access = has_access(request.user, course, 'instructor') + has_forum_admin = has_forum_access( + request.user, course_id, FORUM_ROLE_ADMINISTRATOR + ) + + email = request.GET.get('email') + rolename = request.GET.get('rolename') + action = request.GET.get('action') + + # default roles require either (staff & forum admin) or (instructor) + if not (has_forum_admin or has_instructor_access): + return HttpResponseBadRequest( + "Operation requires staff & forum admin or instructor access" + ) + + # EXCEPT FORUM_ROLE_ADMINISTRATOR requires (instructor) + if rolename == FORUM_ROLE_ADMINISTRATOR and not has_instructor_access: + return HttpResponseBadRequest("Operation requires instructor access.") + + if not rolename in [FORUM_ROLE_ADMINISTRATOR, FORUM_ROLE_MODERATOR, FORUM_ROLE_COMMUNITY_TA]: + return HttpResponseBadRequest("Unrecognized rolename '{}'.".format(rolename)) + + user = User.objects.get(email=email) + target_is_instructor = has_access(user, course, 'instructor') + # cannot revoke instructor + if target_is_instructor and action == 'revoke' and rolename == FORUM_ROLE_ADMINISTRATOR: + return HttpResponseBadRequest("Cannot revoke instructor forum admin privelages.") + + try: + access.update_forum_role_membership(course_id, user, rolename, action) + except Role.DoesNotExist: + return HttpResponseBadRequest("Role does not exist.") + + response_payload = { + 'course_id': course_id, + 'action': action, + } + return JsonResponse(response_payload) + + +def _split_input_list(str_list): + """ + Separate out individual student email from the comma, or space separated string. + + e.g. + in: "Lorem@ipsum.dolor, sit@amet.consectetur\nadipiscing@elit.Aenean\r convallis@at.lacus\r, ut@lacinia.Sed" + out: ['Lorem@ipsum.dolor', 'sit@amet.consectetur', 'adipiscing@elit.Aenean', 'convallis@at.lacus', 'ut@lacinia.Sed'] + + `str_list` is a string coming from an input text area + returns a list of separated values + """ + + new_list = re.split(r'[\n\r\s,]', str_list) + new_list = [s.strip() for s in new_list] + new_list = [s for s in new_list if s != ''] + + return new_list + + +def _msk_from_problem_urlname(course_id, urlname): + """ + Convert a 'problem urlname' (name that instructor's input into dashboard) + to a module state key (db field) + """ + if urlname.endswith(".xml"): + urlname = urlname[:-4] + + urlname = "problem/" + urlname + + (org, course_name, __) = course_id.split("/") + module_state_key = "i4x://" + org + "/" + course_name + "/" + urlname + return module_state_key diff --git a/lms/djangoapps/instructor/views/api_urls.py b/lms/djangoapps/instructor/views/api_urls.py new file mode 100644 index 0000000000..8515b60524 --- /dev/null +++ b/lms/djangoapps/instructor/views/api_urls.py @@ -0,0 +1,33 @@ +""" +Instructor API endpoint urls. +""" + + +from django.conf.urls import patterns, url + +urlpatterns = patterns('', # nopep8 + url(r'^students_update_enrollment$', + 'instructor.views.api.students_update_enrollment', name="students_update_enrollment"), + url(r'^list_course_role_members$', + 'instructor.views.api.list_course_role_members', name="list_course_role_members"), + url(r'^modify_access$', + 'instructor.views.api.modify_access', name="modify_access"), + url(r'^get_grading_config$', + 'instructor.views.api.get_grading_config', name="get_grading_config"), + url(r'^get_students_features(?P<csv>/csv)?$', + 'instructor.views.api.get_students_features', name="get_students_features"), + url(r'^get_distribution$', + 'instructor.views.api.get_distribution', name="get_distribution"), + url(r'^get_student_progress_url$', + 'instructor.views.api.get_student_progress_url', name="get_student_progress_url"), + url(r'^reset_student_attempts$', + 'instructor.views.api.reset_student_attempts', name="reset_student_attempts"), + url(r'^rescore_problem$', + 'instructor.views.api.rescore_problem', name="rescore_problem"), + url(r'^list_instructor_tasks$', + 'instructor.views.api.list_instructor_tasks', name="list_instructor_tasks"), + url(r'^list_forum_members$', + 'instructor.views.api.list_forum_members', name="list_forum_members"), + url(r'^update_forum_role_membership$', + 'instructor.views.api.update_forum_role_membership', name="update_forum_role_membership"), +) diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py new file mode 100644 index 0000000000..ca89545ec0 --- /dev/null +++ b/lms/djangoapps/instructor/views/instructor_dashboard.py @@ -0,0 +1,146 @@ +""" +Instructor Dashboard Views +""" + +from django_future.csrf import ensure_csrf_cookie +from django.views.decorators.cache import cache_control +from mitxmako.shortcuts import render_to_response +from django.core.urlresolvers import reverse +from django.utils.html import escape +from django.http import Http404 + +from courseware.access import has_access +from courseware.courses import get_course_by_id +from django_comment_client.utils import has_forum_access +from django_comment_common.models import FORUM_ROLE_ADMINISTRATOR +from xmodule.modulestore.django import modulestore +from student.models import CourseEnrollment + + +@ensure_csrf_cookie +@cache_control(no_cache=True, no_store=True, must_revalidate=True) +def instructor_dashboard_2(request, course_id): + """ Display the instructor dashboard for a course. """ + + course = get_course_by_id(course_id, depth=None) + + access = { + 'admin': request.user.is_staff, + 'instructor': has_access(request.user, course, 'instructor'), + 'staff': has_access(request.user, course, 'staff'), + 'forum_admin': has_forum_access( + request.user, course_id, FORUM_ROLE_ADMINISTRATOR + ), + } + + if not access['staff']: + raise Http404() + + sections = [ + _section_course_info(course_id), + _section_membership(course_id, access), + _section_student_admin(course_id, access), + _section_data_download(course_id), + _section_analytics(course_id), + ] + + context = { + 'course': course, + 'old_dashboard_url': reverse('instructor_dashboard', kwargs={'course_id': course_id}), + 'sections': sections, + } + + return render_to_response('instructor/instructor_dashboard_2/instructor_dashboard_2.html', context) + + +""" +Section functions starting with _section return a dictionary of section data. + +The dictionary must include at least { + 'section_key': 'circus_expo' + 'section_display_name': 'Circus Expo' +} + +section_key will be used as a css attribute, javascript tie-in, and template import filename. +section_display_name will be used to generate link titles in the nav bar. +""" # pylint: disable=W0105 + + +def _section_course_info(course_id): + """ Provide data for the corresponding dashboard section """ + course = get_course_by_id(course_id, depth=None) + + section_data = {} + section_data['section_key'] = 'course_info' + section_data['section_display_name'] = 'Course Info' + section_data['course_id'] = course_id + section_data['course_display_name'] = course.display_name + section_data['enrollment_count'] = CourseEnrollment.objects.filter(course_id=course_id).count() + section_data['has_started'] = course.has_started() + section_data['has_ended'] = course.has_ended() + + try: + advance = lambda memo, (letter, score): "{}: {}, ".format(letter, score) + memo + section_data['grade_cutoffs'] = reduce(advance, course.grade_cutoffs.items(), "")[:-2] + except Exception: + section_data['grade_cutoffs'] = "Not Available" + # section_data['offline_grades'] = offline_grades_available(course_id) + + try: + section_data['course_errors'] = [(escape(a), '') for (a, _) in modulestore().get_item_errors(course.location)] + except Exception: + section_data['course_errors'] = [('Error fetching errors', '')] + + return section_data + + +def _section_membership(course_id, access): + """ Provide data for the corresponding dashboard section """ + section_data = { + 'section_key': 'membership', + 'section_display_name': 'Membership', + 'access': access, + 'enroll_button_url': reverse('students_update_enrollment', kwargs={'course_id': course_id}), + 'unenroll_button_url': reverse('students_update_enrollment', kwargs={'course_id': course_id}), + 'list_course_role_members_url': reverse('list_course_role_members', kwargs={'course_id': course_id}), + 'modify_access_url': reverse('modify_access', kwargs={'course_id': course_id}), + 'list_forum_members_url': reverse('list_forum_members', kwargs={'course_id': course_id}), + 'update_forum_role_membership_url': reverse('update_forum_role_membership', kwargs={'course_id': course_id}), + } + return section_data + + +def _section_student_admin(course_id, access): + """ Provide data for the corresponding dashboard section """ + section_data = { + 'section_key': 'student_admin', + 'section_display_name': 'Student Admin', + 'access': access, + 'get_student_progress_url_url': reverse('get_student_progress_url', kwargs={'course_id': course_id}), + 'enrollment_url': reverse('students_update_enrollment', kwargs={'course_id': course_id}), + 'reset_student_attempts_url': reverse('reset_student_attempts', kwargs={'course_id': course_id}), + 'rescore_problem_url': reverse('rescore_problem', kwargs={'course_id': course_id}), + 'list_instructor_tasks_url': reverse('list_instructor_tasks', kwargs={'course_id': course_id}), + } + return section_data + + +def _section_data_download(course_id): + """ Provide data for the corresponding dashboard section """ + section_data = { + 'section_key': 'data_download', + 'section_display_name': 'Data Download', + 'get_grading_config_url': reverse('get_grading_config', kwargs={'course_id': course_id}), + 'get_students_features_url': reverse('get_students_features', kwargs={'course_id': course_id}), + } + return section_data + + +def _section_analytics(course_id): + """ Provide data for the corresponding dashboard section """ + section_data = { + 'section_key': 'analytics', + 'section_display_name': 'Analytics', + 'get_distribution_url': reverse('get_distribution', kwargs={'course_id': course_id}), + } + return section_data diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views/legacy.py similarity index 95% rename from lms/djangoapps/instructor/views.py rename to lms/djangoapps/instructor/views/legacy.py index 1875d380a6..6a02b5be7d 100644 --- a/lms/djangoapps/instructor/views.py +++ b/lms/djangoapps/instructor/views/legacy.py @@ -21,6 +21,7 @@ from django_future.csrf import ensure_csrf_cookie from django.views.decorators.cache import cache_control from django.core.urlresolvers import reverse from django.core.mail import send_mail +from django.utils import timezone import xmodule.graders as xmgraders from xmodule.modulestore.django import modulestore @@ -93,6 +94,7 @@ def instructor_dashboard(request, course_id): 'title': 'Course Statistics At A Glance', } data = [['# Enrolled', CourseEnrollment.objects.filter(course_id=course_id).count()]] + data += [['Date', timezone.now().isoformat()]] data += compute_course_stats(course).items() if request.user.is_staff: for field in course.fields: @@ -308,7 +310,9 @@ def instructor_dashboard(request, course_id): "Delete student state for module" in action or "Rescore student's problem submission" in action): # get the form data - unique_student_identifier = request.POST.get('unique_student_identifier', '') + unique_student_identifier = request.POST.get( + 'unique_student_identifier', '' + ) problem_urlname = request.POST.get('problem_for_student', '') module_state_key = get_module_url(problem_urlname) # try to uniquely id student by email address or username @@ -318,23 +322,42 @@ def instructor_dashboard(request, course_id): if student is not None: # find the module in question try: - student_module = StudentModule.objects.get(student_id=student.id, - course_id=course_id, - module_state_key=module_state_key) + student_module = StudentModule.objects.get( + student_id=student.id, + course_id=course_id, + module_state_key=module_state_key + ) msg += "Found module. " - except StudentModule.DoesNotExist: - msg += "<font color='red'>Couldn't find module with that urlname. </font>" + except StudentModule.DoesNotExist as err: + error_msg = "Couldn't find module with that urlname: {0}. ".format( + problem_urlname + ) + msg += "<font color='red'>" + error_msg + "({0}) ".format(err) + "</font>" + log.debug(error_msg) if student_module is not None: if "Delete student state for module" in action: # delete the state try: student_module.delete() - msg += "<font color='red'>Deleted student module state for %s!</font>" % module_state_key - event = {"problem": problem_url, "student": unique_student_identifier, "course": course_id} - track.views.server_track(request, "delete-student-module-state", event, page="idashboard") - except: - msg += "Failed to delete module state for %s/%s" % (unique_student_identifier, problem_urlname) + msg += "<font color='red'>Deleted student module state for {0}!</font>".format(module_state_key) + event = { + "problem": problem_url, + "student": unique_student_identifier, + "course": course_id + } + track.views.server_track( + request, + "delete-student-module-state", + event, + page="idashboard" + ) + except Exception as err: + error_msg = "Failed to delete module state for {0}/{1}. ".format( + unique_student_identifier, problem_urlname + ) + msg += "<font color='red'>" + error_msg + "({0}) ".format(err) + "</font>" + log.exception(error_msg) elif "Reset student's attempts" in action: # modify the problem's state try: @@ -342,19 +365,24 @@ def instructor_dashboard(request, course_id): problem_state = json.loads(student_module.state) old_number_of_attempts = problem_state["attempts"] problem_state["attempts"] = 0 - # save student_module.state = json.dumps(problem_state) student_module.save() - event = {"old_attempts": old_number_of_attempts, - "student": student, - "problem": student_module.module_state_key, - "instructor": request.user, - "course": course_id} + event = { + "old_attempts": old_number_of_attempts, + "student": unicode(student), + "problem": student_module.module_state_key, + "instructor": unicode(request.user), + "course": course_id + } track.views.server_track(request, "reset-student-attempts", event, page="idashboard") msg += "<font color='green'>Module state successfully reset!</font>" - except: - msg += "<font color='red'>Couldn't reset module state. </font>" + except Exception as err: + error_msg = "Couldn't reset module state for {0}/{1}. ".format( + unique_student_identifier, problem_urlname + ) + msg += "<font color='red'>" + error_msg + "({0}) ".format(err) + "</font>" + log.exception(error_msg) else: # "Rescore student's problem submission" case try: @@ -363,9 +391,14 @@ def instructor_dashboard(request, course_id): msg += '<font color="red">Failed to create a background task for rescoring "{0}" for student {1}.</font>'.format(module_state_key, unique_student_identifier) else: track.views.server_track(request, "rescore-student-submission", {"problem": module_state_key, "student": unique_student_identifier, "course": course_id}, page="idashboard") - except Exception as e: - log.exception("Encountered exception from rescore: {0}") - msg += '<font color="red">Failed to create a background task for rescoring "{0}": {1}.</font>'.format(module_state_key, e.message) + except Exception as err: + msg += '<font color="red">Failed to create a background task for rescoring "{0}": {1}.</font>'.format( + module_state_key, err.message + ) + log.exception("Encountered exception from rescore: student '{0}' problem '{1}'".format( + unique_student_identifier, module_state_key + ) + ) elif "Get link to student's progress page" in action: unique_student_identifier = request.POST.get('unique_student_identifier', '') @@ -736,14 +769,15 @@ def instructor_dashboard(request, course_id): 'plots': plots, # psychometrics 'course_errors': modulestore().get_item_errors(course.location), 'instructor_tasks': instructor_tasks, - 'djangopid': os.getpid(), - 'mitx_version': getattr(settings, 'MITX_VERSION_STRING', ''), 'offline_grade_log': offline_grades_available(course_id), 'cohorts_ajax_url': reverse('cohorts', kwargs={'course_id': course_id}), 'analytics_results': analytics_results, } + if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BETA_DASHBOARD'): + context['beta_dashboard_url'] = reverse('instructor_dashboard_2', kwargs={'course_id': course_id}) + return render_to_response('courseware/instructor_dashboard.html', context) diff --git a/lms/djangoapps/notification_prefs/tests.py b/lms/djangoapps/notification_prefs/tests.py index c70b19e92b..06a7521016 100644 --- a/lms/djangoapps/notification_prefs/tests.py +++ b/lms/djangoapps/notification_prefs/tests.py @@ -1,3 +1,5 @@ +import json + from django.contrib.auth.models import AnonymousUser from django.core.exceptions import PermissionDenied from django.http import Http404 @@ -7,7 +9,7 @@ from django.test.utils import override_settings from mock import Mock, patch from notification_prefs import NOTIFICATION_PREF_KEY -from notification_prefs.views import ajax_enable, ajax_disable, unsubscribe +from notification_prefs.views import ajax_enable, ajax_disable, ajax_status, unsubscribe from student.tests.factories import UserFactory from user_api.models import UserPreference @@ -57,6 +59,34 @@ class NotificationPrefViewTest(TestCase): UserPreference.objects.filter(user=user, key=NOTIFICATION_PREF_KEY).exists() ) + # AJAX status view + + def test_ajax_status_get_0(self): + request = self.request_factory.get("dummy") + request.user = self.user + response = ajax_status(request) + self.assertEqual(response.status_code, 200) + self.assertEqual(json.loads(response.content), {"status":0}) + + def test_ajax_status_get_1(self): + self.create_prefs() + request = self.request_factory.get("dummy") + request.user = self.user + response = ajax_status(request) + self.assertEqual(response.status_code, 200) + self.assertEqual(json.loads(response.content), {"status":1}) + + def test_ajax_status_post(self): + request = self.request_factory.post("dummy") + request.user = self.user + response = ajax_status(request) + self.assertEqual(response.status_code, 405) + + def test_ajax_status_anon_user(self): + request = self.request_factory.get("dummy") + request.user = AnonymousUser() + self.assertRaises(PermissionDenied, ajax_status, request) + # AJAX enable view def test_ajax_enable_get(self): diff --git a/lms/djangoapps/notification_prefs/views.py b/lms/djangoapps/notification_prefs/views.py index 893fc14a59..6be5b8f766 100644 --- a/lms/djangoapps/notification_prefs/views.py +++ b/lms/djangoapps/notification_prefs/views.py @@ -1,5 +1,6 @@ from base64 import urlsafe_b64encode, urlsafe_b64decode from hashlib import sha256 +import json from Crypto.Cipher import AES from Crypto import Random @@ -131,6 +132,25 @@ def ajax_disable(request): return HttpResponse(status=204) +@require_GET +def ajax_status(request): + """ + A view that retrieves notifications status for the authenticated user. + + This view should be invoked by an AJAX GET call. It returns status 200, + with a JSON-formatted payload, or an error. + """ + if not request.user.is_authenticated(): + raise PermissionDenied + + + qs = UserPreference.objects.filter( + user=request.user, + key=NOTIFICATION_PREF_KEY + ) + + return HttpResponse(json.dumps({"status":len(qs)}), content_type="application/json") + @require_GET def unsubscribe(request, token): diff --git a/lms/djangoapps/open_ended_grading/tests.py b/lms/djangoapps/open_ended_grading/tests.py index 556a421808..262124d667 100644 --- a/lms/djangoapps/open_ended_grading/tests.py +++ b/lms/djangoapps/open_ended_grading/tests.py @@ -205,7 +205,9 @@ class TestPeerGradingService(LoginEnrollmentTestCase): 'submission_key': 'fake key', 'score': 2, 'feedback': 'feedback', - 'submission_flagged': 'false' + 'submission_flagged': 'false', + 'answer_unknown': 'false', + 'rubric_scores_complete' : 'true' } qdict = MagicMock() diff --git a/lms/djangoapps/user_api/serializers.py b/lms/djangoapps/user_api/serializers.py index 42c42cf891..8822817933 100644 --- a/lms/djangoapps/user_api/serializers.py +++ b/lms/djangoapps/user_api/serializers.py @@ -14,8 +14,8 @@ class UserSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = User # This list is the minimal set required by the notification service - fields = ("id", "email", "name") - read_only_fields = ("id", "email") + fields = ("id", "email", "name", "username") + read_only_fields = ("id", "email", "username") class UserPreferenceSerializer(serializers.HyperlinkedModelSerializer): diff --git a/lms/djangoapps/user_api/tests/test_views.py b/lms/djangoapps/user_api/tests/test_views.py index 3fc630333a..451b167050 100644 --- a/lms/djangoapps/user_api/tests/test_views.py +++ b/lms/djangoapps/user_api/tests/test_views.py @@ -1,3 +1,5 @@ +import base64 + from django.contrib.auth.models import User from django.test import TestCase from django.test.utils import override_settings @@ -31,6 +33,9 @@ class UserApiTestCase(TestCase): UserPreferenceFactory.create(user=self.users[1], key="key0") ] + def basic_auth(self, username, password): + return {'HTTP_AUTHORIZATION': 'Basic ' + base64.b64encode('%s:%s' % (username, password))} + def request_with_auth(self, method, *args, **kwargs): """Issue a get request to the given URI with the API key header""" return getattr(self.client, method)(*args, HTTP_X_EDX_API_KEY=TEST_API_KEY, **kwargs) @@ -74,7 +79,7 @@ class UserApiTestCase(TestCase): def assertUserIsValid(self, user): """Assert that the given user result is valid""" - self.assertItemsEqual(user.keys(), ["email", "id", "name", "url"]) + self.assertItemsEqual(user.keys(), ["email", "id", "name", "username", "url"]) self.assertSelfReferential(user) def assertPrefIsValid(self, pref): @@ -122,6 +127,20 @@ class UserViewSetTest(UserApiTestCase): def test_list_unauthorized(self): self.assertHttpForbidden(self.client.get(self.LIST_URI)) + @override_settings(DEBUG=True) + @override_settings(EDX_API_KEY=None) + def test_debug_auth(self): + self.assertHttpOK(self.client.get(self.LIST_URI)) + + @override_settings(DEBUG=False) + @override_settings(EDX_API_KEY=TEST_API_KEY) + def test_basic_auth(self): + # ensure that having basic auth headers in the mix does not break anything + self.assertHttpOK( + self.request_with_auth("get", self.LIST_URI, **self.basic_auth('someuser', 'somepass'))) + self.assertHttpForbidden( + self.client.get(self.LIST_URI, **self.basic_auth('someuser', 'somepass'))) + def test_get_list_empty(self): User.objects.all().delete() result = self.get_json(self.LIST_URI) @@ -191,7 +210,8 @@ class UserViewSetTest(UserApiTestCase): "email": user.email, "id": user.id, "name": user.profile.name, - "url": uri, + "username": user.username, + "url": uri } ) @@ -220,6 +240,11 @@ class UserPreferenceViewSetTest(UserApiTestCase): def test_list_unauthorized(self): self.assertHttpForbidden(self.client.get(self.LIST_URI)) + @override_settings(DEBUG=True) + @override_settings(EDX_API_KEY=None) + def test_debug_auth(self): + self.assertHttpOK(self.client.get(self.LIST_URI)) + def test_get_list_empty(self): UserPreference.objects.all().delete() result = self.get_json(self.LIST_URI) @@ -252,6 +277,26 @@ class UserPreferenceViewSetTest(UserApiTestCase): self.assertPrefIsValid(pref) self.assertEqual(pref["key"], "key0") + def test_get_list_filter_user_empty(self): + def test_id(user_id): + result = self.get_json(self.LIST_URI, data={"user": user_id}) + self.assertEqual(result["count"], 0) + self.assertEqual(result["results"], []) + test_id(self.users[2].id) + # TODO: If the given id does not match a user, then the filter is a no-op + # test_id(42) + # test_id("asdf") + + def test_get_list_filter_user_nonempty(self): + user_id = self.users[0].id + result = self.get_json(self.LIST_URI, data={"user": user_id}) + self.assertEqual(result["count"], 2) + prefs = result["results"] + self.assertEqual(len(prefs), 2) + for pref in prefs: + self.assertPrefIsValid(pref) + self.assertEqual(pref["user"]["id"], user_id) + def test_get_list_pagination(self): first_page = self.get_json(self.LIST_URI, data={"page_size": 2}) self.assertEqual(first_page["count"], 3) @@ -304,6 +349,7 @@ class UserPreferenceViewSetTest(UserApiTestCase): "email": pref.user.email, "id": pref.user.id, "name": pref.user.profile.name, + "username": pref.user.username, "url": self.get_uri_for_user(pref.user), }, "key": pref.key, diff --git a/lms/djangoapps/user_api/views.py b/lms/djangoapps/user_api/views.py index ae1ecef8d9..c64a5a4d23 100644 --- a/lms/djangoapps/user_api/views.py +++ b/lms/djangoapps/user_api/views.py @@ -1,5 +1,6 @@ from django.conf import settings from django.contrib.auth.models import User +from rest_framework import authentication from rest_framework import filters from rest_framework import permissions from rest_framework import viewsets @@ -12,14 +13,20 @@ class ApiKeyHeaderPermission(permissions.BasePermission): """ Check for permissions by matching the configured API key and header - settings.EDX_API_KEY must be set, and the X-Edx-Api-Key HTTP header must - be present in the request and match the setting. + If settings.DEBUG is True and settings.EDX_API_KEY is not set or None, + then allow the request. Otherwise, allow the request if and only if + settings.EDX_API_KEY is set and the X-Edx-Api-Key HTTP header is + present in the request and matches the setting. """ api_key = getattr(settings, "EDX_API_KEY", None) - return api_key is not None and request.META.get("HTTP_X_EDX_API_KEY") == api_key + return ( + (settings.DEBUG and api_key is None) or + (api_key is not None and request.META.get("HTTP_X_EDX_API_KEY") == api_key) + ) class UserViewSet(viewsets.ReadOnlyModelViewSet): + authentication_classes = (authentication.SessionAuthentication,) permission_classes = (ApiKeyHeaderPermission,) queryset = User.objects.all() serializer_class = UserSerializer @@ -28,10 +35,11 @@ class UserViewSet(viewsets.ReadOnlyModelViewSet): class UserPreferenceViewSet(viewsets.ReadOnlyModelViewSet): + authentication_classes = (authentication.SessionAuthentication,) permission_classes = (ApiKeyHeaderPermission,) queryset = UserPreference.objects.all() filter_backends = (filters.DjangoFilterBackend,) - filter_fields = ("key",) + filter_fields = ("key", "user") serializer_class = UserPreferenceSerializer paginate_by = 10 paginate_by_param = "page_size" diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index 5f8fd99c16..a58420ab1e 100644 --- a/lms/envs/acceptance.py +++ b/lms/envs/acceptance.py @@ -83,6 +83,9 @@ MITX_FEATURES['STUB_VIDEO_FOR_TESTING'] = True # per-test control for acceptance tests MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = True +# 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 = ('courseware',) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 2eb5814622..8d2ffba96e 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -226,6 +226,9 @@ ANALYTICS_API_KEY = AUTH_TOKENS.get("ANALYTICS_API_KEY", "") ZENDESK_USER = AUTH_TOKENS.get("ZENDESK_USER") ZENDESK_API_KEY = AUTH_TOKENS.get("ZENDESK_API_KEY") +# API Key for inbound requests from Notifier service +EDX_API_KEY = AUTH_TOKENS.get("EDX_API_KEY") + # Celery Broker CELERY_BROKER_TRANSPORT = ENV_TOKENS.get("CELERY_BROKER_TRANSPORT", "") CELERY_BROKER_HOSTNAME = ENV_TOKENS.get("CELERY_BROKER_HOSTNAME", "") diff --git a/lms/envs/common.py b/lms/envs/common.py index 70c2ffcbaf..0cbcbb774a 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -37,7 +37,6 @@ PLATFORM_NAME = "edX" COURSEWARE_ENABLED = True ENABLE_JASMINE = False -GENERATE_RANDOM_USER_CREDENTIALS = False PERFSTATS = False DISCUSSION_SETTINGS = { @@ -72,6 +71,9 @@ MITX_FEATURES = { 'ENABLE_TEXTBOOK': True, 'ENABLE_DISCUSSION_SERVICE': True, + # discussion home panel, which includes a subscription on/off setting for discussion digest emails. + # this should remain off in production until digest notifications are online. + 'ENABLE_DISCUSSION_HOME_PANEL': False, 'ENABLE_PSYCHOMETRICS': False, # real-time psychometrics (eg item response theory analysis in instructor dashboard) @@ -96,19 +98,19 @@ MITX_FEATURES = { # This flag disables the requirement of having to agree to the TOS for users registering # with Shib. Feature was requested by Stanford's office of general counsel 'SHIB_DISABLE_TOS': False, - + # Enables ability to restrict enrollment in specific courses by the user account login method 'RESTRICT_ENROLL_BY_REG_METHOD': False, # analytics experiments 'ENABLE_INSTRUCTOR_ANALYTICS': False, - # enable analytics server. + # enable analytics server. # WARNING: THIS SHOULD ALWAYS BE SET TO FALSE UNDER NORMAL # LMS OPERATION. See analytics.py for details about what - # this does. + # this does. - 'RUN_AS_ANALYTICS_SERVER_ENABLED' : False, + 'RUN_AS_ANALYTICS_SERVER_ENABLED': False, # Flip to True when the YouTube iframe API breaks (again) 'USE_YOUTUBE_OBJECT_API': False, @@ -142,12 +144,18 @@ MITX_FEATURES = { # Enable instructor dash to submit background tasks 'ENABLE_INSTRUCTOR_BACKGROUND_TASKS': True, + # Enable instructor dash beta version link + 'ENABLE_INSTRUCTOR_BETA_DASHBOARD': False, + # Allow use of the hint managment instructor view. 'ENABLE_HINTER_INSTRUCTOR_VIEW': False, + # for load testing + 'AUTOMATIC_AUTH_FOR_TESTING': False, + # Toggle to enable chat availability (configured on a per-course # basis in Studio) - 'ENABLE_CHAT': False + 'ENABLE_CHAT': False, } # Used for A/B testing @@ -161,7 +169,7 @@ XQUEUE_WAITTIME_BETWEEN_REQUESTS = 5 # seconds ############################# SET PATH INFORMATION ############################# -PROJECT_ROOT = path(__file__).abspath().dirname().dirname() # /mitx/lms +PROJECT_ROOT = path(__file__).abspath().dirname().dirname() # /edx-platform/lms REPO_ROOT = PROJECT_ROOT.dirname() COMMON_ROOT = REPO_ROOT / "common" ENV_ROOT = REPO_ROOT.dirname() # virtualenv dir /mitx is in @@ -218,7 +226,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.contrib.messages.context_processors.messages', #'django.core.context_processors.i18n', 'django.contrib.auth.context_processors.auth', # this is required for admin - 'django.core.context_processors.csrf', # necessary for csrf protection + 'django.core.context_processors.csrf', # Added for django-wiki 'django.core.context_processors.media', @@ -231,6 +239,10 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'mitxmako.shortcuts.marketing_link_context_processor', ) +# use the ratelimit backend to prevent brute force attacks +AUTHENTICATION_BACKENDS = ( + 'ratelimitbackend.backends.RateLimitModelBackend', +) STUDENT_FILEUPLOAD_MAX_SIZE = 4 * 1000 * 1000 # 4 MB MAX_FILEUPLOADS_PER_INPUT = 20 @@ -312,8 +324,6 @@ CODE_JAIL = { 'limits': { # How many CPU seconds can jailed code use? 'CPU': 1, - # How large a file can jailed code write? - 'FSIZE': 50000, }, } @@ -352,9 +362,7 @@ SERVER_EMAIL = 'devops@edx.org' TECH_SUPPORT_EMAIL = 'technical@edx.org' CONTACT_EMAIL = 'info@edx.org' BUGS_EMAIL = 'bugs@edx.org' -ADMINS = ( - ('edX Admins', 'admin@edx.org'), -) +ADMINS = () MANAGERS = ADMINS # Static content @@ -375,6 +383,8 @@ LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html USE_I18N = True USE_L10N = True +# Localization strings (e.g. django.po) are under this directory +LOCALE_PATHS = (REPO_ROOT + '/conf/locale',) # edx-platform/conf/locale/ # Messages MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage' @@ -431,10 +441,10 @@ OPEN_ENDED_GRADING_INTERFACE = { 'url': 'http://sandbox-grader-001.m.edx.org/peer_grading', 'username': 'incorrect_user', 'password': 'incorrect_pass', - 'staff_grading' : 'staff_grading', - 'peer_grading' : 'peer_grading', - 'grading_controller' : 'grading_controller' - } + 'staff_grading': 'staff_grading', + 'peer_grading': 'peer_grading', + 'grading_controller': 'grading_controller' +} # Used for testing, debugging peer grading MOCK_PEER_GRADING = False @@ -469,7 +479,6 @@ MIDDLEWARE_CLASSES = ( 'django_comment_client.middleware.AjaxExceptionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', # Instead of AuthenticationMiddleware, we use a cached backed version #'django.contrib.auth.middleware.AuthenticationMiddleware', @@ -478,14 +487,21 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.messages.middleware.MessageMiddleware', 'track.middleware.TrackMiddleware', 'mitxmako.middleware.MakoMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', 'course_wiki.course_nav.Middleware', + # Detects user-requested locale from 'accept-language' header in http request + 'django.middleware.locale.LocaleMiddleware', + 'django.middleware.transaction.TransactionMiddleware', # 'debug_toolbar.middleware.DebugToolbarMiddleware', 'django_comment_client.utils.ViewNameMiddleware', 'codejail.django_integration.ConfigureCodeJailMiddleware', + + # catches any uncaught RateLimitExceptions and returns a 403 instead of a 500 + 'ratelimitbackend.middleware.RateLimitMiddleware', ) ############################### Pipeline ####################################### @@ -563,6 +579,7 @@ PIPELINE_JS = { 'js/toggle_login_modal.js', 'js/sticky_filter.js', 'js/query-params.js', + 'js/utility.js', ], 'output_filename': 'js/lms-application.js', diff --git a/lms/envs/dev.py b/lms/envs/dev.py index ee37cacc82..622ff6acf7 100644 --- a/lms/envs/dev.py +++ b/lms/envs/dev.py @@ -29,6 +29,7 @@ MITX_FEATURES['ENABLE_PSYCHOMETRICS'] = False # real-time psychometrics (eg i MITX_FEATURES['ENABLE_INSTRUCTOR_ANALYTICS'] = True MITX_FEATURES['ENABLE_SERVICE_STATUS'] = True MITX_FEATURES['ENABLE_HINTER_INSTRUCTOR_VIEW'] = True +MITX_FEATURES['ENABLE_INSTRUCTOR_BETA_DASHBOARD'] = False WIKI_ENABLED = True @@ -257,7 +258,7 @@ if SEGMENT_IO_LMS_KEY: ########################## USER API ######################## -EDX_API_KEY = '' +EDX_API_KEY = None ##################################################################### # Lastly, see if the developer has any local overrides. diff --git a/lms/envs/dev_edx4edx.py b/lms/envs/dev_edx4edx.py deleted file mode 100644 index 13a66ed1e8..0000000000 --- a/lms/envs/dev_edx4edx.py +++ /dev/null @@ -1,79 +0,0 @@ -""" -This config file runs the simplest dev environment using sqlite, and db-based -sessions. Assumes structure: - -/envroot/ - /db # This is where it'll write the database file - /mitx # The location of this repo - /log # Where we're going to write log files -""" - -# We intentionally define lots of variables that aren't used, and -# want to import all variables from base settings files -# pylint: disable=W0401, W0614 - -import socket - -if 'eecs1' in socket.gethostname(): - MITX_ROOT_URL = '/mitx2' - -from .common import * -from .dev import * - -if 'eecs1' in socket.gethostname(): - MITX_ROOT_URL = '/mitx2' - -#----------------------------------------------------------------------------- -# edx4edx content server - -EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mitx.mit.edu' -EDX4EDX_ROOT = ENV_ROOT / "data/edx4edx" - -#EMAIL_BACKEND = 'django_ses.SESBackend' - -#----------------------------------------------------------------------------- -# ichuang - -DEBUG = True -ENABLE_MULTICOURSE = True # set to False to disable multicourse display (see lib.util.views.mitxhome) - -MAKO_TEMPLATES['course'] = [DATA_DIR, EDX4EDX_ROOT] - -#MITX_FEATURES['USE_DJANGO_PIPELINE'] = False -MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False -MITX_FEATURES['DISPLAY_EDIT_LINK'] = True - -COURSE_DEFAULT = "edx4edx" -COURSE_NAME = "edx4edx" -COURSE_NUMBER = "edX.01" -COURSE_TITLE = "edx4edx: edX Author Course" -SITE_NAME = "ichuang.mitx.mit.edu" - -COURSE_SETTINGS = {'edx4edx': {'number' : 'edX.01', - 'title': 'edx4edx: edX Author Course', - 'xmlpath': '/edx4edx/', - 'github_url': 'https://github.com/MITx/edx4edx', - 'active': True, - 'default_chapter': 'Introduction', - 'default_section': 'edx4edx_Course', - }, - } - -#----------------------------------------------------------------------------- - -MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + ( - 'ssl_auth.ssl_auth.NginxProxyHeaderMiddleware', # ssl authentication behind nginx proxy - ) - -AUTHENTICATION_BACKENDS = ( - 'ssl_auth.ssl_auth.SSLLoginBackend', - 'django.contrib.auth.backends.ModelBackend', - ) - -INSTALLED_APPS = INSTALLED_APPS + ( - 'ssl_auth', - ) - -LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/' -LOGIN_URL = MITX_ROOT_URL + '/' diff --git a/lms/envs/load_test.py b/lms/envs/load_test.py new file mode 100644 index 0000000000..f4d3cae758 --- /dev/null +++ b/lms/envs/load_test.py @@ -0,0 +1,16 @@ +""" +Settings for load testing. +""" + +# 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 .aws import * + +# Disable CSRF for load testing +exclude_csrf = lambda elem: not elem in \ + ['django.core.context_processors.csrf', + 'django.middleware.csrf.CsrfViewMiddleware'] +TEMPLATE_CONTEXT_PROCESSORS = filter(exclude_csrf, TEMPLATE_CONTEXT_PROCESSORS) +MIDDLEWARE_CLASSES = filter(exclude_csrf, MIDDLEWARE_CLASSES) diff --git a/lms/envs/test.py b/lms/envs/test.py index 81505ab0b3..704c78b177 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -15,6 +15,7 @@ sessions. Assumes structure: from .common import * import os from path import path +from warnings import filterwarnings # can't test start dates with this True, but on the other hand, # can test everything else :) @@ -29,6 +30,8 @@ MITX_FEATURES['ENABLE_SERVICE_STATUS'] = True MITX_FEATURES['ENABLE_HINTER_INSTRUCTOR_VIEW'] = True +MITX_FEATURES['ENABLE_INSTRUCTOR_BETA_DASHBOARD'] = True + # Need wiki for courseware views to work. TODO (vshnayder): shouldn't need it. WIKI_ENABLED = True @@ -135,6 +138,9 @@ CACHES = { # Dummy secret key for dev SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' +# hide ratelimit warnings while running tests +filterwarnings('ignore', message='No request passed to the backend, unable to rate-limit') + ################################## OPENID ##################################### MITX_FEATURES['AUTH_USE_OPENID'] = True MITX_FEATURES['AUTH_USE_OPENID_PROVIDER'] = True diff --git a/lms/lib/comment_client/user.py b/lms/lib/comment_client/user.py index 2370052d90..1af64cc18c 100644 --- a/lms/lib/comment_client/user.py +++ b/lms/lib/comment_client/user.py @@ -102,3 +102,8 @@ def _url_for_user_active_threads(user_id): def _url_for_user_subscribed_threads(user_id): return "{prefix}/users/{user_id}/subscribed_threads".format(prefix=settings.PREFIX, user_id=user_id) + +def _url_for_user_stats(user_id,course_id): + return "{prefix}/users/{user_id}/stats?course_id={course_id}".format(prefix=settings.PREFIX, user_id=user_id,course_id=course_id) + + diff --git a/lms/static/coffee/src/instructor_dashboard/analytics.coffee b/lms/static/coffee/src/instructor_dashboard/analytics.coffee new file mode 100644 index 0000000000..d6e1ffdd3e --- /dev/null +++ b/lms/static/coffee/src/instructor_dashboard/analytics.coffee @@ -0,0 +1,138 @@ +# Analytics Section + +# imports from other modules. +# wrap in (-> ... apply) to defer evaluation +# such that the value can be defined later than this assignment (file load order). +plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments +std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments + +# Analytics Section +class Analytics + constructor: (@$section) -> + @$section.data 'wrapper', @ + + # gather elements + @$display = @$section.find '.distribution-display' + @$display_text = @$display.find '.distribution-display-text' + @$display_graph = @$display.find '.distribution-display-graph' + @$display_table = @$display.find '.distribution-display-table' + @$distribution_select = @$section.find 'select#distributions' + @$request_response_error = @$display.find '.request-response-error' + + @populate_selector => @$distribution_select.change => @on_selector_change() + + reset_display: -> + @$display_text.empty() + @$display_graph.empty() + @$display_table.empty() + @$request_response_error.empty() + + # fetch and list available distributions + # `cb` is a callback to be run after + populate_selector: (cb) -> + # ask for no particular distribution to get list of available distribuitions. + @get_profile_distributions undefined, + # on error, print to console and dom. + error: std_ajax_err => @$request_response_error.text "Error getting available distributions." + success: (data) => + # replace loading text in drop-down with "-- Select Distribution --" + @$distribution_select.find('option').eq(0).text "-- Select Distribution --" + + # add all fetched available features to drop-down + for feature in data.available_features + opt = $ '<option/>', + text: data.feature_display_names[feature] + data: + feature: feature + + @$distribution_select.append opt + + # call callback if one was supplied + cb?() + + # display data + on_selector_change: -> + opt = @$distribution_select.children('option:selected') + feature = opt.data 'feature' + + @reset_display() + # only proceed if there is a feature attached to the selected option. + return unless feature + @get_profile_distributions feature, + error: std_ajax_err => @$request_response_error.text "Error getting distribution for '#{feature}'." + success: (data) => + feature_res = data.feature_results + if feature_res.type is 'EASY_CHOICE' + # display on SlickGrid + options = + enableCellNavigation: true + enableColumnReorder: false + forceFitColumns: true + + columns = [ + id: feature + field: feature + name: feature + , + id: 'count' + field: 'count' + name: 'Count' + ] + + grid_data = _.map feature_res.data, (value, key) -> + datapoint = {} + datapoint[feature] = feature_res.choices_display_names[key] + datapoint['count'] = value + datapoint + + table_placeholder = $ '<div/>', class: 'slickgrid' + @$display_table.append table_placeholder + grid = new Slick.Grid(table_placeholder, grid_data, columns, options) + else if feature_res.feature is 'year_of_birth' + graph_placeholder = $ '<div/>', class: 'year-of-birth' + @$display_graph.append graph_placeholder + + graph_data = _.map feature_res.data, (value, key) -> [parseInt(key), value] + + $.plot graph_placeholder, [ + data: graph_data + ] + else + console.warn("unable to show distribution #{feature_res.type}") + @$display_text.text 'Unavailable Metric Display\n' + JSON.stringify(feature_res) + + # fetch distribution data from server. + # `handler` can be either a callback for success + # or a mapping e.g. {success: ->, error: ->, complete: ->} + get_profile_distributions: (feature, handler) -> + settings = + dataType: 'json' + url: @$distribution_select.data 'endpoint' + data: feature: feature + + if typeof handler is 'function' + _.extend settings, success: handler + else + _.extend settings, handler + + $.ajax settings + + # slickgrid's layout collapses when rendered + # in an invisible div. use this method to reload + # the AuthList widget + refresh: -> + @on_selector_change() + + # handler for when the section title is clicked. + onClickTitle: -> + @refresh() + + +# export for use +# create parent namespaces if they do not already exist. +# abort if underscore can not be found. +if _? + _.defaults window, InstructorDashboard: {} + _.defaults window.InstructorDashboard, sections: {} + _.defaults window.InstructorDashboard.sections, + Analytics: Analytics diff --git a/lms/static/coffee/src/instructor_dashboard/course_info.coffee b/lms/static/coffee/src/instructor_dashboard/course_info.coffee new file mode 100644 index 0000000000..d48c7ba873 --- /dev/null +++ b/lms/static/coffee/src/instructor_dashboard/course_info.coffee @@ -0,0 +1,45 @@ +# Course Info Section +# This is the implementation of the simplest section +# of the instructor dashboard. + +# imports from other modules. +# wrap in (-> ... apply) to defer evaluation +# such that the value can be defined later than this assignment (file load order). +plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments +std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments + +# A typical section object. +# constructed with $section, a jquery object +# which holds the section body container. +class CourseInfo + constructor: (@$section) -> + @$course_errors_wrapper = @$section.find '.course-errors-wrapper' + + # if there are errors + if @$course_errors_wrapper.length + @$course_error_toggle = @$course_errors_wrapper.find '.toggle-wrapper' + @$course_error_toggle_text = @$course_error_toggle.find 'h2' + @$course_error_visibility_wrapper = @$course_errors_wrapper.find '.course-errors-visibility-wrapper' + @$course_errors = @$course_errors_wrapper.find '.course-error' + + # append "(34)" to the course errors label + @$course_error_toggle_text.text @$course_error_toggle_text.text() + " (#{@$course_errors.length})" + + # toggle .open class on errors + # to show and hide them. + @$course_error_toggle.click (e) => + e.preventDefault() + if @$course_errors_wrapper.hasClass 'open' + @$course_errors_wrapper.removeClass 'open' + else + @$course_errors_wrapper.addClass 'open' + + +# export for use +# create parent namespaces if they do not already exist. +# abort if underscore can not be found. +if _? + _.defaults window, InstructorDashboard: {} + _.defaults window.InstructorDashboard, sections: {} + _.defaults window.InstructorDashboard.sections, + CourseInfo: CourseInfo diff --git a/lms/static/coffee/src/instructor_dashboard/data_download.coffee b/lms/static/coffee/src/instructor_dashboard/data_download.coffee new file mode 100644 index 0000000000..cfd3534e04 --- /dev/null +++ b/lms/static/coffee/src/instructor_dashboard/data_download.coffee @@ -0,0 +1,88 @@ +# Data Download Section + +# imports from other modules. +# wrap in (-> ... apply) to defer evaluation +# such that the value can be defined later than this assignment (file load order). +plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments +std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments + + +# Data Download Section +class DataDownload + constructor: (@$section) -> + # gather elements + @$display = @$section.find '.data-display' + @$display_text = @$display.find '.data-display-text' + @$display_table = @$display.find '.data-display-table' + @$request_response_error = @$display.find '.request-response-error' + @$list_studs_btn = @$section.find("input[name='list-profiles']'") + @$grade_config_btn = @$section.find("input[name='dump-gradeconf']'") + + # attach click handlers + + # this handler binds to both the download + # and the csv button + @$list_studs_btn.click (e) => + url = @$list_studs_btn.data 'endpoint' + + # handle csv special case + if $(e.target).data 'csv' + # redirect the document to the csv file. + url += '/csv' + location.href = url + else + @clear_display() + @$display_table.text 'Loading...' + + # fetch user list + $.ajax + dataType: 'json' + url: url + error: std_ajax_err => + @clear_display() + @$request_response_error.text "Error getting student list." + success: (data) => + @clear_display() + + # display on a SlickGrid + options = + enableCellNavigation: true + enableColumnReorder: false + forceFitColumns: true + + columns = ({id: feature, field: feature, name: feature} for feature in data.queried_features) + grid_data = data.students + + $table_placeholder = $ '<div/>', class: 'slickgrid' + @$display_table.append $table_placeholder + grid = new Slick.Grid($table_placeholder, grid_data, columns, options) + # grid.autosizeColumns() + + @$grade_config_btn.click (e) => + url = @$grade_config_btn.data 'endpoint' + # display html from grading config endpoint + $.ajax + dataType: 'json' + url: url + error: std_ajax_err => + @clear_display() + @$request_response_error.text "Error getting grading configuration." + success: (data) => + @clear_display() + @$display_text.html data['grading_config_summary'] + + + clear_display: -> + @$display_text.empty() + @$display_table.empty() + @$request_response_error.empty() + + +# export for use +# create parent namespaces if they do not already exist. +# abort if underscore can not be found. +if _? + _.defaults window, InstructorDashboard: {} + _.defaults window.InstructorDashboard, sections: {} + _.defaults window.InstructorDashboard.sections, + DataDownload: DataDownload diff --git a/lms/static/coffee/src/instructor_dashboard/instructor_dashboard.coffee b/lms/static/coffee/src/instructor_dashboard/instructor_dashboard.coffee new file mode 100644 index 0000000000..91b31cf221 --- /dev/null +++ b/lms/static/coffee/src/instructor_dashboard/instructor_dashboard.coffee @@ -0,0 +1,106 @@ +# Instructor Dashboard Tab Manager +# The instructor dashboard is broken into sections. +# Only one section is visible at a time, +# and is responsible for its own functionality. +# +# NOTE: plantTimeout (which is just setTimeout from util.coffee) +# is used frequently in the instructor dashboard to isolate +# failures. If one piece of code under a plantTimeout fails +# then it will not crash the rest of the dashboard. +# +# NOTE: The instructor dashboard currently does not +# use backbone. Just lots of jquery. This should be fixed. +# +# NOTE: Server endpoints in the dashboard are stored in +# the 'data-endpoint' attribute of relevant html elements. +# The urls are rendered there by a template. +# +# NOTE: For an example of what a section object should look like +# see course_info.coffee + +# imports from other modules +# wrap in (-> ... apply) to defer evaluation +# such that the value can be defined later than this assignment (file load order). +plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments +std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments + +# CSS classes +CSS_INSTRUCTOR_CONTENT = 'instructor-dashboard-content-2' +CSS_ACTIVE_SECTION = 'active-section' +CSS_IDASH_SECTION = 'idash-section' +CSS_INSTRUCTOR_NAV = 'instructor-nav' + +# prefix for deep-linking +HASH_LINK_PREFIX = '#view-' + +# once we're ready, check if this page is the instructor dashboard +$ => + instructor_dashboard_content = $ ".#{CSS_INSTRUCTOR_CONTENT}" + if instructor_dashboard_content.length > 0 + setup_instructor_dashboard instructor_dashboard_content + setup_instructor_dashboard_sections instructor_dashboard_content + + +# enable navigation bar +# handles hiding and showing sections +setup_instructor_dashboard = (idash_content) => + # clickable section titles + links = idash_content.find(".#{CSS_INSTRUCTOR_NAV}").find('a') + + for link in ($ link for link in links) + link.click (e) -> + e.preventDefault() + + # deactivate all link & section styles + idash_content.find(".#{CSS_INSTRUCTOR_NAV}").children().removeClass CSS_ACTIVE_SECTION + idash_content.find(".#{CSS_IDASH_SECTION}").removeClass CSS_ACTIVE_SECTION + + # discover section paired to link + section_name = $(this).data 'section' + section = idash_content.find "##{section_name}" + + # activate link & section styling + $(this).addClass CSS_ACTIVE_SECTION + section.addClass CSS_ACTIVE_SECTION + + # tracking + analytics.pageview "instructor_section:#{section_name}" + + # deep linking + # write to url + location.hash = "#{HASH_LINK_PREFIX}#{section_name}" + + plantTimeout 0, -> section.data('wrapper')?.onClickTitle?() + # plantTimeout 0, -> section.data('wrapper')?.onExit?() + + + # activate an initial section by 'clicking' on it. + # check for a deep-link, or click the first link. + click_first_link = -> + link = links.eq(0) + link.click() + link.data('wrapper')?.onClickTitle?() + + if (new RegExp "^#{HASH_LINK_PREFIX}").test location.hash + rmatch = (new RegExp "^#{HASH_LINK_PREFIX}(.*)").exec location.hash + section_name = rmatch[1] + link = links.filter "[data-section='#{section_name}']" + if link.length == 1 + link.click() + link.data('wrapper')?.onClickTitle?() + else + click_first_link() + else + click_first_link() + + + +# enable sections +setup_instructor_dashboard_sections = (idash_content) -> + # see fault isolation NOTE at top of file. + # an error thrown in one section will not block other sections from exectuing. + plantTimeout 0, -> new window.InstructorDashboard.sections.CourseInfo idash_content.find ".#{CSS_IDASH_SECTION}#course_info" + plantTimeout 0, -> new window.InstructorDashboard.sections.DataDownload idash_content.find ".#{CSS_IDASH_SECTION}#data_download" + plantTimeout 0, -> new window.InstructorDashboard.sections.Membership idash_content.find ".#{CSS_IDASH_SECTION}#membership" + plantTimeout 0, -> new window.InstructorDashboard.sections.StudentAdmin idash_content.find ".#{CSS_IDASH_SECTION}#student_admin" + plantTimeout 0, -> new window.InstructorDashboard.sections.Analytics idash_content.find ".#{CSS_IDASH_SECTION}#analytics" diff --git a/lms/static/coffee/src/instructor_dashboard/membership.coffee b/lms/static/coffee/src/instructor_dashboard/membership.coffee new file mode 100644 index 0000000000..733480e268 --- /dev/null +++ b/lms/static/coffee/src/instructor_dashboard/membership.coffee @@ -0,0 +1,490 @@ +# Membership Section + +# imports from other modules. +# wrap in (-> ... apply) to defer evaluation +# such that the value can be defined later than this assignment (file load order). +plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments +std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments + + +class MemberListWidget + # create a MemberListWidget `$container` is a jquery object to embody. + # `params` holds template parameters. `params` should look like the defaults below. + constructor: (@$container, params={}) -> + params = _.defaults params, + title: "Member List" + info: """ + Use this list to manage members. + """ + labels: ["field1", "field2", "field3"] + add_placeholder: "Enter name" + add_btn_label: "Add Member" + add_handler: (input) -> + + template_html = $("#member-list-widget-template").html() + @$container.html Mustache.render template_html, params + + # bind info toggle + @$('.info-badge').click => @toggle_info() + + # bind add button + @$('input[type="button"].add').click => + params.add_handler? @$('.add-field').val() + + show_info: -> + @$('.info').show() + @$('.member-list').hide() + + show_list: -> + @$('.info').hide() + @$('.member-list').show() + + toggle_info: -> + @$('.info').toggle() + @$('.member-list').toggle() + + # clear the input text field + clear_input: -> @$('.add-field').val '' + + # clear all table rows + clear_rows: -> @$('table tbody').empty() + + # takes a table row as an array items are inserted as text, unless detected + # as a jquery objects in which case they are inserted directly. if an + # element is a jquery object + add_row: (row_array) -> + $tbody = @$('table tbody') + $tr = $ '<tr>' + for item in row_array + $td = $ '<td>' + if item instanceof jQuery + $td.append item + else + $td.text item + $tr.append $td + $tbody.append $tr + + # local selector + $: (selector) -> + if @debug? + s = @$container.find selector + if s?.length != 1 + console.warn "local selector '#{selector}' found (#{s.length}) results" + s + else + @$container.find selector + + +class AuthListWidget extends MemberListWidget + constructor: ($container, @rolename, @$error_section) -> + super $container, + title: $container.data 'display-name' + info: $container.data 'info-text' + labels: ["username", "email", "revoke access"] + add_placeholder: "Enter email" + add_btn_label: $container.data 'add-button-label' + add_handler: (input) => @add_handler input + + @debug = true + @list_endpoint = $container.data 'list-endpoint' + @modify_endpoint = $container.data 'modify-endpoint' + unless @rolename? + throw "AuthListWidget missing @rolename" + + @reload_list() + + # action to do when is reintroduced into user's view + re_view: -> + @clear_errors() + @clear_input() + @reload_list() + @$('.info').hide() + @$('.member-list').show() + + # handle clicks on the add button + add_handler: (input) -> + if input? and input isnt '' + @modify_member_access input, 'allow', (error) => + # abort on error + return @show_errors error unless error is null + @clear_errors() + @clear_input() + @reload_list() + else + @show_errors "Enter an email." + + # reload the list of members + reload_list: -> + # @clear_rows() + # @show_info() + @get_member_list (error, member_list) => + # abort on error + return @show_errors error unless error is null + + # only show the list of there are members + @clear_rows() + @show_info() + # @show_info() + + # use _.each instead of 'for' so that member + # is bound in the button callback. + _.each member_list, (member) => + # if there are members, show the list + + # create revoke button and insert it into the row + $revoke_btn = $ '<div/>', + class: 'revoke' + click: => + @modify_member_access member.email, 'revoke', (error) => + # abort on error + return @show_errors error unless error is null + @clear_errors() + @reload_list() + @add_row [member.username, member.email, $revoke_btn] + # make sure the list is shown because there are members. + @show_list() + + # clear error display + clear_errors: -> @$error_section?.text '' + + # set error display + show_errors: (msg) -> @$error_section?.text msg + + # send ajax request to list members + # `cb` is called with cb(error, member_list) + get_member_list: (cb) -> + $.ajax + dataType: 'json' + url: @list_endpoint + data: rolename: @rolename + success: (data) => cb? null, data[@rolename] + error: std_ajax_err => cb? "Error fetching list for role '#{@rolename}'" + + # send ajax request to modify access + # (add or remove them from the list) + # `action` can be 'allow' or 'revoke' + # `cb` is called with cb(error, data) + modify_member_access: (email, action, cb) -> + $.ajax + dataType: 'json' + url: @modify_endpoint + data: + email: email + rolename: @rolename + action: action + success: (data) => cb? null, data + error: std_ajax_err => cb? "Error changing user's permissions." + + +# Wrapper for the batch enrollment subsection. +# This object handles buttons, success and failure reporting, +# and server communication. +class BatchEnrollment + constructor: (@$container) -> + # gather elements + @$emails_input = @$container.find("textarea[name='student-emails']'") + @$btn_enroll = @$container.find("input[name='enroll']'") + @$btn_unenroll = @$container.find("input[name='unenroll']'") + @$checkbox_autoenroll = @$container.find("input[name='auto-enroll']'") + @$task_response = @$container.find(".request-response") + @$request_response_error = @$container.find(".request-response-error") + + # attach click handlers + + @$btn_enroll.click => + send_data = + action: 'enroll' + emails: @$emails_input.val() + auto_enroll: @$checkbox_autoenroll.is(':checked') + + $.ajax + dataType: 'json' + url: @$btn_enroll.data 'endpoint' + data: send_data + success: (data) => @display_response data + error: std_ajax_err => @fail_with_error "Error enrolling/unenrolling students." + + @$btn_unenroll.click => + send_data = + action: 'unenroll' + emails: @$emails_input.val() + auto_enroll: @$checkbox_autoenroll.is(':checked') + + $.ajax + dataType: 'json' + url: @$btn_unenroll.data 'endpoint' + data: send_data + success: (data) => @display_response data + error: std_ajax_err => @fail_with_error "Error enrolling/unenrolling students." + + + fail_with_error: (msg) -> + console.warn msg + @$task_response.empty() + @$request_response_error.empty() + @$request_response_error.text msg + + display_response: (data_from_server) -> + @$task_response.empty() + @$request_response_error.empty() + + # these results arrays contain student_results + # only populated arrays will be rendered + # + # students for which there was an error during the action + errors = [] + # students who are now enrolled in the course + enrolled = [] + # students who are now allowed to enroll in the course + allowed = [] + # students who will be autoenrolled on registration + autoenrolled = [] + # students who are now not enrolled in the course + notenrolled = [] + + # categorize student results into the above arrays. + for student_results in data_from_server.results + # for a successful action. + # student_results is of the form { + # "email": "jd405@edx.org", + # "before": { + # "enrollment": true, + # "auto_enroll": false, + # "user": true, + # "allowed": false + # } + # "after": { + # "enrollment": true, + # "auto_enroll": false, + # "user": true, + # "allowed": false + # }, + # } + # + # for an action error. + # student_results is of the form { + # 'email': email, + # 'error': True, + # } + + if student_results.error + errors.push student_results + else if student_results.after.enrollment + enrolled.push student_results + else if student_results.after.allowed + if student_results.after.auto_enroll + autoenrolled.push student_results + else + allowed.push student_results + else if not student_results.after.enrollment + notenrolled.push student_results + else + console.warn 'student results not reported to user' + console.warn student_results + + # render populated result arrays + render_list = (label, emails) => + task_res_section = $ '<div/>', class: 'request-res-section' + task_res_section.append $ '<h3/>', text: label + email_list = $ '<ul/>' + task_res_section.append email_list + + for email in emails + email_list.append $ '<li/>', text: email + + @$task_response.append task_res_section + + if errors.length + errors_label = do -> + if data_from_server.action is 'enroll' + "There was an error enrolling:" + else if data_from_server.action is 'unenroll' + "There was an error unenrolling:" + else + console.warn "unknown action from server '#{data_from_server.action}'" + "There was an error processing:" + + for student_results in errors + render_list errors_label, (sr.email for sr in errors) + + if enrolled.length + render_list "Students Enrolled:", (sr.email for sr in enrolled) + + if allowed.length + render_list "These students will be allowed to enroll once they register:", + (sr.email for sr in allowed) + + if autoenrolled.length + render_list "These students will be enrolled once they register:", + (sr.email for sr in autoenrolled) + + if notenrolled.length + render_list "These students are now not enrolled:", + (sr.email for sr in notenrolled) + + +# Wrapper for auth list subsection. +# manages a list of users who have special access. +# these could be instructors, staff, beta users, or forum roles. +# uses slickgrid to display list. +class AuthList + # rolename is one of ['instructor', 'staff'] for instructor_staff endpoints + # rolename is the name of Role for forums for the forum endpoints + constructor: (@$container, @rolename) -> + # gather elements + @$display_table = @$container.find('.auth-list-table') + @$request_response_error = @$container.find('.request-response-error') + @$add_section = @$container.find('.auth-list-add') + @$allow_field = @$add_section.find("input[name='email']") + @$allow_button = @$add_section.find("input[name='allow']") + + # attach click handler + @$allow_button.click => + @access_change @$allow_field.val(), 'allow', => @reload_auth_list() + @$allow_field.val '' + + @reload_auth_list() + + # fetch and display list of users who match criteria + reload_auth_list: -> + # helper function to display server data in the list + load_auth_list = (data) => + # clear existing data + @$request_response_error.empty() + @$display_table.empty() + + # setup slickgrid + options = + enableCellNavigation: true + enableColumnReorder: false + # autoHeight: true + forceFitColumns: true + + # this is a hack to put a button/link in a slick grid cell + # if you change columns, then you must update + # WHICH_CELL_IS_REVOKE to have the index + # of the revoke column (left to right). + WHICH_CELL_IS_REVOKE = 3 + columns = [ + id: 'username' + field: 'username' + name: 'Username' + , + id: 'email' + field: 'email' + name: 'Email' + , + id: 'first_name' + field: 'first_name' + name: 'First Name' + , + # id: 'last_name' + # field: 'last_name' + # name: 'Last Name' + # , + id: 'revoke' + field: 'revoke' + name: 'Revoke' + formatter: (row, cell, value, columnDef, dataContext) -> + "<span class='revoke-link'>Revoke Access</span>" + ] + + table_data = data[@rolename] + + $table_placeholder = $ '<div/>', class: 'slickgrid' + @$display_table.append $table_placeholder + grid = new Slick.Grid($table_placeholder, table_data, columns, options) + + # click handler part of the revoke button/link hack. + grid.onClick.subscribe (e, args) => + item = args.grid.getDataItem(args.row) + if args.cell is WHICH_CELL_IS_REVOKE + @access_change item.email, 'revoke', => @reload_auth_list() + + # fetch data from the endpoint + # the endpoint comes from data-endpoint of the table + $.ajax + dataType: 'json' + url: @$display_table.data 'endpoint' + data: rolename: @rolename + success: load_auth_list + error: std_ajax_err => @$request_response_error.text "Error fetching list for '#{@rolename}'" + + + # slickgrid's layout collapses when rendered + # in an invisible div. use this method to reload + # the AuthList widget + refresh: -> + @$display_table.empty() + @reload_auth_list() + + # update the access of a user. + # (add or remove them from the list) + # action should be one of ['allow', 'revoke'] + access_change: (email, action, cb) -> + $.ajax + dataType: 'json' + url: @$add_section.data 'endpoint' + data: + email: email + rolename: @rolename + action: action + success: (data) -> cb?(data) + error: std_ajax_err => @$request_response_error.text "Error changing user's permissions." + + +# Membership Section +class Membership + # enable subsections. + constructor: (@$section) -> + # attach self to html + # so that instructor_dashboard.coffee can find this object + # to call event handlers like 'onClickTitle' + @$section.data 'wrapper', @ + + # isolate # initialize BatchEnrollment subsection + plantTimeout 0, => new BatchEnrollment @$section.find '.batch-enrollment' + + # gather elements + @$list_selector = @$section.find 'select#member-lists-selector' + @$auth_list_containers = @$section.find '.auth-list-container' + @$auth_list_errors = @$section.find '.member-lists-management .request-response-error' + + # initialize & store AuthList subsections + # one for each .auth-list-container in the section. + @auth_lists = _.map (@$auth_list_containers), (auth_list_container) => + rolename = $(auth_list_container).data 'rolename' + new AuthListWidget $(auth_list_container), rolename, @$auth_list_errors + + # populate selector + @$list_selector.empty() + for auth_list in @auth_lists + @$list_selector.append $ '<option/>', + text: auth_list.$container.data 'display-name' + data: + auth_list: auth_list + + @$list_selector.change => + $opt = @$list_selector.children('option:selected') + return unless $opt.length > 0 + for auth_list in @auth_lists + auth_list.$container.removeClass 'active' + auth_list = $opt.data('auth_list') + auth_list.$container.addClass 'active' + auth_list.re_view() + + # one-time first selection of top list. + @$list_selector.change() + + # handler for when the section title is clicked. + onClickTitle: -> + + +# export for use +# create parent namespaces if they do not already exist. +# abort if underscore can not be found. +if _? + _.defaults window, InstructorDashboard: {} + _.defaults window.InstructorDashboard, sections: {} + _.defaults window.InstructorDashboard.sections, + Membership: Membership diff --git a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee new file mode 100644 index 0000000000..5db030ffa0 --- /dev/null +++ b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee @@ -0,0 +1,298 @@ +# Student Admin Section + +# imports from other modules. +# wrap in (-> ... apply) to defer evaluation +# such that the value can be defined later than this assignment (file load order). +plantTimeout = -> window.InstructorDashboard.util.plantTimeout.apply this, arguments +plantInterval = -> window.InstructorDashboard.util.plantInterval.apply this, arguments +std_ajax_err = -> window.InstructorDashboard.util.std_ajax_err.apply this, arguments + +# wrap window.confirm +# display `msg` +# run `ok` or `cancel` depending on response +confirm_then = ({msg, ok, cancel}) -> + if window.confirm msg then ok?() else cancel?() + +# get jquery element and assert its existance +find_and_assert = ($root, selector) -> + item = $root.find selector + if item.length != 1 + console.error "element selection failed for '#{selector}' resulted in length #{item.length}" + throw "Failed Element Selection" + else + item + +# render a task list table to the DOM +# `$table_tasks` the $element in which to put the table +# `tasks_data` +create_task_list_table = ($table_tasks, tasks_data) -> + $table_tasks.empty() + + options = + enableCellNavigation: true + enableColumnReorder: false + autoHeight: true + rowHeight: 60 + forceFitColumns: true + + columns = [ + id: 'task_type' + field: 'task_type' + name: 'Task Type' + , + id: 'requester' + field: 'requester' + name: 'Requester' + width: 30 + , + id: 'task_input' + field: 'task_input' + name: 'Input' + , + id: 'task_state' + field: 'task_state' + name: 'State' + width: 30 + , + id: 'task_id' + field: 'task_id' + name: 'Task ID' + width: 50 + , + id: 'created' + field: 'created' + name: 'Created' + ] + + table_data = tasks_data + + $table_placeholder = $ '<div/>', class: 'slickgrid' + $table_tasks.append $table_placeholder + grid = new Slick.Grid($table_placeholder, table_data, columns, options) + + +class StudentAdmin + constructor: (@$section) -> + @$section.data 'wrapper', @ + + # gather buttons + # some buttons are optional because they can be flipped by the instructor task feature switch + # student-specific + @$field_student_select = find_and_assert @$section, "input[name='student-select']" + @$progress_link = find_and_assert @$section, "a.progress-link" + @$btn_enroll = find_and_assert @$section, "input[name='enroll']" + @$btn_unenroll = find_and_assert @$section, "input[name='unenroll']" + @$field_problem_select_single = find_and_assert @$section, "input[name='problem-select-single']" + @$btn_reset_attempts_single = find_and_assert @$section, "input[name='reset-attempts-single']" + @$btn_delete_state_single = @$section.find "input[name='delete-state-single']" + @$btn_rescore_problem_single = @$section.find "input[name='rescore-problem-single']" + @$btn_task_history_single = @$section.find "input[name='task-history-single']" + @$table_task_history_single = @$section.find ".task-history-single-table" + + # course-specific + @$field_problem_select_all = @$section.find "input[name='problem-select-all']" + @$btn_reset_attempts_all = @$section.find "input[name='reset-attempts-all']" + @$btn_rescore_problem_all = @$section.find "input[name='rescore-problem-all']" + @$btn_task_history_all = @$section.find "input[name='task-history-all']" + @$table_task_history_all = @$section.find ".task-history-all-table" + @$table_running_tasks = @$section.find ".running-tasks-table" + + # response areas + @$request_response_error_single = find_and_assert @$section, ".student-specific-container .request-response-error" + @$request_response_error_all = @$section.find ".course-specific-container .request-response-error" + + # start polling for task list + if @$table_running_tasks.length > 0 + @start_refresh_running_task_poll_loop() + + # attach click handlers + + # go to student progress page + @$progress_link.click (e) => + e.preventDefault() + email = @$field_student_select.val() + + $.ajax + dataType: 'json' + url: @$progress_link.data 'endpoint' + data: student_email: email + success: @clear_errors_then (data) -> + window.location = data.progress_url + error: std_ajax_err => @$request_response_error_single.text "Error getting student progress url for '#{email}'." + + # enroll student + @$btn_enroll.click => + send_data = + action: 'enroll' + emails: @$field_student_select.val() + auto_enroll: false + + $.ajax + dataType: 'json' + url: @$btn_enroll.data 'endpoint' + data: send_data + success: @clear_errors_then -> console.log "student #{send_data.emails} enrolled" + error: std_ajax_err => @$request_response_error_single.text "Error enrolling student '#{send_data.emails}'." + + # unenroll student + @$btn_unenroll.click => + send_data = + action: 'unenroll' + emails: @$field_student_select.val() + + $.ajax + dataType: 'json' + url: @$btn_unenroll.data 'endpoint' + data: send_data + success: @clear_errors_then -> console.log "student #{send_data.emails} unenrolled" + error: std_ajax_err => @$request_response_error_single.text "Error unenrolling student '#{send_data.emails}'." + + # reset attempts for student on problem + @$btn_reset_attempts_single.click => + send_data = + student_email: @$field_student_select.val() + problem_to_reset: @$field_problem_select_single.val() + delete_module: false + + $.ajax + dataType: 'json' + url: @$btn_reset_attempts_single.data 'endpoint' + data: send_data + success: @clear_errors_then -> console.log 'problem attempts reset' + error: std_ajax_err => @$request_response_error_single.text "Error resetting problem attempts." + + # delete state for student on problem + @$btn_delete_state_single.click => confirm_then + msg: "Delete student '#{@$field_student_select.val()}'s state on problem '#{@$field_problem_select_single.val()}'?" + ok: => + send_data = + student_email: @$field_student_select.val() + problem_to_reset: @$field_problem_select_single.val() + delete_module: true + + $.ajax + dataType: 'json' + url: @$btn_delete_state_single.data 'endpoint' + data: send_data + success: @clear_errors_then -> console.log 'module state deleted' + error: std_ajax_err => @$request_response_error_single.text "Error deleting problem state." + + # start task to rescore problem for student + @$btn_rescore_problem_single.click => + send_data = + student_email: @$field_student_select.val() + problem_to_reset: @$field_problem_select_single.val() + + $.ajax + dataType: 'json' + url: @$btn_rescore_problem_single.data 'endpoint' + data: send_data + success: @clear_errors_then -> console.log 'started rescore problem task' + error: std_ajax_err => @$request_response_error_single.text "Error starting a task to rescore student's problem." + + # list task history for student+problem + @$btn_task_history_single.click => + send_data = + student_email: @$field_student_select.val() + problem_urlname: @$field_problem_select_single.val() + + if not send_data.student_email + return @$request_response_error_single.text "Enter a student email." + if not send_data.problem_urlname + return @$request_response_error_single.text "Enter a problem urlname." + + $.ajax + dataType: 'json' + url: @$btn_task_history_single.data 'endpoint' + data: send_data + success: @clear_errors_then (data) => + create_task_list_table @$table_task_history_single, data.tasks + error: std_ajax_err => @$request_response_error_single.text "Error getting task history for student+problem" + + # start task to reset attempts on problem for all students + @$btn_reset_attempts_all.click => confirm_then + msg: "Reset attempts for all students on problem '#{@$field_problem_select_all.val()}'?" + ok: => + send_data = + all_students: true + problem_to_reset: @$field_problem_select_all.val() + + $.ajax + dataType: 'json' + url: @$btn_reset_attempts_all.data 'endpoint' + data: send_data + success: @clear_errors_then -> console.log 'started reset attempts task' + error: std_ajax_err => @$request_response_error_all.text "Error starting a task to reset attempts for all students on this problem." + + # start task to rescore problem for all students + @$btn_rescore_problem_all.click => confirm_then + msg: "Rescore problem '#{@$field_problem_select_all.val()}' for all students?" + ok: => + send_data = + all_students: true + problem_to_reset: @$field_problem_select_all.val() + + $.ajax + dataType: 'json' + url: @$btn_rescore_problem_all.data 'endpoint' + data: send_data + success: @clear_errors_then -> console.log 'started rescore problem task' + error: std_ajax_err => @$request_response_error_all.text "Error starting a task to rescore this problem for all students." + + # list task history for problem + @$btn_task_history_all.click => + send_data = + problem_urlname: @$field_problem_select_all.val() + + if not send_data.problem_urlname + return @$request_response_error_all.text "Enter a problem urlname." + + $.ajax + dataType: 'json' + url: @$btn_task_history_all.data 'endpoint' + data: send_data + success: @clear_errors_then (data) => + create_task_list_table @$table_task_history_all, data.tasks + error: std_ajax_err => @$request_response_error_all.text "Error listing task history for this student and problem." + + + reload_running_tasks_list: => + list_endpoint = @$table_running_tasks.data 'endpoint' + $.ajax + dataType: 'json' + url: list_endpoint + success: (data) => create_task_list_table @$table_running_tasks, data.tasks + error: std_ajax_err => console.warn "error listing all instructor tasks" + + start_refresh_running_task_poll_loop: -> + @reload_running_tasks_list() + if @$section.hasClass 'active-section' + # poll every 20 seconds + plantTimeout 20000, => @start_refresh_running_task_poll_loop() + + # wraps a function, but first clear the error displays + clear_errors_then: (cb) -> + @$request_response_error_single.empty() + @$request_response_error_all.empty() + -> + cb?.apply this, arguments + + # handler for when the section title is clicked. + onClickTitle: -> + if @$table_running_tasks.length > 0 + @start_refresh_running_task_poll_loop() + + # handler for when the section is closed + # not working yet. + # onExit: -> + # clearInterval @reload_running_task_list_slot + + +# export for use +# create parent namespaces if they do not already exist. +# abort if underscore can not be found. +if _? + _.defaults window, InstructorDashboard: {} + _.defaults window.InstructorDashboard, sections: {} + _.defaults window.InstructorDashboard.sections, + StudentAdmin: StudentAdmin diff --git a/lms/static/coffee/src/instructor_dashboard/util.coffee b/lms/static/coffee/src/instructor_dashboard/util.coffee new file mode 100644 index 0000000000..b22410e8aa --- /dev/null +++ b/lms/static/coffee/src/instructor_dashboard/util.coffee @@ -0,0 +1,27 @@ +# Common utilities for instructor dashboard components. + +# reverse arguments on common functions to enable +# better coffeescript with callbacks at the end. +plantTimeout = (ms, cb) -> setTimeout cb, ms +plantInterval = (ms, cb) -> setInterval cb, ms + +# standard ajax error wrapper +# +# wraps a `handler` function so that first +# it prints basic error information to the console. +std_ajax_err = (handler) -> (jqXHR, textStatus, errorThrown) -> + console.warn """ajax error + textStatus: #{textStatus} + errorThrown: #{errorThrown}""" + handler.apply this, arguments + + +# export for use +# create parent namespaces if they do not already exist. +# abort if underscore can not be found. +if _? + _.defaults window, InstructorDashboard: {} + window.InstructorDashboard.util = + plantTimeout: plantTimeout + plantInterval: plantInterval + std_ajax_err: std_ajax_err diff --git a/lms/static/fonts/vendor/FontAwesome.otf b/lms/static/fonts/vendor/FontAwesome.otf new file mode 100644 index 0000000000..32dd8b1cd5 Binary files /dev/null and b/lms/static/fonts/vendor/FontAwesome.otf differ diff --git a/lms/static/fonts/vendor/fontawesome-webfont.eot b/lms/static/fonts/vendor/fontawesome-webfont.eot new file mode 100755 index 0000000000..c080283bdd Binary files /dev/null and b/lms/static/fonts/vendor/fontawesome-webfont.eot differ diff --git a/lms/static/fonts/vendor/fontawesome-webfont.svg b/lms/static/fonts/vendor/fontawesome-webfont.svg new file mode 100755 index 0000000000..10a1e1bbf7 --- /dev/null +++ b/lms/static/fonts/vendor/fontawesome-webfont.svg @@ -0,0 +1,339 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata></metadata> +<defs> +<font id="fontawesomeregular" horiz-adv-x="1536" > +<font-face units-per-em="1792" ascent="1536" descent="-256" /> +<missing-glyph horiz-adv-x="448" /> +<glyph unicode=" " horiz-adv-x="448" /> +<glyph unicode=" " horiz-adv-x="448" /> +<glyph unicode=" " horiz-adv-x="448" /> +<glyph unicode="¨" horiz-adv-x="1792" /> +<glyph unicode="©" horiz-adv-x="1792" /> +<glyph unicode="®" horiz-adv-x="1792" /> +<glyph unicode="´" horiz-adv-x="1792" /> +<glyph unicode="Æ" horiz-adv-x="1792" /> +<glyph unicode=" " horiz-adv-x="768" /> +<glyph unicode=" " /> +<glyph unicode=" " horiz-adv-x="768" /> +<glyph unicode=" " /> +<glyph unicode=" " horiz-adv-x="512" /> +<glyph unicode=" " horiz-adv-x="384" /> +<glyph unicode=" " horiz-adv-x="256" /> +<glyph unicode=" " horiz-adv-x="256" /> +<glyph unicode=" " horiz-adv-x="192" /> +<glyph unicode=" " horiz-adv-x="307" /> +<glyph unicode=" " horiz-adv-x="85" /> +<glyph unicode=" " horiz-adv-x="307" /> +<glyph unicode=" " horiz-adv-x="384" /> +<glyph unicode="™" horiz-adv-x="1792" /> +<glyph unicode="∞" horiz-adv-x="1792" /> +<glyph unicode="≠" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="500" d="M0 0z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" /> +<glyph unicode="" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" /> +<glyph unicode="" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> +<glyph unicode="" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" /> +<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " /> +<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" /> +<glyph unicode="" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" /> +<glyph unicode="" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" /> +<glyph unicode="" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h299l-299 299v-299zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544q40 0 88 -20t76 -48l408 -408q28 -28 48 -76t20 -88z" /> +<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273 t73 -273t198 -198t273 -73zM1024 640q26 0 45 -19t19 -45v-96q0 -26 -19 -45t-45 -19h-416q-26 0 -45 19t-19 45v480q0 26 19 45t45 19h96q26 0 45 -19t19 -45v-320h256z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" /> +<glyph unicode="" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" /> +<glyph unicode="" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" /> +<glyph unicode="" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" /> +<glyph unicode="" horiz-adv-x="1152" d="M704 512q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5q0 -37 19 -67t51 -47l-69 -229q-5 -15 5 -28t26 -13h192q16 0 26 13t5 28l-69 229q32 17 51 47t19 67zM320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68 t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" /> +<glyph unicode="" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" /> +<glyph unicode="" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" /> +<glyph unicode="" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" /> +<glyph unicode="" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" /> +<glyph unicode="" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" /> +<glyph unicode="" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" /> +<glyph unicode="" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" /> +<glyph unicode="" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" /> +<glyph unicode="" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" /> +<glyph unicode="" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> +<glyph unicode="" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" /> +<glyph unicode="" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" /> +<glyph unicode="" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" /> +<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" /> +<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" /> +<glyph unicode="" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" /> +<glyph unicode="" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" /> +<glyph unicode="" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" /> +<glyph unicode="" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" /> +<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" /> +<glyph unicode="" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" /> +<glyph unicode="" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" /> +<glyph unicode="" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" /> +<glyph unicode="" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" /> +<glyph unicode="" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" /> +<glyph unicode="" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" /> +<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" /> +<glyph unicode="" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" /> +<glyph unicode="" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " /> +<glyph unicode="" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-225 -225l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-195 -195l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l195 195l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l224 224q76 76 172 108t148 -12z" /> +<glyph unicode="" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" /> +<glyph unicode="" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" /> +<glyph unicode="" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " /> +<glyph unicode="" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" /> +<glyph unicode="" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> +<glyph unicode="" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" /> +<glyph unicode="" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" /> +<glyph unicode="" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" /> +<glyph unicode="" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" /> +<glyph unicode="" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" /> +<glyph unicode="" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" /> +<glyph unicode="" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" /> +<glyph unicode="" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" /> +<glyph unicode="" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" /> +<glyph unicode="" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" /> +<glyph unicode="" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" /> +<glyph unicode="" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" /> +<glyph unicode="" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M704 160q0 6 -15 57t-35 115.5t-20 65.5q32 16 51 47t19 67q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5q0 -36 19 -66.5t51 -47.5q0 -2 -20 -66t-35 -115t-15 -57q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1664 960v-256q0 -26 -19 -45t-45 -19 h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" /> +<glyph unicode="" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" /> +<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" /> +<glyph unicode="" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" /> +<glyph unicode="" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" /> +<glyph unicode="" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" /> +<glyph unicode="" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" /> +<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1193 993q11 7 25 22v-1q0 -2 -9.5 -10t-11.5 -12q-1 1 -4 1zM1187 992q-1 1 -2.5 3t-1.5 3q3 -2 10 -5q-6 -4 -6 -1zM728 1175q-16 2 -26 5q1 0 6.5 -1t10.5 -2t9 -2zM773 1212q7 4 13.5 2.5t7.5 -7.5q-5 3 -21 5zM765 1206l-3 2q-2 3 -5.5 5t-4.5 2q2 -1 21 -3 q-6 -4 -8 -6zM663 1290v2q1 -2 3 -5.5t3 -5.5zM558 1250q0 -2 -1 -2l-1 2h2zM933 206v-1v1zM768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1240 162 l5 5q-7 10 -29 12q1 12 -14 26.5t-27 15.5q0 4 -10.5 11t-17.5 8q-9 2 -27 -9q-7 -3 -4 -5q-3 3 -12 11t-16 11q-2 1 -7.5 1t-8.5 2q-1 1 -6 4.5t-7 4.5t-6.5 3t-7.5 1.5t-7.5 -2.5t-8.5 -6t-4.5 -15.5t-2.5 -14.5q-8 6 -0.5 20t1.5 20q-7 7 -21 0.5t-21 -15.5 q-1 -1 -9.5 -5.5t-11.5 -7.5q-4 -6 -9 -17.5t-6 -13.5q0 2 -2.5 6.5t-2.5 6.5q-12 -2 -16 3q5 -16 8 -17l-4 2q-1 -6 3 -15t4 -11q1 -5 -1.5 -13t-2.5 -11q0 -2 5 -11q4 -19 -2 -32q0 -1 -3.5 -7t-6.5 -11l-2 -5l-2 1q-1 1 -2 0q-1 -6 -9 -13t-10 -11q-15 -23 -9 -38 q3 -8 10 -10q3 -1 3 2q1 -9 -11 -27q1 -1 4 -3q-17 0 -10 -14q202 36 352 181h-3zM680 347q16 3 30.5 -16t22.5 -23q41 -20 59 -11q0 -9 14 -28q3 -4 6.5 -11.5t5.5 -10.5q5 -7 19 -16t19 -16q6 3 9 9q13 -35 24 -34q5 0 8 8q0 -1 -0.5 -3t-1.5 -3q7 15 5 26l6 4q5 4 5 5 q-6 6 -9 -3q-30 -14 -48 22q-2 3 -4.5 8t-5 12t-1.5 11.5t6 4.5q11 0 12.5 1.5t-2.5 6t-4 7.5q-1 4 -1.5 12.5t-1.5 12.5l-5 6q-5 6 -11.5 13.5t-7.5 9.5q-4 -10 -16.5 -8.5t-18.5 9.5q1 -2 -0.5 -6.5t-1.5 -6.5q-14 0 -17 1q1 6 3 21t4 22q1 5 5.5 13.5t8 15.5t4.5 14 t-4.5 10.5t-18.5 2.5q-20 -1 -29 -22q-1 -3 -3 -11.5t-5 -12.5t-9 -7q-8 -3 -27 -2t-26 5q-14 8 -24 30.5t-11 41.5q0 10 3 27.5t3 27t-6 26.5q3 2 10 10.5t11 11.5q2 2 5 2h5t4 2t3 6q-1 1 -4 3q-3 3 -4 3q4 -3 19 -1t19 2q0 1 22 0q17 -13 24 2q0 1 -2.5 10.5t-0.5 14.5 q5 -29 32 -10q3 -4 16.5 -6t18.5 -5q3 -2 7 -5.5t6 -5t6 -0.5t9 7q11 -17 13 -25q11 -43 20 -48q8 -2 12.5 -2t5 10.5t0 15.5t-1.5 13l-2 37q-16 3 -20 12.5t1.5 20t16.5 19.5q1 1 16.5 8t21.5 12q24 19 17 39q9 -2 11 9l-5 3q-4 3 -8 5.5t-5 1.5q11 7 2 18q5 3 8 11.5 t9 11.5q9 -14 22 -3q8 9 2 18q5 8 22 11.5t20 9.5q5 -1 7 0t2 4.5v7.5t1 8.5t3 7.5q4 6 16 10.5t14 5.5l19 12q4 4 0 4q18 -2 32 11q13 12 -5 23q2 7 -4 10.5t-16 5.5q3 1 12 0.5t12 1.5q15 11 -7 17q-20 5 -47 -13q-3 -2 -13 -12t-17 -11q15 18 5 22q8 -1 22.5 9t15.5 11 q4 2 10.5 2.5t8.5 1.5q71 25 92 -1q8 11 11 15t9.5 9t15.5 8q21 7 23 9l1 23q-12 -1 -18 8t-7 22l-6 -8q0 6 -3.5 7.5t-7.5 0.5t-9.5 -2t-7.5 0q-9 2 -19.5 15.5t-14.5 16.5q9 0 9 5q-2 5 -10 8q1 6 -2 8t-9 0q-2 12 -1 13q-6 1 -11 11t-8 10q-2 0 -4.5 -2t-5 -5.5l-5 -7 t-3.5 -5.5l-2 -2q-12 6 -24 -10q-9 1 -17 -2q15 6 2 13q-11 5 -21 2q12 5 10 14t-12 16q1 0 4 -1t4 -1q-1 5 -9.5 9.5t-19.5 9t-14 6.5q-7 5 -36 10.5t-36 1.5q-5 -3 -6 -6t1.5 -8.5t3.5 -8.5q6 -23 5 -27q-1 -3 -8.5 -8t-5.5 -12q1 -4 11.5 -10t12.5 -12q5 -13 -4 -25 q-4 -5 -15 -11t-14 -10q-5 -5 -3.5 -11.5t0.5 -9.5q1 1 1 2.5t1 2.5q0 -13 11 -22q8 -6 -16 -18q-20 -11 -20 -4q1 8 -7.5 16t-10.5 12t-3.5 19t-9.5 21q-6 4 -19 4t-18 -5q0 10 -49 30q-17 8 -58 4q7 1 0 17q-8 16 -21 12q-8 25 -4 35q2 5 9 14t9 15q1 3 15.5 6t16.5 8 q1 4 -2.5 6.5t-9.5 4.5q53 -6 63 18q5 9 3 14q0 -1 2 -1t2 -1q12 3 7 17q19 8 26 8q5 -1 11 -6t10 -5q17 -3 21.5 10t-9.5 23q7 -4 7 6q-1 13 -7 19q-3 2 -6.5 2.5t-6.5 0t-7 0.5q-1 0 -8 2q-1 -1 -2 -1h-8q-4 -2 -4 -5v-1q-1 -3 4 -6l5 -1l3 -2q-1 0 -2.5 -2.5t-2.5 -2.5 q0 -3 3 -5q-2 -1 -14 -7.5t-17 -10.5q-1 -1 -4 -2.5t-4 -2.5q-2 -1 -4 2t-4 9t-4 11.5t-4.5 10t-5.5 4.5q-12 0 -18 -17q3 10 -13 17.5t-25 7.5q20 15 -9 30l-1 1q-30 -4 -45 -7q-2 -6 3 -12q-1 -7 6 -9q0 -1 0.5 -1t0.5 -1q0 1 -0.5 1t-0.5 1q3 -1 10.5 -1.5t9.5 -1.5 q3 -1 4.5 -2l7.5 -5t5.5 -6t-2.5 -5q-2 -1 -9 -4t-12.5 -5.5t-6.5 -3.5q-3 -5 0 -16t-2 -15q-5 5 -10 18.5t-8 17.5q8 -9 -30 -6l-8 1q-4 0 -15 -2t-16 -1q-7 0 -29 6q7 17 5 25q5 0 7 2l-6 3q-3 -1 -25 -9q2 -3 8 -9.5t9 -11.5q-22 6 -27 -2q0 -1 -9 0q-25 1 -24 -7 q1 -4 9 -12q0 -9 -1 -9q-27 22 -30 23q-172 -83 -276 -248q1 -2 2.5 -11t3.5 -8.5t11 4.5q9 -9 3 -21q2 2 36 -21q56 -40 22 -53v5.5t1 6.5q-9 -1 -19 5q-3 -6 0.5 -20t11.5 -14q-8 0 -10.5 -17t-2.5 -38.5t-1 -25.5l2 -1q-3 -13 6 -37.5t24 -20.5q-4 -18 5 -21q-1 -4 0 -8 t4.5 -8.5t6 -7l7.5 -7.5l6 -6q28 -11 41 -29q4 -6 10.5 -24.5t15.5 -25.5q-2 -6 10 -21.5t11 -25.5q-1 0 -2.5 -0.5t-2.5 -0.5q3 -8 16.5 -16t16.5 -14q2 -3 2.5 -10.5t3 -12t8.5 -2.5q3 24 -26 68q-16 27 -18 31q-3 5 -5.5 16.5t-4.5 15.5q27 -9 26 -13q-5 -10 26 -52 q2 -3 10 -10t11 -12q3 -4 9.5 -14.5t10.5 -15.5q-1 0 -3 -2l-3 -3q4 -2 9 -5t8 -4.5t7.5 -5t7.5 -7.5q16 -18 20 -33q1 -4 0.5 -15.5t1.5 -16.5q2 -6 6 -11t11.5 -10t11.5 -7t14.5 -6.5t11.5 -5.5q2 -1 18 -11t25 -14q10 -4 16.5 -4.5t16 2.5t15.5 4z" /> +<glyph unicode="" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" /> +<glyph unicode="" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" /> +<glyph unicode="" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " /> +<glyph unicode="" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " /> +<glyph unicode="" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" /> +<glyph unicode="" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" /> +<glyph unicode="" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" /> +<glyph unicode="" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" /> +<glyph unicode="" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" /> +<glyph unicode="" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" /> +<glyph unicode="" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" /> +<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" /> +<glyph unicode="" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" /> +<glyph unicode="" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" /> +<glyph unicode="" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" /> +<glyph unicode="" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" /> +<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" /> +<glyph unicode="" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" /> +<glyph unicode="" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" /> +<glyph unicode="" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" /> +<glyph unicode="" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" /> +<glyph unicode="" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" /> +<glyph unicode="" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" /> +<glyph unicode="" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h299l-299 299v-299zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544q40 0 88 -20t76 -48l408 -408q28 -28 48 -76t20 -88z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" /> +<glyph unicode="" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" /> +<glyph unicode="" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" /> +<glyph unicode="" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" /> +<glyph unicode="" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" /> +<glyph unicode="" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" /> +<glyph unicode="" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" /> +<glyph unicode="" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" /> +<glyph unicode="" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" /> +<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" /> +<glyph unicode="" horiz-adv-x="1664" /> +<glyph unicode="" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" /> +<glyph unicode="" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " /> +<glyph unicode="" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" /> +<glyph unicode="" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" /> +<glyph unicode="" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" /> +<glyph unicode="" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" /> +<glyph unicode="" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" /> +<glyph unicode="" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" /> +<glyph unicode="" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" /> +<glyph unicode="" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" /> +<glyph unicode="" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" /> +<glyph unicode="" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" /> +<glyph unicode="" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" /> +<glyph unicode="" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" /> +<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" /> +<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" /> +<glyph unicode="" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" /> +<glyph unicode="" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" /> +<glyph unicode="" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" /> +<glyph unicode="" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" /> +<glyph unicode="" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" /> +<glyph unicode="" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1708 881l-188 -881h-304l181 849q4 21 1 43q-4 20 -16 35q-10 14 -28 24q-18 9 -40 9h-197l-205 -960h-303l204 960h-304l-205 -960h-304l272 1280h1139q157 0 245 -118q86 -116 52 -281z" /> +<glyph unicode="" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" /> +<glyph unicode="" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" /> +<glyph unicode="" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1790 276q-8 -20 -30 -20h-112q0 -137 -99.5 -251t-272 -179.5t-380.5 -65.5t-380.5 65.5t-272 179.5t-99.5 251h-112q-22 0 -30 20q-8 19 7 35l224 224q10 9 23 9q12 0 23 -9l224 -224 q15 -16 7 -35q-8 -20 -30 -20h-112q0 -85 112.5 -162.5t287.5 -100.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19t19 -45v-128 q0 -26 -19 -45t-45 -19h-192v-647q175 23 287.5 100.5t112.5 162.5h-112q-22 0 -30 20q-8 19 7 35l224 224q11 9 23 9t23 -9l224 -224q15 -16 7 -35z" /> +<glyph unicode="" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736zM703 169l-69 229q32 17 51 47t19 67q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5q0 -37 19 -67t51 -47l-69 -229q-5 -15 5 -28t26 -13h192q16 0 26 13t5 28z" /> +<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" /> +<glyph unicode="" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" /> +<glyph unicode="" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" /> +<glyph unicode="" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" /> +<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" /> +<glyph unicode="" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" /> +<glyph unicode="" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" /> +<glyph unicode="" horiz-adv-x="1792" /> +<glyph unicode="" horiz-adv-x="1792" /> +</font> +</defs></svg> \ No newline at end of file diff --git a/lms/static/fonts/vendor/fontawesome-webfont.ttf b/lms/static/fonts/vendor/fontawesome-webfont.ttf new file mode 100755 index 0000000000..908f69ec9a Binary files /dev/null and b/lms/static/fonts/vendor/fontawesome-webfont.ttf differ diff --git a/lms/static/fonts/vendor/fontawesome-webfont.woff b/lms/static/fonts/vendor/fontawesome-webfont.woff new file mode 100755 index 0000000000..a33af950ae Binary files /dev/null and b/lms/static/fonts/vendor/fontawesome-webfont.woff differ diff --git a/lms/static/images/flagged.png b/lms/static/images/flagged.png deleted file mode 100644 index ad2b0dac55..0000000000 Binary files a/lms/static/images/flagged.png and /dev/null differ diff --git a/lms/static/images/info-icon-dark.png b/lms/static/images/info-icon-dark.png new file mode 100644 index 0000000000..4f22a5dac9 Binary files /dev/null and b/lms/static/images/info-icon-dark.png differ diff --git a/lms/static/images/new-post-icon.png b/lms/static/images/new-post-icon.png deleted file mode 100644 index bf16b9da89..0000000000 Binary files a/lms/static/images/new-post-icon.png and /dev/null differ diff --git a/lms/static/images/notflagged.png b/lms/static/images/notflagged.png deleted file mode 100644 index fda47d5ab5..0000000000 Binary files a/lms/static/images/notflagged.png and /dev/null differ diff --git a/lms/static/images/pinned.png b/lms/static/images/pinned.png deleted file mode 100644 index e70df7f9db..0000000000 Binary files a/lms/static/images/pinned.png and /dev/null differ diff --git a/lms/static/images/unpinned.png b/lms/static/images/unpinned.png deleted file mode 100644 index a5f5f02894..0000000000 Binary files a/lms/static/images/unpinned.png and /dev/null differ diff --git a/lms/static/sass/_discussion-old.scss b/lms/static/sass/_discussion-old.scss index 01380faa77..8d1152cbcc 100644 --- a/lms/static/sass/_discussion-old.scss +++ b/lms/static/sass/_discussion-old.scss @@ -68,7 +68,10 @@ width: 16px; height: 17px; margin: 7px 7px 0 0; - background: url(../images/new-post-icon.png) no-repeat; + font-size: 16px; + padding-right: $baseline/2; + vertical-align: middle; + color: $white; } .post-search { diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 80f469113d..9cb6708b8f 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -8,7 +8,7 @@ font-size: 13px; font-weight: 700; line-height: 32px; - color: #fff; + color: $white; text-shadow: 0 1px 0 rgba(0, 0, 0, .3); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) inset, 0 1px 1px rgba(0, 0, 0, .15); @@ -33,7 +33,7 @@ box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) inset, 0 1px 1px rgba(0, 0, 0, .15); &:hover { - @include linear-gradient(top, #fff, #ddd); + @include linear-gradient(top, $white, #ddd); } } @@ -90,10 +90,6 @@ } - - - - body.discussion { .new-post-form-errors { @@ -102,13 +98,13 @@ body.discussion { padding: 0; border: 1px solid #333; list-style: none; - color: #fff; + color: $white; line-height: 1.6; border-radius: 3px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3) inset, 0 1px 0 rgba(255, 255, 255, .2); li { - padding: 10px 20px 12px 45px; + padding: $baseline/2 $baseline 12px 45px; border-bottom: 1px solid #dc4949; background: url(../images/white-error-icon.png) no-repeat 15px 14px; @@ -133,13 +129,15 @@ body.discussion { width: 16px; height: 17px; margin: 8px 7px 0 0; - background: url(../images/new-post-icon.png) no-repeat; + font-size: 16px; + vertical-align: middle; + color: $white; } } .new-post-article { display: none; - margin-top: 20px; + margin-top: $baseline; .inner-wrapper { max-width: 1180px; @@ -150,13 +148,13 @@ body.discussion { .left-column { float: left; width: 32%; - padding: 40px; + padding: $baseline*2; @include box-sizing(border-box); label { font-size: 22px; font-weight: 700; - color: #fff; + color: $white; text-shadow: none; } @@ -172,8 +170,8 @@ body.discussion { .form-group-label { display: block; - padding-top: 5px; - color:#fff; + padding-top: $baseline/4; + color: $white; } .topic_dropdown_button { @@ -195,12 +193,12 @@ body.discussion { .topic_menu_wrapper { display: none; position: absolute; - top: 40px; + top: $baseline*2; left: 0; z-index: 9999; width: 100%; @include box-sizing(border-box); - background: #737373; + background: #797979; border: 1px solid #333; box-shadow: 0 2px 50px rgba(0, 0, 0, .4); } @@ -211,7 +209,7 @@ body.discussion { a { display: block; - padding: 10px 15px; + padding: $baseline/2 15px; border-top: 1px solid #5f5f5f; font-size: 14px; font-weight: 700; @@ -241,7 +239,7 @@ body.discussion { } .topic_menu_search { - padding: 10px; + padding: $baseline/2; border-bottom: 1px solid black; } @@ -253,7 +251,7 @@ body.discussion { border-radius: 30px; border: 1px solid #333; box-shadow: 0 1px 3px rgba(0, 0, 0, .25) inset; - background: -webkit-linear-gradient(top, #eee, #fff); + background: -webkit-linear-gradient(top, #eee, $white); font-size: 11px; line-height: 16px; color: #333; @@ -263,7 +261,7 @@ body.discussion { .right-column { float: left; width: 68%; - padding: 40px; + padding: $baseline*2; @include box-sizing(border-box); } @@ -277,9 +275,9 @@ body.discussion { } .edit-post-form { - width: 100%; - margin-bottom: 40px; @include clearfix; + margin-bottom: $baseline*2; + width: 100%; @include box-sizing(border-box); h1 { @@ -287,21 +285,21 @@ body.discussion { } .form-row { - margin-top: 20px; + margin-top: $baseline; } .post-cancel { @include white-button; float: left; - margin: 10px 0 0 15px; + margin: $baseline/2 0 0 15px; } .post-update { @include blue-button; float: left; - height: 37px; - margin-top: 10px; + margin-top: $baseline/2; padding-bottom: 2px; + height: 37px; &:hover { border-color: #222; @@ -348,7 +346,7 @@ body.discussion { @include clearfix; .form-row { - margin-bottom: 20px; + margin-bottom: $baseline; } .new-post-body .wmd-input { @@ -403,9 +401,9 @@ body.discussion { position: absolute; top: 4px; left: 4px; - font-size: 11px; color: #aaa; text-transform: uppercase; + font-size: 11px; } .new-post-title, @@ -429,9 +427,9 @@ body.discussion { .submit { @include blue-button; float: left; - height: 37px; - margin-top: 10px; + margin-top: $baseline/2; padding-bottom: 2px; + height: 37px; border-color: #333; &:hover { @@ -441,20 +439,20 @@ body.discussion { .new-post-cancel { @include white-button; - border-color: #444; float: left; - margin: 10px 0 0 15px; + margin: $baseline/2 0 0 15px; + border-color: #444; } .options { - margin-top: 40px; + margin-top: $baseline*2; label { display: inline; margin-left: 8px; - font-size: 15px; - color: #fff; + color: $white; text-shadow: none; + font-size: 15px; } } } @@ -462,25 +460,25 @@ body.discussion { .thread-tags { - margin-top: 20px; + margin-top: $baseline; } .thread-tag { margin-right: 5px; - padding: 3px 10px 6px; - border-radius: 3px; - color: #333; - background: #c5eeff; + padding: 3px $baseline/2 6px; border: 1px solid #90c4d7; + border-radius: 3px; + background: #c5eeff; + color: #333; font-size: 13px; } .thread-title { display: block; - margin-bottom: 20px; - font-size: 21px; + margin-bottom: $baseline; color: #333; font-weight: 700; + font-size: 21px; } @@ -500,14 +498,14 @@ body.discussion { } .sidebar-username { - font-size: 18px; font-weight: 700; + font-size: 18px; } .sidebar-user-roles { margin-top: 6px; - font-size: 13px; font-style: italic; + font-size: 13px; } .sidebar-threads-count { @@ -521,8 +519,8 @@ body.discussion { .sidebar-toggle-moderator-button { @include blue-button; + margin-top: $baseline; text-align: center; - margin-top: 20px; } } @@ -530,8 +528,8 @@ body.discussion { .wmd-panel { - width: 100%; min-width: 500px; + width: 100%; } .wmd-button-bar { @@ -540,15 +538,15 @@ body.discussion { } .wmd-input { - height: 150px; width: 100%; - background-color: #e9e9e9; + height: 150px; border: 1px solid #c8c8c8; - font-family: Monaco, 'Lucida Console', monospace; + border-radius: 3px 3px 0 0; + background-color: #e9e9e9; font-style: normal; font-size: 0.8em; + font-family: Monaco, 'Lucida Console', monospace; line-height: 1.6em; - border-radius: 3px 3px 0 0; &::-webkit-input-placeholder { color: #888; @@ -556,16 +554,16 @@ body.discussion { } .wmd-preview { - position: relative; - font-family: $sans-serif; - padding: 25px 20px 10px 20px; - margin-bottom: 5px; @include box-sizing(border-box); + @include transition(all .2s ease-out 0s); + position: relative; + overflow: hidden; + margin-bottom: 5px; + padding: 25px $baseline $baseline/2 $baseline; border: 1px solid #c8c8c8; border-top-width: 0; border-radius: 0 0 3px 3px; - overflow: hidden; - @include transition(all .2s ease-out 0s); + font-family: $sans-serif; &:before { content: 'PREVIEW'; @@ -583,46 +581,46 @@ body.discussion { } .wmd-button-row { + @include transition(all .2s ease-out 0s); position: relative; - margin-left: 5px; + overflow: hidden; + margin-top: $baseline/2; margin-right: 5px; margin-bottom: 5px; - margin-top: 10px; + margin-left: 5px; padding: 0px; height: 20px; - overflow: hidden; - @include transition(all .2s ease-out 0s); } .wmd-spacer { - width: 1px; - height: 20px; - margin-left: 14px; position: absolute; - background-color: Silver; display: inline-block; + margin-left: 14px; + width: 1px; + height: 20px; + background-color: Silver; list-style: none; } .wmd-button { - width: 20px; - height: 20px; - padding-left: 2px; - padding-right: 3px; position: absolute; display: inline-block; + padding-right: 3px; + padding-left: 2px; + width: 20px; + height: 20px; list-style: none; cursor: pointer; } .wmd-button > span { display: inline-block; - background-image: url('/static/images/wmd-buttons.png'); - background-repeat: no-repeat; - background-position: 0px 0px; width: 20px; height: 20px; + background-image: url('/static/images/wmd-buttons.png'); + background-position: 0px 0px; + background-repeat: no-repeat; } .wmd-spacer1 { @@ -642,11 +640,11 @@ body.discussion { .wmd-prompt-dialog { @extend .modal; - background: #fff; + background: $white; } .wmd-prompt-dialog { - padding: 20px; + padding: $baseline; > div { font-size: 0.8em; @@ -664,8 +662,8 @@ body.discussion { > form > input[type="button"] { border: 1px solid #888; - font-family: $sans-serif; font-size: 14px; + font-family: $sans-serif; } > form > input[type="file"] { @@ -683,15 +681,15 @@ body.discussion { @include clearfix; .sidebar { - float: left; @include box-sizing(border-box); + float: left; width: 31%; height: 550px; border: 1px solid #aaa; - box-shadow: 0 1px 2px rgba(0, 0, 0, .05); - background: #f6f6f6; - border-radius: 3px; border-right: 1px solid #bcbcbc; + border-radius: 3px; + background: #f6f6f6; + box-shadow: 0 1px 2px rgba(0, 0, 0, .05); &.fixed { @include box-sizing(border-box); @@ -703,30 +701,50 @@ body.discussion { } .browse-search { - display: block; position: relative; + display: block; height: 60px; border-bottom: 1px solid #a3a3a3; border-radius: 3px 0 0 0; - .browse, + .home, .browse, .search { + @include linear-gradient(top, rgba(255, 255, 255, .5), rgba(255, 255, 255, 0)); + @include transition(all .2s ease-out); position: relative; float: left; width: 20%; height: 100%; - @include linear-gradient(top, rgba(255, 255, 255, .5), rgba(255, 255, 255, 0)); - background-color: #dcdcdc; - @include transition(all .2s ease-out 0s); + background-color: #dedede; &:hover { - background-color: #e9e9e9; + background-color: $white; } + } - &.is-open { - width: 80%; - } + .icon { + @include transition(all .2s ease-out); + z-index: 100; + display: inline-block; + width: 100%; + color: #aeaeae; + text-align: center; + font-size: 28px; + line-height: 60px; + opacity: 1; + } + + .home { + border-radius: 3px 0 0 0; + box-shadow: -1px 0 0 #aaa inset; + cursor: pointer; + } + + .home-icon { + width: 100%; + height: 100%; + display: block; } .browse { @@ -734,6 +752,7 @@ body.discussion { box-shadow: -1px 0 0 #aaa inset; &.is-open { + width:60%; .browse-topic-drop-btn span { opacity: 1.0; } @@ -746,7 +765,7 @@ body.discussion { .browse-topic-drop-btn { span { - color: #fff; + color: $white; text-shadow: none; } @@ -774,9 +793,14 @@ body.discussion { &.is-open { cursor: auto; + width: 60%; + + .home { + width:0%; + } .post-search { - padding: 0 10px; + padding: 0 $baseline/2; max-width: 1000px; } @@ -794,21 +818,21 @@ body.discussion { } .browse-topic-drop-btn { - display: block; + @include transition(none); position: absolute; top: -1px; left: -1px; z-index: 50; + display: block; + overflow: hidden; width: 100%; height: 100%; - border-radius: 3px 0 0 0; border: 1px solid transparent; text-align: center; - overflow: hidden; - @include transition(none); .current-board { - white-space: nowrap; + white-space: normal; + } span { @@ -820,20 +844,22 @@ body.discussion { opacity: 0.0; @include transition(opacity .2s linear 0s); } + .drop-arrow { + font-size: 16px; + } + .drop-arrow { + font-size: 16px; + } + .drop-arrow { + font-size: 16px; + } } .browse-topic-drop-icon { display: block; - position: absolute; - top: 21px; - left: 50%; z-index: 100; - width: 29px; - height: 16px; - margin-left: -12px; - background: url(../images/browse-icon.png) no-repeat; opacity: 1.0; - @include transition(none); + @include transition(none); } .browse-topic-drop-menu-wrapper { @@ -843,7 +869,7 @@ body.discussion { left: -1px; z-index: 9999; width: 100%; - background: #737373; + background: #797979; border: 1px solid #4b4b4b; border-left: none; border-radius: 0 0 3px 3px; @@ -854,6 +880,7 @@ body.discussion { overflow-y: scroll; } + ul { position: inline; } @@ -864,12 +891,12 @@ body.discussion { a { display: block; - padding: 0 20px; + padding: 0 $baseline; border-top: 1px solid #5f5f5f; - font-size: 14px; + font-size: 12px; font-weight: 700; line-height: 22px; - color: #fff; + color: $white; @include clearfix; @include transition(none); @@ -886,7 +913,7 @@ body.discussion { float: left; width: 80%; margin: 13px 0; - color: #fff; + color: $white; } .unread { @@ -916,7 +943,7 @@ body.discussion { } .browse-topic-drop-search { - padding: 10px; + padding: $baseline/2; } .browse-topic-drop-search-input { @@ -927,7 +954,7 @@ body.discussion { border-radius: 30px; border: 1px solid #333; box-shadow: 0 1px 3px rgba(0, 0, 0, .25) inset; - background: -webkit-linear-gradient(top, #eee, #fff); + background: -webkit-linear-gradient(top, #eee, $white); font-size: 11px; line-height: 16px; color: #333; @@ -995,7 +1022,7 @@ body.discussion { .sort-label { display: block; float: left; - margin: 0 10px; + margin: 0 $baseline/2; } li { @@ -1019,7 +1046,7 @@ body.discussion { &.active { @include linear-gradient(top, rgba(0, 0, 0, .3), rgba(0, 0, 0, 0)); background-color: #999; - color: #fff; + color: $white; text-shadow: 0 -1px 0 rgba(0, 0, 0, .3); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 1px rgba(0, 0, 0, .2) inset; } @@ -1027,7 +1054,7 @@ body.discussion { } .group-filter-label { width: 40px; - margin-left:10px; + margin-left: $baseline/2; } .group-filter-select { @@ -1042,7 +1069,7 @@ body.discussion { .post-list-wrapper { overflow-y: scroll; overflow-x: hidden; - border-right: 1px solid transparent; + //border-right: 1px solid transparent; } .post-list { @@ -1075,11 +1102,11 @@ body.discussion { float: left; clear: both; width: 100%; - padding: 0 10px 0 18px; + padding: 0 $baseline/2 0 18px; margin-bottom: 1px; margin-right: -1px; @include linear-gradient(top, rgba(255, 255, 255, .7), rgba(255, 255, 255, 0)); - background-color: #fff; + background-color: $white; @include clearfix; &:hover { @@ -1120,7 +1147,7 @@ body.discussion { display: block; float: left; width: 70%; - margin: 8px 0 10px; + margin: 8px 0 $baseline/2; font-size: 13px; font-weight: 700; line-height: 1.4; @@ -1176,7 +1203,7 @@ body.discussion { .votes-count, .comments-count { @include linear-gradient(top, #3994c7, #4da7d3); - color: #fff; + color: $white; &:after { background-position: 0 0; @@ -1238,9 +1265,6 @@ body.discussion { } } - - - .bottom-post-status { padding: 30px; font-size: 20px; @@ -1249,9 +1273,6 @@ body.discussion { text-align: center; } - - - .discussion-column { float: right; @include box-sizing(border-box); @@ -1260,7 +1281,7 @@ body.discussion { min-height: 500px; border: 1px solid #aaa; border-radius: 3px; - background: #fff; + background: $white; box-shadow: 0 1px 2px rgba(0, 0, 0, .05); &.sidebar-fixed { @@ -1268,24 +1289,167 @@ body.discussion { } } - .blank-slate h1 { - margin-top: 195px; - text-align: center; - color: #ccc; + .blank-slate { + + section { + border-bottom: 1px solid #ccc; + } + + .label { + display: block; + font-size: 12px; + } + + .label-settings { + padding-top: $baseline; + padding-bottom: $baseline/2; + } + + .home-header { + margin: 0; + } + + .home-title { + font-size: 18px; + color: $black; + margin-bottom: 5px; + } + .home-description { + font-size: 12px; + line-height: 1; + margin-bottom: $baseline/2; + } + .home-stats { + padding: $baseline 0; + + .label-area { + display: inline-block; + min-width: $baseline*5; + width: 25%; + vertical-align: middle; + + .profile-link { + font-weight: 700; + } + } + + .stats-grouping { + display: inline-block; + width: 70%; + padding-left: $baseline; + + .profile-stat { + display: inline-block; + width: 32.5%; + vertical-align: middle; + font-size: 12px; + + .count { + display: inline-block; + font-size: 28px; + padding: 0 $baseline/2; + vertical-align: middle; + } + + .profile-stat-label{ + vertical-align: middle; + } + } + } + } + + .home-helpgrid { + border-bottom: none; + border-radius: 3px; + border: 1px solid #b2b2b2; + box-shadow: 0 1px 3px rgba(0, 0, 0, .15); + } + } + + .helpgrid-row { + border-bottom: 1px solid #b2b2b2; + + .row-title { + padding: 30px $baseline; + background-color: #dedede; + font-size: 12px; + } + + .row-item-full, .row-item { + font-size: 12px; + padding: 0px $baseline/2; + width: 26%; + vertical-align: middle; + + .icon { + padding: 0 $baseline/2; + font-size: 24px; + vertical-align: middle; + display: table-cell; + } + + .icon-stack i { + padding: 0 $baseline/2; + } + + .row-description { + vertical-align: middle; + display: table-cell; + } + } + + .row-item-full { + + .email-setting { + display: inline-block; + text-align: center; + vertical-align: middle; + margin-left: $baseline/2; + } + + .icon { + display: inline-block; + } + + .email-setting:checked ~ .icon { + color: $green; + } + + .row-description { + display: inline-block; + width:80%; + } + } + } + + .helpgrid-row-navigation { + .icon-reorder {color: $light-gray;} + .icon-search {color: $light-gray;} + .icon-sort {color: $light-gray;} + } + + .helpgrid-row-participation { + .icon-plus {color: $green;} + .icon-flag {color: $pink;} + .icon-star {color: $blue;} + } + + .helpgrid-row-notification { + .icon-sign-blank {color: $green;} + .icon-envelope {color: $light-gray;} } - .blank-slate, .discussion-article { position: relative; - padding: 40px; - min-height: 468px; + padding: $baseline*2; + min-height: 468px; a { word-wrap: break-word; } h1 { - margin-bottom: 10px; + margin-bottom: $baseline/2; font-size: 28px; font-weight: 700; letter-spacing: 0; @@ -1309,13 +1473,13 @@ body.discussion { } .post-context{ - margin-top: 20px; + margin-top: $baseline; font-size: 12px; color: #888; } p + p { - margin-top: 20px; + margin-top: $baseline; } .dogear { @@ -1338,13 +1502,13 @@ body.discussion { } .discussion-post { - padding: 10px 20px; + padding: $baseline/2 $baseline; > header .vote-btn { position: relative; z-index: 100; margin-top: 5px; - margin-left: 40px; + margin-left: $baseline*2; } @@ -1376,20 +1540,20 @@ body.discussion { .discussion-post header, .responses li header { - margin-bottom: 20px; + margin-bottom: $baseline; } .responses { list-style: none; - margin-top: 40px; + margin-top: $baseline; padding: 0; > li { position: relative; margin: 0 -10px 30px; - padding: 26px 30px 20px; + padding: 26px 30px $baseline; border-radius: 3px; border: 1px solid #b2b2b2; box-shadow: 0 1px 3px rgba(0, 0, 0, .15); @@ -1417,7 +1581,7 @@ body.discussion { background: #009fe2; font-size: 9px; font-weight: 700; - color: #fff; + color: $white; text-transform: uppercase; } @@ -1433,7 +1597,7 @@ body.discussion { background: #449944; font-size: 9px; font-weight: 700; - color: #fff; + color: $white; text-transform: uppercase; } @@ -1461,7 +1625,7 @@ body.discussion { padding: 0 8px; border-radius: 5px; border: 1px solid #b2b2b2; - @include linear-gradient(top, #fff 35%, #ebebeb); + @include linear-gradient(top, $white 35%, #ebebeb); box-shadow: 0 1px 1px rgba(0, 0, 0, .15); font-size: 12px; font-weight: 700; @@ -1483,7 +1647,7 @@ body.discussion { &.is-cast { border-color: #379a42; @include linear-gradient(top, #50cc5e, #3db84b); - color: #fff; + color: $white; text-shadow: 0 1px 0 rgba(0, 0, 0, .3); box-shadow: 0 1px 0 rgba(255, 255, 255, .4) inset, 0 1px 2px rgba(0, 0, 0, .2); @@ -1500,10 +1664,10 @@ body.discussion { float: right; width: 27px; height: 27px; - margin-right: 10px; + margin-right: $baseline/2; border-radius: 27px; border: 1px solid #a0a0a0; - @include linear-gradient(top, #fff 35%, #ebebeb); + @include linear-gradient(top, $white 35%, #ebebeb); box-shadow: 0 1px 1px rgba(0, 0, 0, .1); .check-icon { @@ -1528,13 +1692,13 @@ body.discussion { blockquote { background: #f6f6f6; border-radius: 3px; - padding: 5px 10px; + padding: 5px $baseline/2; font-size: 14px; } .comments { list-style: none; - margin-top: 20px; + margin-top: $baseline; padding: 0; border-top: 1px solid #ddd; @@ -1546,7 +1710,7 @@ body.discussion { blockquote { background: #e6e6e6; border-radius: 3px; - padding: 5px 10px; + padding: 5px $baseline/2; font-size: 14px; } @@ -1555,8 +1719,8 @@ body.discussion { @include clearfix; .comment-form-input { - padding: 5px 10px; - background-color: #fff; + padding: 5px $baseline/2; + background-color: $white; font-size: 14px; } @@ -1577,7 +1741,7 @@ body.discussion { .response-body { font-size: 13px; - padding: 10px 20px; + padding: $baseline/2 $baseline; p + p { margin-top: 12px; @@ -1585,7 +1749,7 @@ body.discussion { } .posted-details { - margin: 0 20px 10px; + margin: 0 $baseline $baseline/2; font-size: 11px; } @@ -1615,7 +1779,7 @@ body.discussion { } .comment-form { - padding: 8px 20px; + padding: 8px $baseline; .wmd-input { @include transition(all .2s linear 0s); @@ -1633,7 +1797,7 @@ body.discussion { .comment-form-input { width: 100%; height: 31px; - padding: 0 10px; + padding: 0 $baseline/2; @include box-sizing(border-box); border: 1px solid #b2b2b2; border-radius: 3px; @@ -1647,7 +1811,7 @@ body.discussion { .moderator-actions { margin: 0; - margin-top: 20px; + margin-top: $baseline; padding: 0; @include clearfix; @@ -1663,7 +1827,7 @@ body.discussion { padding: 0 12px; border-radius: 3px; border: 1px solid #b2b2b2; - @include linear-gradient(top, #fff 35%, #ebebeb); + @include linear-gradient(top, $white 35%, #ebebeb); font-size: 13px; line-height: 24px; color: #737373; @@ -1698,20 +1862,20 @@ body.discussion { } .new-post-form { - margin-top: 20px; + margin-top: $baseline; @include clearfix; } .new-post-form .submit { @include blue-button; float: left; - margin-top: 10px; + margin-top: $baseline/2; padding-bottom: 2px; } .new-post-form .options { float: right; - margin-top: 20px; + margin-top: $baseline; font-size: 14px; label { @@ -1724,7 +1888,7 @@ body.discussion { .discussion-reply-new { - padding: 20px; + padding: $baseline; @include clearfix; @include transition(opacity .2s linear 0s); @@ -1747,7 +1911,7 @@ body.discussion { } .reply-post-control { - margin-top: 20px; + margin-top: $baseline; } .discussion-submit-post { @@ -1774,8 +1938,8 @@ body.discussion { .discussion-module { @extend .discussion-body; position: relative; - margin: 20px 0; - padding: 20px; + margin: $baseline 0; + padding: $baseline; background: #f6f6f6 !important; border-radius: 3px; @@ -1786,11 +1950,11 @@ body.discussion { } .responses { - margin-top: 40px; + margin-top: $baseline*2; > li { - margin: 0 20px 20px !important; - padding: 26px 30px 20px !important; + margin: 0 $baseline $baseline !important; + padding: 26px 30px $baseline !important; } } @@ -1831,7 +1995,7 @@ body.discussion { margin-top: 30px; .threads { - margin-top: 20px; + margin-top: $baseline; } /* Course content p has a default margin-bottom of 1.416em, this is just to reset that */ @@ -1844,7 +2008,7 @@ body.discussion { } &.expanded { - padding: 20px 0; + padding: $baseline 0; .dogear{ display: block; @@ -1864,14 +2028,14 @@ body.discussion { .discussion-article { border: 1px solid #ddd; border-bottom-width: 0; - background: #fff; + background: $white; min-height: 0; - padding: 10px 10px 15px 10px; + padding: $baseline/2 $baseline/2 15px $baseline/2; box-shadow: 0 1px 0 #ddd; @include transition(all .2s linear 0s); .discussion-post { - padding: 12px 20px 0 20px; + padding: 12px $baseline 0 $baseline; @include clearfix; .inline-comment-count { @@ -1922,7 +2086,7 @@ body.discussion { } .post-tools { - margin-left: 20px; + margin-left: $baseline; margin-top: 5px; a { @@ -1945,7 +2109,7 @@ body.discussion { } .responses { - margin-top: 10px; + margin-top: $baseline/2; header { padding-bottom: 0; @@ -1982,7 +2146,7 @@ body.discussion { .new-post-article { display: none; - margin-top: 20px; + margin-top: $baseline; .inner-wrapper { max-width: 1180px; @@ -1992,17 +2156,17 @@ body.discussion { .new-post-form { width: 100%; - margin-bottom: 20px; + margin-bottom: $baseline; padding: 30px; border-radius: 3px; background: rgba(0, 0, 0, .55); - color: #fff; + color: $white; box-shadow: none; @include clearfix; @include box-sizing(border-box); .form-row { - margin-bottom: 20px; + margin-bottom: $baseline; } .new-post-body .wmd-input { @@ -2011,11 +2175,11 @@ body.discussion { width: 100%; height: 200px; z-index: 1; - padding: 10px; + padding: $baseline/2; @include box-sizing(border-box); border: 1px solid #333; border-radius: 3px 3px 0 0; - background: #fff; + background: $white; font-family: 'Monaco', monospace; font-size: 13px; line-height: 1.6; @@ -2028,7 +2192,7 @@ body.discussion { width: 100%; //height: 50px; margin-top: -1px; - padding: 25px 20px 10px 20px; + padding: 25px $baseline $baseline/2 $baseline; @include box-sizing(border-box); border: 1px solid #333; border-radius: 0 0 3px 3px; @@ -2050,7 +2214,7 @@ body.discussion { .new-post-tags { width: 100%; height: 40px; - padding: 0 10px; + padding: 0 $baseline/2; @include box-sizing(border-box); border-radius: 3px; border: 1px solid #333; @@ -2065,11 +2229,11 @@ body.discussion { } .tagsinput { - padding: 10px; + padding: $baseline/2; @include box-sizing(border-box); border: 1px solid #333; border-radius: 3px; - background: #fff; + background: $white; font-family: 'Monaco', monospace; font-size: 13px; line-height: 1.6; @@ -2084,7 +2248,7 @@ body.discussion { @include blue-button; float: left; height: 37px; - margin-top: 10px; + margin-top: $baseline/2; padding-bottom: 2px; border-color: #333; @@ -2096,7 +2260,7 @@ body.discussion { .new-post-cancel { @include white-button; float: left; - margin: 10px 0 0 15px; + margin: $baseline/2 0 0 15px; border-color: #444; } @@ -2107,18 +2271,18 @@ body.discussion { display: inline; margin-left: 8px; font-size: 15px; - color: #fff; + color: $white; text-shadow: none; } } } .thread-tags { - margin: 20px 0; + margin: $baseline 0; } .thread-tag { - padding: 3px 10px 6px; + padding: 3px $baseline/2 6px; margin-right: 5px; border-radius: 3px; color: #333; @@ -2129,7 +2293,7 @@ body.discussion { .thread-title { display: block; - margin-bottom: 20px; + margin-bottom: $baseline; font-size: 21px; color: #333; font-weight: 700; @@ -2149,7 +2313,10 @@ body.discussion { width: 16px; height: 17px; margin: 8px 7px 0 0; - background: url(../images/new-post-icon.png) no-repeat; + font-size: 16px; + padding-right: $baseline/2; + vertical-align: middle; + color: $white; } .moderator-actions { @@ -2216,7 +2383,7 @@ body.discussion { .wmd-preview { position: relative; font-family: $sans-serif; - padding: 25px 20px 10px 20px; + padding: 25px $baseline $baseline/2 $baseline; margin-bottom: 5px; @include box-sizing(border-box); border: 1px solid #c8c8c8; @@ -2245,7 +2412,7 @@ body.discussion { margin-left: 5px; margin-right: 5px; margin-bottom: 5px; - margin-top: 10px; + margin-top: $baseline/2; padding: 0px; height: 20px; overflow: hidden; @@ -2301,11 +2468,11 @@ body.discussion { .wmd-prompt-dialog { @extend .modal; - background: #fff; + background: $white; } .wmd-prompt-dialog { - padding: 20px; + padding: $baseline; > div { font-size: 0.8em; @@ -2361,25 +2528,25 @@ body.discussion { } .edit-post-form { width: 100%; - margin-bottom: 20px; + margin-bottom: $baseline; @include clearfix; @include box-sizing(border-box); .form-row { - margin-top: 20px; + margin-top: $baseline; } .post-cancel { @include white-button; float: left; - margin: 10px 0 0 15px; + margin: $baseline/2 0 0 15px; } .post-update { @include blue-button; float: left; height: 37px; - margin-top: 10px; + margin-top: $baseline/2; padding-bottom: 2px; &:hover { @@ -2390,7 +2557,7 @@ body.discussion { .edit-post-title, .edit-post-tags { width: 100%; height: 40px; - padding: 0 10px; + padding: 0 $baseline/2; @include box-sizing(border-box); border-radius: 3px; border: 1px solid #aaa; @@ -2401,11 +2568,11 @@ body.discussion { } .tagsinput { - padding: 10px; + padding: $baseline/2; @include box-sizing(border-box); border: 1px solid #aaa; border-radius: 3px; - background: #fff; + background: $white; font-family: 'Monaco', monospace; font-size: 13px; line-height: 1.6; @@ -2418,11 +2585,11 @@ body.discussion { } .thread-tags { - margin: 20px 0; + margin: $baseline 0; } .thread-tag { - padding: 3px 10px 6px; + padding: 3px $baseline/2 6px; margin-right: 5px; border-radius: 3px; color: #333; @@ -2440,7 +2607,7 @@ body.discussion { font-size: 12px; color:#000; font-style: italic; - background-color:#fff; + background-color: $white; } .discussion-pin { @@ -2448,8 +2615,8 @@ body.discussion { float:right; padding-right: 5px; font-style: italic; - cursor:pointer; - margin-right: 10px; + cursor: pointer; + margin-right: $baseline/2; opacity: 0.8; span { @@ -2481,7 +2648,7 @@ body.discussion { width: 10px; height: 14px; padding-right: 3px; - background: transparent url('../images/unpinned.png') no-repeat 0 0; + color: #aeaeae; } .pinned .icon { @@ -2491,7 +2658,7 @@ body.discussion { width: 10px; height: 14px; padding-right: 3px; - background: transparent url('../images/pinned.png') no-repeat 0 0; + color: $pink; } .pinned span { @@ -2504,8 +2671,6 @@ body.discussion { .notpinned span { color: #888; font-style: italic; - //cursor change is here since pins are read-only for inline discussions. - cursor: default; } .pinned-false @@ -2514,40 +2679,39 @@ display:none; } .discussion-flag-abuse { - font-size: 12px; - float:right; - padding-right: 5px; - font-style: italic; - cursor:pointer; - opacity: 0.8; + font-size: 12px; + float:right; + padding-right: 5px; + font-style: italic; + cursor:pointer; + opacity: 0.8; - &:hover { - @include transition(opacity .2s linear 0s); - opacity: 1.0; - } - - } - -.notflagged .icon -{ + &:hover { + @include transition(opacity .2s linear 0s); + opacity: 1.0; + } +} + +.notflagged .icon { display: block; + color: #aeaeae; float: left; margin: 3px; width: 10px; height: 14px; padding-right: 3px; - background: transparent url('../images/notflagged.png') no-repeat 0 0; } .flagged .icon { display: block; + color: #aeaeae; float: left; margin: 3px; width: 10px; height: 14px; padding-right: 3px; - background: transparent url('../images/flagged.png') no-repeat 0 0; + color: $pink; } .flagged span { diff --git a/lms/static/sass/_shame.scss b/lms/static/sass/_shame.scss index ac6ac24b41..8348a774d4 100644 --- a/lms/static/sass/_shame.scss +++ b/lms/static/sass/_shame.scss @@ -2,70 +2,141 @@ // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/) // ==================== -// marketing site - registration iframe band-aid (poor form enough to isolate out) +// edx.org marketing site - 7/2013 visual button revamp + +// extends btn +.m-btn { + @include box-sizing(border-box); + @include transition(color 0.25s ease-in-out, background 0.25s ease-in-out, box-shadow 0.25s ease-in-out); + display: inline-block; + cursor: pointer; + text-decoration: none; + + &:hover, &:active { + + } + + &.disabled, &[disabled] { + cursor: default; + pointer-events: none; + } +} + +.m-btn-pill { + border-radius: ($baseline/5); +} + +.m-btn-rounded { + border-radius: ($baseline/2); +} + +.m-btn-edged { + border-radius: ($baseline/10); +} + +// primary button +.m-btn-base { + @extend .m-btn; + @extend .m-btn-edged; + border: none; + padding:($baseline/2) ($baseline); + text-align: center; + text-shadow: none; + font-weight: 500; + letter-spacing: 0; + + &.disabled, &[disabled], &.is-disabled { + background: $action-primary-disabled-bg; + + &:hover { + background: $action-primary-disabled-bg !important; // needed for IE currently + } + } +} + +// primary button +.m-btn-primary { + @extend .m-btn-base; + box-shadow: 0 2px 1px 0 $action-primary-shadow; + background: $action-primary-bg; + color: $action-primary-fg; + + &:hover, &:active { + background: $action-primary-focused-bg; + } + + &.current, &.active { + box-shadow: inset 0 2px 1px 1px $action-primary-active-shadow; + background: $action-primary-active-bg; + color: $action-primary-active-fg; + + &:hover, &:active { + box-shadow: inset 0 2px 1px 1px $action-primary-active-focused-shadow; + color: $action-primary-active-focused-fg; + } + } + + &.disabled, &[disabled] { + box-shadow: none; + background: $action-primary-disabled-bg; // needed for IE currently + } +} + +// secondary button +.m-btn-secondary { + @extend .m-btn-base; + box-shadow: 0 2px 1px 0 $action-secondary-shadow; + background: $action-secondary-bg; + color: $action-secondary-fg; + + &:hover, &:active { + background: $action-secondary-focused-bg; + } + + &.current, &.active { + box-shadow: inset 0 2px 1px 1px $action-secondary-active-shadow; + background: $action-secondary-active-bg; + color: $action-secondary-active-fg; + + &:hover, &:active { + box-shadow: inset 0 2px 1px 1px $action-secondary-active-focused-shadow; + color: $action-secondary-active-focused-fg; + } + } + + &.disabled, &[disabled] { + box-shadow: none; + background: $action-secondary-disabled-bg; // needed for IE currently + } +} + + +// ==================== + +// edx.org marketing site - needed, but bad overrides with importants +.view-register, .view-login, .view-passwordreset { + + .form-actions button[type="submit"] { + text-transform: none; + vertical-align: middle; + font-weight: 600 !important; + letter-spacing: 0 !important; + } +} + + + + +// ==================== + +// edx.org marketing site - registration iframe band-aid (poor form enough to isolate out) .view-partial-mktgregister { - background: transparent; // dimensions needed for course about page on marketing site .wrapper-view { overflow: hidden; } - // button elements - not a better place to put these, sadly - .btn { - @include box-sizing('border-box'); - display: block; - padding: $baseline/2; - text-transform: lowercase; - color: $white; - letter-spacing: 0.1rem; - cursor: pointer; - text-align: center; - border: none !important; - text-decoration: none; - text-shadow: none; - letter-spacing: 0.1rem; - font-size: 17px; - font-weight: 300; - box-shadow: 0 !important; - - strong { - font-weight: 400; - text-transform: none; - } - } - - .btn-primary { - @extend .btn; - @include linear-gradient($m-blue-s1 5%, $m-blue-d1 95%); - - // no hover state conventions to follow from marketing :/ - &:hover, &:active { - - } - } - - .btn-secondary { - @extend .btn; - @include linear-gradient($m-gray 5%, $m-gray-d1 95%); - - // no hover state conventions to follow from marketing :/ - &:hover, &:active { - - } - } - - .btn-tertiary { - @extend .btn; - background: $m-blue-l1; - color: $m-blue; - - // no hover state conventions to follow from marketing :/ - &:hover, &:active { - - } - } - // nav list .list-actions { list-style: none; @@ -78,31 +149,37 @@ } .action { + font-size: 16px; + font-weight: 500; // register or access courseware &.action-register, &.access-courseware { - @extend .btn-primary; + @extend .m-btn-primary; + display: block; } // already registered but course not started or registration is closed &.is-registered, &.registration-closed { - @extend .btn-secondary; + @extend .m-btn-secondary; pointer-events: none !important; + display: block; } // coming soon &.coming-soon { - @extend .btn-tertiary; + @extend .m-btn-secondary; pointer-events: none !important; outline: none; + display: block; } } } -//-------------------------------------- -// The Following is to enable themes to -// display H1s on login and register pages -//-------------------------------------- + +// ==================== + + +// The Following is to enable themes to display H1s on login and register pages .view-login .introduction header h1, .view-register .introduction header h1 { @include login_register_h1_style; @@ -110,4 +187,4 @@ footer .references { @include footer_references_style; -} \ No newline at end of file +} diff --git a/lms/static/sass/application.scss.mako b/lms/static/sass/application.scss.mako index d30c0c16a1..fb7b4b1db2 100644 --- a/lms/static/sass/application.scss.mako +++ b/lms/static/sass/application.scss.mako @@ -1,7 +1,20 @@ -@import 'bourbon/bourbon'; +// lms - css application architecture +// ==================== + +// libs and resets *do not edit* +@import 'bourbon/bourbon'; // lib - bourbon + +// VENDOR + REBASE *referenced/used vendor presentation and reset* +// ==================== @import 'base/reset'; -@import 'base/font_face'; +@import 'vendor/font-awesome'; + + +// BASE *default edX offerings* +// ==================== +// base - utilities + @import 'base/mixins'; @import 'base/variables'; @@ -19,10 +32,16 @@ % endif @import 'base/base'; -@import 'base/extends'; -@import 'base/animations'; -// Multicourse styles +// base - assets +@import 'base/font_face'; +@import 'base/extends'; +@import 'base/animations'; + +// base - starter +@import 'base/base'; + +// shared - course @import 'shared/forms'; @import 'shared/footer'; @import 'shared/header'; @@ -32,6 +51,7 @@ @import 'shared/activation_messages'; @import 'shared/unsubscribe'; +// shared - platform @import 'multicourse/home'; @import 'multicourse/dashboard'; @import 'multicourse/account'; @@ -47,7 +67,8 @@ @import 'multicourse/help'; @import 'multicourse/edge'; +// applications @import 'discussion'; @import 'news'; -@import 'shame'; +@import 'shame'; // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/) diff --git a/lms/static/sass/base/_mixins.scss b/lms/static/sass/base/_mixins.scss index 4060c36f5f..e2074f1976 100644 --- a/lms/static/sass/base/_mixins.scss +++ b/lms/static/sass/base/_mixins.scss @@ -1,10 +1,13 @@ -@function em($pxval, $base: 16) { - @return #{$pxval / $base}em; +// mixins - font sizing +@mixin font-size($sizeValue: 16){ + font-size: $sizeValue + px; + font-size: ($sizeValue/10) + rem; } -// Line-height -@function lh($amount: 1) { - @return $body-line-height * $amount; +// mixins - line height +@mixin line-height($fontSize: auto){ + line-height: ($fontSize*1.48) + px; + line-height: (($fontSize/10)*1.48) + rem; } // image-replacement hidden text @@ -31,6 +34,15 @@ display: block; } +@function em($pxval, $base: 16) { + @return #{$pxval / $base}em; +} + +// Line-height +@function lh($amount: 1) { + @return $body-line-height * $amount; +} + //----------------- // Theme Mixin Styles diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index c0bbcfb9ee..93297f4043 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -29,33 +29,48 @@ $pink: rgb(182,37,104); $yellow: rgb(255, 252, 221); $red: rgb(178, 6, 16); $error-red: rgb(253, 87, 87); +$danger-red: rgb(212, 64, 64); $light-gray: rgb(221, 221, 221); $dark-gray: rgb(51, 51, 51); $border-color: rgb(200, 200, 200); $sidebar-color: rgb(246, 246, 246); $outer-border-color: rgb(170, 170, 170); +$green: rgb(37, 184, 90); // old variables $light-gray: #ddd; $dark-gray: #333; -// edx.org-related -$m-gray-l1: rgb(203,203,203); -$m-gray-l2: rgb(246,246,246); -$m-gray: rgb(153,153,153); -$m-gray-d1: rgb(102,102,102); -$m-gray-d2: rgb(51,51,51); -$m-gray-a1: rgb(80,80,80); -$m-blue: rgb(65, 116, 170); -// $m-blue: rgb(85, 151, 221); (used in marketing redesign) -$m-blue-l1: rgb(85, 151, 221); -$m-blue-d1: shade($m-blue,15%); -$m-blue-s1: saturate($m-blue,15%); -$m-pink: rgb(204,51,102); +// edx.org marketing site variables +$m-gray: #8A8C8F; +$m-gray-l1: #97999B; +$m-gray-l2: #A4A6A8; +$m-gray-l3: #B1B2B4; +$m-gray-l4: #F5F5F5; +$m-gray-d1: #7D7F83; +$m-gray-d2: #707276; +$m-gray-d3: #646668; +$m-gray-d4: #050505; + +$m-blue: #1AA1DE; +$m-blue-l1: #2BACE6; +$m-blue-l2: #42B5E9; +$m-blue-l3: #59BEEC; +$m-blue-d1: #1790C7; +$m-blue-d2: #1580B0; +$m-blue-d3: #126F9A; +$m-blue-d4: #0A4A67; + +$m-pink: #B52A67; +$m-pink-l1: #CA2F73; +$m-pink-l2: #D33F80; +$m-pink-l3: #D7548E; +$m-pink-d1: #A0255B; +$m-pink-d2: #8C204F; +$m-pink-d3: #771C44; $m-base-font-size: em(15); - $base-font-color: rgb(60,60,60); $baseFontColor: rgb(60,60,60); $lighter-base-font-color: rgb(100,100,100); @@ -74,10 +89,57 @@ $courseware-footer-border: none; $courseware-footer-shadow: none; $courseware-footer-margin: 0px; + +// actions $button-bg-image: linear-gradient(#fff 0%, rgb(250,250,250) 50%, rgb(237,237,237) 50%, rgb(220,220,220) 100%); $button-bg-color: transparent; $button-bg-hover-color: #fff; +// actions - primary +$action-primary-bg: $m-blue-d3; +$action-primary-fg: $white; +$action-primary-shadow: $m-blue-d4; + +// focused - hover/active pseudo states +$action-primary-focused-bg: $m-blue-d1; +$action-primary-focused-fg: $white; + +// current or active navigation item +$action-primary-active-bg: $m-blue; +$action-primary-active-fg: $m-blue-d3; +$action-primary-active-shadow: $m-blue-d2; +$action-primary-active-focused-fg: $m-blue-d4; +$action-primary-active-focused-shadow: $m-blue-d3; + +// disabled +$action-primary-disabled-bg: $m-gray-d3; +$action-prmary-disabled-fg: $white; + + + +// actions - secondary +$action-secondary-bg: $m-pink; +$action-secondary-fg: $white; +$action-secondary-shadow: $m-pink-d2; + +// focused - hover/active pseudo states +$action-secondary-focused-bg: $m-pink-l3; +$action-secondary-focused-fg: $white; + +// current or active navigation item +$action-secondary-active-bg: $m-pink-l2; +$action-secondary-active-fg: $m-pink-d1; +$action-secondary-active-shadow: $m-pink-d1; +$action-secondary-active-focused-fg: $m-pink-d3; +$action-secondary-active-focused-shadow: $m-pink-d2; + +// disabled +$action-secondary-disabled-bg: $m-gray-d3; +$action-secondary-disabled-fg: $white; + + + + $faded-hr-image-1: linear-gradient(180deg, rgba(200,200,200, 0) 0%, rgba(200,200,200, 1) 50%, rgba(200,200,200, 0)); $faded-hr-image-2: linear-gradient(180deg, rgba(200,200,200, 0) 0%, rgba(200,200,200, 1)); $faded-hr-image-3: linear-gradient(180deg, rgba(200,200,200, 1) 0%, rgba(200,200,200, 0)); @@ -104,7 +166,7 @@ $border-color-3: rgb(100,100,100); $border-color-4: rgb(252,252,252); $link-color: $blue; -$link-color-d1: $m-blue; +$link-color-d1: $m-blue-d2; $link-hover: $pink; $site-status-color: $pink; @@ -135,4 +197,4 @@ $homepage-bg-image: '../images/homepage-bg.jpg'; $login-banner-image: url(../images/bg-banner-login.png); $register-banner-image: url(../images/bg-banner-register.png); -$video-thumb-url: '../images/courses/video-thumb.jpg'; +$video-thumb-url: '../images/courses/video-thumb.jpg'; \ No newline at end of file diff --git a/lms/static/sass/course.scss.mako b/lms/static/sass/course.scss.mako index 94da43b15f..7c04968f86 100644 --- a/lms/static/sass/course.scss.mako +++ b/lms/static/sass/course.scss.mako @@ -64,6 +64,7 @@ // instructor @import "course/instructor/instructor"; +@import "course/instructor/instructor_2"; // discussion @import "course/discussion/form-wmd-toolbar"; diff --git a/lms/static/sass/course/_discussions-inline.scss b/lms/static/sass/course/_discussions-inline.scss new file mode 100644 index 0000000000..bd4142c2d2 --- /dev/null +++ b/lms/static/sass/course/_discussions-inline.scss @@ -0,0 +1,537 @@ +.discussion-module { + @extend .discussion-body; + margin: 20px 0; + padding: 20px 20px 28px 20px; + background: #f6f6f6 !important; + border-radius: 3px; + + .responses { + margin-top: 40px; + + > li { + margin: 0 20px 30px; + } + } + + .discussion-show { + display: block; + width: 200px; + margin: auto; + font-size: 14px; + text-align: center; + + &.shown { + .show-hide-discussion-icon { + background-position: 0 0; + } + } + + .show-hide-discussion-icon { + display: inline-block; + position: relative; + top: 5px; + margin-right: 6px; + width: 21px; + height: 19px; + background: url(../images/show-hide-discussion-icon.png) no-repeat; + background-position: -21px 0; + } + } + + .new-post-btn { + display: inline-block; + } + + section.discussion { + margin-top: 20px; + + .threads { + margin-top: 20px; + } + + /* Course content p has a default margin-bottom of 1.416em, this is just to reset that */ + .discussion-thread { + padding: 0; + @include transition(all .25s); + + .dogear, + .vote-btn { + display: none; + } + + &.expanded { + padding: 20px 0; + + .dogear, + .vote-btn { + display: block; + } + + .discussion-article { + border: 1px solid #b2b2b2; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15); + border-radius: 3px; + } + } + + p { + margin-bottom: 0em; + } + + .discussion-article { + border: 1px solid #ddd; + border-bottom-width: 0; + background: #fff; + min-height: 0; + padding: 10px 10px 15px 10px; + box-shadow: 0 1px 0 #ddd; + @include transition(all .2s); + + .discussion-post { + padding: 12px 20px 0 20px; + @include clearfix; + + header { + padding-bottom: 0; + margin-bottom: 15px; + + h3 { + font-size: 19px; + font-weight: 700; + margin-bottom: 0px; + } + + h4 { + font-size: 16px; + } + } + + .post-body { + font-size: 14px; + clear: both; + } + } + + .post-tools { + margin-left: 20px; + + a { + display: block; + font-size: 12px; + line-height: 30px; + + &.expand-post:before { + content: '▾ '; + } + + &.collapse-post:before { + content: '▴ '; + } + + &.collapse-post { + display: none; + } + } + } + + .responses { + margin-top: 10px; + + header { + padding-bottom: 0em; + margin-bottom: 5px; + + .posted-by { + font-size: 0.8em; + } + } + .response-body { + margin-bottom: 0.2em; + font-size: 14px; + } + } + + .discussion-reply-new { + .wmd-input { + height: 120px; + } + } + + // Content that is hidden by default in the inline view + .post-extended-content{ + display: none; + } + + + } + } + } + + .new-post-article { + display: none; + margin-top: 20px; + + .inner-wrapper { + max-width: 1180px; + min-width: 760px; + margin: auto; + } + + .new-post-form { + width: 100%; + margin-bottom: 20px; + padding: 30px; + border-radius: 3px; + background: rgba(0, 0, 0, .55); + color: #fff; + box-shadow: none; + @include clearfix; + @include box-sizing(border-box); + + .form-row { + margin-bottom: 20px; + } + + .new-post-body .wmd-input { + @include discussion-wmd-input; + position: relative; + width: 100%; + height: 200px; + z-index: 1; + padding: 10px; + box-sizing: border-box; + border: 1px solid #333; + border-radius: 3px 3px 0 0; + background: #fff; + font-family: 'Monaco', monospace; + font-size: 13px; + line-height: 1.6; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset; + } + + .new-post-body .wmd-preview { + @include discussion-wmd-preview; + position: relative; + width: 100%; + //height: 50px; + margin-top: -1px; + padding: 25px 20px 10px 20px; + box-sizing: border-box; + border: 1px solid #333; + border-radius: 0 0 3px 3px; + background: #e6e6e6; + color: #333; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset; + } + + .new-post-preview-label { + position: absolute; + top: 4px; + left: 4px; + font-size: 11px; + color: #aaa; + text-transform: uppercase; + } + + .new-post-title, + .new-post-tags { + width: 100%; + height: 40px; + padding: 0 10px; + box-sizing: border-box; + border-radius: 3px; + border: 1px solid #333; + font-size: 16px; + font-family: 'Open Sans', sans-serif; + color: #333; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset; + } + + .new-post-title { + font-weight: 700; + } + + .tagsinput { + padding: 10px; + box-sizing: border-box; + border: 1px solid #333; + border-radius: 3px; + background: #fff; + font-family: 'Monaco', monospace; + font-size: 13px; + line-height: 1.6; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3) inset; + + span.tag { + margin-bottom: 0; + } + } + + .submit { + @include blue-button; + float: left; + height: 37px; + margin-top: 10px; + padding-bottom: 2px; + border-color: #333; + + &:hover { + border-color: #222; + } + } + + .new-post-cancel { + @include white-button; + float: left; + margin: 10px 0 0 15px; + border-color: #444; + } + + .options { + margin-top: 5px; + + label { + display: inline; + margin-left: 8px; + font-size: 15px; + color: #fff; + text-shadow: none; + } + } + } + + .thread-tags { + margin-top: 20px; + } + + .thread-tag { + padding: 3px 10px 6px; + border-radius: 3px; + color: #333; + background: #c5eeff; + border: 1px solid #90c4d7; + font-size: 13px; + } + + .thread-title { + display: block; + margin-bottom: 20px; + font-size: 21px; + color: #333; + font-weight: 700; + } + } + + .new-post-btn { + @include blue-button; + display: inline-block; + font-size: 13px; + margin-right: 4px; + } + + .new-post-icon { + display: block; + float: left; + width: 16px; + height: 17px; + margin: 8px 7px 0 0; + font-size: 16px; + vertical-align: middle; + color: $white; + } + + .moderator-actions { + padding-left: 0 !important; + } + + section.pagination { + margin-top: 30px; + + nav.discussion-paginator { + float: right; + + ol { + li { + list-style: none; + display: inline-block; + padding-right: 0.5em; + a { + @include white-button; + } + } + + li.current-page{ + height: 35px; + padding: 0 15px; + border: 1px solid #ccc; + border-radius: 3px; + font-size: 13px; + font-weight: 700; + line-height: 32px; + color: #333; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6); + } + } + } + } + + .new-post-body { + .wmd-panel { + width: 100%; + min-width: 500px; + } + + .wmd-button-bar { + width: 100%; + } + + .wmd-input { + height: 150px; + width: 100%; + background-color: #e9e9e9; + border: 1px solid #c8c8c8; + font-family: Monaco, 'Lucida Console', monospace; + font-style: normal; + font-size: 0.8em; + line-height: 1.6em; + @include border-radius(3px 3px 0 0); + + &::-webkit-input-placeholder { + color: #888; + } + } + + .wmd-preview { + position: relative; + font-family: $sans-serif; + padding: 25px 20px 10px 20px; + margin-bottom: 5px; + box-sizing: border-box; + border: 1px solid #c8c8c8; + border-top-width: 0; + @include border-radius(0 0 3px 3px); + overflow: hidden; + @include transition(all, .2s, easeOut); + + &:before { + content: 'PREVIEW'; + position: absolute; + top: 3px; + left: 5px; + font-size: 11px; + color: #bbb; + } + + p { + font-family: $sans-serif; + } + background-color: #fafafa; + } + + .wmd-button-row { + position: relative; + margin-left: 5px; + margin-right: 5px; + margin-bottom: 5px; + margin-top: 10px; + padding: 0px; + height: 20px; + overflow: hidden; + @include transition(all, .2s, easeOut); + } + + .wmd-spacer { + width: 1px; + height: 20px; + margin-left: 14px; + + position: absolute; + background-color: Silver; + display: inline-block; + list-style: none; + } + + .wmd-button { + width: 20px; + height: 20px; + padding-left: 2px; + padding-right: 3px; + position: absolute; + display: inline-block; + list-style: none; + cursor: pointer; + background: none; + } + + .wmd-button > span { + display: inline-block; + background-image: url(../images/new-post-icons-full.png); + background-repeat: no-repeat; + background-position: 0px 0px; + width: 20px; + height: 20px; + } + + .wmd-spacer1 { + left: 50px; + } + .wmd-spacer2 { + left: 175px; + } + + .wmd-spacer3 { + left: 300px; + } + + .wmd-prompt-background { + background-color: Black; + } + + .wmd-prompt-dialog { + @extend .modal; + background: #fff; + } + + .wmd-prompt-dialog { + padding: 20px; + + > div { + font-size: 0.8em; + font-family: arial, helvetica, sans-serif; + } + + b { + font-size: 16px; + } + + > form > input[type="text"] { + border-radius: 3px; + color: #333; + } + + > form > input[type="button"] { + border: 1px solid #888; + font-family: $sans-serif; + font-size: 14px; + } + + > form > input[type="file"] { + margin-bottom: 18px; + } + } + } + + .wmd-button-row { + // this is being hidden now because the inline styles to position the icons are not being written + display: none; + position: relative; + height: 12px; + } + + .wmd-button { + span { + background-image: url("/static/images/wmd-buttons.png"); + display: inline-block; + } + } +} \ No newline at end of file diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index 200705e8b6..abceb38359 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -3,6 +3,14 @@ html { max-height: 100%; } +html.video-fullscreen{ + overflow: hidden; + + body{ + overflow: hidden; + } +} + div.course-wrapper { section.course-content { diff --git a/lms/static/sass/course/instructor/_instructor.scss b/lms/static/sass/course/instructor/_instructor.scss index ff5cc39a84..f5f75e2be9 100644 --- a/lms/static/sass/course/instructor/_instructor.scss +++ b/lms/static/sass/course/instructor/_instructor.scss @@ -1,5 +1,12 @@ .instructor-dashboard-wrapper { - display: table; + display: table; + position: relative; + + .beta-button-wrapper { + position: absolute; + top: 2em; + right: 2em; + } section.instructor-dashboard-content { @extend .content; diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss new file mode 100644 index 0000000000..58ac22c7b9 --- /dev/null +++ b/lms/static/sass/course/instructor/_instructor_2.scss @@ -0,0 +1,448 @@ +@mixin idashbutton ($color) { + @include button(simple, $color); + @extend .button-reset; + + margin-bottom: 1em; + padding: 8px 17px 8px 17px; + font-size: em(13); + line-height: 1.3em; +} + +.instructor-dashboard-wrapper-2 { + position: relative; + // display: table; + + .olddash-button-wrapper { + position: absolute; + top: 17px; + right: 15px; + font-size: 11pt; + } +} + +section.instructor-dashboard-content-2 { + @extend .content; + // position: relative; + padding: 40px; + width: 100%; + + // .has-event-handler-for-click { + // border: 1px solid blue; + // } + + .request-response-error { + margin-top: 1em; + margin-bottom: 1em; + color: $error-red; + } + + .slickgrid { + margin-left: 1px; + color:#333333; + font-size:11px; + font-family: verdana,arial,sans-serif; + + .slick-header-column { + // height: 100% + } + + .slick-cell { + border: 1px dotted silver; + border-collapse: collapse; + white-space: normal; + word-wrap: break-word; + } + } + + h1 { + @extend .top-header; + padding-bottom: 0; + border-bottom: 0; + } + + input[type="button"] { + @include idashbutton(#eee); + + &.molly-guard { + // @include idashbutton($danger-red); + // @include idashbutton($black); + // border: 2px solid $danger-red; + } + } + + .instructor_dash_glob_info { + position: absolute; + top: 46px; + right: 50px; + text-align: right; + } + + .instructor-nav { + padding-bottom: 1em; + + border-bottom: 1px solid #C8C8C8; + a { + margin-right: 1.2em; + } + + .active-section { + color: #551A8B; + } + } + + section.idash-section { + display: none; + // background-color: #0f0; + + &.active-section { + display: block; + // background-color: #ff0; + } + + .basic-data { + padding: 6px; + } + } +} + + +.instructor-dashboard-wrapper-2 section.idash-section#course_info { + .course-errors-wrapper { + margin-top: 2em; + + h2 { + color: #D60000; + } + + &.open { + .toggle-wrapper { + .triangle { + background-image: url('/static/images/bullet-open.png'); + } + } + .course-errors-visibility-wrapper { + display: block; + } + } + + .toggle-wrapper { + width: 300px; + cursor: pointer; + div { + float:left; + } + + h2 { + float: left; + } + + .triangle { + float: left; + width: 20px; + height: 20px; + background-image: url('/static/images/bullet-closed.png'); + background-position: 8px 6px; + background-repeat: no-repeat; + } + } + + .course-errors-visibility-wrapper { + display: none; + clear: both; + + .course-error { + margin-bottom: 1em; + margin-left: 0.5em; + + code { + &.course-error-first { + color: #111; + } + + &.course-error-second { + color: #111; + } + } + } + } + } +} + + +.instructor-dashboard-wrapper-2 section.idash-section#membership { + $half_width: $baseline * 20; + + .vert-left { + float: left; + width: $half_width; + } + + .vert-right { + float: right; + width: $half_width; + } + + select { + margin-bottom: 1em; + } + + .revoke-link { + color: $danger-red; + text-decoration: underline; + cursor: pointer; + } + + label[for="auto-enroll"]:hover + .auto-enroll-hint { + display: block; + } + + .auto-enroll-hint { + position: absolute; + display: none; + padding: $baseline; + width: $half_width; + border: 1px solid $light-gray; + background-color: $white; + + span.emph { + font-weight: bold; + } + } + + .batch-enrollment { + textarea { + margin-top: 0.2em; + margin-bottom: 1em; + width: 500px; + + height: 100px; + } + + input { + margin-right: 5px; + } + + .request-res-section { + margin-top: 1.5em; + + h3 { + color: #646464; + } + + ul { + margin: 0; + margin-top: 0.5em; + padding: 0; + list-style-type: none; + line-height: 1.5em; + li { + } + } + } + } + + .auth-list-container { + display: none; + margin-bottom: 1.5em; + + &.active { + display: block; + } + + .revoke { + width: 10px; + height: 10px; + background: url('../images/moderator-delete-icon.png') left center no-repeat; + opacity: 0.7; + &:hover { opacity: 0.8; } + &:active { opacity: 0.9; } + + // @include idashbutton($danger-red); + // line-height: 0.6em; + // margin-top: 5px; + // padding: 6px 9px; + // font-size: 9pt; + // border-radius: 10px; + } + } +} + + +.instructor-dashboard-wrapper-2 section.idash-section#student_admin > { + .progress-link-wrapper { + margin-top: 0.7em; + } + + // .task-history-single-table { .slickgrid + // max-height: 500px; + // } } + + // .running-tasks-table { .slickgrid { + // max-height: 500px; + // } } + + .task-history-all-table { + margin-top: 1em; + // height: 300px; + // overflow-y: scroll + } + .task-history-single-table { + margin-top: 1em; + // height: 300px; + // overflow-y: scroll + } + .running-tasks-table { + margin-top: 1em; + // height: 500px; + // overflow-y: scroll + } +} + + +.instructor-dashboard-wrapper-2 section.idash-section#data_download { + input { + // display: block; + margin-bottom: 1em; + line-height: 1.3em; + } + + .data-display { + .data-display-table { + .slickgrid { + height: 400px; + } + } + } +} + + +.instructor-dashboard-wrapper-2 section.idash-section#analytics { + .distribution-display { + margin-top: 1.2em; + + .distribution-display-graph { + .year-of-birth { + width: 750px; + height: 250px; + } + } + + .distribution-display-table { + .slickgrid { + height: 400px; + } + } + } +} + + +.member-list-widget { + $width: 20 * $baseline; + $height: 25 * $baseline; + $header-height: 3 * $baseline; + $bottom-bar-height: 3 * $baseline; + $content-height: $height - $header-height - $bottom-bar-height; + $border-radius: 3px; + + width: $width; + height: $height; + + .header { + @include box-sizing(border-box); + @include border-top-radius($border-radius); + + position: relative; + padding: $baseline; + width: $width; + height: $header-height; + + background-color: #efefef; + border: 1px solid $light-gray; + } + + .title { + font-size: 16pt; + } + + .label { + color: $lighter-base-font-color; + font-size: $body-font-size * 4/5; + } + + .info-badge { + // float: right; + position: absolute; + top: $baseline / 2; + right: $baseline / 2; + width: 17px; + height: 17px; + background: url('../images/info-icon-dark.png') left center no-repeat; + opacity: 0.35; + &:hover { opacity: 0.45; } + &:active { opacity: 0.5; } + } + + .info { + display: none; + + @include box-sizing(border-box); + max-height: $content-height; + padding: $baseline; + + border: 1px solid $light-gray; + border-top: none; + color: $lighter-base-font-color; + line-height: 1.3em; + } + + .member-list { + @include box-sizing(border-box); + overflow: auto; + padding-top: 0; + width: $width; + max-height: $content-height; + + table { + width: 100%; + } + + tr { + border-bottom: 1px solid $light-gray; + } + + td { + table-layout: fixed; + vertical-align: middle; + word-wrap: break-word; + padding-left: 15px; + border-left: 1px solid $light-gray; + border-right: 1px solid $light-gray; + + font-size: 3/4 *$body-font-size; + } + } + + .bottom-bar { + @include box-sizing(border-box); + @include border-bottom-radius($border-radius); + + position: relative; + width: $width; + height: $bottom-bar-height; + padding: $baseline / 2; + + // border-top: none; + margin-top: -1px; + border: 1px solid $light-gray; + background-color: #efefef; + box-shadow: inset #bbb 0px 1px 1px 0px; + } + + // .add-field + + input[type="button"].add { + @include idashbutton($blue); + position: absolute; + right: $baseline; + } +} diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss index 9de0a1fca8..2ec9f50dba 100644 --- a/lms/static/sass/multicourse/_account.scss +++ b/lms/static/sass/multicourse/_account.scss @@ -37,7 +37,7 @@ font-weight: 600; text-transform: uppercase; letter-spacing: 0 !important; - color: saturate($link-color-d1,15%); + color: $m-gray-d2; } .heading-5 { @@ -390,7 +390,7 @@ @include clearfix(); button[type="submit"] { - @extend .button-primary; + @extend .m-btn-primary; &:disabled, &.is-disabled { opacity: 0.3; @@ -431,7 +431,6 @@ margin: 0 0 ($baseline/4) 0; font-size: em(14); font-weight: 600; - color: $m-gray-d2 !important; } .message-copy { diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index 7da89ccc1c..3f2daccf52 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -278,26 +278,8 @@ header.global { li { display: inline-block; - a { - border-radius: 0; - @include linear-gradient(saturate($link-color-d1,15%) 5%, shade($link-color-d1,15%) 95%); - display: inline-block; - padding: $baseline/2 $baseline*2.5; - text-transform: lowercase; - color: $very-light-text; - letter-spacing: 0.1rem; - font-weight: 300; - cursor: pointer; - text-align: center; - border: none !important; - text-shadow: none; - letter-spacing: 0.1rem; - font-size: 14px; - box-shadow: none !important; - - &:hover { - text-decoration: none; - } + .cta { + @extend .m-btn-primary; } } diff --git a/lms/static/sass/vendor/_font-awesome.scss b/lms/static/sass/vendor/_font-awesome.scss new file mode 100644 index 0000000000..035ca8c750 --- /dev/null +++ b/lms/static/sass/vendor/_font-awesome.scss @@ -0,0 +1,1268 @@ +/*! + * Font Awesome 3.1.0 + * the iconic font designed for Bootstrap + * ------------------------------------------------------- + * The full suite of pictographic icons, examples, and documentation + * can be found at: http://fontawesome.io + * + * License + * ------------------------------------------------------- + * - The Font Awesome font is licensed under the SIL Open Font License v1.1 - + * http://scripts.sil.org/OFL + * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - + * http://opensource.org/licenses/mit-license.html + * - Font Awesome documentation licensed under CC BY 3.0 License - + * http://creativecommons.org/licenses/by/3.0/ + * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: + * "Font Awesome by Dave Gandy - http://fontawesome.io" + + * Contact + * ------------------------------------------------------- + * Email: dave@fontawesome.io + * Twitter: http://twitter.com/fortaweso_me + * Work: Lead Product Designer @ http://kyruus.com + */ +/* FONT PATH + * -------------------------- */ +@font-face { + font-family: 'FontAwesome'; + src: url('../fonts/vendor/fontawesome-webfont.eot?v=3.1.0'); + src: url('../fonts/vendor/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../fonts/vendor/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../fonts/vendor/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../fonts/vendor/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg'); + font-weight: normal; + font-style: normal; +} +/* FONT AWESOME CORE + * -------------------------- */ +[class^="icon-"], +[class*=" icon-"] { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + *margin-right: .3em; +} +[class^="icon-"]:before, +[class*=" icon-"]:before { + text-decoration: inherit; + display: inline-block; + speak: none; +} +/* makes the font 33% larger relative to the icon container */ +.icon-large:before { + vertical-align: -10%; + font-size: 1.3333333333333333em; +} +/* makes sure icons active on rollover in links */ +a [class^="icon-"], +a [class*=" icon-"], +a [class^="icon-"]:before, +a [class*=" icon-"]:before { + display: inline; +} +/* increased font size for icon-large */ +[class^="icon-"].icon-fixed-width, +[class*=" icon-"].icon-fixed-width { + display: inline-block; + width: 1.2857142857142858em; + text-align: center; +} +[class^="icon-"].icon-fixed-width.icon-large, +[class*=" icon-"].icon-fixed-width.icon-large { + width: 1.5714285714285714em; +} +ul.icons-ul { + list-style-type: none; + text-indent: -0.7142857142857143em; + margin-left: 2.142857142857143em; +} +ul.icons-ul > li .icon-li { + width: 0.7142857142857143em; + display: inline-block; + text-align: center; +} +[class^="icon-"].hide, +[class*=" icon-"].hide { + display: none; +} +.icon-muted { + color: #eeeeee; +} +.icon-light { + color: #ffffff; +} +.icon-dark { + color: #333333; +} +.icon-border { + border: solid 1px #eeeeee; + padding: .2em .25em .15em; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.icon-2x { + font-size: 2em; +} +.icon-2x.icon-border { + border-width: 2px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.icon-3x { + font-size: 3em; +} +.icon-3x.icon-border { + border-width: 3px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} +.icon-4x { + font-size: 4em; +} +.icon-4x.icon-border { + border-width: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.icon-5x { + font-size: 5em; +} +.icon-5x.icon-border { + border-width: 5px; + -webkit-border-radius: 7px; + -moz-border-radius: 7px; + border-radius: 7px; +} +.pull-right { + float: right; +} +.pull-left { + float: left; +} +[class^="icon-"].pull-left, +[class*=" icon-"].pull-left { + margin-right: .3em; +} +[class^="icon-"].pull-right, +[class*=" icon-"].pull-right { + margin-left: .3em; +} +/* BOOTSTRAP SPECIFIC CLASSES + * -------------------------- */ +/* Bootstrap 2.0 sprites.less reset */ +[class^="icon-"], +[class*=" icon-"] { + display: inline; + width: auto; + height: auto; + line-height: normal; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; + margin-top: 0; +} +/* more sprites.less reset */ +.icon-white, +.nav-pills > .active > a > [class^="icon-"], +.nav-pills > .active > a > [class*=" icon-"], +.nav-list > .active > a > [class^="icon-"], +.nav-list > .active > a > [class*=" icon-"], +.navbar-inverse .nav > .active > a > [class^="icon-"], +.navbar-inverse .nav > .active > a > [class*=" icon-"], +.dropdown-menu > li > a:hover > [class^="icon-"], +.dropdown-menu > li > a:hover > [class*=" icon-"], +.dropdown-menu > .active > a > [class^="icon-"], +.dropdown-menu > .active > a > [class*=" icon-"], +.dropdown-submenu:hover > a > [class^="icon-"], +.dropdown-submenu:hover > a > [class*=" icon-"] { + background-image: none; +} +/* keeps Bootstrap styles with and without icons the same */ +.btn [class^="icon-"].icon-large, +.nav [class^="icon-"].icon-large, +.btn [class*=" icon-"].icon-large, +.nav [class*=" icon-"].icon-large { + line-height: .9em; +} +.btn [class^="icon-"].icon-spin, +.nav [class^="icon-"].icon-spin, +.btn [class*=" icon-"].icon-spin, +.nav [class*=" icon-"].icon-spin { + display: inline-block; +} +.nav-tabs [class^="icon-"], +.nav-pills [class^="icon-"], +.nav-tabs [class*=" icon-"], +.nav-pills [class*=" icon-"], +.nav-tabs [class^="icon-"].icon-large, +.nav-pills [class^="icon-"].icon-large, +.nav-tabs [class*=" icon-"].icon-large, +.nav-pills [class*=" icon-"].icon-large { + line-height: .9em; +} +.btn [class^="icon-"].pull-left.icon-2x, +.btn [class*=" icon-"].pull-left.icon-2x, +.btn [class^="icon-"].pull-right.icon-2x, +.btn [class*=" icon-"].pull-right.icon-2x { + margin-top: .18em; +} +.btn [class^="icon-"].icon-spin.icon-large, +.btn [class*=" icon-"].icon-spin.icon-large { + line-height: .8em; +} +.btn.btn-small [class^="icon-"].pull-left.icon-2x, +.btn.btn-small [class*=" icon-"].pull-left.icon-2x, +.btn.btn-small [class^="icon-"].pull-right.icon-2x, +.btn.btn-small [class*=" icon-"].pull-right.icon-2x { + margin-top: .25em; +} +.btn.btn-large [class^="icon-"], +.btn.btn-large [class*=" icon-"] { + margin-top: 0; +} +.btn.btn-large [class^="icon-"].pull-left.icon-2x, +.btn.btn-large [class*=" icon-"].pull-left.icon-2x, +.btn.btn-large [class^="icon-"].pull-right.icon-2x, +.btn.btn-large [class*=" icon-"].pull-right.icon-2x { + margin-top: .05em; +} +.btn.btn-large [class^="icon-"].pull-left.icon-2x, +.btn.btn-large [class*=" icon-"].pull-left.icon-2x { + margin-right: .2em; +} +.btn.btn-large [class^="icon-"].pull-right.icon-2x, +.btn.btn-large [class*=" icon-"].pull-right.icon-2x { + margin-left: .2em; +} +/* EXTRAS + * -------------------------- */ +/* Stacked and layered icon */ +.icon-stack { + position: relative; + display: inline-block; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: -35%; +} +.icon-stack [class^="icon-"], +.icon-stack [class*=" icon-"] { + display: block; + text-align: center; + position: absolute; + width: 100%; + height: 100%; + font-size: 1em; + line-height: inherit; + *line-height: 2em; +} +.icon-stack .icon-stack-base { + font-size: 2em; + *line-height: 1em; +} +/* Animated rotating icon */ +.icon-spin { + display: inline-block; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + -webkit-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } +} +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } +} +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } +} +@-ms-keyframes spin { + 0% { + -ms-transform: rotate(0deg); + } + 100% { + -ms-transform: rotate(359deg); + } +} +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(359deg); + } +} +/* Icon rotations and mirroring */ +.icon-rotate-90:before { + -webkit-transform: rotate(90deg); + -moz-transform: rotate(90deg); + -ms-transform: rotate(90deg); + -o-transform: rotate(90deg); + transform: rotate(90deg); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); +} +.icon-rotate-180:before { + -webkit-transform: rotate(180deg); + -moz-transform: rotate(180deg); + -ms-transform: rotate(180deg); + -o-transform: rotate(180deg); + transform: rotate(180deg); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); +} +.icon-rotate-270:before { + -webkit-transform: rotate(270deg); + -moz-transform: rotate(270deg); + -ms-transform: rotate(270deg); + -o-transform: rotate(270deg); + transform: rotate(270deg); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); +} +.icon-flip-horizontal:before { + -webkit-transform: scale(-1, 1); + -moz-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + -o-transform: scale(-1, 1); + transform: scale(-1, 1); +} +.icon-flip-vertical:before { + -webkit-transform: scale(1, -1); + -moz-transform: scale(1, -1); + -ms-transform: scale(1, -1); + -o-transform: scale(1, -1); + transform: scale(1, -1); +} +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { + content: "\f000"; +} +.icon-music:before { + content: "\f001"; +} +.icon-search:before { + content: "\f002"; +} +.icon-envelope:before { + content: "\f003"; +} +.icon-heart:before { + content: "\f004"; +} +.icon-star:before { + content: "\f005"; +} +.icon-star-empty:before { + content: "\f006"; +} +.icon-user:before { + content: "\f007"; +} +.icon-film:before { + content: "\f008"; +} +.icon-th-large:before { + content: "\f009"; +} +.icon-th:before { + content: "\f00a"; +} +.icon-th-list:before { + content: "\f00b"; +} +.icon-ok:before { + content: "\f00c"; +} +.icon-remove:before { + content: "\f00d"; +} +.icon-zoom-in:before { + content: "\f00e"; +} +.icon-zoom-out:before { + content: "\f010"; +} +.icon-off:before { + content: "\f011"; +} +.icon-signal:before { + content: "\f012"; +} +.icon-cog:before { + content: "\f013"; +} +.icon-trash:before { + content: "\f014"; +} +.icon-home:before { + content: "\f015"; +} +.icon-file:before { + content: "\f016"; +} +.icon-time:before { + content: "\f017"; +} +.icon-road:before { + content: "\f018"; +} +.icon-download-alt:before { + content: "\f019"; +} +.icon-download:before { + content: "\f01a"; +} +.icon-upload:before { + content: "\f01b"; +} +.icon-inbox:before { + content: "\f01c"; +} +.icon-play-circle:before { + content: "\f01d"; +} +.icon-repeat:before, +.icon-rotate-right:before { + content: "\f01e"; +} +/* F020 doesn't work in Safari. all shifted one down */ +.icon-refresh:before { + content: "\f021"; +} +.icon-list-alt:before { + content: "\f022"; +} +.icon-lock:before { + content: "\f023"; +} +.icon-flag:before { + content: "\f024"; +} +.icon-headphones:before { + content: "\f025"; +} +.icon-volume-off:before { + content: "\f026"; +} +.icon-volume-down:before { + content: "\f027"; +} +.icon-volume-up:before { + content: "\f028"; +} +.icon-qrcode:before { + content: "\f029"; +} +.icon-barcode:before { + content: "\f02a"; +} +.icon-tag:before { + content: "\f02b"; +} +.icon-tags:before { + content: "\f02c"; +} +.icon-book:before { + content: "\f02d"; +} +.icon-bookmark:before { + content: "\f02e"; +} +.icon-print:before { + content: "\f02f"; +} +.icon-camera:before { + content: "\f030"; +} +.icon-font:before { + content: "\f031"; +} +.icon-bold:before { + content: "\f032"; +} +.icon-italic:before { + content: "\f033"; +} +.icon-text-height:before { + content: "\f034"; +} +.icon-text-width:before { + content: "\f035"; +} +.icon-align-left:before { + content: "\f036"; +} +.icon-align-center:before { + content: "\f037"; +} +.icon-align-right:before { + content: "\f038"; +} +.icon-align-justify:before { + content: "\f039"; +} +.icon-list:before { + content: "\f03a"; +} +.icon-indent-left:before { + content: "\f03b"; +} +.icon-indent-right:before { + content: "\f03c"; +} +.icon-facetime-video:before { + content: "\f03d"; +} +.icon-picture:before { + content: "\f03e"; +} +.icon-pencil:before { + content: "\f040"; +} +.icon-map-marker:before { + content: "\f041"; +} +.icon-adjust:before { + content: "\f042"; +} +.icon-tint:before { + content: "\f043"; +} +.icon-edit:before { + content: "\f044"; +} +.icon-share:before { + content: "\f045"; +} +.icon-check:before { + content: "\f046"; +} +.icon-move:before { + content: "\f047"; +} +.icon-step-backward:before { + content: "\f048"; +} +.icon-fast-backward:before { + content: "\f049"; +} +.icon-backward:before { + content: "\f04a"; +} +.icon-play:before { + content: "\f04b"; +} +.icon-pause:before { + content: "\f04c"; +} +.icon-stop:before { + content: "\f04d"; +} +.icon-forward:before { + content: "\f04e"; +} +.icon-fast-forward:before { + content: "\f050"; +} +.icon-step-forward:before { + content: "\f051"; +} +.icon-eject:before { + content: "\f052"; +} +.icon-chevron-left:before { + content: "\f053"; +} +.icon-chevron-right:before { + content: "\f054"; +} +.icon-plus-sign:before { + content: "\f055"; +} +.icon-minus-sign:before { + content: "\f056"; +} +.icon-remove-sign:before { + content: "\f057"; +} +.icon-ok-sign:before { + content: "\f058"; +} +.icon-question-sign:before { + content: "\f059"; +} +.icon-info-sign:before { + content: "\f05a"; +} +.icon-screenshot:before { + content: "\f05b"; +} +.icon-remove-circle:before { + content: "\f05c"; +} +.icon-ok-circle:before { + content: "\f05d"; +} +.icon-ban-circle:before { + content: "\f05e"; +} +.icon-arrow-left:before { + content: "\f060"; +} +.icon-arrow-right:before { + content: "\f061"; +} +.icon-arrow-up:before { + content: "\f062"; +} +.icon-arrow-down:before { + content: "\f063"; +} +.icon-share-alt:before, +.icon-mail-forward:before { + content: "\f064"; +} +.icon-resize-full:before { + content: "\f065"; +} +.icon-resize-small:before { + content: "\f066"; +} +.icon-plus:before { + content: "\f067"; +} +.icon-minus:before { + content: "\f068"; +} +.icon-asterisk:before { + content: "\f069"; +} +.icon-exclamation-sign:before { + content: "\f06a"; +} +.icon-gift:before { + content: "\f06b"; +} +.icon-leaf:before { + content: "\f06c"; +} +.icon-fire:before { + content: "\f06d"; +} +.icon-eye-open:before { + content: "\f06e"; +} +.icon-eye-close:before { + content: "\f070"; +} +.icon-warning-sign:before { + content: "\f071"; +} +.icon-plane:before { + content: "\f072"; +} +.icon-calendar:before { + content: "\f073"; +} +.icon-random:before { + content: "\f074"; +} +.icon-comment:before { + content: "\f075"; +} +.icon-magnet:before { + content: "\f076"; +} +.icon-chevron-up:before { + content: "\f077"; +} +.icon-chevron-down:before { + content: "\f078"; +} +.icon-retweet:before { + content: "\f079"; +} +.icon-shopping-cart:before { + content: "\f07a"; +} +.icon-folder-close:before { + content: "\f07b"; +} +.icon-folder-open:before { + content: "\f07c"; +} +.icon-resize-vertical:before { + content: "\f07d"; +} +.icon-resize-horizontal:before { + content: "\f07e"; +} +.icon-bar-chart:before { + content: "\f080"; +} +.icon-twitter-sign:before { + content: "\f081"; +} +.icon-facebook-sign:before { + content: "\f082"; +} +.icon-camera-retro:before { + content: "\f083"; +} +.icon-key:before { + content: "\f084"; +} +.icon-cogs:before { + content: "\f085"; +} +.icon-comments:before { + content: "\f086"; +} +.icon-thumbs-up:before { + content: "\f087"; +} +.icon-thumbs-down:before { + content: "\f088"; +} +.icon-star-half:before { + content: "\f089"; +} +.icon-heart-empty:before { + content: "\f08a"; +} +.icon-signout:before { + content: "\f08b"; +} +.icon-linkedin-sign:before { + content: "\f08c"; +} +.icon-pushpin:before { + content: "\f08d"; +} +.icon-external-link:before { + content: "\f08e"; +} +.icon-signin:before { + content: "\f090"; +} +.icon-trophy:before { + content: "\f091"; +} +.icon-github-sign:before { + content: "\f092"; +} +.icon-upload-alt:before { + content: "\f093"; +} +.icon-lemon:before { + content: "\f094"; +} +.icon-phone:before { + content: "\f095"; +} +.icon-check-empty:before { + content: "\f096"; +} +.icon-bookmark-empty:before { + content: "\f097"; +} +.icon-phone-sign:before { + content: "\f098"; +} +.icon-twitter:before { + content: "\f099"; +} +.icon-facebook:before { + content: "\f09a"; +} +.icon-github:before { + content: "\f09b"; +} +.icon-unlock:before { + content: "\f09c"; +} +.icon-credit-card:before { + content: "\f09d"; +} +.icon-rss:before { + content: "\f09e"; +} +.icon-hdd:before { + content: "\f0a0"; +} +.icon-bullhorn:before { + content: "\f0a1"; +} +.icon-bell:before { + content: "\f0a2"; +} +.icon-certificate:before { + content: "\f0a3"; +} +.icon-hand-right:before { + content: "\f0a4"; +} +.icon-hand-left:before { + content: "\f0a5"; +} +.icon-hand-up:before { + content: "\f0a6"; +} +.icon-hand-down:before { + content: "\f0a7"; +} +.icon-circle-arrow-left:before { + content: "\f0a8"; +} +.icon-circle-arrow-right:before { + content: "\f0a9"; +} +.icon-circle-arrow-up:before { + content: "\f0aa"; +} +.icon-circle-arrow-down:before { + content: "\f0ab"; +} +.icon-globe:before { + content: "\f0ac"; +} +.icon-wrench:before { + content: "\f0ad"; +} +.icon-tasks:before { + content: "\f0ae"; +} +.icon-filter:before { + content: "\f0b0"; +} +.icon-briefcase:before { + content: "\f0b1"; +} +.icon-fullscreen:before { + content: "\f0b2"; +} +.icon-group:before { + content: "\f0c0"; +} +.icon-link:before { + content: "\f0c1"; +} +.icon-cloud:before { + content: "\f0c2"; +} +.icon-beaker:before { + content: "\f0c3"; +} +.icon-cut:before { + content: "\f0c4"; +} +.icon-copy:before { + content: "\f0c5"; +} +.icon-paper-clip:before { + content: "\f0c6"; +} +.icon-save:before { + content: "\f0c7"; +} +.icon-sign-blank:before { + content: "\f0c8"; +} +.icon-reorder:before { + content: "\f0c9"; +} +.icon-list-ul:before { + content: "\f0ca"; +} +.icon-list-ol:before { + content: "\f0cb"; +} +.icon-strikethrough:before { + content: "\f0cc"; +} +.icon-underline:before { + content: "\f0cd"; +} +.icon-table:before { + content: "\f0ce"; +} +.icon-magic:before { + content: "\f0d0"; +} +.icon-truck:before { + content: "\f0d1"; +} +.icon-pinterest:before { + content: "\f0d2"; +} +.icon-pinterest-sign:before { + content: "\f0d3"; +} +.icon-google-plus-sign:before { + content: "\f0d4"; +} +.icon-google-plus:before { + content: "\f0d5"; +} +.icon-money:before { + content: "\f0d6"; +} +.icon-caret-down:before { + content: "\f0d7"; +} +.icon-caret-up:before { + content: "\f0d8"; +} +.icon-caret-left:before { + content: "\f0d9"; +} +.icon-caret-right:before { + content: "\f0da"; +} +.icon-columns:before { + content: "\f0db"; +} +.icon-sort:before { + content: "\f0dc"; +} +.icon-sort-down:before { + content: "\f0dd"; +} +.icon-sort-up:before { + content: "\f0de"; +} +.icon-envelope-alt:before { + content: "\f0e0"; +} +.icon-linkedin:before { + content: "\f0e1"; +} +.icon-undo:before, +.icon-rotate-left:before { + content: "\f0e2"; +} +.icon-legal:before { + content: "\f0e3"; +} +.icon-dashboard:before { + content: "\f0e4"; +} +.icon-comment-alt:before { + content: "\f0e5"; +} +.icon-comments-alt:before { + content: "\f0e6"; +} +.icon-bolt:before { + content: "\f0e7"; +} +.icon-sitemap:before { + content: "\f0e8"; +} +.icon-umbrella:before { + content: "\f0e9"; +} +.icon-paste:before { + content: "\f0ea"; +} +.icon-lightbulb:before { + content: "\f0eb"; +} +.icon-exchange:before { + content: "\f0ec"; +} +.icon-cloud-download:before { + content: "\f0ed"; +} +.icon-cloud-upload:before { + content: "\f0ee"; +} +.icon-user-md:before { + content: "\f0f0"; +} +.icon-stethoscope:before { + content: "\f0f1"; +} +.icon-suitcase:before { + content: "\f0f2"; +} +.icon-bell-alt:before { + content: "\f0f3"; +} +.icon-coffee:before { + content: "\f0f4"; +} +.icon-food:before { + content: "\f0f5"; +} +.icon-file-alt:before { + content: "\f0f6"; +} +.icon-building:before { + content: "\f0f7"; +} +.icon-hospital:before { + content: "\f0f8"; +} +.icon-ambulance:before { + content: "\f0f9"; +} +.icon-medkit:before { + content: "\f0fa"; +} +.icon-fighter-jet:before { + content: "\f0fb"; +} +.icon-beer:before { + content: "\f0fc"; +} +.icon-h-sign:before { + content: "\f0fd"; +} +.icon-plus-sign-alt:before { + content: "\f0fe"; +} +.icon-double-angle-left:before { + content: "\f100"; +} +.icon-double-angle-right:before { + content: "\f101"; +} +.icon-double-angle-up:before { + content: "\f102"; +} +.icon-double-angle-down:before { + content: "\f103"; +} +.icon-angle-left:before { + content: "\f104"; +} +.icon-angle-right:before { + content: "\f105"; +} +.icon-angle-up:before { + content: "\f106"; +} +.icon-angle-down:before { + content: "\f107"; +} +.icon-desktop:before { + content: "\f108"; +} +.icon-laptop:before { + content: "\f109"; +} +.icon-tablet:before { + content: "\f10a"; +} +.icon-mobile-phone:before { + content: "\f10b"; +} +.icon-circle-blank:before { + content: "\f10c"; +} +.icon-quote-left:before { + content: "\f10d"; +} +.icon-quote-right:before { + content: "\f10e"; +} +.icon-spinner:before { + content: "\f110"; +} +.icon-circle:before { + content: "\f111"; +} +.icon-reply:before, +.icon-mail-reply:before { + content: "\f112"; +} +.icon-folder-close-alt:before { + content: "\f114"; +} +.icon-folder-open-alt:before { + content: "\f115"; +} +.icon-expand-alt:before { + content: "\f116"; +} +.icon-collapse-alt:before { + content: "\f117"; +} +.icon-smile:before { + content: "\f118"; +} +.icon-frown:before { + content: "\f119"; +} +.icon-meh:before { + content: "\f11a"; +} +.icon-gamepad:before { + content: "\f11b"; +} +.icon-keyboard:before { + content: "\f11c"; +} +.icon-flag-alt:before { + content: "\f11d"; +} +.icon-flag-checkered:before { + content: "\f11e"; +} +.icon-terminal:before { + content: "\f120"; +} +.icon-code:before { + content: "\f121"; +} +.icon-reply-all:before { + content: "\f122"; +} +.icon-mail-reply-all:before { + content: "\f122"; +} +.icon-star-half-full:before, +.icon-star-half-empty:before { + content: "\f123"; +} +.icon-location-arrow:before { + content: "\f124"; +} +.icon-crop:before { + content: "\f125"; +} +.icon-code-fork:before { + content: "\f126"; +} +.icon-unlink:before { + content: "\f127"; +} +.icon-question:before { + content: "\f128"; +} +.icon-info:before { + content: "\f129"; +} +.icon-exclamation:before { + content: "\f12a"; +} +.icon-superscript:before { + content: "\f12b"; +} +.icon-subscript:before { + content: "\f12c"; +} +.icon-eraser:before { + content: "\f12d"; +} +.icon-puzzle-piece:before { + content: "\f12e"; +} +.icon-microphone:before { + content: "\f130"; +} +.icon-microphone-off:before { + content: "\f131"; +} +.icon-shield:before { + content: "\f132"; +} +.icon-calendar-empty:before { + content: "\f133"; +} +.icon-fire-extinguisher:before { + content: "\f134"; +} +.icon-rocket:before { + content: "\f135"; +} +.icon-maxcdn:before { + content: "\f136"; +} +.icon-chevron-sign-left:before { + content: "\f137"; +} +.icon-chevron-sign-right:before { + content: "\f138"; +} +.icon-chevron-sign-up:before { + content: "\f139"; +} +.icon-chevron-sign-down:before { + content: "\f13a"; +} +.icon-html5:before { + content: "\f13b"; +} +.icon-css3:before { + content: "\f13c"; +} +.icon-anchor:before { + content: "\f13d"; +} +.icon-unlock-alt:before { + content: "\f13e"; +} +.icon-bullseye:before { + content: "\f140"; +} +.icon-ellipsis-horizontal:before { + content: "\f141"; +} +.icon-ellipsis-vertical:before { + content: "\f142"; +} +.icon-rss-sign:before { + content: "\f143"; +} +.icon-play-sign:before { + content: "\f144"; +} +.icon-ticket:before { + content: "\f145"; +} +.icon-minus-sign-alt:before { + content: "\f146"; +} +.icon-check-minus:before { + content: "\f147"; +} +.icon-level-up:before { + content: "\f148"; +} +.icon-level-down:before { + content: "\f149"; +} +.icon-check-sign:before { + content: "\f14a"; +} +.icon-edit-sign:before { + content: "\f14b"; +} +.icon-external-link-sign:before { + content: "\f14c"; +} +.icon-share-sign:before { + content: "\f14d"; +} diff --git a/lms/templates/admin_dashboard.html b/lms/templates/admin_dashboard.html index 6a903a3f94..5314881233 100644 --- a/lms/templates/admin_dashboard.html +++ b/lms/templates/admin_dashboard.html @@ -1,4 +1,5 @@ <%namespace name='static' file='static_content.html'/> +<%! from django.utils.translation import ugettext as _ %> <%inherit file="main.html" /> @@ -7,7 +8,7 @@ <section class="basic_stats"> <div class="edx_summary"> - <h2>edX-wide Summary</h2> + <h2>${_("{platform_name}-wide Summary").format(platform_name=settings.PLATFORM_NAME)}</h2> <table style="margin-left:auto;margin-right:auto;width:50%"> % for key in results["scalars"]: <tr> diff --git a/lms/templates/annotatable.html b/lms/templates/annotatable.html index f010305744..20a85d0ca2 100644 --- a/lms/templates/annotatable.html +++ b/lms/templates/annotatable.html @@ -1,3 +1,5 @@ +<%! from django.utils.translation import ugettext as _ %> + <div class="annotatable-wrapper"> <div class="annotatable-header"> % if display_name is not UNDEFINED and display_name is not None: @@ -8,8 +10,8 @@ % if instructions_html is not UNDEFINED and instructions_html is not None: <div class="annotatable-section shaded"> <div class="annotatable-section-title"> - Instructions - <a class="annotatable-toggle annotatable-toggle-instructions expanded" href="javascript:void(0)">Collapse Instructions</a> + ${_("Instructions")} + <a class="annotatable-toggle annotatable-toggle-instructions expanded" href="javascript:void(0)">${_("Collapse Instructions")}</a> </div> <div class="annotatable-section-body annotatable-instructions"> ${instructions_html} @@ -19,8 +21,8 @@ <div class="annotatable-section"> <div class="annotatable-section-title"> - Guided Discussion - <a class="annotatable-toggle annotatable-toggle-annotations" href="javascript:void(0)">Hide Annotations</a> + ${_("Guided Discussion")} + <a class="annotatable-toggle annotatable-toggle-annotations" href="javascript:void(0)">${_("Hide Annotations")}</a> </div> <div class="annotatable-section-body annotatable-content"> ${content_html} diff --git a/lms/templates/combinedopenended/combined_open_ended.html b/lms/templates/combinedopenended/combined_open_ended.html index 1a5c7e3c7d..fa75d61f72 100644 --- a/lms/templates/combinedopenended/combined_open_ended.html +++ b/lms/templates/combinedopenended/combined_open_ended.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %> <section id="combined-open-ended" class="combined-open-ended" data-location="${location}" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}" data-accept-file-upload = "${accept_file_upload}"> <div class="name"> <h2>${display_name}</h2> @@ -37,8 +38,8 @@ % endfor </div> - <input type="button" value="Reset" class="reset-button" name="reset"/> - <input type="button" value="Next Step" class="next-step-button" name="reset"/> + <input type="button" value="${_('Reset')}" class="reset-button" name="reset"/> + <input type="button" value="${_('Next Step')}" class="next-step-button" name="reset"/> </div> <div class="combined-rubric-container"> diff --git a/lms/templates/combinedopenended/combined_open_ended_legend.html b/lms/templates/combinedopenended/combined_open_ended_legend.html index e3e2494670..d5d482e190 100644 --- a/lms/templates/combinedopenended/combined_open_ended_legend.html +++ b/lms/templates/combinedopenended/combined_open_ended_legend.html @@ -1,6 +1,7 @@ +<%! from django.utils.translation import ugettext as _ %> <section class="legend-container"> <div class="legenditem"> - Legend + ${_("Legend")} </div> % for i in xrange(0,len(legend_list)): <%legend_title=legend_list[i]['name'] %> diff --git a/lms/templates/combinedopenended/combined_open_ended_status.html b/lms/templates/combinedopenended/combined_open_ended_status.html index 50c0459ce9..866eaccb1c 100644 --- a/lms/templates/combinedopenended/combined_open_ended_status.html +++ b/lms/templates/combinedopenended/combined_open_ended_status.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %> <div class="status-elements"> <section id="combined-open-ended-status" class="combined-open-ended-status"> %for i in xrange(0,len(status_list)): @@ -7,8 +8,7 @@ %else: <div class="statusitem" data-status-number="${i}"> %endif - ${status['human_task']} - + ${status['human_task']} </div> %endfor </section> diff --git a/lms/templates/combinedopenended/open_ended_result_table.html b/lms/templates/combinedopenended/open_ended_result_table.html index 24bf7a76fe..bac684b91c 100644 --- a/lms/templates/combinedopenended/open_ended_result_table.html +++ b/lms/templates/combinedopenended/open_ended_result_table.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %> % for co in context_list: % if co['grader_type'] in grader_type_image_dict: <%grader_type=co['grader_type']%> @@ -18,7 +19,7 @@ %if len(co['feedback'])>2: <div class="collapsible evaluation-response"> <header> - <a href="#">See full feedback</a> + <a href="#">${_("See full feedback")}</a> </header> <section class="feedback-full"> ${co['feedback']} @@ -32,22 +33,22 @@ <input type="hidden" value="${co['submission_id']}" class="submission_id" /> <div class="collapsible evaluation-response"> <header> - <a href="#">Respond to Feedback</a> + <a href="#">${_("Respond to Feedback")}</a> </header> <section id="evaluation" class="evaluation"> - <p>How accurate do you find this feedback?</p> + <p>${_("How accurate do you find this feedback?")}</p> <div class="evaluation-scoring"> <ul class="scoring-list"> - <li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> Correct</label></li> - <li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> Partially Correct</label></li> - <li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> No Opinion</label></li> - <li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> Partially Incorrect</label></li> - <li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> Incorrect</label></li> + <li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> ${_("Correct")}</label></li> + <li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> ${_("Partially Correct")}</label></li> + <li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> ${_("No Opinion")}</label></li> + <li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> ${_("Partially Incorrect")}</label></li> + <li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> ${_("Incorrect")}</label></li> </ul> </div> - <p>Additional comments:</p> + <p>${_("Additional comments:")}</p> <textarea rows="${rows}" cols="${cols}" name="feedback" class="feedback-on-feedback" id="feedback"></textarea> - <input type="button" value="Submit Feedback" class="submit-evaluation-button" name="reset"/> + <input type="button" value="${_("Submit Feedback")}" class="submit-evaluation-button" name="reset"/> </section> </div> </div> @@ -55,4 +56,4 @@ </section> <br/> %endif -%endfor \ No newline at end of file +%endfor diff --git a/lms/templates/combinedopenended/openended/open_ended.html b/lms/templates/combinedopenended/openended/open_ended.html index b76db8cecf..6e2de66823 100644 --- a/lms/templates/combinedopenended/openended/open_ended.html +++ b/lms/templates/combinedopenended/openended/open_ended.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %> <section id="openended_${id}" class="open-ended-child" data-state="${state}" data-child-type="${child_type}"> <div class="error"></div> <div class="prompt"> @@ -6,14 +7,14 @@ <div class="visibility-control visibility-control-response"> <div class="inner"> </div> - <span class="section-header section-header-response">Response</span> + <span class="section-header section-header-response">${_("Response")}</span> </div> <textarea rows="${rows}" cols="${cols}" name="answer" class="answer short-form-response" id="input_${id}">${previous_answer|h}</textarea> <div class="message-wrapper"></div> <div class="grader-status"> % if state == 'initial': - <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span> + <span class="unanswered" style="display:inline-block;" id="status_${id}">${_("Unanswered")}</span> % elif state == 'assessing': <span class="grading" id="status_${id}"> % if eta_message is not None: @@ -30,8 +31,8 @@ <div class="file-upload"></div> - <input type="button" value="Submit" class="submit-button" name="show"/> - <input name="skip" class="skip-button" type="button" value="Skip Post-Assessment"/> + <input type="button" value="${_("Submit")}" class="submit-button" name="show"/> + <input name="skip" class="skip-button" type="button" value="${_("Skip Post-Assessment")}"/> <div class="open-ended-action"></div> diff --git a/lms/templates/combinedopenended/openended/open_ended_error.html b/lms/templates/combinedopenended/openended/open_ended_error.html index 58a90f86ef..65b7381d60 100644 --- a/lms/templates/combinedopenended/openended/open_ended_error.html +++ b/lms/templates/combinedopenended/openended/open_ended_error.html @@ -1,7 +1,8 @@ +<%! from django.utils.translation import ugettext as _ %> <section> <div class="shortform"> <div class="result-errors"> - There was an error with your submission. Please contact course staff. + ${_("There was an error with your submission. Please contact course staff.")} </div> </div> <div class="longform"> @@ -9,4 +10,4 @@ ${errors} </div> </div> -</section> \ No newline at end of file +</section> diff --git a/lms/templates/combinedopenended/openended/open_ended_evaluation.html b/lms/templates/combinedopenended/openended/open_ended_evaluation.html index da3f38b6a9..ee55120d51 100644 --- a/lms/templates/combinedopenended/openended/open_ended_evaluation.html +++ b/lms/templates/combinedopenended/openended/open_ended_evaluation.html @@ -1,23 +1,24 @@ +<%! from django.utils.translation import ugettext as _ %> <div class="external-grader-message"> ${msg|n} <div class="collapsible evaluation-response"> <header> - <a href="#">Respond to Feedback</a> + <a href="#">${_("Respond to Feedback")}</a> </header> <section id="evaluation_${id}" class="evaluation"> - <p>How accurate do you find this feedback?</p> + <p>${_("How accurate do you find this feedback?")}</p> <div class="evaluation-scoring"> <ul class="scoring-list"> - <li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> Correct</label></li> - <li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> Partially Correct</label></li> - <li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> No Opinion</label></li> - <li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> Partially Incorrect</label></li> - <li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> Incorrect</label></li> + <li><input type="radio" name="evaluation-score" id="evaluation-score-5" value="5" /> <label for="evaluation-score-5"> ${_("Correct")}</label></li> + <li><input type="radio" name="evaluation-score" id="evaluation-score-4" value="4" /> <label for="evaluation-score-4"> ${_("Partially Correct")}</label></li> + <li><input type="radio" name="evaluation-score" id="evaluation-score-3" value="3" /> <label for="evaluation-score-3"> ${_("No Opinion")}</label></li> + <li><input type="radio" name="evaluation-score" id="evaluation-score-2" value="2" /> <label for="evaluation-score-2"> ${_("Partially Incorrect")}</label></li> + <li><input type="radio" name="evaluation-score" id="evaluation-score-1" value="1" /> <label for="evaluation-score-1"> ${_("Incorrect")}</label></li> </ul> </div> - <p>Additional comments:</p> + <p>${_("Additional comments:")}</p> <textarea rows="${rows}" cols="${cols}" name="feedback_${id}" class="feedback-on-feedback" id="feedback_${id}"></textarea> - <input type="button" value="Submit Feedback" class="submit-evaluation-button" name="reset"/> + <input type="button" value="${_("Submit Feedback")}" class="submit-evaluation-button" name="reset"/> </section> </div> -</div> \ No newline at end of file +</div> diff --git a/lms/templates/combinedopenended/openended/open_ended_rubric.html b/lms/templates/combinedopenended/openended/open_ended_rubric.html index df0704a263..ea374c5173 100644 --- a/lms/templates/combinedopenended/openended/open_ended_rubric.html +++ b/lms/templates/combinedopenended/openended/open_ended_rubric.html @@ -1,8 +1,9 @@ +<%! from django.utils.translation import ugettext as _ %> <form class="rubric-template" id="inputtype_${id}" xmlns="http://www.w3.org/1999/html"> <div class="visibility-control visibility-control-rubric"> <div class="inner"> </div> - <span class="section-header section-header-rubric">Rubric</span> + <span class="section-header section-header-rubric">${_("Rubric")}</span> </div> <p>Select the criteria you feel best represents this submission in each category.</p> <div class="rubric"> diff --git a/lms/templates/combinedopenended/selfassessment/self_assessment_hint.html b/lms/templates/combinedopenended/selfassessment/self_assessment_hint.html index 8c6eacba11..abdc25b77b 100644 --- a/lms/templates/combinedopenended/selfassessment/self_assessment_hint.html +++ b/lms/templates/combinedopenended/selfassessment/self_assessment_hint.html @@ -1,6 +1,7 @@ +<%! from django.utils.translation import ugettext as _ %> <div class="hint"> <div class="hint-prompt"> - Please enter a hint below: + ${_("Please enter a hint below:")} </div> <textarea name="post_assessment" class="post_assessment" cols="70" rows="5" ${'readonly="true"' if read_only else ''}>${hint}</textarea> diff --git a/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html b/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html index 5755eeec3a..99782e3185 100644 --- a/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html +++ b/lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %> <section id="self_assessment_${id}" class="open-ended-child" data-ajax-url="${ajax_url}" data-id="${id}" data-state="${state}" data-allow_reset="${allow_reset}" data-child-type="${child_type}"> <div class="error"></div> @@ -8,6 +9,9 @@ </div> <span class="section-header section-header-response">Response</span> </div> + + <h4>${_("Response")}</h4> + <div> <textarea name="answer" class="answer short-form-response" cols="70" rows="20">${previous_answer|n}</textarea> </div> @@ -20,5 +24,5 @@ <div class="message-wrapper"></div> <div class="file-upload"></div> - <input type="button" value="Submit" class="submit-button" name="show"/> + <input type="button" value="${_("Submit")}" class="submit-button" name="show"/> </section> diff --git a/lms/templates/contact.html b/lms/templates/contact.html index a8f5e6b732..c23e74c19a 100644 --- a/lms/templates/contact.html +++ b/lms/templates/contact.html @@ -1,13 +1,15 @@ +<%! from django.utils.translation import ugettext as _ %> + <%namespace name='static' file='static_content.html'/> <%inherit file="main.html" /> <section class="container about"> <nav> - <a href="/t/about.html">Vision</a> - <a href="/t/faq.html">Faq</a> - <a href="/t/press.html">Press</a> - <a href="/t/contact.html" class="active">Contact</a> + <a href="/t/about.html">${_("Vision")}</a> + <a href="/t/faq.html">${_("Faq")}</a> + <a href="/t/press.html">${_("Press")}</a> + <a href="/t/contact.html" class="active">${_("Contact")}</a> </nav> <section class="contact"> @@ -15,21 +17,35 @@ <img src="${static.url('images/contact-page.jpg')}"> </div> <div class="contacts"> - <h2>Class Feedback</h2> - <p>We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.</p> + <h2>${_("Class Feedback")}</h2> + <p>${_("We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.")}</p> - <h2>General Inquiries and Feedback</h2> - <p>"If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p> + <h2>${_("General Inquiries and Feedback")}</h2> + <p>${_('If you have a general question about {platform_name} please email <a href="mailto:{contact_email}">{contact_email}</a>. To see if your question has already been answered, visit our {faq_link_start}FAQ page{faq_link_end}. You can also join the discussion on our {fb_link_start}facebook page{fb_link_end}. Though we may not have a chance to respond to every email, we take all feedback into consideration.').format( + platform_name=settings.PLATFORM_NAME, + contact_email=settings.CONTACT_EMAIL, + faq_link_start='<a href="{url}">'.format(url=reverse('faq_edx')), + faq_link_end='</a>', + fb_link_start='<a href="http://www.facebook.com/EdxOnline">', + fb_link_end='</a>' + )}</p> - <h2>Technical Inquiries and Feedback</h2> - <p>If you have suggestions/feedback about the overall edX platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at <a href="mailto:technical@edx.org">technical@edx.org</a>. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: <a href="mailto:bugs@edx.org">bugs@edx.org</a>.</p> + <h2>${_("Technical Inquiries and Feedback")}</h2> + <p>${_('If you have suggestions/feedback about the overall {platform_name} platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at <a href="mailto:{tech_email}">{tech_email}</a>. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: <a href="mailto:{bugs_email}">{bugs_email}</a>.').format( + tech_email=settings.TECH_SUPPORT_EMAIL, + bug_email=settings.BUGS_EMAIL, + platform_name=settings.PLATFORM_NAME + )}</p> - <h2>Media</h2> - <p>Please visit our <a href="${reverse('faq_edx')}">media/press page</a> for more information. 
For any media or press inquiries, please email <a href="mailto:press@edx.org">press@edx.org</a>.</p> - - <h2>Universities</h2> - <p>If you are a university wishing to Collaborate or with questions about edX, please email <a href="mailto:university@edx.org">university@edx.org</a>.</p> + <h2>${_("Media")}</h2> + <p>${_('Please visit our {link_start}media/press page{link_end} for more information. For any media or press inquiries, please email {email}.').format( + link_start='<a href="{url}">'.format(url=reverse('faq_edx')), + link_end='</a>', + email='<a href="mailto:press@edx.org">press@edx.org</a>', + )}</p> + <h2>${_("Universities")}</h2> + <p>${_('If you are a university wishing to collaborate with or if you have questions about {platform_name}, please email {email}.').format(email='<a href="mailto:university@edx.org">university@edx.org</a>', platform_name="edX")}</p> </div> </section> </section> diff --git a/lms/templates/course.html b/lms/templates/course.html index e3dd9baf43..4f2a78984f 100644 --- a/lms/templates/course.html +++ b/lms/templates/course.html @@ -1,25 +1,26 @@ <%namespace name='static' file='static_content.html'/> <%namespace file='main.html' import="stanford_theme_enabled"/> <%! - from django.core.urlresolvers import reverse - from courseware.courses import course_image_url, get_course_about_section +from django.utils.translation import ugettext as _ +from django.core.urlresolvers import reverse +from courseware.courses import course_image_url, get_course_about_section %> <%page args="course" /> <article id="${course.id}" class="course"> %if course.is_newish: - <span class="status">New</span> + <span class="status">${_("New")}</span> %endif <a href="${reverse('about_course', args=[course.id])}"> <div class="inner-wrapper"> <header class="course-preview"> <hgroup> - <h2><span class="course-number">${course.number}</span> ${get_course_about_section(course, 'title')}</h2> + <h2><span class="course-number">${course.display_number_with_default | h}</span> ${get_course_about_section(course, 'title')}</h2> </hgroup> <div class="info-link">➔</div> </header> <section class="info"> <div class="cover-image"> - <img src="${course_image_url(course)}" alt="${course.number} ${get_course_about_section(course, 'title')} Cover Image" /> + <img src="${course_image_url(course)}" alt="${course.display_number_with_default | h} ${get_course_about_section(course, 'title')} Cover Image" /> </div> <div class="desc"> <p>${get_course_about_section(course, 'short_description')}</p> @@ -28,7 +29,7 @@ % if stanford_theme_enabled(): <span class="university">${get_course_about_section(course, 'university')}</span> % else: - <a href="${reverse('university_profile', args=[course.org])}" class="university">${get_course_about_section(course, 'university')}</a> + <a href="#" class="university">${get_course_about_section(course, 'university')}</a> % endif <span class="start-date">${course.start_date_text}</span> </div> diff --git a/lms/templates/course_filter.html b/lms/templates/course_filter.html deleted file mode 100644 index 9e7c0a16f4..0000000000 --- a/lms/templates/course_filter.html +++ /dev/null @@ -1,50 +0,0 @@ -<section class="filter"> - <nav> - <div class="dropdown university"> - <div class="filter-heading"> - All Universities - </div> - <ul> - <li> - <a href="#">Harvard</a> - </li> - <li> - <a href="#">MIT</a> - </li> - </ul> - </div> - - <div class="dropdown subject"> - <div class="filter-heading"> - All Subjects - </div> - <ul> - <li> - <a href="#">Computer Science</a> - </li> - <li> - <a href="#">History</a> - </li> - </ul> - </div> - - <div class="dropdown featured"> - <div class="filter-heading"> - Newest - </div> - <ul> - <li> - <a href="#">Top Rated</a> - </li> - <li> - <a href="#">Starting soonest</a> - </li> - </ul> - </div> - - <form class="search"> - <input type="text" placeholder="Search for courses"> - <input type="submit"> - </form> - </nav> -</section> diff --git a/lms/templates/course_groups/cohort_management.html b/lms/templates/course_groups/cohort_management.html index 239863beeb..4c9ca9e5a2 100644 --- a/lms/templates/course_groups/cohort_management.html +++ b/lms/templates/course_groups/cohort_management.html @@ -1,21 +1,22 @@ +<%! from django.utils.translation import ugettext as _ %> <section class="cohort_manager" data-ajax_url="${cohorts_ajax_url}"> -<h3>Cohort groups</h3> +<h3>${_("Cohort groups")}</h3> <div class="controls" style="padding-top:15px"> - <a href="#" class="button show_cohorts">Show cohorts</a> + <a href="#" class="button show_cohorts">${_("Show cohorts")}</a> </div> <ul class="errors"> </ul> <div class="summary" style="display:none"> - <h3>Cohorts in the course</h3> + <h3>${_("Cohorts in the course")}</h3> <ul class="cohorts"> </ul> <p> <input class="cohort_name"/> - <a href="#" class="button add_cohort">Add cohort</a> + <a href="#" class="button add_cohort">${_("Add cohort")}</a> </p> </div> @@ -27,10 +28,10 @@ <span class="page_num"></span> <p> - Add users by username or email. One per line or comma-separated. + ${_("Add users by username or email. One per line or comma-separated.")} </p> <textarea cols="50" row="30" class="users_area" style="height: 200px"></textarea> - <a href="#" class="button add_members">Add cohort members</a> + <a href="#" class="button add_members">${_("Add cohort members")}</a> <ul class="op_results"> </ul> diff --git a/lms/templates/course_groups/debug.html b/lms/templates/course_groups/debug.html index d8bbc324de..7554557f81 100644 --- a/lms/templates/course_groups/debug.html +++ b/lms/templates/course_groups/debug.html @@ -1,6 +1,8 @@ <!DOCTYPE html> +<%! from django.utils.translation import ugettext as _ %> <html> <head> + ## "edX" should not be translated <%block name="title"><title>edX diff --git a/lms/templates/courseware/accordion.html b/lms/templates/courseware/accordion.html index 5b9c6f7450..4761408232 100644 --- a/lms/templates/courseware/accordion.html +++ b/lms/templates/courseware/accordion.html @@ -1,9 +1,20 @@ -<%! from django.core.urlresolvers import reverse %> -<%! from xmodule.util.date_utils import get_default_time_display %> +<%! + from django.core.urlresolvers import reverse + from xmodule.util.date_utils import get_default_time_display + from django.utils.translation import ugettext as _ +%> <%def name="make_chapter(chapter)">
        -

        + <% + if chapter.get('active'): + aria_label = _('{chapter}, current chapter').format(chapter=chapter['display_name']) + active_class = ' class="active"' + else: + aria_label = chapter['display_name'] + active_class = '' + %> +

        ${chapter['display_name']} diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html index 15317de207..0c95a3cf8e 100644 --- a/lms/templates/courseware/course_about.html +++ b/lms/templates/courseware/course_about.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %> <%! from django.core.urlresolvers import reverse from courseware.courses import course_image_url, get_course_about_section @@ -65,7 +66,7 @@ -<%block name="title">About ${course.number} +<%block name="title">${_("About {course.display_number_with_default}").format(course=course) | h}
        @@ -74,9 +75,9 @@

        - ${course.number}: ${get_course_about_section(course, "title")} + ${course.display_number_with_default | h}: ${get_course_about_section(course, "title")} % if not self.theme_enabled(): - ${get_course_about_section(course, "university")} + ${get_course_about_section(course, "university")} % endif

        @@ -86,13 +87,15 @@ %if show_courseware_link: %endif - You are registered for this course (${course.number}) + + ${_("You are registered for this course {course.display_number_with_default}").format(course=course) | h} %if show_courseware_link: - View Courseware + ${_("View Courseware")} %endif %else: - Register for ${course.number} + ${_("Register for {course.display_number_with_default}").format(course=course) | h} +
        %endif

        @@ -115,16 +118,16 @@
        - +
        @@ -136,7 +139,7 @@
          -

        1. Course Number

          ${course.number}
          2. -

        2. Classes Start

          ${course.start_date_text}
          3. +

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

          ${course.display_number_with_default | h}
          4. +

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

          ${course.start_date_text}
          5. ## We plan to ditch end_date (which is not stored in course metadata), ## but for backwards compatibility, show about/end_date blob if it exists. % if get_course_about_section(course, "end_date") or course.end:
        5. -

          Classes End

          +

          ${_("Classes End")}

          % if get_course_about_section(course, "end_date"): ${get_course_about_section(course, "end_date")} % else: @@ -180,13 +183,13 @@ % endif % if get_course_about_section(course, "effort"): -

        6. Estimated Effort

          ${get_course_about_section(course, "effort")}
          7. +

        7. ${_("Estimated Effort")}

          ${get_course_about_section(course, "effort")}
          8. % endif - ##

        8. Course Length

          15 weeks
          9. + ##

        9. ${_('Course Length')}

          ${_('{number} weeks').format(number=15)}
          10. % if get_course_about_section(course, "prerequisites"): -

        10. Prerequisites

          ${get_course_about_section(course, "prerequisites")}
          11. +

        11. ${_("Prerequisites")}

          ${get_course_about_section(course, "prerequisites")}
          12. % endif
        @@ -196,10 +199,11 @@ % if get_course_about_section(course, "ocw_links"):
        -

        Additional Resources

        +

        ${_("Additional Resources")}

        + ## "MITOpenCourseware" should *not* be translated

        MITOpenCourseware

        ${get_course_about_section(course, "ocw_links")}
        @@ -215,10 +219,10 @@
        - +
        - +
        diff --git a/lms/templates/courseware/course_navigation.html b/lms/templates/courseware/course_navigation.html index 98329b9836..799b10b36b 100644 --- a/lms/templates/courseware/course_navigation.html +++ b/lms/templates/courseware/course_navigation.html @@ -12,6 +12,7 @@ def url_class(is_active): return "" %> <%! from courseware.tabs import get_course_tabs %> +<%! from django.utils.translation import ugettext as _ %>
    diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index f731f0d989..1f1d96a0df 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -1,8 +1,9 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="../main.html" /> <%namespace name='static' file='../static_content.html'/> -<%block name="title">Courses +<%block name="title">${_("Courses")}
    @@ -16,17 +17,15 @@ % endif % if self.stanford_theme_enabled(): -

    Explore free courses from Stanford University.

    +

    ${_("Explore free courses from {university_name}.").format(university_name="Stanford University")}

    % else: -

    Explore free courses from leading universities.

    +

    ${_("Explore free courses from leading universities.")}

    % endif
    - ## I'm removing this for now since we aren't using it for the fall. - ## <%include file="course_filter.html" />
      %for course in courses: diff --git a/lms/templates/courseware/courseware-error.html b/lms/templates/courseware/courseware-error.html index e289e1c99d..f0f7969026 100644 --- a/lms/templates/courseware/courseware-error.html +++ b/lms/templates/courseware/courseware-error.html @@ -1,7 +1,9 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="/main.html" /> <%namespace name='static' file='../static_content.html'/> <%block name="bodyclass">courseware -<%block name="title">Courseware – edX +## Translators: "edX" should *not* be translated +<%block name="title">${_("Courseware")} - ${settings.PLATFORM_NAME} <%block name="headextra"> <%static:css group='course'/> @@ -11,7 +13,7 @@
      -

      There has been an error on the edX servers

      -

      We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at technical@edx.org to report any problems or downtime.

      +

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

      +

      ${_("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(tech_support_email=settings.TECH_SUPPORT_EMAIL)}

      diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index e009e535e3..2a52b50b09 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -1,7 +1,8 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="/main.html" /> <%namespace name='static' file='/static_content.html'/> <%block name="bodyclass">courseware ${course.css_class} -<%block name="title">${course.number} Courseware +<%block name="title">${_("{course_number} Courseware").format(course_number=course.display_number_with_default) | h} <%block name="headextra"> <%static:css group='course'/> @@ -155,7 +156,7 @@
      % if timer_navigation_return_url: - Return to Exam + ${_("Return to Exam")} % endif
      Time Remaining:
       
      @@ -170,9 +171,9 @@
      % if accordion: -
      +
      - close + ${_("close")}
    - ## `news` should be `None` whenever a non-edX theme is enabled: - ## see common/djangoapps/student/views.py#_get_news - %if news: -
    -
    -

    edX News

    - -
    -
    - % for entry in news: -
    - %if entry.image: -
    - -
    - %endif -
    ${entry.title}
    -
    - %if entry.summary: -

    ${entry.summary}

    - %endif -

    Learn More ›

    -
    -
    - %endfor -
    -
    - %endif
    -

    Current Courses

    +

    ${_("Current Courses")}

    % if len(courses) > 0: @@ -211,11 +140,11 @@ % if course.id in show_courseware_links_for: - ${course.number} ${course.display_name_with_default} Cover Image + ${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}') |h} % else:
    - ${course.number} ${course.display_name_with_default} Cover Image + ${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')}
    % endif @@ -223,19 +152,19 @@

    % if course.has_ended(): - Course Completed - ${course.end_date_text} + ${_("Course Completed - {end_date}").format(end_date=course.end_date_text)} % elif course.has_started(): - Course Started - ${course.start_date_text} + ${_("Course Started - {start_date}").format(start_date=course.start_date_text)} % else: # hasn't started yet - Course Starts - ${course.start_date_text} + ${_("Course Starts - {start_date}").format(start_date=course.start_date_text)} % endif

    ${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

    @@ -249,27 +178,41 @@ % if registration is None and testcenter_exam_info.is_registering():
    - Register for Pearson exam -

    Registration for the Pearson exam is now open and will close on ${testcenter_exam_info.registration_end_date_text}

    + ${_("Register for Pearson exam")} +

    ${_("Registration for the Pearson exam is now open and will close on {end_date}").format(end_date="{}".format(testcenter_exam_info.registration_end_date_text))}

    % endif % if registration is not None: % if registration.is_accepted:
    - Schedule Pearson exam -

    Registration number: ${registration.client_candidate_id}

    -

    Write this down! You’ll need it to schedule your exam.

    + ${_("Schedule Pearson exam")} +

    ${_("{link_start}Registration{link_end} number: {number}").format( + link_start=''.format(url=testcenter_register_target), + link_end='', + number=registration.client_candidate_id, + )}

    +

    ${_("Write this down! You'll need it to schedule your exam.")}

    % endif % if registration.is_rejected:
    -

    Your registration for the Pearson exam has been rejected. Please see your registration status details. Otherwise contact edX at exam-help@edx.org for further help.

    +

    + ${_("Your registration for the Pearson exam has been rejected. Please {link_start}see your registration status details{link_end}.").format( + 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.display_number_with_default), + link_end='', + email="exam-help@edx.org", + )}

    % endif % if not registration.is_accepted and not registration.is_rejected:
    -

    Your registration for the Pearson exam is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.

    +

    ${_("Your {link_start}registration for the Pearson exam{link_end} is pending.").format(link_start=''.format(url=testcenter_register_target), link_end='')} + ${_("Within a few days, you should see a confirmation number here, which can be used to schedule your exam.")} +

    % endif % endif @@ -292,17 +235,16 @@
    % if cert_status['status'] == 'processing': -

    Final course details are being wrapped up at - this time. Your final standing will be available shortly.

    +

    ${_("Final course details are being wrapped up at this time. Your final standing will be available shortly.")}

    % elif cert_status['status'] in ('generating', 'ready', 'notpassing', 'restricted'): -

    Your final grade: +

    ${_("Your final grade:")} ${"{0:.0f}%".format(float(cert_status['grade'])*100)}. % if cert_status['status'] == 'notpassing': - Grade required for a certificate: + ${_("Grade required for a certificate:")} ${"{0:.0f}%".format(float(course.lowest_passing_grade)*100)}. % elif cert_status['status'] == 'restricted':

    - Your certificate is being held pending confirmation that the issuance of your certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria and Sudan. If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting ${settings.CONTACT_EMAIL}. + ${_("Your certificate is being held pending confirmation that the issuance of your certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria and Sudan. If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting {email}.").format(email='{email}.'.format(email=settings.CONTACT_EMAIL))}

    % endif

    @@ -312,17 +254,17 @@ % endif @@ -332,12 +274,12 @@ % if course.id in show_courseware_links_for: % if course.has_ended(): - View Archived Course + ${_('View Archived Course')} % else: - View Course + ${_('View Course')} % endif % endif - Unregister + ${_('Unregister')}
    @@ -346,16 +288,16 @@ % endfor % else:
    -

    Looks like you haven't registered for any courses yet.

    +

    ${_("Looks like you haven't registered for any courses yet.")}

    - Find courses now! + ${_("Find courses now!")}
    % endif % if staff_access and len(errored_courses) > 0:
    -

    Course-loading errors

    +

    ${_("Course-loading errors")}

    % for course_dir, errors in errored_courses.items():

    ${course_dir | h}

    @@ -374,7 +316,7 @@ @@ -48,7 +49,7 @@
    -

    Prompt (Hide)

    +

    ${_('Prompt')} ${_("(Hide)")}

    @@ -56,14 +57,14 @@
    - +
    -

    Student Response

    +

    ${_("Student Response")}

    @@ -72,18 +73,18 @@

    -

    Written Feedback

    -

    - Flag as inappropriate content for later review + ${_("Flag as inappropriate content for later review")}

    - +
    - - + +
    diff --git a/lms/templates/invalid_email_key.html b/lms/templates/invalid_email_key.html index 212f91fa9d..5fdcdb4b12 100644 --- a/lms/templates/invalid_email_key.html +++ b/lms/templates/invalid_email_key.html @@ -1,16 +1,18 @@ +<%! from django.utils.translation import ugettext as _ %> + <%inherit file="main.html" />
    -

    Invalid email change key

    +

    ${_("Invalid email change key")}

    -

    This e-mail key is not valid. Please check:

    +

    ${_("This e-mail key is not valid. Please check:")}

      -
    • Was this key already used? Check whether the e-mail change has already happened. -
    • Did your e-mail client break the URL into two lines? -
    • The keys are valid for a limited amount of time. Has the key expired? +
    • ${_("Was this key already used? Check whether the e-mail change has already happened.")} +
    • ${_("Did your e-mail client break the URL into two lines?")} +
    • ${_("The keys are valid for a limited amount of time. Has the key expired?")}
    -

    Go back to the home page.

    +

    ${_('Go back to the {link_start}home page{link_end}.').format(link_start='', link_end='')}

    diff --git a/lms/templates/licenses/serial_numbers.html b/lms/templates/licenses/serial_numbers.html index 18f0ff8a9b..a9f048f18f 100644 --- a/lms/templates/licenses/serial_numbers.html +++ b/lms/templates/licenses/serial_numbers.html @@ -1,10 +1,11 @@ +<%! from django.utils.translation import ugettext as _ %>
    % for license in licenses:
    ${license.software.name}:
    % if license.serial:
    ${license.serial}
    % else: -
    None Available
    +
    ${_("None Available")}
    % endif % endfor
    diff --git a/lms/templates/login.html b/lms/templates/login.html index 5ab63a86c2..b737255a0d 100644 --- a/lms/templates/login.html +++ b/lms/templates/login.html @@ -1,3 +1,5 @@ +<%! from django.utils.translation import ugettext as _ %> + <%inherit file="main.html" /> <%namespace name='static' file='static_content.html'/> @@ -5,7 +7,7 @@ <%! from django.core.urlresolvers import reverse %> <%! from django.utils.translation import ugettext as _ %> -<%block name="title">Log into your ${settings.PLATFORM_NAME} Account +<%block name="title">${_("Log into your {platform_name} Account").format(platform_name=settings.PLATFORM_NAME)} <%block name="js_extra"> @@ -90,46 +92,46 @@

    - Please provide the following information to log into your ${settings.PLATFORM_NAME} account. Required fields are noted by bold text and an asterisk (*). + ${_('Please provide the following information to log into your {platform_name} account. Required fields are noted by bold text and an asterisk (*).').format(platform_name=settings.PLATFORM_NAME)}

    - Required Information + ${_('Required Information')}
    1. - +
    2. - + - Forgot password? + ${_('Forgot password?')}
    - Account Preferences + ${_('Account Preferences')}
    1. - +
    @@ -147,27 +149,27 @@