diff --git a/.gitignore b/.gitignore index 2fd1ca0181..493df5a7fd 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ lms/lib/comment_client/python nosetests.xml cover_html/ .idea/ +.redcar/ chromedriver.log \ No newline at end of file diff --git a/.pep8 b/.pep8 new file mode 100644 index 0000000000..25d0edbcb4 --- /dev/null +++ b/.pep8 @@ -0,0 +1,2 @@ +[pep8] +ignore=E501 \ No newline at end of file diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..dd472cffa2 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +1.8.7-p371 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 0fe7df217d..43a9f6e2b1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,6 @@ source :rubygems -ruby "1.9.3" -gem 'rake' +gem 'rake', '~> 10.0.3' gem 'sass', '3.1.15' gem 'bourbon', '~> 1.3.6' -gem 'colorize' -gem 'launchy' +gem 'colorize', '~> 0.5.8' +gem 'launchy', '~> 2.1.2' diff --git a/apt-packages.txt b/apt-packages.txt index b783ccb67e..0560dfcbc2 100644 --- a/apt-packages.txt +++ b/apt-packages.txt @@ -9,6 +9,7 @@ gfortran liblapack-dev libfreetype6-dev libpng12-dev +libjpeg-dev libxml2-dev libxslt-dev yui-compressor diff --git a/cms/.coveragerc b/cms/.coveragerc index 9b1e59d670..4f0dbebe79 100644 --- a/cms/.coveragerc +++ b/cms/.coveragerc @@ -1,8 +1,8 @@ # .coveragerc for cms [run] data_file = reports/cms/.coverage -source = cms -omit = cms/envs/*, cms/manage.py +source = cms,common/djangoapps +omit = cms/envs/*, cms/manage.py, common/djangoapps/terrain/*, common/djangoapps/*/migrations/* [report] ignore_errors = True diff --git a/cms/__init__.py b/cms/__init__.py index 8b13789179..e69de29bb2 100644 --- a/cms/__init__.py +++ b/cms/__init__.py @@ -1 +0,0 @@ - diff --git a/cms/djangoapps/auth/authz.py b/cms/djangoapps/auth/authz.py index 22bbc4bc1c..281e3f46b2 100644 --- a/cms/djangoapps/auth/authz.py +++ b/cms/djangoapps/auth/authz.py @@ -18,6 +18,8 @@ STAFF_ROLE_NAME = 'staff' # we're just making a Django group for each location/role combo # to do this we're just creating a Group name which is a formatted string # of those two variables + + def get_course_groupname_for_role(location, role): loc = Location(location) # hack: check for existence of a group name in the legacy LMS format _ @@ -25,11 +27,12 @@ def get_course_groupname_for_role(location, role): # more information groupname = '{0}_{1}'.format(role, loc.course) - if len(Group.objects.filter(name = groupname)) == 0: - groupname = '{0}_{1}'.format(role,loc.course_id) + if len(Group.objects.filter(name=groupname)) == 0: + groupname = '{0}_{1}'.format(role, loc.course_id) return groupname + def get_users_in_course_group_by_role(location, role): groupname = get_course_groupname_for_role(location, role) (group, created) = Group.objects.get_or_create(name=groupname) @@ -39,6 +42,8 @@ def get_users_in_course_group_by_role(location, role): ''' Create all permission groups for a new course and subscribe the caller into those roles ''' + + def create_all_course_groups(creator, location): create_new_course_group(creator, location, INSTRUCTOR_ROLE_NAME) create_new_course_group(creator, location, STAFF_ROLE_NAME) @@ -46,7 +51,7 @@ def create_all_course_groups(creator, location): def create_new_course_group(creator, location, role): groupname = get_course_groupname_for_role(location, role) - (group, created) =Group.objects.get_or_create(name=groupname) + (group, created) = Group.objects.get_or_create(name=groupname) if created: group.save() @@ -59,6 +64,8 @@ def create_new_course_group(creator, location, role): This is to be called only by either a command line code path or through a app which has already asserted permissions ''' + + def _delete_course_group(location): # remove all memberships instructors = Group.objects.get(name=get_course_groupname_for_role(location, INSTRUCTOR_ROLE_NAME)) @@ -75,6 +82,8 @@ def _delete_course_group(location): This is to be called only by either a command line code path or through an app which has already asserted permissions to do this action ''' + + def _copy_course_group(source, dest): instructors = Group.objects.get(name=get_course_groupname_for_role(source, INSTRUCTOR_ROLE_NAME)) new_instructors_group = Group.objects.get(name=get_course_groupname_for_role(dest, INSTRUCTOR_ROLE_NAME)) @@ -86,7 +95,7 @@ def _copy_course_group(source, dest): new_staff_group = Group.objects.get(name=get_course_groupname_for_role(dest, STAFF_ROLE_NAME)) for user in staff.user_set.all(): user.groups.add(new_staff_group) - user.save() + user.save() def add_user_to_course_group(caller, user, location, role): @@ -133,8 +142,6 @@ def remove_user_from_course_group(caller, user, location, role): def is_user_in_course_group_role(user, location, role): 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 + return user.is_staff or user.groups.filter(name=get_course_groupname_for_role(location, role)).count() > 0 return False - - diff --git a/cms/djangoapps/contentstore/__init__.py b/cms/djangoapps/contentstore/__init__.py index e8dccbbf60..8b13789179 100644 --- a/cms/djangoapps/contentstore/__init__.py +++ b/cms/djangoapps/contentstore/__init__.py @@ -1,3 +1 @@ -from xmodule.templates import update_templates -update_templates() diff --git a/cms/djangoapps/contentstore/course_info_model.py b/cms/djangoapps/contentstore/course_info_model.py index 6995df06a8..153d13dd13 100644 --- a/cms/djangoapps/contentstore/course_info_model.py +++ b/cms/djangoapps/contentstore/course_info_model.py @@ -8,6 +8,8 @@ import logging ## TODO store as array of { date, content } and override course_info_module.definition_from_xml ## This should be in a class which inherits from XmlDescriptor + + def get_course_updates(location): """ Retrieve the relevant course_info updates and unpack into the model which the client expects: @@ -21,13 +23,13 @@ def get_course_updates(location): # current db rep: {"_id" : locationjson, "definition" : { "data" : "
    [

  1. date

    content
    2. ]
"} "metadata" : ignored} location_base = course_updates.location.url() - + # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break. try: course_html_parsed = html.fromstring(course_updates.definition['data']) except: course_html_parsed = html.fromstring("
    ") - + # Confirm that root is
      , iterate over
    1. , pull out

      subs and then rest of val course_upd_collection = [] if course_html_parsed.tag == 'ol': @@ -40,25 +42,26 @@ def get_course_updates(location): content = update[0].tail else: content = "\n".join([html.tostring(ele) for ele in update[1:]]) - + # make the id on the client be 1..len w/ 1 being the oldest and len being the newest - course_upd_collection.append({"id" : location_base + "/" + str(len(course_html_parsed) - idx), - "date" : update.findtext("h2"), - "content" : content}) - + course_upd_collection.append({"id": location_base + "/" + str(len(course_html_parsed) - idx), + "date": update.findtext("h2"), + "content": content}) + return course_upd_collection + def update_course_updates(location, update, passed_id=None): """ Either add or update the given course update. It will add it if the passed_id is absent or None. It will update it if it has an passed_id which has a valid value. Until updates have distinct values, the passed_id is the location url + an index - into the html structure. + into the html structure. """ try: course_updates = modulestore('direct').get_item(location) except ItemNotFoundError: return HttpResponseBadRequest - + # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break. try: course_html_parsed = html.fromstring(course_updates.definition['data']) @@ -67,7 +70,7 @@ def update_course_updates(location, update, passed_id=None): # No try/catch b/c failure generates an error back to client new_html_parsed = html.fromstring('

    2. ' + update['date'] + '

      ' + update['content'] + '
      3. ') - + # 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? @@ -80,14 +83,15 @@ def update_course_updates(location, update, passed_id=None): idx = len(course_html_parsed) passed_id = course_updates.location.url() + "/" + str(idx) - + # update db record course_updates.definition['data'] = html.tostring(course_html_parsed) modulestore('direct').update_item(location, course_updates.definition['data']) - - return {"id" : passed_id, - "date" : update['date'], - "content" :update['content']} + + return {"id": passed_id, + "date": update['date'], + "content": update['content']} + def delete_course_update(location, update, passed_id): """ @@ -96,19 +100,19 @@ def delete_course_update(location, update, passed_id): """ if not passed_id: return HttpResponseBadRequest - + try: course_updates = modulestore('direct').get_item(location) except ItemNotFoundError: return HttpResponseBadRequest - + # TODO use delete_blank_text parser throughout and cache as a static var in a class # purely to handle free formed updates not done via editor. Actually kills them, but at least doesn't break. try: course_html_parsed = html.fromstring(course_updates.definition['data']) except: course_html_parsed = html.fromstring("
          ") - + if course_html_parsed.tag == 'ol': # ??? Should this use the id in the json or in the url or does it matter? idx = get_idx(passed_id) @@ -120,10 +124,11 @@ def delete_course_update(location, update, passed_id): # update db record course_updates.definition['data'] = html.tostring(course_html_parsed) store = modulestore('direct') - store.update_item(location, course_updates.definition['data']) - + store.update_item(location, course_updates.definition['data']) + return get_course_updates(location) - + + def get_idx(passed_id): """ From the url w/ idx appended, get the idx. @@ -131,4 +136,4 @@ def get_idx(passed_id): # TODO compile this regex into a class static and reuse for each call idx_matcher = re.search(r'.*/(\d+)$', passed_id) if idx_matcher: - return int(idx_matcher.group(1)) \ No newline at end of file + return int(idx_matcher.group(1)) diff --git a/cms/djangoapps/contentstore/features/advanced-settings.feature b/cms/djangoapps/contentstore/features/advanced-settings.feature new file mode 100644 index 0000000000..4708a60be1 --- /dev/null +++ b/cms/djangoapps/contentstore/features/advanced-settings.feature @@ -0,0 +1,51 @@ +Feature: Advanced (manual) course policy + In order to specify course policy settings for which no custom user interface exists + I want to be able to manually enter JSON key/value pairs + + Scenario: A course author sees only display_name on a newly created course + Given I have opened a new course in Studio + When I select the Advanced Settings + Then I see only the display name + + Scenario: Test if there are no policy settings without existing UI controls + Given I am on the Advanced Course Settings page in Studio + When I delete the display name + Then there are no advanced policy settings + And I reload the page + Then there are no advanced policy settings + + Scenario: Test cancel editing key name + Given I am on the Advanced Course Settings page in Studio + When I edit the name of a policy key + And I press the "Cancel" notification button + Then the policy key name is unchanged + + Scenario: Test editing key name + Given I am on the Advanced Course Settings page in Studio + When I edit the name of a policy key + And I press the "Save" notification button + Then the policy key name is changed + + Scenario: Test cancel editing key value + Given I am on the Advanced Course Settings page in Studio + When I edit the value of a policy key + And I press the "Cancel" notification button + Then the policy key value is unchanged + + Scenario: Test editing key value + Given I am on the Advanced Course Settings page in Studio + When I edit the value of a policy key + And I press the "Save" notification button + Then the policy key value is changed + + Scenario: Add new entries, and they appear alphabetically after save + Given I am on the Advanced Course Settings page in Studio + When I create New Entries + Then they are alphabetized + And I reload the page + Then they are alphabetized + + Scenario: Test how multi-line input appears + Given I am on the Advanced Course Settings page in Studio + When I create a JSON object + Then it is displayed as formatted diff --git a/cms/djangoapps/contentstore/features/advanced-settings.py b/cms/djangoapps/contentstore/features/advanced-settings.py new file mode 100644 index 0000000000..91daf70718 --- /dev/null +++ b/cms/djangoapps/contentstore/features/advanced-settings.py @@ -0,0 +1,182 @@ +from lettuce import world, step +from common import * +import time + +from nose.tools import assert_equal +from nose.tools import assert_true + +""" +http://selenium.googlecode.com/svn/trunk/docs/api/py/webdriver/selenium.webdriver.common.keys.html +""" +from selenium.webdriver.common.keys import Keys + + +############### ACTIONS #################### +@step('I select the Advanced Settings$') +def i_select_advanced_settings(step): + expand_icon_css = 'li.nav-course-settings i.icon-expand' + if world.browser.is_element_present_by_css(expand_icon_css): + css_click(expand_icon_css) + link_css = 'li.nav-course-settings-advanced a' + css_click(link_css) + + +@step('I am on the Advanced Course Settings page in Studio$') +def i_am_on_advanced_course_settings(step): + step.given('I have opened a new course in Studio') + step.given('I select the Advanced Settings') + + +# TODO: this is copied from terrain's step.py. Need to figure out how to share that code. +@step('I reload the page$') +def reload_the_page(step): + world.browser.reload() + + +@step(u'I edit the name of a policy key$') +def edit_the_name_of_a_policy_key(step): + policy_key_css = 'input.policy-key' + e = css_find(policy_key_css).first + e.fill('new') + + +@step(u'I press the "([^"]*)" notification button$') +def press_the_notification_button(step, name): + world.browser.click_link_by_text(name) + + +@step(u'I edit the value of a policy key$') +def edit_the_value_of_a_policy_key(step): + """ + It is hard to figure out how to get into the CodeMirror + area, so cheat and do it from the policy key field :) + """ + policy_key_css = 'input.policy-key' + e = css_find(policy_key_css).first + e._element.send_keys(Keys.TAB, Keys.END, Keys.ARROW_LEFT, ' ', 'X') + + +@step('I delete the display name$') +def delete_the_display_name(step): + delete_entry(0) + click_save() + + +@step('create New Entries$') +def create_new_entries(step): + create_entry("z", "apple") + create_entry("a", "zebra") + click_save() + + +@step('I create a JSON object$') +def create_JSON_object(step): + create_entry("json", '{"key": "value", "key_2": "value_2"}') + click_save() + + +############### RESULTS #################### +@step('I see only the display name$') +def i_see_only_display_name(step): + assert_policy_entries(["display_name"], ['"Robot Super Course"']) + + +@step('there are no advanced policy settings$') +def no_policy_settings(step): + assert_policy_entries([], []) + + +@step('they are alphabetized$') +def they_are_alphabetized(step): + assert_policy_entries(["a", "display_name", "z"], ['"zebra"', '"Robot Super Course"', '"apple"']) + + +@step('it is displayed as formatted$') +def it_is_formatted(step): + assert_policy_entries(["display_name", "json"], ['"Robot Super Course"', '{\n "key": "value",\n "key_2": "value_2"\n}']) + + +@step(u'the policy key name is unchanged$') +def the_policy_key_name_is_unchanged(step): + policy_key_css = 'input.policy-key' + e = css_find(policy_key_css).first + assert_equal(e.value, 'display_name') + + +@step(u'the policy key name is changed$') +def the_policy_key_name_is_changed(step): + policy_key_css = 'input.policy-key' + e = css_find(policy_key_css).first + assert_equal(e.value, 'new') + + +@step(u'the policy key value is unchanged$') +def the_policy_key_value_is_unchanged(step): + policy_value_css = 'li.course-advanced-policy-list-item div.value textarea' + e = css_find(policy_value_css).first + assert_equal(e.value, '"Robot Super Course"') + + +@step(u'the policy key value is changed$') +def the_policy_key_value_is_unchanged(step): + policy_value_css = 'li.course-advanced-policy-list-item div.value textarea' + e = css_find(policy_value_css).first + assert_equal(e.value, '"Robot Super Course X"') + + +############# HELPERS ############### +def create_entry(key, value): + # Scroll down the page so the button is visible + world.scroll_to_bottom() + css_click_at('a.new-advanced-policy-item', 10, 10) + new_key_css = 'div#__new_advanced_key__ input' + new_key_element = css_find(new_key_css).first + new_key_element.fill(key) +# For some reason have to get the instance for each command (get error that it is no longer attached to the DOM) +# Have to do all this because Selenium has a bug that fill does not remove existing text + new_value_css = 'div.CodeMirror textarea' + css_find(new_value_css).last.fill("") + css_find(new_value_css).last._element.send_keys(Keys.DELETE, Keys.DELETE) + css_find(new_value_css).last.fill(value) + + +def delete_entry(index): + """ + Delete the nth entry where index is 0-based + """ + css = '.delete-button' + assert_true(world.browser.is_element_present_by_css(css, 5)) + delete_buttons = css_find(css) + assert_true(len(delete_buttons) > index, "no delete button exists for entry " + str(index)) + delete_buttons[index].click() + + +def assert_policy_entries(expected_keys, expected_values): + assert_entries('.key input', expected_keys) + assert_entries('.json', expected_values) + + +def assert_entries(css, expected_values): + webElements = css_find(css) + assert_equal(len(expected_values), len(webElements)) +# Sometimes get stale reference if I hold on to the array of elements + for counter in range(len(expected_values)): + assert_equal(expected_values[counter], css_find(css)[counter].value) + + +def click_save(): + css = ".save-button" + + def is_shown(driver): + visible = css_find(css).first.visible + if visible: + # Even when waiting for visible, this fails sporadically. Adding in a small wait. + time.sleep(float(1)) + return visible + wait_for(is_shown) + css_click(css) + + +def fill_last_field(value): + newValue = css_find('#__new_advanced_key__ input').first + newValue.fill(value) diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py index d910d73085..61b4fee9f6 100644 --- a/cms/djangoapps/contentstore/features/common.py +++ b/cms/djangoapps/contentstore/features/common.py @@ -1,51 +1,67 @@ from lettuce import world, step -from factories import * -from django.core.management import call_command from lettuce.django import django_url -from django.conf import settings -from django.core.management import call_command from nose.tools import assert_true from nose.tools import assert_equal +from selenium.webdriver.support.ui import WebDriverWait + +from terrain.factories import UserFactory, RegistrationFactory, UserProfileFactory +from terrain.factories import CourseFactory, GroupFactory import xmodule.modulestore.django +from auth.authz import get_user_by_email from logging import getLogger logger = getLogger(__name__) ########### STEP HELPERS ############## + + @step('I (?:visit|access|open) the Studio homepage$') def i_visit_the_studio_homepage(step): # To make this go to port 8001, put # LETTUCE_SERVER_PORT = 8001 # in your settings.py file. world.browser.visit(django_url('/')) - assert world.browser.is_element_present_by_css('body.no-header', 10) + signin_css = 'a.action-signin' + assert world.browser.is_element_present_by_css(signin_css, 10) + @step('I am logged into Studio$') def i_am_logged_into_studio(step): log_into_studio() + @step('I confirm the alert$') def i_confirm_with_ok(step): world.browser.get_alert().accept() + @step(u'I press the "([^"]*)" delete icon$') def i_press_the_category_delete_icon(step, category): if category == 'section': css = 'a.delete-button.delete-section-button span.delete-icon' elif category == 'subsection': - css='a.delete-button.delete-subsection-button span.delete-icon' + css = 'a.delete-button.delete-subsection-button span.delete-icon' else: assert False, 'Invalid category: %s' % category css_click(css) + +@step('I have opened a new course in Studio$') +def i_have_opened_a_new_course(step): + clear_courses() + log_into_studio() + create_a_course() + ####### HELPER FUNCTIONS ############## + + def create_studio_user( uname='robot', email='robot+studio@edx.org', password='test', - is_staff=False): + is_staff=False): studio_user = UserFactory.build( - username=uname, + username=uname, email=email, password=password, is_staff=is_staff) @@ -58,6 +74,7 @@ def create_studio_user( user_profile = UserProfileFactory(user=studio_user) + def flush_xmodule_store(): # Flush and initialize the module store # It needs the templates because it creates new records @@ -70,26 +87,57 @@ def flush_xmodule_store(): xmodule.modulestore.django.modulestore().collection.drop() xmodule.templates.update_templates() -def assert_css_with_text(css,text): + +def assert_css_with_text(css, text): assert_true(world.browser.is_element_present_by_css(css, 5)) assert_equal(world.browser.find_by_css(css).text, text) + def css_click(css): + assert_true(world.browser.is_element_present_by_css(css, 5)) world.browser.find_by_css(css).first.click() + +def css_click_at(css, x=10, y=10): + ''' + A method to click at x,y coordinates of the element + rather than in the center of the element + ''' + assert_true(world.browser.is_element_present_by_css(css, 5)) + e = world.browser.find_by_css(css).first + e.action_chains.move_to_element_with_offset(e._element, x, y) + e.action_chains.click() + e.action_chains.perform() + + def css_fill(css, value): world.browser.find_by_css(css).first.fill(value) + +def css_find(css): + return world.browser.find_by_css(css) + + +def wait_for(func): + WebDriverWait(world.browser.driver, 10).until(func) + + +def id_find(id): + return world.browser.find_by_id(id) + + def clear_courses(): flush_xmodule_store() + def fill_in_course_info( name='Robot Super Course', org='MITx', num='101'): - css_fill('.new-course-name',name) - css_fill('.new-course-org',org) - css_fill('.new-course-number',num) + css_fill('.new-course-name', name) + css_fill('.new-course-org', org) + css_fill('.new-course-number', num) + def log_into_studio( uname='robot', @@ -99,7 +147,11 @@ def log_into_studio( create_studio_user(uname=uname, email=email, is_staff=is_staff) world.browser.cookies.delete() world.browser.visit(django_url('/')) - world.browser.is_element_present_by_css('body.no-header', 10) + signin_css = 'a.action-signin' + world.browser.is_element_present_by_css(signin_css, 10) + + # click the signin button + css_click(signin_css) login_form = world.browser.find_by_css('form#login_form') login_form.find_by_name('email').fill(email) @@ -108,19 +160,34 @@ def log_into_studio( assert_true(world.browser.is_element_present_by_css('.new-course-button', 5)) + def create_a_course(): - css_click('a.new-course-button') - fill_in_course_info() - css_click('input.new-course-save') - assert_true(world.browser.is_element_present_by_css('a#courseware-tab', 5)) + c = CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') + + # Add the user to the instructor group of the course + # so they will have the permissions to see it in studio + g = GroupFactory.create(name='instructor_MITx/999/Robot_Super_Course') + u = get_user_by_email('robot+studio@edx.org') + u.groups.add(g) + u.save() + world.browser.reload() + + course_link_css = 'span.class-name' + css_click(course_link_css) + course_title_css = 'span.course-title' + assert_true(world.browser.is_element_present_by_css(course_title_css, 5)) + def add_section(name='My Section'): link_css = 'a.new-courseware-section-button' css_click(link_css) - name_css = '.new-section-name' - save_css = '.new-section-name-save' - css_fill(name_css,name) + name_css = 'input.new-section-name' + save_css = 'input.new-section-name-save' + css_fill(name_css, name) css_click(save_css) + span_css = 'span.section-name-span' + assert_true(world.browser.is_element_present_by_css(span_css, 5)) + def add_subsection(name='Subsection One'): css = 'a.new-subsection-item' @@ -128,4 +195,4 @@ def add_subsection(name='Subsection One'): name_css = 'input.new-subsection-name-input' save_css = 'input.new-subsection-name-save' css_fill(name_css, name) - css_click(save_css) \ No newline at end of file + css_click(save_css) diff --git a/cms/djangoapps/contentstore/features/courses.py b/cms/djangoapps/contentstore/features/courses.py index 2c1cf6281a..e394165f08 100644 --- a/cms/djangoapps/contentstore/features/courses.py +++ b/cms/djangoapps/contentstore/features/courses.py @@ -2,49 +2,61 @@ from lettuce import world, step from common import * ############### ACTIONS #################### + + @step('There are no courses$') def no_courses(step): clear_courses() + @step('I click the New Course button$') def i_click_new_course(step): css_click('.new-course-button') + @step('I fill in the new course information$') def i_fill_in_a_new_course_information(step): fill_in_course_info() + @step('I create a new course$') def i_create_a_course(step): create_a_course() + @step('I click the course link in My Courses$') def i_click_the_course_link_in_my_courses(step): course_css = 'span.class-name' css_click(course_css) ############ ASSERTIONS ################### + + @step('the Courseware page has loaded in Studio$') def courseware_page_has_loaded_in_studio(step): - courseware_css = 'a#courseware-tab' - assert world.browser.is_element_present_by_css(courseware_css) + course_title_css = 'span.course-title' + assert world.browser.is_element_present_by_css(course_title_css) + @step('I see the course listed in My Courses$') def i_see_the_course_in_my_courses(step): course_css = 'span.class-name' - assert_css_with_text(course_css,'Robot Super Course') + assert_css_with_text(course_css, 'Robot Super Course') + @step('the course is loaded$') def course_is_loaded(step): class_css = 'a.class-name' - assert_css_with_text(class_css,'Robot Super Course') + assert_css_with_text(class_css, 'Robot Super Course') + @step('I am on the "([^"]*)" tab$') def i_am_on_tab(step, tab_name): header_css = 'div.inner-wrapper h1' - assert_css_with_text(header_css,tab_name) + assert_css_with_text(header_css, tab_name) + @step('I see a link for adding a new section$') def i_see_new_section_link(step): link_css = 'a.new-courseware-section-button' - assert_css_with_text(link_css,'New Section') + assert_css_with_text(link_css, '+ New Section') diff --git a/cms/djangoapps/contentstore/features/factories.py b/cms/djangoapps/contentstore/features/factories.py index 389f2bac49..087ceaaa2d 100644 --- a/cms/djangoapps/contentstore/features/factories.py +++ b/cms/djangoapps/contentstore/features/factories.py @@ -3,6 +3,7 @@ from student.models import User, UserProfile, Registration from datetime import datetime import uuid + class UserProfileFactory(factory.Factory): FACTORY_FOR = UserProfile @@ -10,12 +11,14 @@ class UserProfileFactory(factory.Factory): name = 'Robot Studio' courseware = 'course.xml' + class RegistrationFactory(factory.Factory): FACTORY_FOR = Registration user = None activation_key = uuid.uuid4().hex + class UserFactory(factory.Factory): FACTORY_FOR = User @@ -28,4 +31,4 @@ class UserFactory(factory.Factory): is_active = True is_superuser = False last_login = datetime.now() - date_joined = datetime.now() \ No newline at end of file + date_joined = datetime.now() diff --git a/cms/djangoapps/contentstore/features/section.feature b/cms/djangoapps/contentstore/features/section.feature index ad00ba2911..75e7a4af10 100644 --- a/cms/djangoapps/contentstore/features/section.feature +++ b/cms/djangoapps/contentstore/features/section.feature @@ -11,6 +11,14 @@ Feature: Create Section And I see a release date for my section And I see a link to create a new subsection + Scenario: Add a new section (with a quote in the name) to a course (bug #216) + Given I have opened a new course in Studio + When I click the New Section link + And I enter a section name with a quote and click save + Then I see my section name with a quote on the Courseware page + And I click to edit the section name + Then I see the complete section name with a quote in the editor + Scenario: Edit section release date Given I have opened a new course in Studio And I have added a new section diff --git a/cms/djangoapps/contentstore/features/section.py b/cms/djangoapps/contentstore/features/section.py index 8ac30e2170..cfa4e4bb52 100644 --- a/cms/djangoapps/contentstore/features/section.py +++ b/cms/djangoapps/contentstore/features/section.py @@ -1,55 +1,79 @@ from lettuce import world, step from common import * +from nose.tools import assert_equal ############### ACTIONS #################### -@step('I have opened a new course in Studio$') -def i_have_opened_a_new_course(step): - clear_courses() - log_into_studio() - create_a_course() + @step('I click the new section link$') def i_click_new_section_link(step): link_css = 'a.new-courseware-section-button' css_click(link_css) + @step('I enter the section name and click save$') def i_save_section_name(step): - name_css = '.new-section-name' - save_css = '.new-section-name-save' - css_fill(name_css,'My Section') - css_click(save_css) + save_section_name('My Section') + + +@step('I enter a section name with a quote and click save$') +def i_save_section_name_with_quote(step): + save_section_name('Section with "Quote"') + @step('I have added a new section$') def i_have_added_new_section(step): add_section() - + + @step('I click the Edit link for the release date$') def i_click_the_edit_link_for_the_release_date(step): button_css = 'div.section-published-date a.edit-button' css_click(button_css) + @step('I save a new section release date$') def i_save_a_new_section_release_date(step): date_css = 'input.start-date.date.hasDatepicker' time_css = 'input.start-time.time.ui-timepicker-input' - css_fill(date_css,'12/25/2013') + css_fill(date_css, '12/25/2013') # click here to make the calendar go away css_click(time_css) - css_fill(time_css,'12:00am') + css_fill(time_css, '12:00am') css_click('a.save-button') + ############ ASSERTIONS ################### + + @step('I see my section on the Courseware page$') def i_see_my_section_on_the_courseware_page(step): - section_css = 'span.section-name-span' - assert_css_with_text(section_css,'My Section') + see_my_section_on_the_courseware_page('My Section') + + +@step('I see my section name with a quote on the Courseware page$') +def i_see_my_section_name_with_quote_on_the_courseware_page(step): + see_my_section_on_the_courseware_page('Section with "Quote"') + + +@step('I click to edit the section name$') +def i_click_to_edit_section_name(step): + css_click('span.section-name-span') + + +@step('I see the complete section name with a quote in the editor$') +def i_see_complete_section_name_with_quote_in_editor(step): + css = '.edit-section-name' + assert world.browser.is_element_present_by_css(css, 5) + assert_equal(world.browser.find_by_css(css).value, 'Section with "Quote"') + @step('the section does not exist$') def section_does_not_exist(step): css = 'span.section-name-span' assert world.browser.is_element_not_present_by_css(css) + @step('I see a release date for my section$') def i_see_a_release_date_for_my_section(step): import re @@ -63,20 +87,37 @@ def i_see_a_release_date_for_my_section(step): date_regex = '[01][0-9]\/[0-3][0-9]\/[12][0-9][0-9][0-9]' time_regex = '[0-2][0-9]:[0-5][0-9]' match_string = '%s %s at %s' % (msg, date_regex, time_regex) - assert re.match(match_string,status_text) + assert re.match(match_string, status_text) + @step('I see a link to create a new subsection$') def i_see_a_link_to_create_a_new_subsection(step): css = 'a.new-subsection-item' assert world.browser.is_element_present_by_css(css) + @step('the section release date picker is not visible$') def the_section_release_date_picker_not_visible(step): css = 'div.edit-subsection-publish-settings' assert False, world.browser.find_by_css(css).visible + @step('the section release date is updated$') def the_section_release_date_is_updated(step): css = 'span.published-status' status_text = world.browser.find_by_css(css).text assert status_text == 'Will Release: 12/25/2013 at 12:00am' + + +############ HELPER METHODS ################### + +def save_section_name(name): + name_css = '.new-section-name' + save_css = '.new-section-name-save' + css_fill(name_css, name) + css_click(save_css) + + +def see_my_section_on_the_courseware_page(name): + section_css = 'span.section-name-span' + assert_css_with_text(section_css, name) \ No newline at end of file diff --git a/cms/djangoapps/contentstore/features/signup.feature b/cms/djangoapps/contentstore/features/signup.feature index 8a6f93d33b..03a1c9524a 100644 --- a/cms/djangoapps/contentstore/features/signup.feature +++ b/cms/djangoapps/contentstore/features/signup.feature @@ -5,8 +5,8 @@ Feature: Sign in Scenario: Sign up from the homepage Given I visit the Studio homepage - When I click the link with the text "Sign up" + 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 + 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." \ No newline at end of file + And I should see the message "please click on the activation link in your email." diff --git a/cms/djangoapps/contentstore/features/signup.py b/cms/djangoapps/contentstore/features/signup.py index 7794511f94..a786225ead 100644 --- a/cms/djangoapps/contentstore/features/signup.py +++ b/cms/djangoapps/contentstore/features/signup.py @@ -1,5 +1,6 @@ from lettuce import world, step + @step('I fill in the registration form$') def i_fill_in_the_registration_form(step): register_form = world.browser.find_by_css('form#register_form') @@ -9,15 +10,19 @@ def i_fill_in_the_registration_form(step): register_form.find_by_name('name').fill('Robot Studio') register_form.find_by_name('terms_of_service').check() -@step('I press the "([^"]*)" button on the registration form$') -def i_press_the_button_on_the_registration_form(step, button): + +@step('I press the Create My Account button on the registration form$') +def i_press_the_button_on_the_registration_form(step): register_form = world.browser.find_by_css('form#register_form') - register_form.find_by_value(button).click() + submit_css = 'button#submit' + register_form.find_by_css(submit_css).click() + @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(u'I should see the message "([^"]*)"$') def i_should_see_the_message(step, msg): - assert world.browser.is_text_present(msg, 5) \ No newline at end of file + assert world.browser.is_text_present(msg, 5) diff --git a/cms/djangoapps/contentstore/features/studio-overview-togglesection.py b/cms/djangoapps/contentstore/features/studio-overview-togglesection.py index 010678c0e8..00aa39455d 100644 --- a/cms/djangoapps/contentstore/features/studio-overview-togglesection.py +++ b/cms/djangoapps/contentstore/features/studio-overview-togglesection.py @@ -6,11 +6,13 @@ from nose.tools import assert_true, assert_false, assert_equal from logging import getLogger logger = getLogger(__name__) + @step(u'I have a course with no sections$') def have_a_course(step): clear_courses() course = CourseFactory.create() + @step(u'I have a course with 1 section$') def have_a_course_with_1_section(step): clear_courses() @@ -18,8 +20,9 @@ def have_a_course_with_1_section(step): section = ItemFactory.create(parent_location=course.location) subsection1 = ItemFactory.create( parent_location=section.location, - template = 'i4x://edx/templates/sequential/Empty', - display_name = 'Subsection One',) + template='i4x://edx/templates/sequential/Empty', + display_name='Subsection One',) + @step(u'I have a course with multiple sections$') def have_a_course_with_two_sections(step): @@ -28,19 +31,20 @@ def have_a_course_with_two_sections(step): section = ItemFactory.create(parent_location=course.location) subsection1 = ItemFactory.create( parent_location=section.location, - template = 'i4x://edx/templates/sequential/Empty', - display_name = 'Subsection One',) + template='i4x://edx/templates/sequential/Empty', + display_name='Subsection One',) section2 = ItemFactory.create( parent_location=course.location, display_name='Section Two',) subsection2 = ItemFactory.create( parent_location=section2.location, - template = 'i4x://edx/templates/sequential/Empty', - display_name = 'Subsection Alpha',) + template='i4x://edx/templates/sequential/Empty', + display_name='Subsection Alpha',) subsection3 = ItemFactory.create( parent_location=section2.location, - template = 'i4x://edx/templates/sequential/Empty', - display_name = 'Subsection Beta',) + template='i4x://edx/templates/sequential/Empty', + display_name='Subsection Beta',) + @step(u'I navigate to the course overview page$') def navigate_to_the_course_overview_page(step): @@ -48,15 +52,18 @@ def navigate_to_the_course_overview_page(step): course_locator = '.class-name' css_click(course_locator) + @step(u'I navigate to the courseware page of a course with multiple sections') def nav_to_the_courseware_page_of_a_course_with_multiple_sections(step): step.given('I have a course with multiple sections') step.given('I navigate to the course overview page') + @step(u'I add a section') def i_add_a_section(step): add_section(name='My New Section That I Just Added') + @step(u'I click the "([^"]*)" link$') def i_click_the_text_span(step, text): span_locator = '.toggle-button-sections span' @@ -65,16 +72,19 @@ def i_click_the_text_span(step, text): assert_equal(world.browser.find_by_css(span_locator).value, text) css_click(span_locator) + @step(u'I collapse the first section$') def i_collapse_a_section(step): collapse_locator = 'section.courseware-section a.collapse' css_click(collapse_locator) + @step(u'I expand the first section$') def i_expand_a_section(step): expand_locator = 'section.courseware-section a.expand' css_click(expand_locator) + @step(u'I see the "([^"]*)" link$') def i_see_the_span_with_text(step, text): span_locator = '.toggle-button-sections span' @@ -82,6 +92,7 @@ def i_see_the_span_with_text(step, text): assert_equal(world.browser.find_by_css(span_locator).value, text) assert_true(world.browser.find_by_css(span_locator).visible) + @step(u'I do not see the "([^"]*)" link$') def i_do_not_see_the_span_with_text(step, text): # Note that the span will exist on the page but not be visible @@ -89,6 +100,7 @@ def i_do_not_see_the_span_with_text(step, text): assert_true(world.browser.is_element_present_by_css(span_locator)) assert_false(world.browser.find_by_css(span_locator).visible) + @step(u'all sections are expanded$') def all_sections_are_expanded(step): subsection_locator = 'div.subsection-list' @@ -96,9 +108,10 @@ def all_sections_are_expanded(step): for s in subsections: assert_true(s.visible) + @step(u'all sections are collapsed$') def all_sections_are_expanded(step): subsection_locator = 'div.subsection-list' subsections = world.browser.find_by_css(subsection_locator) for s in subsections: - assert_false(s.visible) \ No newline at end of file + assert_false(s.visible) diff --git a/cms/djangoapps/contentstore/features/subsection.feature b/cms/djangoapps/contentstore/features/subsection.feature index 5acb5bfe44..4b5f5b869d 100644 --- a/cms/djangoapps/contentstore/features/subsection.feature +++ b/cms/djangoapps/contentstore/features/subsection.feature @@ -9,6 +9,14 @@ Feature: Create Subsection And I enter the subsection name and click save Then I see my subsection on the Courseware page + Scenario: Add a new subsection (with a name containing a quote) to a section (bug #216) + Given I have opened a new course section in Studio + 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 + Then I see the complete subsection name with a quote in the editor + Scenario: Delete a subsection Given I have opened a new course section in Studio And I have added a new subsection diff --git a/cms/djangoapps/contentstore/features/subsection.py b/cms/djangoapps/contentstore/features/subsection.py index ea614d3feb..88e1424898 100644 --- a/cms/djangoapps/contentstore/features/subsection.py +++ b/cms/djangoapps/contentstore/features/subsection.py @@ -1,7 +1,10 @@ from lettuce import world, step from common import * +from nose.tools import assert_equal ############### ACTIONS #################### + + @step('I have opened a new course section in Studio$') def i_have_opened_a_new_course_section(step): clear_courses() @@ -9,31 +12,69 @@ def i_have_opened_a_new_course_section(step): create_a_course() add_section() + @step('I click the New Subsection link') def i_click_the_new_subsection_link(step): css = 'a.new-subsection-item' css_click(css) + @step('I enter the subsection name and click save$') def i_save_subsection_name(step): - name_css = 'input.new-subsection-name-input' - save_css = 'input.new-subsection-name-save' - css_fill(name_css,'Subsection One') - css_click(save_css) + save_subsection_name('Subsection One') + + +@step('I enter a subsection name with a quote and click save$') +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): + css_click('span.subsection-name-value') + + +@step('I see the complete subsection name with a quote in the editor$') +def i_see_complete_subsection_name_with_quote_in_editor(step): + css = '.subsection-display-name-input' + assert world.browser.is_element_present_by_css(css, 5) + assert_equal(world.browser.find_by_css(css).value, 'Subsection With "Quote"') + @step('I have added a new subsection$') def i_have_added_a_new_subsection(step): add_subsection() + ############ ASSERTIONS ################### + + @step('I see my subsection on the Courseware page$') def i_see_my_subsection_on_the_courseware_page(step): - css = 'span.subsection-name' - assert world.browser.is_element_present_by_css(css) - css = 'span.subsection-name-value' - assert_css_with_text(css,'Subsection One') + see_subsection_name('Subsection One') + + +@step('I see my subsection name with a quote on the Courseware page$') +def i_see_my_subsection_name_with_quote_on_the_courseware_page(step): + see_subsection_name('Subsection With "Quote"') + @step('the subsection does not exist$') def the_subsection_does_not_exist(step): css = 'span.subsection-name' - assert world.browser.is_element_not_present_by_css(css) \ No newline at end of file + assert world.browser.is_element_not_present_by_css(css) + + +############ HELPER METHODS ################### + +def save_subsection_name(name): + name_css = 'input.new-subsection-name-input' + save_css = 'input.new-subsection-name-save' + css_fill(name_css, name) + css_click(save_css) + +def see_subsection_name(name): + css = 'span.subsection-name' + assert world.browser.is_element_present_by_css(css) + css = 'span.subsection-name-value' + assert_css_with_text(css, name) diff --git a/cms/djangoapps/contentstore/management/commands/clone.py b/cms/djangoapps/contentstore/management/commands/clone.py index 2357cd1dbd..abf04f3da3 100644 --- a/cms/djangoapps/contentstore/management/commands/clone.py +++ b/cms/djangoapps/contentstore/management/commands/clone.py @@ -14,6 +14,7 @@ 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''' diff --git a/cms/djangoapps/contentstore/management/commands/delete_course.py b/cms/djangoapps/contentstore/management/commands/delete_course.py index 0313f7faed..789226db1a 100644 --- a/cms/djangoapps/contentstore/management/commands/delete_course.py +++ b/cms/djangoapps/contentstore/management/commands/delete_course.py @@ -15,26 +15,31 @@ from auth.authz import _delete_course_group # To run from command line: rake cms:delete_course LOC=MITx/111/Foo1 # + class Command(BaseCommand): - help = \ -'''Delete a MongoDB backed course''' + help = '''Delete a MongoDB backed course''' def handle(self, *args, **options): - if len(args) != 1: - raise CommandError("delete_course requires one argument: ") + if len(args) != 1 and len(args) != 2: + raise CommandError("delete_course requires one or more arguments: |commit|") loc_str = args[0] + commit = False + if len(args) == 2: + commit = args[1] == 'commit' + + if commit: + print 'Actually going to delete the course from DB....' + ms = modulestore('direct') cs = contentstore() if query_yes_no("Deleting course {0}. Confirm?".format(loc_str), default="no"): - if query_yes_no("Are you sure. This action cannot be undone!", default="no"): - loc = CourseDescriptor.id_to_location(loc_str) - if delete_course(ms, cs, loc) == True: - print 'removing User permissions from course....' - # in the django layer, we need to remove all the user permissions groups associated with this course - _delete_course_group(loc) - - - + if query_yes_no("Are you sure. This action cannot be undone!", default="no"): + loc = CourseDescriptor.id_to_location(loc_str) + if delete_course(ms, cs, loc, commit) == True: + print 'removing User permissions from course....' + # in the django layer, we need to remove all the user permissions groups associated with this course + if commit: + _delete_course_group(loc) diff --git a/cms/djangoapps/contentstore/management/commands/prompt.py b/cms/djangoapps/contentstore/management/commands/prompt.py index 9c8fd81d45..40a39d0a11 100644 --- a/cms/djangoapps/contentstore/management/commands/prompt.py +++ b/cms/djangoapps/contentstore/management/commands/prompt.py @@ -1,5 +1,6 @@ import sys + def query_yes_no(question, default="yes"): """Ask a yes/no question via raw_input() and return their answer. @@ -12,7 +13,7 @@ def query_yes_no(question, default="yes"): """ valid = {"yes":True, "y":True, "ye":True, "no":False, "n":False} - if default == None: + if default is None: prompt = " [y/n] " elif default == "yes": prompt = " [Y/n] " @@ -30,4 +31,4 @@ def query_yes_no(question, default="yes"): return valid[choice] else: sys.stdout.write("Please respond with 'yes' or 'no' "\ - "(or 'y' or 'n').\n") \ No newline at end of file + "(or 'y' or 'n').\n") diff --git a/cms/djangoapps/contentstore/management/commands/update_templates.py b/cms/djangoapps/contentstore/management/commands/update_templates.py new file mode 100644 index 0000000000..b30d30480a --- /dev/null +++ b/cms/djangoapps/contentstore/management/commands/update_templates.py @@ -0,0 +1,9 @@ +from xmodule.templates import update_templates +from django.core.management.base import BaseCommand + +class Command(BaseCommand): + help = \ +'''Imports and updates the Studio component templates from the code pack and put in the DB''' + + def handle(self, *args, **options): + update_templates() \ No newline at end of file diff --git a/cms/djangoapps/contentstore/module_info_model.py b/cms/djangoapps/contentstore/module_info_model.py index 0017010885..7ed4505c94 100644 --- a/cms/djangoapps/contentstore/module_info_model.py +++ b/cms/djangoapps/contentstore/module_info_model.py @@ -1,84 +1,92 @@ -import logging -from static_replace import replace_urls +from static_replace import replace_static_urls from xmodule.modulestore.exceptions import ItemNotFoundError from xmodule.modulestore import Location -from xmodule.modulestore.django import modulestore -from lxml import etree -import re -from django.http import HttpResponseBadRequest, Http404 +from django.http import Http404 -def get_module_info(store, location, parent_location = None, rewrite_static_links = False): - try: - if location.revision is None: - module = store.get_item(location) - else: - module = store.get_item(location) - except ItemNotFoundError: - raise Http404 - data = module.definition['data'] - if rewrite_static_links: - data = replace_urls(module.definition['data'], course_namespace = Location([module.location.tag, module.location.org, module.location.course, None, None])) +def get_module_info(store, location, parent_location=None, rewrite_static_links=False): + try: + if location.revision is None: + module = store.get_item(location) + else: + module = store.get_item(location) + except ItemNotFoundError: + # create a new one + template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty']) + module = store.clone_item(template_location, location) - return { + data = module.definition['data'] + if rewrite_static_links: + data = replace_static_urls( + module.definition['data'], + None, + course_namespace=Location([ + module.location.tag, + module.location.org, + module.location.course, + None, + None + ]) + ) + + return { 'id': module.location.url(), 'data': data, 'metadata': module.metadata } + def set_module_info(store, location, post_data): - module = None - isNew = False - try: - if location.revision is None: - module = store.get_item(location) - else: - module = store.get_item(location) - except: - pass + module = None + try: + if location.revision is None: + module = store.get_item(location) + else: + module = store.get_item(location) + except: + pass - if module is None: - # new module at this location - # presume that we have an 'Empty' template - template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty']) - module = store.clone_item(template_location, location) - isNew = True + if module is None: + # new module at this location + # presume that we have an 'Empty' template + template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty']) + module = store.clone_item(template_location, location) - if post_data.get('data') is not None: - data = post_data['data'] - store.update_item(location, data) - - # cdodge: note calling request.POST.get('children') will return None if children is an empty array - # so it lead to a bug whereby the last component to be deleted in the UI was not actually - # deleting the children object from the children collection - if 'children' in post_data and post_data['children'] is not None: - children = post_data['children'] - store.update_children(location, children) + if post_data.get('data') is not None: + data = post_data['data'] + store.update_item(location, data) - # cdodge: also commit any metadata which might have been passed along in the - # POST from the client, if it is there - # NOTE, that the postback is not the complete metadata, as there's system metadata which is - # not presented to the end-user for editing. So let's fetch the original and - # 'apply' the submitted metadata, so we don't end up deleting system metadata - if post_data.get('metadata') is not None: - posted_metadata = post_data['metadata'] + # cdodge: note calling request.POST.get('children') will return None if children is an empty array + # so it lead to a bug whereby the last component to be deleted in the UI was not actually + # deleting the children object from the children collection + if 'children' in post_data and post_data['children'] is not None: + children = post_data['children'] + store.update_children(location, children) - # update existing metadata with submitted metadata (which can be partial) - # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it' - for metadata_key in posted_metadata.keys(): - - # let's strip out any metadata fields from the postback which have been identified as system metadata - # and therefore should not be user-editable, so we should accept them back from the client - if metadata_key in module.system_metadata_fields: - del posted_metadata[metadata_key] - elif posted_metadata[metadata_key] is None: - # remove both from passed in collection as well as the collection read in from the modulestore - if metadata_key in module.metadata: - del module.metadata[metadata_key] - del posted_metadata[metadata_key] - - # overlay the new metadata over the modulestore sourced collection to support partial updates - module.metadata.update(posted_metadata) - - # commit to datastore - store.update_metadata(location, module.metadata) + # cdodge: also commit any metadata which might have been passed along in the + # POST from the client, if it is there + # NOTE, that the postback is not the complete metadata, as there's system metadata which is + # not presented to the end-user for editing. So let's fetch the original and + # 'apply' the submitted metadata, so we don't end up deleting system metadata + if post_data.get('metadata') is not None: + posted_metadata = post_data['metadata'] + + # update existing metadata with submitted metadata (which can be partial) + # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it' + for metadata_key in posted_metadata.keys(): + + # let's strip out any metadata fields from the postback which have been identified as system metadata + # and therefore should not be user-editable, so we should accept them back from the client + if metadata_key in module.system_metadata_fields: + del posted_metadata[metadata_key] + elif posted_metadata[metadata_key] is None: + # remove both from passed in collection as well as the collection read in from the modulestore + if metadata_key in module.metadata: + del module.metadata[metadata_key] + del posted_metadata[metadata_key] + + # overlay the new metadata over the modulestore sourced collection to support partial updates + module.metadata.update(posted_metadata) + + # commit to datastore + store.update_metadata(location, module.metadata) diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py new file mode 100644 index 0000000000..8e4a016a0f --- /dev/null +++ b/cms/djangoapps/contentstore/tests/test_contentstore.py @@ -0,0 +1,512 @@ +import json +import shutil +from django.test.client import Client +from django.test.utils import override_settings +from django.conf import settings +from django.core.urlresolvers import reverse +from path import path +from tempdir import mkdtemp_clean +import json +from fs.osfs import OSFS +import copy +from mock import Mock +from json import dumps, loads + +from student.models import Registration +from django.contrib.auth.models import User +from cms.djangoapps.contentstore.utils import get_modulestore + +from utils import ModuleStoreTestCase, parse_json +from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory + +from xmodule.modulestore import Location +from xmodule.modulestore.store_utilities import clone_course +from xmodule.modulestore.store_utilities import delete_course +from xmodule.modulestore.django import modulestore, _MODULESTORES +from xmodule.contentstore.django import contentstore +from xmodule.templates import update_templates +from xmodule.modulestore.xml_exporter import export_to_xml +from xmodule.modulestore.xml_importer import import_from_xml +from xmodule.templates import update_templates + +from xmodule.capa_module import CapaDescriptor +from xmodule.course_module import CourseDescriptor +from xmodule.seq_module import SequenceDescriptor +from xmodule.modulestore.exceptions import ItemNotFoundError + +TEST_DATA_MODULESTORE = copy.deepcopy(settings.MODULESTORE) +TEST_DATA_MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data') +TEST_DATA_MODULESTORE['direct']['OPTIONS']['fs_root'] = path('common/test/data') + + +@override_settings(MODULESTORE=TEST_DATA_MODULESTORE) +class ContentStoreToyCourseTest(ModuleStoreTestCase): + """ + Tests that rely on the toy courses. + TODO: refactor using CourseFactory so they do not. + """ + def setUp(self): + uname = 'testuser' + email = 'test+courses@edx.org' + password = 'foo' + + # Create the use so we can log them in. + self.user = User.objects.create_user(uname, email, password) + + # Note that we do not actually need to do anything + # for registration if we directly mark them active. + self.user.is_active = True + # Staff has access to view all courses + self.user.is_staff = True + self.user.save() + + self.client = Client() + self.client.login(username=uname, password=password) + + + def check_edit_unit(self, test_course_name): + import_from_xml(modulestore(), 'common/test/data/', [test_course_name]) + + for descriptor in modulestore().get_items(Location(None, None, 'vertical', None, None)): + print "Checking ", descriptor.location.url() + print descriptor.__class__, descriptor.location + resp = self.client.get(reverse('edit_unit', kwargs={'location': descriptor.location.url()})) + self.assertEqual(resp.status_code, 200) + + def test_edit_unit_toy(self): + self.check_edit_unit('toy') + + def test_edit_unit_full(self): + self.check_edit_unit('full') + + def test_static_tab_reordering(self): + import_from_xml(modulestore(), 'common/test/data/', ['full']) + + ms = modulestore('direct') + course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None])) + + # reverse the ordering + reverse_tabs = [] + for tab in course.tabs: + if tab['type'] == 'static_tab': + reverse_tabs.insert(0, 'i4x://edX/full/static_tab/{0}'.format(tab['url_slug'])) + + resp = self.client.post(reverse('reorder_static_tabs'), json.dumps({'tabs': reverse_tabs}), "application/json") + + course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None])) + + # compare to make sure that the tabs information is in the expected order after the server call + course_tabs = [] + for tab in course.tabs: + if tab['type'] == 'static_tab': + course_tabs.append('i4x://edX/full/static_tab/{0}'.format(tab['url_slug'])) + + self.assertEqual(reverse_tabs, course_tabs) + + def test_about_overrides(self): + ''' + This test case verifies that a course can use specialized override for about data, e.g. /about/Fall_2012/effort.html + while there is a base definition in /about/effort.html + ''' + import_from_xml(modulestore(), 'common/test/data/', ['full']) + ms = modulestore('direct') + effort = ms.get_item(Location(['i4x', 'edX', 'full', 'about', 'effort', None])) + self.assertEqual(effort.definition['data'], '6 hours') + + # this one should be in a non-override folder + effort = ms.get_item(Location(['i4x', 'edX', 'full', 'about', 'end_date', None])) + self.assertEqual(effort.definition['data'], 'TBD') + + def test_remove_hide_progress_tab(self): + import_from_xml(modulestore(), 'common/test/data/', ['full']) + + ms = modulestore('direct') + cs = contentstore() + + source_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012') + course = ms.get_item(source_location) + self.assertNotIn('hide_progress_tab', course.metadata) + + def test_clone_course(self): + + course_data = { + 'template': 'i4x://edx/templates/course/Empty', + 'org': 'MITx', + 'number': '999', + 'display_name': 'Robot Super Course', + } + + import_from_xml(modulestore(), 'common/test/data/', ['full']) + + 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') + + ms = modulestore('direct') + cs = contentstore() + + source_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012') + dest_location = CourseDescriptor.id_to_location('MITx/999/Robot_Super_Course') + + clone_course(ms, cs, source_location, dest_location) + + # now loop through all the units in the course and verify that the clone can render them, which + # means the objects are at least present + items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None])) + self.assertGreater(len(items), 0) + clone_items = ms.get_items(Location(['i4x', 'MITx', '999', 'vertical', None])) + self.assertGreater(len(clone_items), 0) + for descriptor in items: + new_loc = descriptor.location._replace(org='MITx', course='999') + print "Checking {0} should now also be at {1}".format(descriptor.location.url(), new_loc.url()) + resp = self.client.get(reverse('edit_unit', kwargs={'location': new_loc.url()})) + self.assertEqual(resp.status_code, 200) + + def test_delete_course(self): + import_from_xml(modulestore(), 'common/test/data/', ['full']) + + ms = modulestore('direct') + cs = contentstore() + + location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012') + + delete_course(ms, cs, location, commit=True) + + items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None])) + self.assertEqual(len(items), 0) + + def verify_content_existence(self, modulestore, root_dir, location, dirname, category_name, filename_suffix=''): + fs = OSFS(root_dir / 'test_export') + self.assertTrue(fs.exists(dirname)) + + query_loc = Location('i4x', location.org, location.course, category_name, None) + items = modulestore.get_items(query_loc) + + for item in items: + fs = OSFS(root_dir / ('test_export/' + dirname)) + self.assertTrue(fs.exists(item.location.name + filename_suffix)) + + def test_export_course(self): + ms = modulestore('direct') + cs = contentstore() + + import_from_xml(ms, 'common/test/data/', ['full']) + location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012') + + root_dir = path(mkdtemp_clean()) + + print 'Exporting to tempdir = {0}'.format(root_dir) + + # export out to a tempdir + export_to_xml(ms, cs, location, root_dir, 'test_export') + + # check for static tabs + self.verify_content_existence(ms, root_dir, location, 'tabs', 'static_tab', '.html') + + # check for custom_tags + self.verify_content_existence(ms, root_dir, location, 'info', 'course_info', '.html') + + # check for custom_tags + self.verify_content_existence(ms, root_dir, location, 'custom_tags', 'custom_tag_template') + + # check for graiding_policy.json + fs = OSFS(root_dir / 'test_export/policies/6.002_Spring_2012') + self.assertTrue(fs.exists('grading_policy.json')) + + course = ms.get_item(location) + # compare what's on disk compared to what we have in our course + with fs.open('grading_policy.json','r') as grading_policy: + on_disk = loads(grading_policy.read()) + self.assertEqual(on_disk, course.definition['data']['grading_policy']) + + #check for policy.json + self.assertTrue(fs.exists('policy.json')) + + # compare what's on disk to what we have in the course module + with fs.open('policy.json','r') as course_policy: + on_disk = loads(course_policy.read()) + self.assertIn('course/6.002_Spring_2012', on_disk) + self.assertEqual(on_disk['course/6.002_Spring_2012'], course.metadata) + + # remove old course + delete_course(ms, cs, location) + + # reimport + import_from_xml(ms, root_dir, ['test_export']) + + items = ms.get_items(Location(['i4x', 'edX', 'full', 'vertical', None])) + self.assertGreater(len(items), 0) + for descriptor in items: + print "Checking {0}....".format(descriptor.location.url()) + resp = self.client.get(reverse('edit_unit', kwargs={'location': descriptor.location.url()})) + self.assertEqual(resp.status_code, 200) + + shutil.rmtree(root_dir) + + def test_course_handouts_rewrites(self): + ms = modulestore('direct') + cs = contentstore() + + # import a test course + import_from_xml(ms, 'common/test/data/', ['full']) + + handout_location = Location(['i4x', 'edX', 'full', 'course_info', 'handouts']) + + # get module info + resp = self.client.get(reverse('module_info', kwargs={'module_location': handout_location})) + + # make sure we got a successful response + self.assertEqual(resp.status_code, 200) + + # check that /static/ has been converted to the full path + # note, we know the link it should be because that's what in the 'full' course in the test data + self.assertContains(resp, '/c4x/edX/full/asset/handouts_schematic_tutorial.pdf') + + + +class ContentStoreTest(ModuleStoreTestCase): + """ + Tests for the CMS ContentStore application. + """ + def setUp(self): + """ + These tests need a user in the DB so that the django Test Client + can log them in. + They inherit from the ModuleStoreTestCase class so that the mongodb collection + will be cleared out before each test case execution and deleted + afterwards. + """ + uname = 'testuser' + email = 'test+courses@edx.org' + password = 'foo' + + # Create the use so we can log them in. + self.user = User.objects.create_user(uname, email, password) + + # Note that we do not actually need to do anything + # for registration if we directly mark them active. + self.user.is_active = True + # Staff has access to view all courses + self.user.is_staff = True + self.user.save() + + self.client = Client() + self.client.login(username=uname, password=password) + + self.course_data = { + 'template': 'i4x://edx/templates/course/Empty', + 'org': 'MITx', + 'number': '999', + 'display_name': 'Robot Super Course', + } + + def test_create_course(self): + """Test new course creation - happy path""" + resp = self.client.post(reverse('create_new_course'), self.course_data) + self.assertEqual(resp.status_code, 200) + data = parse_json(resp) + self.assertEqual(data['id'], 'i4x://MITx/999/course/Robot_Super_Course') + + def test_create_course_duplicate_course(self): + """Test new course creation - error path""" + resp = self.client.post(reverse('create_new_course'), self.course_data) + resp = self.client.post(reverse('create_new_course'), self.course_data) + data = parse_json(resp) + self.assertEqual(resp.status_code, 200) + self.assertEqual(data['ErrMsg'], 'There is already a course defined with this name.') + + def test_create_course_duplicate_number(self): + """Test new course creation - error path""" + resp = self.client.post(reverse('create_new_course'), self.course_data) + self.course_data['display_name'] = 'Robot Super Course Two' + + resp = self.client.post(reverse('create_new_course'), self.course_data) + data = parse_json(resp) + + self.assertEqual(resp.status_code, 200) + self.assertEqual(data['ErrMsg'], + 'There is already a course defined with the same organization and course number.') + + def test_create_course_with_bad_organization(self): + """Test new course creation - error path for bad organization name""" + self.course_data['org'] = 'University of California, Berkeley' + resp = self.client.post(reverse('create_new_course'), self.course_data) + data = parse_json(resp) + + self.assertEqual(resp.status_code, 200) + self.assertEqual(data['ErrMsg'], + "Unable to create course 'Robot Super Course'.\n\nInvalid characters in 'University of California, Berkeley'.") + + def test_course_index_view_with_no_courses(self): + """Test viewing the index page with no courses""" + # Create a course so there is something to view + resp = self.client.get(reverse('index')) + self.assertContains(resp, + '

          My Courses

          ', + status_code=200, + html=True) + + def test_course_factory(self): + """Test that the course factory works correctly.""" + course = CourseFactory.create() + self.assertIsInstance(course, CourseDescriptor) + + def test_item_factory(self): + """Test that the item factory works correctly.""" + course = CourseFactory.create() + item = ItemFactory.create(parent_location=course.location) + self.assertIsInstance(item, SequenceDescriptor) + + def test_course_index_view_with_course(self): + """Test viewing the index page with an existing course""" + CourseFactory.create(display_name='Robot Super Educational Course') + resp = self.client.get(reverse('index')) + self.assertContains(resp, + 'Robot Super Educational Course', + status_code=200, + html=True) + + def test_course_overview_view_with_course(self): + """Test viewing the course overview page with an existing course""" + CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') + + data = { + 'org': 'MITx', + 'course': '999', + 'name': Location.clean('Robot Super Course'), + } + + resp = self.client.get(reverse('course_index', kwargs=data)) + self.assertContains(resp, + '
          ', + status_code=200, + html=True) + + def test_clone_item(self): + """Test cloning an item. E.g. creating a new section""" + CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') + + section_data = { + 'parent_location': 'i4x://MITx/999/course/Robot_Super_Course', + 'template': 'i4x://edx/templates/chapter/Empty', + 'display_name': 'Section One', + } + + resp = self.client.post(reverse('clone_item'), section_data) + + self.assertEqual(resp.status_code, 200) + data = parse_json(resp) + self.assertRegexpMatches(data['id'], + '^i4x:\/\/MITx\/999\/chapter\/([0-9]|[a-f]){32}$') + + def test_capa_module(self): + """Test that a problem treats markdown specially.""" + course = CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') + + problem_data = { + 'parent_location': 'i4x://MITx/999/course/Robot_Super_Course', + 'template': 'i4x://edx/templates/problem/Blank_Common_Problem' + } + + resp = self.client.post(reverse('clone_item'), problem_data) + + self.assertEqual(resp.status_code, 200) + payload = parse_json(resp) + problem_loc = payload['id'] + problem = get_modulestore(problem_loc).get_item(problem_loc) + # should be a CapaDescriptor + self.assertIsInstance(problem, CapaDescriptor, "New problem is not a CapaDescriptor") + context = problem.get_context() + self.assertIn('markdown', context, "markdown is missing from context") + self.assertIn('markdown', problem.metadata, "markdown is missing from metadata") + self.assertNotIn('markdown', problem.editable_metadata_fields, "Markdown slipped into the editable metadata fields") + + def test_import_metadata_with_attempts_empty_string(self): + import_from_xml(modulestore(), 'common/test/data/', ['simple']) + ms = modulestore('direct') + did_load_item = False + try: + ms.get_item(Location(['i4x', 'edX', 'simple', 'problem', 'ps01-simple', None])) + did_load_item = True + except ItemNotFoundError: + pass + + # make sure we found the item (e.g. it didn't error while loading) + self.assertTrue(did_load_item) + + def test_metadata_inheritance(self): + import_from_xml(modulestore(), 'common/test/data/', ['full']) + + ms = modulestore('direct') + course = ms.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None])) + + verticals = ms.get_items(['i4x', 'edX', 'full', 'vertical', None, None]) + + # let's assert on the metadata_inheritance on an existing vertical + for vertical in verticals: + self.assertIn('xqa_key', vertical.metadata) + self.assertEqual(course.metadata['xqa_key'], vertical.metadata['xqa_key']) + + self.assertGreater(len(verticals), 0) + + new_component_location = Location('i4x', 'edX', 'full', 'html', 'new_component') + source_template_location = Location('i4x', 'edx', 'templates', 'html', 'Blank_HTML_Page') + + # crate a new module and add it as a child to a vertical + ms.clone_item(source_template_location, new_component_location) + parent = verticals[0] + ms.update_children(parent.location, parent.definition.get('children', []) + [new_component_location.url()]) + + # flush the cache + ms.get_cached_metadata_inheritance_tree(new_component_location, -1) + new_module = ms.get_item(new_component_location) + + # check for grace period definition which should be defined at the course level + self.assertIn('graceperiod', new_module.metadata) + + self.assertEqual(parent.metadata['graceperiod'], new_module.metadata['graceperiod']) + + self.assertEqual(course.metadata['xqa_key'], new_module.metadata['xqa_key']) + + # + # now let's define an override at the leaf node level + # + new_module.metadata['graceperiod'] = '1 day' + ms.update_metadata(new_module.location, new_module.metadata) + + # flush the cache and refetch + ms.get_cached_metadata_inheritance_tree(new_component_location, -1) + new_module = ms.get_item(new_component_location) + + self.assertIn('graceperiod', new_module.metadata) + self.assertEqual('1 day', new_module.metadata['graceperiod']) + + +class TemplateTestCase(ModuleStoreTestCase): + + def test_template_cleanup(self): + ms = modulestore('direct') + + # insert a bogus template in the store + bogus_template_location = Location('i4x', 'edx', 'templates', 'html', 'bogus') + source_template_location = Location('i4x', 'edx', 'templates', 'html', 'Blank_HTML_Page') + + ms.clone_item(source_template_location, bogus_template_location) + + verify_create = ms.get_item(bogus_template_location) + self.assertIsNotNone(verify_create) + + # now run cleanup + update_templates() + + # now try to find dangling template, it should not be in DB any longer + asserted = False + try: + verify_create = ms.get_item(bogus_template_location) + except ItemNotFoundError: + asserted = True + + self.assertTrue(asserted) + + diff --git a/cms/djangoapps/contentstore/tests/test_core_caching.py b/cms/djangoapps/contentstore/tests/test_core_caching.py index 0cb4a4930c..676627a045 100644 --- a/cms/djangoapps/contentstore/tests/test_core_caching.py +++ b/cms/djangoapps/contentstore/tests/test_core_caching.py @@ -1,7 +1,8 @@ -from django.test.testcases import TestCase from cache_toolbox.core import get_cached_content, set_cached_content, del_cached_content from xmodule.modulestore import Location from xmodule.contentstore.content import StaticContent +from django.test import TestCase + class Content: def __init__(self, location, content): @@ -11,6 +12,7 @@ class Content: def get_id(self): return StaticContent.get_id_from_location(self.location) + class CachingTestCase(TestCase): # Tests for https://edx.lighthouseapp.com/projects/102637/tickets/112-updating-asset-does-not-refresh-the-cached-copy unicodeLocation = Location(u'c4x', u'mitX', u'800', u'thumbnail', u'monsters.jpg') @@ -32,7 +34,3 @@ class CachingTestCase(TestCase): 'should not be stored in cache with unicodeLocation') self.assertEqual(None, get_cached_content(self.nonUnicodeLocation), 'should not be stored in cache with nonUnicodeLocation') - - - - diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py index 74eff6e9cc..5560d2e39b 100644 --- a/cms/djangoapps/contentstore/tests/test_course_settings.py +++ b/cms/djangoapps/contentstore/tests/test_course_settings.py @@ -1,43 +1,57 @@ -from django.test.testcases import TestCase import datetime -import time +import json +import copy +from util import converters +from util.converters import jsdate_to_time + from django.contrib.auth.models import User -import xmodule from django.test.client import Client from django.core.urlresolvers import reverse -from xmodule.modulestore import Location -from cms.djangoapps.models.settings.course_details import CourseDetails,\ - CourseSettingsEncoder -import json -from util import converters -import calendar -from util.converters import jsdate_to_time from django.utils.timezone import UTC + +from xmodule.modulestore import Location +from cms.djangoapps.models.settings.course_details import (CourseDetails, + CourseSettingsEncoder) from cms.djangoapps.models.settings.course_grading import CourseGradingModel from cms.djangoapps.contentstore.utils import get_modulestore -import copy + +from django.test import TestCase +from utils import ModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory + +from cms.djangoapps.models.settings.course_metadata import CourseMetadata +from xmodule.modulestore.xml_importer import import_from_xml +from xmodule.modulestore.django import modulestore + # YYYY-MM-DDThh:mm:ss.s+/-HH:MM class ConvertersTestCase(TestCase): @staticmethod def struct_to_datetime(struct_time): - return datetime.datetime(struct_time.tm_year, struct_time.tm_mon, struct_time.tm_mday, struct_time.tm_hour, - struct_time.tm_min, struct_time.tm_sec, tzinfo = UTC()) - + return datetime.datetime(struct_time.tm_year, struct_time.tm_mon, struct_time.tm_mday, struct_time.tm_hour, + struct_time.tm_min, struct_time.tm_sec, tzinfo=UTC()) + def compare_dates(self, date1, date2, expected_delta): dt1 = ConvertersTestCase.struct_to_datetime(date1) dt2 = ConvertersTestCase.struct_to_datetime(date2) self.assertEqual(dt1 - dt2, expected_delta, str(date1) + "-" + str(date2) + "!=" + str(expected_delta)) - + def test_iso_to_struct(self): self.compare_dates(converters.jsdate_to_time("2013-01-01"), converters.jsdate_to_time("2012-12-31"), datetime.timedelta(days=1)) self.compare_dates(converters.jsdate_to_time("2013-01-01T00"), converters.jsdate_to_time("2012-12-31T23"), datetime.timedelta(hours=1)) self.compare_dates(converters.jsdate_to_time("2013-01-01T00:00"), converters.jsdate_to_time("2012-12-31T23:59"), datetime.timedelta(minutes=1)) self.compare_dates(converters.jsdate_to_time("2013-01-01T00:00:00"), converters.jsdate_to_time("2012-12-31T23:59:59"), datetime.timedelta(seconds=1)) - - -class CourseTestCase(TestCase): + + +class CourseTestCase(ModuleStoreTestCase): def setUp(self): + """ + These tests need a user in the DB so that the django Test Client + can log them in. + They inherit from the ModuleStoreTestCase class so that the mongodb collection + will be cleared out before each test case execution and deleted + afterwards. + """ uname = 'testuser' email = 'test+courses@edx.org' password = 'foo' @@ -52,36 +66,16 @@ class CourseTestCase(TestCase): self.user.is_staff = True self.user.save() - # Flush and initialize the module store - # It needs the templates because it creates new records - # by cloning from the template. - # Note that if your test module gets in some weird state - # (though it shouldn't), do this manually - # from the bash shell to drop it: - # $ mongo test_xmodule --eval "db.dropDatabase()" - xmodule.modulestore.django._MODULESTORES = {} - xmodule.modulestore.django.modulestore().collection.drop() - xmodule.templates.update_templates() - self.client = Client() self.client.login(username=uname, password=password) - self.course_data = { - 'template': 'i4x://edx/templates/course/Empty', - 'org': 'MITx', - 'number': '999', - 'display_name': 'Robot Super Course', - } - self.course_location = Location('i4x', 'MITx', '999', 'course', 'Robot_Super_Course') - self.create_course() + t = 'i4x://edx/templates/course/Empty' + o = 'MITx' + n = '999' + dn = 'Robot Super Course' + self.course_location = Location('i4x', o, n, 'course', 'Robot_Super_Course') + CourseFactory.create(template=t, org=o, number=n, display_name=dn) - def tearDown(self): - xmodule.modulestore.django._MODULESTORES = {} - xmodule.modulestore.django.modulestore().collection.drop() - - def create_course(self): - """Create new course""" - self.client.post(reverse('create_new_course'), self.course_data) class CourseDetailsTestCase(CourseTestCase): def test_virgin_fetch(self): @@ -94,7 +88,7 @@ class CourseDetailsTestCase(CourseTestCase): self.assertEqual(details.overview, "", "overview somehow initialized" + details.overview) self.assertIsNone(details.intro_video, "intro_video somehow initialized" + str(details.intro_video)) self.assertIsNone(details.effort, "effort somehow initialized" + str(details.effort)) - + def test_encoder(self): details = CourseDetails.fetch(self.course_location) jsondetails = json.dumps(details, cls=CourseSettingsEncoder) @@ -108,7 +102,7 @@ class CourseDetailsTestCase(CourseTestCase): self.assertEqual(jsondetails['overview'], "", "overview somehow initialized") self.assertIsNone(jsondetails['intro_video'], "intro_video somehow initialized") self.assertIsNone(jsondetails['effort'], "effort somehow initialized") - + def test_update_and_fetch(self): ## NOTE: I couldn't figure out how to validly test time setting w/ all the conversions jsondetails = CourseDetails.fetch(self.course_location) @@ -126,6 +120,7 @@ class CourseDetailsTestCase(CourseTestCase): self.assertEqual(CourseDetails.update_from_json(jsondetails.__dict__).effort, jsondetails.effort, "After set effort") + class CourseDetailsViewTest(CourseTestCase): def alter_field(self, url, details, field, val): setattr(details, field, val) @@ -136,9 +131,9 @@ class CourseDetailsViewTest(CourseTestCase): payload['end_date'] = CourseDetailsViewTest.convert_datetime_to_iso(details.end_date) payload['enrollment_start'] = CourseDetailsViewTest.convert_datetime_to_iso(details.enrollment_start) payload['enrollment_end'] = CourseDetailsViewTest.convert_datetime_to_iso(details.enrollment_end) - resp = self.client.post(url, json.dumps(payload), "application/json") + resp = self.client.post(url, json.dumps(payload), "application/json") self.compare_details_with_encoding(json.loads(resp.content), details.__dict__, field + str(val)) - + @staticmethod def convert_datetime_to_iso(datetime): if datetime is not None: @@ -146,27 +141,22 @@ class CourseDetailsViewTest(CourseTestCase): else: return None - def test_update_and_fetch(self): details = CourseDetails.fetch(self.course_location) - - resp = self.client.get(reverse('course_settings', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course, - 'name' : self.course_location.name })) - self.assertContains(resp, '
        1. Course Details
          2. ', status_code=200, html=True) - # resp s/b json from here on - url = reverse('course_settings', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course, - 'name' : self.course_location.name, 'section' : 'details' }) + # resp s/b json from here on + url = reverse('course_settings', kwargs={'org': self.course_location.org, 'course': self.course_location.course, + 'name': self.course_location.name, 'section': 'details'}) resp = self.client.get(url) self.compare_details_with_encoding(json.loads(resp.content), details.__dict__, "virgin get") utc = UTC() - self.alter_field(url, details, 'start_date', datetime.datetime(2012,11,12,1,30, tzinfo=utc)) - self.alter_field(url, details, 'start_date', datetime.datetime(2012,11,1,13,30, tzinfo=utc)) - self.alter_field(url, details, 'end_date', datetime.datetime(2013,2,12,1,30, tzinfo=utc)) - self.alter_field(url, details, 'enrollment_start', datetime.datetime(2012,10,12,1,30, tzinfo=utc)) + self.alter_field(url, details, 'start_date', datetime.datetime(2012, 11, 12, 1, 30, tzinfo=utc)) + self.alter_field(url, details, 'start_date', datetime.datetime(2012, 11, 1, 13, 30, tzinfo=utc)) + self.alter_field(url, details, 'end_date', datetime.datetime(2013, 2, 12, 1, 30, tzinfo=utc)) + self.alter_field(url, details, 'enrollment_start', datetime.datetime(2012, 10, 12, 1, 30, tzinfo=utc)) - self.alter_field(url, details, 'enrollment_end', datetime.datetime(2012,11,15,1,30, tzinfo=utc)) + self.alter_field(url, details, 'enrollment_end', datetime.datetime(2012, 11, 15, 1, 30, tzinfo=utc)) self.alter_field(url, details, 'overview', "Overview") self.alter_field(url, details, 'intro_video', "intro_video") self.alter_field(url, details, 'effort', "effort") @@ -179,7 +169,7 @@ class CourseDetailsViewTest(CourseTestCase): self.assertEqual(details['overview'], encoded['overview'], context + " overviews not ==") self.assertEqual(details['intro_video'], encoded.get('intro_video', None), context + " intro_video not ==") self.assertEqual(details['effort'], encoded['effort'], context + " efforts not ==") - + def compare_date_fields(self, details, encoded, context, field): if details[field] is not None: if field in encoded and encoded[field] is not None: @@ -191,14 +181,15 @@ class CourseDetailsViewTest(CourseTestCase): else: details_encoded = jsdate_to_time(details[field]) dt2 = ConvertersTestCase.struct_to_datetime(details_encoded) - + expected_delta = datetime.timedelta(0) self.assertEqual(dt1 - dt2, expected_delta, str(dt1) + "!=" + str(dt2) + " at " + context) else: self.fail(field + " missing from encoded but in details at " + context) elif field in encoded and encoded[field] is not None: self.fail(field + " included in encoding but missing from details at " + context) - + + class CourseGradingTest(CourseTestCase): def test_initial_grader(self): descriptor = get_modulestore(self.course_location).get_item(self.course_location) @@ -218,58 +209,117 @@ class CourseGradingTest(CourseTestCase): self.assertEqual(self.course_location, test_grader.course_location, "Course locations") self.assertIsNotNone(test_grader.graders, "No graders") self.assertIsNotNone(test_grader.grade_cutoffs, "No cutoffs") - + for i, grader in enumerate(test_grader.graders): subgrader = CourseGradingModel.fetch_grader(self.course_location, i) self.assertDictEqual(grader, subgrader, str(i) + "th graders not equal") - + subgrader = CourseGradingModel.fetch_grader(self.course_location.list(), 0) self.assertDictEqual(test_grader.graders[0], subgrader, "failed with location as list") - + def test_fetch_cutoffs(self): test_grader = CourseGradingModel.fetch_cutoffs(self.course_location) # ??? should this check that it's at least a dict? (expected is { "pass" : 0.5 } I think) self.assertIsNotNone(test_grader, "No cutoffs via fetch") - + test_grader = CourseGradingModel.fetch_cutoffs(self.course_location.url()) self.assertIsNotNone(test_grader, "No cutoffs via fetch with url") - + def test_fetch_grace(self): test_grader = CourseGradingModel.fetch_grace_period(self.course_location) # almost a worthless test self.assertIn('grace_period', test_grader, "No grace via fetch") - + test_grader = CourseGradingModel.fetch_grace_period(self.course_location.url()) self.assertIn('grace_period', test_grader, "No cutoffs via fetch with url") - + def test_update_from_json(self): test_grader = CourseGradingModel.fetch(self.course_location) altered_grader = CourseGradingModel.update_from_json(test_grader.__dict__) self.assertDictEqual(test_grader.__dict__, altered_grader.__dict__, "Noop update") - + test_grader.graders[0]['weight'] = test_grader.graders[0].get('weight') * 2 altered_grader = CourseGradingModel.update_from_json(test_grader.__dict__) self.assertDictEqual(test_grader.__dict__, altered_grader.__dict__, "Weight[0] * 2") - + test_grader.grade_cutoffs['D'] = 0.3 altered_grader = CourseGradingModel.update_from_json(test_grader.__dict__) self.assertDictEqual(test_grader.__dict__, altered_grader.__dict__, "cutoff add D") - - test_grader.grace_period = {'hours' : '4'} + + test_grader.grace_period = {'hours' : 4, 'minutes' : 5, 'seconds': 0} altered_grader = CourseGradingModel.update_from_json(test_grader.__dict__) self.assertDictEqual(test_grader.__dict__, altered_grader.__dict__, "4 hour grace period") - + def test_update_grader_from_json(self): test_grader = CourseGradingModel.fetch(self.course_location) altered_grader = CourseGradingModel.update_grader_from_json(test_grader.course_location, test_grader.graders[1]) self.assertDictEqual(test_grader.graders[1], altered_grader, "Noop update") - + test_grader.graders[1]['min_count'] = test_grader.graders[1].get('min_count') + 2 altered_grader = CourseGradingModel.update_grader_from_json(test_grader.course_location, test_grader.graders[1]) self.assertDictEqual(test_grader.graders[1], altered_grader, "min_count[1] + 2") - + test_grader.graders[1]['drop_count'] = test_grader.graders[1].get('drop_count') + 1 altered_grader = CourseGradingModel.update_grader_from_json(test_grader.course_location, test_grader.graders[1]) self.assertDictEqual(test_grader.graders[1], altered_grader, "drop_count[1] + 2") - - + +class CourseMetadataEditingTest(CourseTestCase): + def setUp(self): + CourseTestCase.setUp(self) + # add in the full class too + import_from_xml(modulestore(), 'common/test/data/', ['full']) + self.fullcourse_location = Location(['i4x','edX','full','course','6.002_Spring_2012', None]) + + + def test_fetch_initial_fields(self): + test_model = CourseMetadata.fetch(self.course_location) + self.assertIn('display_name', test_model, 'Missing editable metadata field') + self.assertEqual(test_model['display_name'], 'Robot Super Course', "not expected value") + + test_model = CourseMetadata.fetch(self.fullcourse_location) + self.assertNotIn('graceperiod', test_model, 'blacklisted field leaked in') + self.assertIn('display_name', test_model, 'full missing editable metadata field') + self.assertEqual(test_model['display_name'], 'Testing', "not expected value") + self.assertIn('rerandomize', test_model, 'Missing rerandomize metadata field') + self.assertIn('showanswer', test_model, 'showanswer field ') + self.assertIn('xqa_key', test_model, 'xqa_key field ') + + def test_update_from_json(self): + test_model = CourseMetadata.update_from_json(self.course_location, + { "a" : 1, + "b_a_c_h" : { "c" : "test" }, + "test_text" : "a text string"}) + self.update_check(test_model) + # try fresh fetch to ensure persistence + test_model = CourseMetadata.fetch(self.course_location) + self.update_check(test_model) + # now change some of the existing metadata + test_model = CourseMetadata.update_from_json(self.course_location, + { "a" : 2, + "display_name" : "jolly roger"}) + self.assertIn('display_name', test_model, 'Missing editable metadata field') + self.assertEqual(test_model['display_name'], 'jolly roger', "not expected value") + self.assertIn('a', test_model, 'Missing revised a metadata field') + self.assertEqual(test_model['a'], 2, "a not expected value") + + def update_check(self, test_model): + self.assertIn('display_name', test_model, 'Missing editable metadata field') + self.assertEqual(test_model['display_name'], 'Robot Super Course', "not expected value") + self.assertIn('a', test_model, 'Missing new a metadata field') + self.assertEqual(test_model['a'], 1, "a not expected value") + self.assertIn('b_a_c_h', test_model, 'Missing b_a_c_h metadata field') + self.assertDictEqual(test_model['b_a_c_h'], { "c" : "test" }, "b_a_c_h not expected value") + self.assertIn('test_text', test_model, 'Missing test_text metadata field') + self.assertEqual(test_model['test_text'], "a text string", "test_text not expected value") + + + def test_delete_key(self): + test_model = CourseMetadata.delete_key(self.fullcourse_location, { 'deleteKeys' : ['doesnt_exist', 'showanswer', 'xqa_key']}) + # ensure no harm + self.assertNotIn('graceperiod', test_model, 'blacklisted field leaked in') + self.assertIn('display_name', test_model, 'full missing editable metadata field') + self.assertEqual(test_model['display_name'], 'Testing', "not expected value") + self.assertIn('rerandomize', test_model, 'Missing rerandomize metadata field') + # check for deletion effectiveness + self.assertNotIn('showanswer', test_model, 'showanswer field still in') + self.assertNotIn('xqa_key', test_model, 'xqa_key field still in') \ No newline at end of file diff --git a/cms/djangoapps/contentstore/tests/test_course_updates.py b/cms/djangoapps/contentstore/tests/test_course_updates.py index 96e4468b31..c57f1322f5 100644 --- a/cms/djangoapps/contentstore/tests/test_course_updates.py +++ b/cms/djangoapps/contentstore/tests/test_course_updates.py @@ -2,29 +2,30 @@ from cms.djangoapps.contentstore.tests.test_course_settings import CourseTestCas from django.core.urlresolvers import reverse import json + class CourseUpdateTest(CourseTestCase): def test_course_update(self): # first get the update to force the creation - url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course, - 'name' : self.course_location.name }) + url = reverse('course_info', kwargs={'org': self.course_location.org, 'course': self.course_location.course, + 'name': self.course_location.name}) self.client.get(url) content = '' - payload = { 'content' : content, - 'date' : 'January 8, 2013'} - url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course, - 'provided_id' : ''}) - + payload = {'content': content, + 'date': 'January 8, 2013'} + url = reverse('course_info', 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) - + + payload = json.loads(resp.content) + self.assertHTMLEqual(content, payload['content'], "single iframe") - - url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course, - 'provided_id' : payload['id']}) + + url = reverse('course_info', kwargs={'org': self.course_location.org, 'course': self.course_location.course, + 'provided_id': payload['id']}) content += '
          div

          p

          ' payload['content'] = content resp = self.client.post(url, json.dumps(payload), "application/json") - + self.assertHTMLEqual(content, json.loads(resp.content)['content'], "iframe w/ div") diff --git a/cms/djangoapps/contentstore/tests/test_utils.py b/cms/djangoapps/contentstore/tests/test_utils.py index 13f6189cc5..09e3b045f9 100644 --- a/cms/djangoapps/contentstore/tests/test_utils.py +++ b/cms/djangoapps/contentstore/tests/test_utils.py @@ -1,16 +1,17 @@ -from django.test.testcases import TestCase from cms.djangoapps.contentstore import utils import mock +from django.test import TestCase + class LMSLinksTestCase(TestCase): def about_page_test(self): - location = 'i4x','mitX','101','course', 'test' + location = 'i4x', 'mitX', '101', 'course', 'test' utils.get_course_id = mock.Mock(return_value="mitX/101/test") link = utils.get_lms_link_for_about_page(location) self.assertEquals(link, "//localhost:8000/courses/mitX/101/test/about") def ls_link_test(self): - location = 'i4x','mitX','101','vertical', 'contacting_us' + location = 'i4x', 'mitX', '101', 'vertical', 'contacting_us' utils.get_course_id = mock.Mock(return_value="mitX/101/test") link = utils.get_lms_link_for_item(location, False) self.assertEquals(link, "//localhost:8000/courses/mitX/101/test/jump_to/i4x://mitX/101/vertical/contacting_us") diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py index 2597ac64fd..c4a46459e2 100644 --- a/cms/djangoapps/contentstore/tests/tests.py +++ b/cms/djangoapps/contentstore/tests/tests.py @@ -1,46 +1,33 @@ import json import shutil -from django.test import TestCase from django.test.client import Client -from override_settings import override_settings from django.conf import settings from django.core.urlresolvers import reverse from path import path -from tempfile import mkdtemp import json - -from student.models import Registration -from django.contrib.auth.models import User -import xmodule.modulestore.django -from xmodule.modulestore.xml_importer import import_from_xml +from fs.osfs import OSFS import copy -from factories import * +from cms.djangoapps.contentstore.utils import get_modulestore + +from xmodule.modulestore import Location from xmodule.modulestore.store_utilities import clone_course from xmodule.modulestore.store_utilities import delete_course -from xmodule.modulestore.django import modulestore +from xmodule.modulestore.django import modulestore, _MODULESTORES from xmodule.contentstore.django import contentstore -from xmodule.course_module import CourseDescriptor +from xmodule.templates import update_templates from xmodule.modulestore.xml_exporter import export_to_xml -from cms.djangoapps.contentstore.utils import get_modulestore +from xmodule.modulestore.xml_importer import import_from_xml + from xmodule.capa_module import CapaDescriptor +from xmodule.course_module import CourseDescriptor +from xmodule.seq_module import SequenceDescriptor -def parse_json(response): - """Parse response, which is assumed to be json""" - return json.loads(response.content) +from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory +from utils import ModuleStoreTestCase, parse_json, user, registration -def user(email): - """look up a user by email""" - return User.objects.get(email=email) - - -def registration(email): - """look up registration object by email""" - return Registration.objects.get(user__email=email) - - -class ContentStoreTestCase(TestCase): +class ContentStoreTestCase(ModuleStoreTestCase): def _login(self, email, pw): """Login. View should always return 200. The success/fail is in the returned json""" @@ -97,7 +84,6 @@ class ContentStoreTestCase(TestCase): # Now make sure that the user is now actually activated self.assertTrue(user(email).is_active) - class AuthTestCase(ContentStoreTestCase): """Check that various permissions-related things work""" @@ -185,294 +171,3 @@ class AuthTestCase(ContentStoreTestCase): self.assertEqual(resp.status_code, 302) # Logged in should work. - -TEST_DATA_MODULESTORE = copy.deepcopy(settings.MODULESTORE) -TEST_DATA_MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data') -TEST_DATA_MODULESTORE['direct']['OPTIONS']['fs_root'] = path('common/test/data') - -@override_settings(MODULESTORE=TEST_DATA_MODULESTORE) -class ContentStoreTest(TestCase): - - def setUp(self): - uname = 'testuser' - email = 'test+courses@edx.org' - password = 'foo' - - # Create the use so we can log them in. - self.user = User.objects.create_user(uname, email, password) - - # Note that we do not actually need to do anything - # for registration if we directly mark them active. - self.user.is_active = True - # Staff has access to view all courses - self.user.is_staff = True - self.user.save() - - # Flush and initialize the module store - # It needs the templates because it creates new records - # by cloning from the template. - # Note that if your test module gets in some weird state - # (though it shouldn't), do this manually - # from the bash shell to drop it: - # $ mongo test_xmodule --eval "db.dropDatabase()" - xmodule.modulestore.django._MODULESTORES = {} - xmodule.modulestore.django.modulestore().collection.drop() - xmodule.templates.update_templates() - - self.client = Client() - self.client.login(username=uname, password=password) - - self.course_data = { - 'template': 'i4x://edx/templates/course/Empty', - 'org': 'MITx', - 'number': '999', - 'display_name': 'Robot Super Course', - } - - def tearDown(self): - # Make sure you flush out the test modulestore after the end - # of the last test because otherwise on the next run - # cms/djangoapps/contentstore/__init__.py - # update_templates() will try to update the templates - # via upsert and it sometimes seems to be messing things up. - xmodule.modulestore.django._MODULESTORES = {} - xmodule.modulestore.django.modulestore().collection.drop() - - def test_create_course(self): - """Test new course creation - happy path""" - resp = self.client.post(reverse('create_new_course'), self.course_data) - self.assertEqual(resp.status_code, 200) - data = parse_json(resp) - self.assertEqual(data['id'], 'i4x://MITx/999/course/Robot_Super_Course') - - def test_create_course_duplicate_course(self): - """Test new course creation - error path""" - resp = self.client.post(reverse('create_new_course'), self.course_data) - resp = self.client.post(reverse('create_new_course'), self.course_data) - data = parse_json(resp) - self.assertEqual(resp.status_code, 200) - self.assertEqual(data['ErrMsg'], 'There is already a course defined with this name.') - - def test_create_course_duplicate_number(self): - """Test new course creation - error path""" - resp = self.client.post(reverse('create_new_course'), self.course_data) - self.course_data['display_name'] = 'Robot Super Course Two' - - resp = self.client.post(reverse('create_new_course'), self.course_data) - data = parse_json(resp) - - self.assertEqual(resp.status_code, 200) - self.assertEqual(data['ErrMsg'], - 'There is already a course defined with the same organization and course number.') - - def test_create_course_with_bad_organization(self): - """Test new course creation - error path for bad organization name""" - self.course_data['org'] = 'University of California, Berkeley' - resp = self.client.post(reverse('create_new_course'), self.course_data) - data = parse_json(resp) - - self.assertEqual(resp.status_code, 200) - self.assertEqual(data['ErrMsg'], - "Unable to create course 'Robot Super Course'.\n\nInvalid characters in 'University of California, Berkeley'.") - - def test_course_index_view_with_no_courses(self): - """Test viewing the index page with no courses""" - # Create a course so there is something to view - resp = self.client.get(reverse('index')) - self.assertContains(resp, - '

          My Courses

          ', - status_code=200, - html=True) - - def test_course_factory(self): - course = CourseFactory.create() - self.assertIsInstance(course, xmodule.course_module.CourseDescriptor) - - def test_item_factory(self): - course = CourseFactory.create() - item = ItemFactory.create(parent_location=course.location) - self.assertIsInstance(item, xmodule.seq_module.SequenceDescriptor) - - def test_course_index_view_with_course(self): - """Test viewing the index page with an existing course""" - CourseFactory.create(display_name='Robot Super Educational Course') - resp = self.client.get(reverse('index')) - self.assertContains(resp, - 'Robot Super Educational Course', - status_code=200, - html=True) - - def test_course_overview_view_with_course(self): - """Test viewing the course overview page with an existing course""" - CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') - - data = { - 'org': 'MITx', - 'course': '999', - 'name': Location.clean('Robot Super Course'), - } - - resp = self.client.get(reverse('course_index', kwargs=data)) - self.assertContains(resp, - 'Robot Super Course', - status_code=200, - html=True) - - def test_clone_item(self): - """Test cloning an item. E.g. creating a new section""" - CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') - - section_data = { - 'parent_location' : 'i4x://MITx/999/course/Robot_Super_Course', - 'template' : 'i4x://edx/templates/chapter/Empty', - 'display_name': 'Section One', - } - - resp = self.client.post(reverse('clone_item'), section_data) - - self.assertEqual(resp.status_code, 200) - data = parse_json(resp) - self.assertRegexpMatches(data['id'], - '^i4x:\/\/MITx\/999\/chapter\/([0-9]|[a-f]){32}$') - - def check_edit_unit(self, test_course_name): - import_from_xml(modulestore(), 'common/test/data/', [test_course_name]) - - for descriptor in modulestore().get_items(Location(None, None, 'vertical', None, None)): - print "Checking ", descriptor.location.url() - print descriptor.__class__, descriptor.location - resp = self.client.get(reverse('edit_unit', kwargs={'location': descriptor.location.url()})) - self.assertEqual(resp.status_code, 200) - - def test_edit_unit_toy(self): - self.check_edit_unit('toy') - - def test_edit_unit_full(self): - self.check_edit_unit('full') - - def test_about_overrides(self): - ''' - This test case verifies that a course can use specialized override for about data, e.g. /about/Fall_2012/effort.html - while there is a base definition in /about/effort.html - ''' - import_from_xml(modulestore(), 'common/test/data/', ['full']) - ms = modulestore('direct') - effort = ms.get_item(Location(['i4x','edX','full','about','effort', None])) - self.assertEqual(effort.definition['data'],'6 hours') - - # this one should be in a non-override folder - effort = ms.get_item(Location(['i4x','edX','full','about','end_date', None])) - self.assertEqual(effort.definition['data'],'TBD') - - - def test_clone_course(self): - import_from_xml(modulestore(), 'common/test/data/', ['full']) - - resp = self.client.post(reverse('create_new_course'), self.course_data) - self.assertEqual(resp.status_code, 200) - data = parse_json(resp) - self.assertEqual(data['id'], 'i4x://MITx/999/course/Robot_Super_Course') - - ms = modulestore('direct') - cs = contentstore() - - source_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012') - dest_location = CourseDescriptor.id_to_location('MITx/999/Robot_Super_Course') - - clone_course(ms, cs, source_location, dest_location) - - # now loop through all the units in the course and verify that the clone can render them, which - # means the objects are at least present - items = ms.get_items(Location(['i4x','edX', 'full', 'vertical', None])) - self.assertGreater(len(items), 0) - clone_items = ms.get_items(Location(['i4x', 'MITx','999','vertical', None])) - self.assertGreater(len(clone_items), 0) - for descriptor in items: - new_loc = descriptor.location._replace(org = 'MITx', course='999') - print "Checking {0} should now also be at {1}".format(descriptor.location.url(), new_loc.url()) - resp = self.client.get(reverse('edit_unit', kwargs={'location': new_loc.url()})) - self.assertEqual(resp.status_code, 200) - - def test_delete_course(self): - import_from_xml(modulestore(), 'common/test/data/', ['full']) - - ms = modulestore('direct') - cs = contentstore() - - location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012') - - delete_course(ms, cs, location) - - items = ms.get_items(Location(['i4x','edX', 'full', 'vertical', None])) - self.assertEqual(len(items), 0) - - def test_export_course(self): - ms = modulestore('direct') - cs = contentstore() - - import_from_xml(ms, 'common/test/data/', ['full']) - location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012') - - root_dir = path(mkdtemp()) - - print 'Exporting to tempdir = {0}'.format(root_dir) - - # export out to a tempdir - export_to_xml(ms, cs, location, root_dir, 'test_export') - - # remove old course - delete_course(ms, cs, location) - - # reimport - import_from_xml(ms, root_dir, ['test_export']) - - items = ms.get_items(Location(['i4x','edX', 'full', 'vertical', None])) - self.assertGreater(len(items), 0) - for descriptor in items: - print "Checking {0}....".format(descriptor.location.url()) - resp = self.client.get(reverse('edit_unit', kwargs={'location': descriptor.location.url()})) - self.assertEqual(resp.status_code, 200) - - shutil.rmtree(root_dir) - - def test_course_handouts_rewrites(self): - ms = modulestore('direct') - cs = contentstore() - - # import a test course - import_from_xml(ms, 'common/test/data/', ['full']) - - handout_location= Location(['i4x', 'edX', 'full', 'course_info', 'handouts']) - - # get module info - resp = self.client.get(reverse('module_info', kwargs={'module_location': handout_location})) - - # make sure we got a successful response - self.assertEqual(resp.status_code, 200) - - # check that /static/ has been converted to the full path - # note, we know the link it should be because that's what in the 'full' course in the test data - self.assertContains(resp, '/c4x/edX/full/asset/handouts_schematic_tutorial.pdf') - - - def test_capa_module(self): - """Test that a problem treats markdown specially.""" - CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course') - - problem_data = { - 'parent_location' : 'i4x://MITx/999/course/Robot_Super_Course', - 'template' : 'i4x://edx/templates/problem/Empty' - } - - resp = self.client.post(reverse('clone_item'), problem_data) - - self.assertEqual(resp.status_code, 200) - payload = parse_json(resp) - problem_loc = payload['id'] - problem = get_modulestore(problem_loc).get_item(problem_loc) - # should be a CapaDescriptor - self.assertIsInstance(problem, CapaDescriptor, "New problem is not a CapaDescriptor") - context = problem.get_context() - self.assertIn('markdown', context, "markdown is missing from context") - self.assertIn('markdown', problem.metadata, "markdown is missing from metadata") - self.assertNotIn('markdown', problem.editable_metadata_fields, "Markdown slipped into the editable metadata fields") \ No newline at end of file diff --git a/cms/djangoapps/contentstore/tests/utils.py b/cms/djangoapps/contentstore/tests/utils.py new file mode 100644 index 0000000000..b6b8cd5023 --- /dev/null +++ b/cms/djangoapps/contentstore/tests/utils.py @@ -0,0 +1,65 @@ +import json +import copy +from uuid import uuid4 +from django.test import TestCase +from django.conf import settings + +from student.models import Registration +from django.contrib.auth.models import User + +import xmodule.modulestore.django +from xmodule.templates import update_templates + + +class ModuleStoreTestCase(TestCase): + """ Subclass for any test case that uses the mongodb + module store. This populates a uniquely named modulestore + collection with templates before running the TestCase + and drops it they are finished. """ + + def _pre_setup(self): + super(ModuleStoreTestCase, self)._pre_setup() + + # Use a uuid to differentiate + # the mongo collections on jenkins. + self.orig_MODULESTORE = copy.deepcopy(settings.MODULESTORE) + self.test_MODULESTORE = self.orig_MODULESTORE + self.test_MODULESTORE['default']['OPTIONS']['collection'] = 'modulestore_%s' % uuid4().hex + self.test_MODULESTORE['direct']['OPTIONS']['collection'] = 'modulestore_%s' % uuid4().hex + settings.MODULESTORE = self.test_MODULESTORE + + # Flush and initialize the module store + # It needs the templates because it creates new records + # by cloning from the template. + # Note that if your test module gets in some weird state + # (though it shouldn't), do this manually + # from the bash shell to drop it: + # $ mongo test_xmodule --eval "db.dropDatabase()" + xmodule.modulestore.django._MODULESTORES = {} + update_templates() + + def _post_teardown(self): + # Make sure you flush out the modulestore. + # Drop the collection at the end of the test, + # otherwise there will be lingering collections leftover + # from executing the tests. + xmodule.modulestore.django._MODULESTORES = {} + xmodule.modulestore.django.modulestore().collection.drop() + settings.MODULESTORE = self.orig_MODULESTORE + + super(ModuleStoreTestCase, self)._post_teardown() + + +def parse_json(response): + """Parse response, which is assumed to be json""" + return json.loads(response.content) + + +def user(email): + """look up a user by email""" + return User.objects.get(email=email) + + +def registration(email): + """look up registration object by email""" + return Registration.objects.get(user__email=email) diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py index da2993e463..cba30131b5 100644 --- a/cms/djangoapps/contentstore/utils.py +++ b/cms/djangoapps/contentstore/utils.py @@ -5,18 +5,20 @@ from xmodule.modulestore.exceptions import ItemNotFoundError DIRECT_ONLY_CATEGORIES = ['course', 'chapter', 'sequential', 'about', 'static_tab', 'course_info'] + def get_modulestore(location): """ Returns the correct modulestore to use for modifying the specified location """ if not isinstance(location, Location): location = Location(location) - + if location.category in DIRECT_ONLY_CATEGORIES: return modulestore('direct') else: return modulestore() + def get_course_location_for_item(location): ''' cdodge: for a given Xmodule, return the course that it belongs to @@ -46,6 +48,7 @@ def get_course_location_for_item(location): return location + def get_course_for_item(location): ''' cdodge: for a given Xmodule, return the course that it belongs to @@ -72,12 +75,20 @@ def get_course_for_item(location): return courses[0] -def get_lms_link_for_item(location, preview=False): +def get_lms_link_for_item(location, preview=False, course_id=None): + if course_id is None: + course_id = get_course_id(location) + if settings.LMS_BASE is not None: - lms_link = "//{preview}{lms_base}/courses/{course_id}/jump_to/{location}".format( - preview='preview.' if preview else '', - lms_base=settings.LMS_BASE, - course_id=get_course_id(location), + if preview: + lms_base = settings.MITX_FEATURES.get('PREVIEW_LMS_BASE', + 'preview.' + settings.LMS_BASE) + else: + lms_base = settings.LMS_BASE + + lms_link = "//{lms_base}/courses/{course_id}/jump_to/{location}".format( + lms_base=lms_base, + course_id=course_id, location=Location(location) ) else: @@ -85,6 +96,7 @@ def get_lms_link_for_item(location, preview=False): return lms_link + def get_lms_link_for_about_page(location): """ Returns the url to the course about page from the location tuple. @@ -99,6 +111,7 @@ def get_lms_link_for_about_page(location): return lms_link + def get_course_id(location): """ Returns the course_id from a given the location tuple. @@ -106,6 +119,7 @@ def get_course_id(location): # TODO: These will need to be changed to point to the particular instance of this problem in the particular course return modulestore().get_containing_courses(Location(location))[0].id + class UnitState(object): draft = 'draft' private = 'private' @@ -135,6 +149,7 @@ def compute_unit_state(unit): def get_date_display(date): return date.strftime("%d %B, %Y at %I:%M %p") + def update_item(location, value): """ If value is None, delete the db entry. Otherwise, update it using the correct modulestore. @@ -142,4 +157,4 @@ def update_item(location, value): if value is None: get_modulestore(location).delete_item(location) else: - get_modulestore(location).update_item(location, value) \ No newline at end of file + get_modulestore(location).update_item(location, value) diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 816ccab091..34003d71a4 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -31,7 +31,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationErr from xmodule.x_module import ModuleSystem from xmodule.error_module import ErrorDescriptor from xmodule.errortracker import exc_info_to_str -from static_replace import replace_urls +import static_replace from external_auth.views import ssl_login_shortcut from mitxmako.shortcuts import render_to_response, render_to_string @@ -58,7 +58,8 @@ from cms.djangoapps.models.settings.course_details import CourseDetails,\ CourseSettingsEncoder from cms.djangoapps.models.settings.course_grading import CourseGradingModel from cms.djangoapps.contentstore.utils import get_modulestore -from lxml import etree +from django.shortcuts import redirect +from cms.djangoapps.models.settings.course_metadata import CourseMetadata # to install PIL on MacOSX: 'easy_install http://dist.repoze.org/PIL-1.1.6.tar.gz' @@ -67,6 +68,10 @@ log = logging.getLogger(__name__) COMPONENT_TYPES = ['customtag', 'discussion', 'html', 'problem', 'video'] +ADVANCED_COMPONENT_TYPES = ['annotatable','combinedopenended', 'peergrading'] +ADVANCED_COMPONENT_CATEGORY = 'advanced' +ADVANCED_COMPONENT_POLICY_KEY = 'advanced_modules' + # cdodge: these are categories which should not be parented, they are detached from the hierarchy DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info'] @@ -81,6 +86,12 @@ def signup(request): csrf_token = csrf(request)['csrf_token'] return render_to_response('signup.html', {'csrf': csrf_token}) +def old_login_redirect(request): + ''' + Redirect to the active login url. + ''' + return redirect('login', permanent=True) + @ssl_login_shortcut @ensure_csrf_cookie def login_page(request): @@ -93,6 +104,11 @@ def login_page(request): 'forgot_password_link': "//{base}/#forgot-password-modal".format(base=settings.LMS_BASE), }) +def howitworks(request): + if request.user.is_authenticated(): + return index(request) + else: + return render_to_response('howitworks.html', {}) # ==== Views for any logged-in user ================================== @@ -102,7 +118,7 @@ def index(request): """ List all courses available to the logged in user """ - courses = modulestore().get_items(['i4x', None, None, 'course', None]) + courses = modulestore('direct').get_items(['i4x', None, None, 'course', None]) # filter out courses that we don't have access too def course_filter(course): @@ -114,14 +130,16 @@ def index(request): courses = filter(course_filter, courses) return render_to_response('index.html', { - 'new_course_template' : Location('i4x', 'edx', 'templates', 'course', 'Empty'), + 'new_course_template': Location('i4x', 'edx', 'templates', 'course', 'Empty'), 'courses': [(course.metadata.get('display_name'), reverse('course_index', args=[ course.location.org, course.location.course, - course.location.name])) + course.location.name]), + get_lms_link_for_item(course.location, course_id=course.location.course_id)) for course in courses], - 'user': request.user + 'user': request.user, + 'disable_course_creation': settings.MITX_FEATURES.get('DISABLE_COURSE_CREATION', False) and not request.user.is_staff }) @@ -132,7 +150,7 @@ def has_access(user, location, role=STAFF_ROLE_NAME): Return True if user allowed to access this piece of data Note that the CMS permissions model is with respect to courses There is a super-admin permissions if user.is_staff is set - Also, since we're unifying the user database between LMS and CAS, + Also, since we're unifying the user database between LMS and CAS, I'm presuming that the course instructor (formally known as admin) will not be in both INSTRUCTOR and STAFF groups, so we have to cascade our queries here as INSTRUCTOR has all the rights that STAFF do @@ -154,15 +172,17 @@ def course_index(request, org, course, name): org, course, name: Attributes of the Location for the item to edit """ location = ['i4x', org, course, 'course', name] - + # check that logged in user has permissions to this item if not has_access(request.user, location): raise PermissionDenied() - upload_asset_callback_url = reverse('upload_asset', kwargs = { - 'org' : org, - 'course' : course, - 'coursename' : name + lms_link = get_lms_link_for_item(location) + + upload_asset_callback_url = reverse('upload_asset', kwargs={ + 'org': org, + 'course': course, + 'coursename': name }) course = modulestore().get_item(location) @@ -171,6 +191,7 @@ def course_index(request, org, course, name): return render_to_response('overview.html', { 'active_tab': 'courseware', 'context_course': course, + 'lms_link': lms_link, 'sections': sections, 'course_graders': json.dumps(CourseGradingModel.fetch(course.location).graders), 'parent_location': course.location, @@ -213,7 +234,7 @@ def edit_subsection(request, location): # remove all metadata from the generic dictionary that is presented in a more normalized UI - policy_metadata = dict((key,value) for key, value in item.metadata.iteritems() + policy_metadata = dict((key, value) for key, value in item.metadata.iteritems() if key not in ['display_name', 'start', 'due', 'format'] and key not in item.system_metadata_fields) can_view_live = False @@ -233,9 +254,9 @@ def edit_subsection(request, location): 'course_graders': json.dumps(CourseGradingModel.fetch(course.location).graders), 'parent_location': course.location, 'parent_item': parent, - 'policy_metadata' : policy_metadata, - 'subsection_units' : subsection_units, - 'can_view_live' : can_view_live + 'policy_metadata': policy_metadata, + 'subsection_units': subsection_units, + 'can_view_live': can_view_live }) @@ -261,18 +282,38 @@ def edit_unit(request, location): break lms_link = get_lms_link_for_item(item.location) - preview_lms_link = get_lms_link_for_item(item.location, preview=True) component_templates = defaultdict(list) + # Check if there are any advanced modules specified in the course policy. These modules + # should be specified as a list of strings, where the strings are the names of the modules + # in ADVANCED_COMPONENT_TYPES that should be enabled for the course. + course_metadata = CourseMetadata.fetch(course.location) + course_advanced_keys = course_metadata.get(ADVANCED_COMPONENT_POLICY_KEY, []) + + # Set component types according to course policy file + component_types = list(COMPONENT_TYPES) + if isinstance(course_advanced_keys, list): + course_advanced_keys = [c for c in course_advanced_keys if c in ADVANCED_COMPONENT_TYPES] + if len(course_advanced_keys) > 0: + component_types.append(ADVANCED_COMPONENT_CATEGORY) + else: + log.error("Improper format for course advanced keys! {0}".format(course_advanced_keys)) + templates = modulestore().get_items(Location('i4x', 'edx', 'templates')) for template in templates: - if template.location.category in COMPONENT_TYPES: - component_templates[template.location.category].append(( + category = template.location.category + + if category in course_advanced_keys: + category = ADVANCED_COMPONENT_CATEGORY + + if category in component_types: + #This is a hack to create categories for different xmodules + component_templates[category].append(( template.display_name, template.location.url(), 'markdown' in template.metadata, - template.location.name == 'Empty' + 'empty' in template.metadata )) components = [ @@ -292,23 +333,26 @@ def edit_unit(request, location): containing_section = modulestore().get_item(containing_section_locs[0]) # cdodge hack. We're having trouble previewing drafts via jump_to redirect - # so let's generate the link url here + # so let's generate the link url here # need to figure out where this item is in the list of children as the preview will need this - index =1 + index = 1 for child in containing_subsection.get_children(): if child.location == item.location: break index = index + 1 - preview_lms_link = '//{preview}{lms_base}/courses/{org}/{course}/{course_name}/courseware/{section}/{subsection}/{index}'.format( - preview='preview.', - lms_base=settings.LMS_BASE, + preview_lms_base = settings.MITX_FEATURES.get('PREVIEW_LMS_BASE', + 'preview.' + settings.LMS_BASE) + + preview_lms_link = '//{preview_lms_base}/courses/{org}/{course}/{course_name}/courseware/{section}/{subsection}/{index}'.format( + preview_lms_base=preview_lms_base, + lms_base=settings.LMS_BASE, org=course.location.org, - course=course.location.course, - course_name=course.location.name, - section=containing_section.location.name, - subsection=containing_subsection.location.name, + course=course.location.course, + course_name=course.location.name, + section=containing_section.location.name, + subsection=containing_subsection.location.name, index=index) unit_state = compute_unit_state(item) @@ -359,14 +403,14 @@ def assignment_type_update(request, org, course, category, name): location = Location(['i4x', org, course, category, name]) if not has_access(request.user, location): raise HttpResponseForbidden() - + if request.method == 'GET': - return HttpResponse(json.dumps(CourseGradingModel.get_section_grader_type(location)), + return HttpResponse(json.dumps(CourseGradingModel.get_section_grader_type(location)), mimetype="application/json") - elif request.method == 'POST': # post or put, doesn't matter. - return HttpResponse(json.dumps(CourseGradingModel.update_section_grader_type(location, request.POST)), + elif request.method == 'POST': # post or put, doesn't matter. + return HttpResponse(json.dumps(CourseGradingModel.update_section_grader_type(location, request.POST)), mimetype="application/json") - + def user_author_string(user): '''Get an author string for commits by this user. Format: @@ -474,7 +518,7 @@ def preview_module_system(request, preview_id, descriptor): get_module=partial(get_preview_module, request, preview_id), render_template=render_from_lms, debug=True, - replace_urls=replace_urls, + replace_urls=partial(static_replace.replace_static_urls, data_directory=None, course_namespace=descriptor.location), user=request.user, ) @@ -511,24 +555,24 @@ def load_preview_module(request, preview_id, descriptor, instance_state, shared_ error_msg=exc_info_to_str(sys.exc_info()) ).xmodule_constructor(system)(None, None) - # cdodge: Special case + # cdodge: Special case if module.location.category == 'static_tab': module.get_html = wrap_xmodule( module.get_html, module, "xmodule_tab_display.html", ) - else: + else: module.get_html = wrap_xmodule( module.get_html, module, "xmodule_display.html", ) - + module.get_html = replace_static_urls( module.get_html, module.metadata.get('data_dir', module.location.course), - course_namespace = Location([module.location.tag, module.location.org, module.location.course, None, None]) + course_namespace=Location([module.location.tag, module.location.org, module.location.course, None, None]) ) save_preview_state(request, preview_id, descriptor.location.url(), module.get_instance_state(), module.get_shared_state()) @@ -555,7 +599,7 @@ def _xmodule_recurse(item, action): _xmodule_recurse(child, action) action(item) - + @login_required @expect_json @@ -589,8 +633,8 @@ def delete_item(request): # semantics of delete_item whereby the store is draft aware. Right now calling # delete_item on a vertical tries to delete the draft version leaving the # requested delete to never occur - if item.location.revision is None and item.location.category=='vertical' and delete_all_versions: - modulestore('direct').delete_item(item.location) + if item.location.revision is None and item.location.category == 'vertical' and delete_all_versions: + modulestore('direct').delete_item(item.location) return HttpResponse() @@ -609,7 +653,7 @@ def save_item(request): if request.POST.get('data') is not None: data = request.POST['data'] store.update_item(item_location, data) - + # cdodge: note calling request.POST.get('children') will return None if children is an empty array # so it lead to a bug whereby the last component to be deleted in the UI was not actually # deleting the children object from the children collection @@ -699,7 +743,7 @@ def unpublish_unit(request): def clone_item(request): parent_location = Location(request.POST['parent_location']) template = Location(request.POST['template']) - + display_name = request.POST.get('display_name') if not has_access(request.user, parent_location): @@ -739,9 +783,9 @@ def upload_asset(request, org, course, coursename): location = ['i4x', org, course, 'course', coursename] if not has_access(request.user, location): return HttpResponseForbidden() - + # Does the course actually exist?!? Get anything from it to prove its existance - + try: item = modulestore().get_item(location) except: @@ -775,12 +819,12 @@ def upload_asset(request, org, course, coursename): # readback the saved content - we need the database timestamp readback = contentstore().find(content.location) - - response_payload = {'displayname' : content.name, - 'uploadDate' : get_date_display(readback.last_modified_at), - 'url' : StaticContent.get_url_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_payload = {'displayname': content.name, + 'uploadDate': get_date_display(readback.last_modified_at), + 'url': StaticContent.get_url_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 = HttpResponse(json.dumps(response_payload)) @@ -793,7 +837,7 @@ This view will return all CMS users who are editors for the specified course @login_required @ensure_csrf_cookie def manage_users(request, location): - + # 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() @@ -804,16 +848,16 @@ def manage_users(request, location): 'active_tab': 'users', '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('/'), - 'allow_actions' : has_access(request.user, location, role=INSTRUCTOR_ROLE_NAME), - 'request_user_id' : request.user.id + 'add_user_postback_url': reverse('add_user', args=[location]).rstrip('/'), + 'remove_user_postback_url': reverse('remove_user', args=[location]).rstrip('/'), + 'allow_actions': has_access(request.user, location, role=INSTRUCTOR_ROLE_NAME), + 'request_user_id': request.user.id }) - + def create_json_response(errmsg = None): if errmsg is not None: - resp = HttpResponse(json.dumps({'Status': 'Failed', 'ErrMsg' : errmsg})) + resp = HttpResponse(json.dumps({'Status': 'Failed', 'ErrMsg': errmsg})) else: resp = HttpResponse(json.dumps({'Status': 'OK'})) @@ -829,15 +873,15 @@ the specified course def add_user(request, location): email = request.POST["email"] - if email=='': + if email == '': return create_json_response('Please specify an email address.') - + # 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: return create_json_response('Could not find user by email address \'{0}\'.'.format(email)) @@ -860,7 +904,7 @@ the specified course @ensure_csrf_cookie def remove_user(request, location): email = request.POST["email"] - + # check that logged in user has admin permissions on this course if not has_access(request.user, location, role=INSTRUCTOR_ROLE_NAME): raise PermissionDenied() @@ -887,7 +931,7 @@ def landing(request, org, course, coursename): def static_pages(request, org, course, coursename): location = ['i4x', org, course, 'course', coursename] - + # check that logged in user has permissions to this item if not has_access(request.user, location): raise PermissionDenied() @@ -903,10 +947,56 @@ def static_pages(request, org, course, coursename): def edit_static(request, org, course, coursename): return render_to_response('edit-static-page.html', {}) + +@login_required +@expect_json +def reorder_static_tabs(request): + tabs = request.POST['tabs'] + course = get_course_for_item(tabs[0]) + + if not has_access(request.user, course.location): + raise PermissionDenied() + + # get list of existing static tabs in course + # make sure they are the same lengths (i.e. the number of passed in tabs equals the number + # that we know about) otherwise we can drop some! + + existing_static_tabs = [t for t in course.tabs if t['type'] == 'static_tab'] + if len(existing_static_tabs) != len(tabs): + return HttpResponseBadRequest() + + # load all reference tabs, return BadRequest if we can't find any of them + tab_items = [] + for tab in tabs: + item = modulestore('direct').get_item(Location(tab)) + if item is None: + return HttpResponseBadRequest() + + tab_items.append(item) + + # now just go through the existing course_tabs and re-order the static tabs + reordered_tabs = [] + static_tab_idx = 0 + for tab in course.tabs: + if tab['type'] == 'static_tab': + reordered_tabs.append({'type': 'static_tab', + 'name': tab_items[static_tab_idx].metadata.get('display_name'), + 'url_slug': tab_items[static_tab_idx].location.name}) + static_tab_idx += 1 + else: + reordered_tabs.append(tab) + + + # OK, re-assemble the static tabs in the new order + course.tabs = reordered_tabs + modulestore('direct').update_metadata(course.location, course.metadata) + return HttpResponse() + + @login_required @ensure_csrf_cookie def edit_tabs(request, org, course, coursename): - location = ['i4x', org, course, 'course', coursename] + location = ['i4x', org, course, 'course', coursename] course_item = modulestore().get_item(location) static_tabs_loc = Location('i4x', org, course, 'static_tab', None) @@ -914,12 +1004,19 @@ def edit_tabs(request, org, course, coursename): if not has_access(request.user, location): raise PermissionDenied() - static_tabs = modulestore('direct').get_items(static_tabs_loc) - # see tabs have been uninitialized (e.g. supporing courses created before tab support in studio) if course_item.tabs is None or len(course_item.tabs) == 0: initialize_course_tabs(course_item) + # first get all static tabs from the tabs list + # we do this because this is also the order in which items are displayed in the LMS + static_tabs_refs = [t for t in course_item.tabs if t['type'] == 'static_tab'] + + static_tabs = [] + for static_tab_ref in static_tabs_refs: + static_tab_loc = Location(location)._replace(category='static_tab', name=static_tab_ref['url_slug']) + static_tabs.append(modulestore('direct').get_item(static_tab_loc)) + components = [ static_tab.location.url() for static_tab @@ -928,7 +1025,7 @@ def edit_tabs(request, org, course, coursename): return render_to_response('edit-tabs.html', { 'active_tab': 'pages', - 'context_course':course_item, + 'context_course': course_item, 'components': components }) @@ -949,24 +1046,24 @@ def course_info(request, org, course, name, provided_id=None): org, course, name: Attributes of the Location for the item to edit """ location = ['i4x', org, course, 'course', name] - + # check that logged in user has permissions to this item if not has_access(request.user, location): raise PermissionDenied() - + course_module = modulestore().get_item(location) - + # get current updates location = ['i4x', org, course, 'course_info', "updates"] return render_to_response('course_info.html', { 'active_tab': 'courseinfo-tab', 'context_course': course_module, - 'url_base' : "/" + org + "/" + course + "/", - 'course_updates' : json.dumps(get_course_updates(location)), + 'url_base': "/" + org + "/" + course + "/", + 'course_updates': json.dumps(get_course_updates(location)), 'handouts_location': Location(['i4x', org, course, 'course_info', 'handouts']).url() }) - + @expect_json @login_required @ensure_csrf_cookie @@ -980,7 +1077,7 @@ def course_info_updates(request, org, course, provided_id=None): # ??? No way to check for access permission afaik # get current updates location = ['i4x', org, course, 'course_info', "updates"] - + # Hmmm, provided_id is coming as empty string on create whereas I believe it used to be None :-( # Possibly due to my removing the seemingly redundant pattern in urls.py if provided_id == '': @@ -995,7 +1092,7 @@ def course_info_updates(request, org, course, provided_id=None): real_method = request.META['HTTP_X_HTTP_METHOD_OVERRIDE'] else: real_method = request.method - + if request.method == 'GET': return HttpResponse(json.dumps(get_course_updates(location)), mimetype="application/json") elif real_method == 'DELETE': # coming as POST need to pull from Request Header X-HTTP-Method-Override DELETE @@ -1012,7 +1109,7 @@ def course_info_updates(request, org, course, provided_id=None): @ensure_csrf_cookie def module_info(request, module_location): location = Location(module_location) - + # check that logged in user has permissions to this item if not has_access(request.user, location): raise PermissionDenied() @@ -1023,12 +1120,12 @@ def module_info(request, module_location): else: real_method = request.method - rewrite_static_links = request.GET.get('rewrite_url_links','True') in ['True', 'true'] - logging.debug('rewrite_static_links = {0} {1}'.format(request.GET.get('rewrite_url_links','False'), rewrite_static_links)) - + rewrite_static_links = request.GET.get('rewrite_url_links', 'True') in ['True', 'true'] + logging.debug('rewrite_static_links = {0} {1}'.format(request.GET.get('rewrite_url_links', 'False'), rewrite_static_links)) + # check that logged in user has permissions to this item if not has_access(request.user, location): - raise PermissionDenied() + raise PermissionDenied() if real_method == 'GET': return HttpResponse(json.dumps(get_module_info(get_modulestore(location), location, rewrite_static_links=rewrite_static_links)), mimetype="application/json") @@ -1037,6 +1134,7 @@ def module_info(request, module_location): else: return HttpResponseBadRequest() + @login_required @ensure_csrf_cookie def get_course_settings(request, org, course, name): @@ -1046,20 +1144,69 @@ def get_course_settings(request, org, course, name): org, course, name: Attributes of the Location for the item to edit """ location = ['i4x', org, course, 'course', name] - + # check that logged in user has permissions to this item if not has_access(request.user, location): raise PermissionDenied() - + course_module = modulestore().get_item(location) - course_details = CourseDetails.fetch(location) - + return render_to_response('settings.html', { - 'active_tab': 'settings', 'context_course': course_module, - 'course_details' : json.dumps(course_details, cls=CourseSettingsEncoder) + 'course_location': location, + 'details_url': reverse(course_settings_updates, + kwargs={"org": org, + "course": course, + "name": name, + "section": "details"}) }) - + +@login_required +@ensure_csrf_cookie +def course_config_graders_page(request, org, course, name): + """ + Send models and views as well as html for editing the course settings to the client. + + org, course, name: Attributes of the Location for the item to edit + """ + location = ['i4x', org, course, 'course', name] + + # check that logged in user has permissions to this item + if not has_access(request.user, location): + raise PermissionDenied() + + course_module = modulestore().get_item(location) + course_details = CourseGradingModel.fetch(location) + + return render_to_response('settings_graders.html', { + 'context_course': course_module, + 'course_location' : location, + 'course_details': json.dumps(course_details, cls=CourseSettingsEncoder) + }) + +@login_required +@ensure_csrf_cookie +def course_config_advanced_page(request, org, course, name): + """ + Send models and views as well as html for editing the advanced course settings to the client. + + org, course, name: Attributes of the Location for the item to edit + """ + location = ['i4x', org, course, 'course', name] + + # check that logged in user has permissions to this item + if not has_access(request.user, location): + raise PermissionDenied() + + course_module = modulestore().get_item(location) + + return render_to_response('settings_advanced.html', { + 'context_course': course_module, + 'course_location' : location, + 'advanced_blacklist' : json.dumps(CourseMetadata.FILTERED_LIST), + 'advanced_dict' : json.dumps(CourseMetadata.fetch(location)), + }) + @expect_json @login_required @ensure_csrf_cookie @@ -1082,13 +1229,13 @@ def course_settings_updates(request, org, course, name, section): elif section == 'grading': manager = CourseGradingModel else: return - + if request.method == 'GET': # Cannot just do a get w/o knowing the course name :-( - return HttpResponse(json.dumps(manager.fetch(Location(['i4x', org, course, 'course',name])), cls=CourseSettingsEncoder), + return HttpResponse(json.dumps(manager.fetch(Location(['i4x', org, course, 'course', name])), cls=CourseSettingsEncoder), mimetype="application/json") - elif request.method == 'POST': # post or put, doesn't matter. - return HttpResponse(json.dumps(manager.update_from_json(request.POST), cls=CourseSettingsEncoder), + elif request.method == 'POST': # post or put, doesn't matter. + return HttpResponse(json.dumps(manager.update_from_json(request.POST), cls=CourseSettingsEncoder), mimetype="application/json") @expect_json @@ -1101,7 +1248,7 @@ def course_grader_updates(request, org, course, name, grader_index=None): org, course: Attributes of the Location for the item to edit """ - + location = ['i4x', org, course, 'course', name] # check that logged in user has permissions to this item @@ -1112,19 +1259,50 @@ def course_grader_updates(request, org, course, name, grader_index=None): real_method = request.META['HTTP_X_HTTP_METHOD_OVERRIDE'] else: real_method = request.method - + if real_method == 'GET': # Cannot just do a get w/o knowing the course name :-( - return HttpResponse(json.dumps(CourseGradingModel.fetch_grader(Location(['i4x', org, course, 'course',name]), grader_index)), + return HttpResponse(json.dumps(CourseGradingModel.fetch_grader(Location(['i4x', org, course, 'course', name]), grader_index)), mimetype="application/json") elif real_method == "DELETE": - # ??? Shoudl this return anything? Perhaps success fail? - CourseGradingModel.delete_grader(Location(['i4x', org, course, 'course',name]), grader_index) + # ??? Shoudl this return anything? Perhaps success fail? + CourseGradingModel.delete_grader(Location(['i4x', org, course, 'course', name]), grader_index) return HttpResponse() - elif request.method == 'POST': # post or put, doesn't matter. - return HttpResponse(json.dumps(CourseGradingModel.update_grader_from_json(Location(['i4x', org, course, 'course',name]), request.POST)), + elif request.method == 'POST': # post or put, doesn't matter. + return HttpResponse(json.dumps(CourseGradingModel.update_grader_from_json(Location(['i4x', org, course, 'course', name]), request.POST)), mimetype="application/json") + +## NB: expect_json failed on ["key", "key2"] and json payload +@login_required +@ensure_csrf_cookie +def course_advanced_updates(request, org, course, name): + """ + restful CRUD operations on metadata. The payload is a json rep of the metadata dicts. For delete, otoh, + the payload is either a key or a list of keys to delete. + + org, course: Attributes of the Location for the item to edit + """ + location = ['i4x', org, course, 'course', name] + + # check that logged in user has permissions to this item + if not has_access(request.user, location): + raise PermissionDenied() + + # NB: we're setting Backbone.emulateHTTP to true on the client so everything comes as a post!!! + if request.method == 'POST' and 'HTTP_X_HTTP_METHOD_OVERRIDE' in request.META: + real_method = request.META['HTTP_X_HTTP_METHOD_OVERRIDE'] + else: + real_method = request.method + + if real_method == 'GET': + return HttpResponse(json.dumps(CourseMetadata.fetch(location)), mimetype="application/json") + elif real_method == 'DELETE': + return HttpResponse(json.dumps(CourseMetadata.delete_key(location, json.loads(request.body))), mimetype="application/json") + elif real_method == 'POST' or real_method == 'PUT': + # NOTE: request.POST is messed up because expect_json cloned_request.POST.copy() is creating a defective entry w/ the whole payload as the key + return HttpResponse(json.dumps(CourseMetadata.update_from_json(location, json.loads(request.body))), mimetype="application/json") + @login_required @ensure_csrf_cookie @@ -1135,20 +1313,20 @@ def asset_index(request, org, course, name): org, course, name: Attributes of the Location for the item to edit """ location = ['i4x', org, course, 'course', name] - + # check that logged in user has permissions to this item if not has_access(request.user, location): raise PermissionDenied() - upload_asset_callback_url = reverse('upload_asset', kwargs = { - 'org' : org, - 'course' : course, - 'coursename' : name + upload_asset_callback_url = reverse('upload_asset', kwargs={ + 'org': org, + 'course': course, + 'coursename': name }) course_module = modulestore().get_item(location) - + course_reference = StaticContent.compute_location(org, course, name) assets = contentstore().get_all_content_for_course(course_reference) @@ -1162,15 +1340,15 @@ def asset_index(request, org, course, name): display_info = {} display_info['displayname'] = asset['displayname'] display_info['uploadDate'] = get_date_display(asset['uploadDate']) - + asset_location = StaticContent.compute_location(id['org'], id['course'], id['name']) display_info['url'] = StaticContent.get_url_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) thumbnail_location = Location(_thumbnail_location) if _thumbnail_location is not None else None display_info['thumb_url'] = StaticContent.get_url_path_from_location(thumbnail_location) if thumbnail_location is not None else None - + asset_display.append(display_info) return render_to_response('asset_index.html', { @@ -1188,10 +1366,19 @@ def edge(request): @login_required @expect_json def create_new_course(request): + + if settings.MITX_FEATURES.get('DISABLE_COURSE_CREATION', False) and not request.user.is_staff: + raise PermissionDenied() + + # This logic is repeated in xmodule/modulestore/tests/factories.py + # so if you change anything here, you need to also change it there. + # TODO: write a test that creates two courses, one with the factory and + # the other with this method, then compare them to make sure they are + # equivalent. template = Location(request.POST['template']) - org = request.POST.get('org') - number = request.POST.get('number') - display_name = request.POST.get('display_name') + org = request.POST.get('org') + number = request.POST.get('number') + display_name = request.POST.get('display_name') try: dest_location = Location('i4x', org, number, 'course', Location.clean(display_name)) @@ -1237,13 +1424,16 @@ def initialize_course_tabs(course): # at least a list populated with the minimal times # @TODO: I don't like the fact that the presentation tier is away of these data related constraints, let's find a better # place for this. Also rather than using a simple list of dictionaries a nice class model would be helpful here - course.tabs = [{"type": "courseware"}, + + # This logic is repeated in xmodule/modulestore/tests/factories.py + # so if you change anything here, you need to also change it there. + course.tabs = [{"type": "courseware"}, {"type": "course_info", "name": "Course Info"}, {"type": "discussion", "name": "Discussion"}, {"type": "wiki", "name": "Wiki"}, {"type": "progress", "name": "Progress"}] - modulestore('direct').update_metadata(course.location.url(), course.own_metadata) + modulestore('direct').update_metadata(course.location.url(), course.own_metadata) @ensure_csrf_cookie @login_required @@ -1283,7 +1473,7 @@ def import_course(request, org, course, name): # find the 'course.xml' file - for r,d,f in os.walk(course_dir): + for r, d, f in os.walk(course_dir): for files in f: if files == 'course.xml': break @@ -1297,10 +1487,10 @@ def import_course(request, org, course, name): if r != course_dir: for fname in os.listdir(r): - shutil.move(r/fname, course_dir) + shutil.move(r / fname, course_dir) module_store, course_items = import_from_xml(modulestore('direct'), settings.GITHUB_REPO_ROOT, - [course_subdir], load_error_modules=False, static_content_store=contentstore(), target_location_namespace = Location(location)) + [course_subdir], load_error_modules=False, static_content_store=contentstore(), target_location_namespace=Location(location)) # we can blow this away when we're done importing. shutil.rmtree(course_dir) @@ -1316,7 +1506,7 @@ def import_course(request, org, course, name): return render_to_response('import.html', { 'context_course': course_module, 'active_tab': 'import', - 'successful_import_redirect_url' : reverse('course_index', args=[ + 'successful_import_redirect_url': reverse('course_index', args=[ course_module.location.org, course_module.location.course, course_module.location.name]) @@ -1326,18 +1516,17 @@ def import_course(request, org, course, name): @login_required def generate_export_course(request, org, course, name): location = ['i4x', org, course, 'course', name] - course_module = modulestore().get_item(location) # check that logged in user has permissions to this item if not has_access(request.user, location): raise PermissionDenied() loc = Location(location) - export_file = NamedTemporaryFile(prefix=name+'.', suffix=".tar.gz") + export_file = NamedTemporaryFile(prefix=name + '.', suffix=".tar.gz") root_dir = path(mkdtemp()) # export out to a tempdir - + logging.debug('root = {0}'.format(root_dir)) export_to_xml(modulestore('direct'), contentstore(), loc, root_dir, name) @@ -1345,11 +1534,11 @@ def generate_export_course(request, org, course, name): logging.debug('tar file being generated at {0}'.format(export_file.name)) tf = tarfile.open(name=export_file.name, mode='w:gz') - tf.add(root_dir/name, arcname=name) + tf.add(root_dir / name, arcname=name) tf.close() # remove temp dir - shutil.rmtree(root_dir/name) + shutil.rmtree(root_dir / name) wrapper = FileWrapper(export_file) response = HttpResponse(wrapper, content_type='application/x-tgz') @@ -1371,5 +1560,12 @@ def export_course(request, org, course, name): return render_to_response('export.html', { 'context_course': course_module, 'active_tab': 'export', - 'successful_import_redirect_url' : '' + 'successful_import_redirect_url': '' }) + +def event(request): + ''' + A noop to swallow the analytics call so that cms methods don't spook and poor developers looking at + console logs don't get distracted :-) + ''' + return HttpResponse(True) diff --git a/cms/djangoapps/models/settings/course_details.py b/cms/djangoapps/models/settings/course_details.py index d01e784d74..b27f4e3804 100644 --- a/cms/djangoapps/models/settings/course_details.py +++ b/cms/djangoapps/models/settings/course_details.py @@ -31,16 +31,16 @@ class CourseDetails(object): """ if not isinstance(course_location, Location): course_location = Location(course_location) - + course = cls(course_location) - + descriptor = get_modulestore(course_location).get_item(course_location) - + course.start_date = descriptor.start course.end_date = descriptor.end course.enrollment_start = descriptor.enrollment_start course.enrollment_end = descriptor.enrollment_end - + temploc = course_location._replace(category='about', name='syllabus') try: course.syllabus = get_modulestore(temploc).get_item(temploc).definition['data'] @@ -52,32 +52,32 @@ class CourseDetails(object): course.overview = get_modulestore(temploc).get_item(temploc).definition['data'] except ItemNotFoundError: pass - + temploc = temploc._replace(name='effort') try: course.effort = get_modulestore(temploc).get_item(temploc).definition['data'] except ItemNotFoundError: pass - + temploc = temploc._replace(name='video') try: raw_video = get_modulestore(temploc).get_item(temploc).definition['data'] - course.intro_video = CourseDetails.parse_video_tag(raw_video) + course.intro_video = CourseDetails.parse_video_tag(raw_video) except ItemNotFoundError: pass - + return course - + @classmethod def update_from_json(cls, jsondict): """ Decode the json into CourseDetails and save any changed attrs to the db """ - ## TODO make it an error for this to be undefined & for it to not be retrievable from modulestore + ## TODO make it an error for this to be undefined & for it to not be retrievable from modulestore course_location = jsondict['course_location'] ## Will probably want to cache the inflight courses because every blur generates an update descriptor = get_modulestore(course_location).get_item(course_location) - + dirty = False if 'start_date' in jsondict: @@ -87,7 +87,7 @@ class CourseDetails(object): if converted != descriptor.start: dirty = True descriptor.start = converted - + if 'end_date' in jsondict: converted = jsdate_to_time(jsondict['end_date']) else: @@ -96,7 +96,7 @@ class CourseDetails(object): if converted != descriptor.end: dirty = True descriptor.end = converted - + if 'enrollment_start' in jsondict: converted = jsdate_to_time(jsondict['enrollment_start']) else: @@ -105,7 +105,7 @@ class CourseDetails(object): if converted != descriptor.enrollment_start: dirty = True descriptor.enrollment_start = converted - + if 'enrollment_end' in jsondict: converted = jsdate_to_time(jsondict['enrollment_end']) else: @@ -114,10 +114,10 @@ class CourseDetails(object): if converted != descriptor.enrollment_end: dirty = True descriptor.enrollment_end = converted - + if dirty: get_modulestore(course_location).update_metadata(course_location, descriptor.metadata) - + # NOTE: below auto writes to the db w/o verifying that any of the fields actually changed # to make faster, could compare against db or could have client send over a list of which fields changed. temploc = Location(course_location)._replace(category='about', name='syllabus') @@ -125,19 +125,19 @@ class CourseDetails(object): temploc = temploc._replace(name='overview') update_item(temploc, jsondict['overview']) - + temploc = temploc._replace(name='effort') update_item(temploc, jsondict['effort']) - + temploc = temploc._replace(name='video') recomposed_video_tag = CourseDetails.recompose_video_tag(jsondict['intro_video']) update_item(temploc, recomposed_video_tag) - - + + # Could just generate and return a course obj w/o doing any db reads, but I put the reads in as a means to confirm # it persisted correctly return CourseDetails.fetch(course_location) - + @staticmethod def parse_video_tag(raw_video): """ @@ -147,17 +147,17 @@ class CourseDetails(object): """ if not raw_video: return None - + keystring_matcher = re.search('(?<=embed/)[a-zA-Z0-9_-]+', raw_video) if keystring_matcher is None: keystring_matcher = re.search('' return result - + # TODO move to a more general util? Is there a better way to do the isinstance model check? class CourseSettingsEncoder(json.JSONEncoder): diff --git a/cms/djangoapps/models/settings/course_grading.py b/cms/djangoapps/models/settings/course_grading.py index 9cfa18c8c9..3d0b8f78af 100644 --- a/cms/djangoapps/models/settings/course_grading.py +++ b/cms/djangoapps/models/settings/course_grading.py @@ -6,55 +6,55 @@ from util import converters class CourseGradingModel(object): """ - Basically a DAO and Model combo for CRUD operations pertaining to grading policy. + Basically a DAO and Model combo for CRUD operations pertaining to grading policy. """ def __init__(self, course_descriptor): self.course_location = course_descriptor.location - self.graders = [CourseGradingModel.jsonize_grader(i, grader) for i, grader in enumerate(course_descriptor.raw_grader)] # weights transformed to ints [0..100] + self.graders = [CourseGradingModel.jsonize_grader(i, grader) for i, grader in enumerate(course_descriptor.raw_grader)] # weights transformed to ints [0..100] self.grade_cutoffs = course_descriptor.grade_cutoffs self.grace_period = CourseGradingModel.convert_set_grace_period(course_descriptor) - - @classmethod + + @classmethod def fetch(cls, course_location): """ Fetch the course details for the given course from persistence and return a CourseDetails model. """ if not isinstance(course_location, Location): course_location = Location(course_location) - + descriptor = get_modulestore(course_location).get_item(course_location) model = cls(descriptor) return model - + @staticmethod def fetch_grader(course_location, index): """ - Fetch the course's nth grader + Fetch the course's nth grader Returns an empty dict if there's no such grader. """ if not isinstance(course_location, Location): course_location = Location(course_location) - + descriptor = get_modulestore(course_location).get_item(course_location) # # ??? it would be good if these had the course_location in them so that they stand alone sufficiently # # but that would require not using CourseDescriptor's field directly. Opinions? - index = int(index) - if len(descriptor.raw_grader) > index: + index = int(index) + if len(descriptor.raw_grader) > index: return CourseGradingModel.jsonize_grader(index, descriptor.raw_grader[index]) - + # return empty model else: return { - "id" : index, - "type" : "", - "min_count" : 0, - "drop_count" : 0, - "short_label" : None, - "weight" : 0 + "id": index, + "type": "", + "min_count": 0, + "drop_count": 0, + "short_label": None, + "weight": 0 } - + @staticmethod def fetch_cutoffs(course_location): """ @@ -62,7 +62,7 @@ class CourseGradingModel(object): """ if not isinstance(course_location, Location): course_location = Location(course_location) - + descriptor = get_modulestore(course_location).get_item(course_location) return descriptor.grade_cutoffs @@ -73,10 +73,10 @@ class CourseGradingModel(object): """ if not isinstance(course_location, Location): course_location = Location(course_location) - + descriptor = get_modulestore(course_location).get_item(course_location) - return {'grace_period' : CourseGradingModel.convert_set_grace_period(descriptor) } - + return {'grace_period': CourseGradingModel.convert_set_grace_period(descriptor)} + @staticmethod def update_from_json(jsondict): """ @@ -85,32 +85,32 @@ class CourseGradingModel(object): """ course_location = jsondict['course_location'] descriptor = get_modulestore(course_location).get_item(course_location) - + graders_parsed = [CourseGradingModel.parse_grader(jsonele) for jsonele in jsondict['graders']] - + descriptor.raw_grader = graders_parsed descriptor.grade_cutoffs = jsondict['grade_cutoffs'] - + get_modulestore(course_location).update_item(course_location, descriptor.definition['data']) CourseGradingModel.update_grace_period_from_json(course_location, jsondict['grace_period']) - + return CourseGradingModel.fetch(course_location) - - + + @staticmethod def update_grader_from_json(course_location, grader): """ - Create or update the grader of the given type (string key) for the given course. Returns the modified + Create or update the grader of the given type (string key) for the given course. Returns the modified grader which is a full model on the client but not on the server (just a dict) """ if not isinstance(course_location, Location): course_location = Location(course_location) - + descriptor = get_modulestore(course_location).get_item(course_location) # # ??? it would be good if these had the course_location in them so that they stand alone sufficiently # # but that would require not using CourseDescriptor's field directly. Opinions? - # parse removes the id; so, grab it before parse + # parse removes the id; so, grab it before parse index = int(grader.get('id', len(descriptor.raw_grader))) grader = CourseGradingModel.parse_grader(grader) @@ -118,11 +118,11 @@ class CourseGradingModel(object): descriptor.raw_grader[index] = grader else: descriptor.raw_grader.append(grader) - + get_modulestore(course_location).update_item(course_location, descriptor.definition['data']) - + return CourseGradingModel.jsonize_grader(index, descriptor.raw_grader[index]) - + @staticmethod def update_cutoffs_from_json(course_location, cutoffs): """ @@ -131,18 +131,18 @@ class CourseGradingModel(object): """ if not isinstance(course_location, Location): course_location = Location(course_location) - + descriptor = get_modulestore(course_location).get_item(course_location) descriptor.grade_cutoffs = cutoffs get_modulestore(course_location).update_item(course_location, descriptor.definition['data']) - + return cutoffs - - + + @staticmethod def update_grace_period_from_json(course_location, graceperiodjson): """ - Update the course's default grace period. Incoming dict is {hours: h, minutes: m} possibly as a + Update the course's default grace period. Incoming dict is {hours: h, minutes: m} possibly as a grace_period entry in an enclosing dict. It is also safe to call this method with a value of None for graceperiodjson. """ @@ -155,12 +155,13 @@ class CourseGradingModel(object): if 'grace_period' in graceperiodjson: graceperiodjson = graceperiodjson['grace_period'] - grace_rep = " ".join(["%s %s" % (value, key) for (key, value) in graceperiodjson.iteritems()]) + # lms requires these to be in a fixed order + grace_rep = "{0[hours]:d} hours {0[minutes]:d} minutes {0[seconds]:d} seconds".format(graceperiodjson) descriptor = get_modulestore(course_location).get_item(course_location) descriptor.metadata['graceperiod'] = grace_rep get_modulestore(course_location).update_metadata(course_location, descriptor.metadata) - + @staticmethod def delete_grader(course_location, index): """ @@ -168,16 +169,16 @@ class CourseGradingModel(object): """ if not isinstance(course_location, Location): course_location = Location(course_location) - + descriptor = get_modulestore(course_location).get_item(course_location) - index = int(index) + index = int(index) if index < len(descriptor.raw_grader): del descriptor.raw_grader[index] # force propagation to definition descriptor.raw_grader = descriptor.raw_grader get_modulestore(course_location).update_item(course_location, descriptor.definition['data']) - - # NOTE cannot delete cutoffs. May be useful to reset + + # NOTE cannot delete cutoffs. May be useful to reset @staticmethod def delete_cutoffs(course_location, cutoffs): """ @@ -185,13 +186,13 @@ class CourseGradingModel(object): """ if not isinstance(course_location, Location): course_location = Location(course_location) - + descriptor = get_modulestore(course_location).get_item(course_location) descriptor.grade_cutoffs = descriptor.defaut_grading_policy['GRADE_CUTOFFS'] get_modulestore(course_location).update_item(course_location, descriptor.definition['data']) - + return descriptor.grade_cutoffs - + @staticmethod def delete_grace_period(course_location): """ @@ -199,28 +200,28 @@ class CourseGradingModel(object): """ if not isinstance(course_location, Location): course_location = Location(course_location) - + descriptor = get_modulestore(course_location).get_item(course_location) if 'graceperiod' in descriptor.metadata: del descriptor.metadata['graceperiod'] get_modulestore(course_location).update_metadata(course_location, descriptor.metadata) - + @staticmethod def get_section_grader_type(location): if not isinstance(location, Location): location = Location(location) - + descriptor = get_modulestore(location).get_item(location) return { - "graderType" : descriptor.metadata.get('format', u"Not Graded"), - "location" : location, - "id" : 99 # just an arbitrary value to + "graderType": descriptor.metadata.get('format', u"Not Graded"), + "location": location, + "id": 99 # just an arbitrary value to } - + @staticmethod def update_section_grader_type(location, jsondict): if not isinstance(location, Location): location = Location(location) - + descriptor = get_modulestore(location).get_item(location) if 'graderType' in jsondict and jsondict['graderType'] != u"Not Graded": descriptor.metadata['format'] = jsondict.get('graderType') @@ -228,16 +229,16 @@ class CourseGradingModel(object): else: if 'format' in descriptor.metadata: del descriptor.metadata['format'] if 'graded' in descriptor.metadata: del descriptor.metadata['graded'] - - get_modulestore(location).update_metadata(location, descriptor.metadata) - - + + get_modulestore(location).update_metadata(location, descriptor.metadata) + + @staticmethod def convert_set_grace_period(descriptor): - # 5 hours 59 minutes 59 seconds => converted to iso format + # 5 hours 59 minutes 59 seconds => { hours: 5, minutes : 59, seconds : 59} rawgrace = descriptor.metadata.get('graceperiod', None) if rawgrace: - parsedgrace = {str(key): val for (val, key) in re.findall('\s*(\d+)\s*(\w+)', rawgrace)} + parsedgrace = {str(key): int(val) for (val, key) in re.findall('\s*(\d+)\s*(\w+)', rawgrace)} return parsedgrace else: return None @@ -245,13 +246,13 @@ class CourseGradingModel(object): def parse_grader(json_grader): # manual to clear out kruft result = { - "type" : json_grader["type"], - "min_count" : int(json_grader.get('min_count', 0)), - "drop_count" : int(json_grader.get('drop_count', 0)), - "short_label" : json_grader.get('short_label', None), - "weight" : float(json_grader.get('weight', 0)) / 100.0 + "type": json_grader["type"], + "min_count": int(json_grader.get('min_count', 0)), + "drop_count": int(json_grader.get('drop_count', 0)), + "short_label": json_grader.get('short_label', None), + "weight": float(json_grader.get('weight', 0)) / 100.0 } - + return result @staticmethod @@ -260,6 +261,6 @@ class CourseGradingModel(object): if grader['weight']: grader['weight'] *= 100 if not 'short_label' in grader: - grader['short_label'] = "" - + grader['short_label'] = "" + return grader diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py new file mode 100644 index 0000000000..d088d75665 --- /dev/null +++ b/cms/djangoapps/models/settings/course_metadata.py @@ -0,0 +1,70 @@ +from xmodule.modulestore import Location +from contentstore.utils import get_modulestore +from xmodule.x_module import XModuleDescriptor + + +class CourseMetadata(object): + ''' + For CRUD operations on metadata fields which do not have specific editors on the other pages including any user generated ones. + The objects have no predefined attrs but instead are obj encodings of the editable metadata. + ''' + # __new_advanced_key__ is used by client not server; so, could argue against it being here + FILTERED_LIST = XModuleDescriptor.system_metadata_fields + ['start', 'end', 'enrollment_start', 'enrollment_end', 'tabs', 'graceperiod', '__new_advanced_key__'] + + @classmethod + def fetch(cls, course_location): + """ + Fetch the key:value editable course details for the given course from persistence and return a CourseMetadata model. + """ + if not isinstance(course_location, Location): + course_location = Location(course_location) + + course = {} + + descriptor = get_modulestore(course_location).get_item(course_location) + + for k, v in descriptor.metadata.iteritems(): + if k not in cls.FILTERED_LIST: + course[k] = v + + return course + + @classmethod + def update_from_json(cls, course_location, jsondict): + """ + Decode the json into CourseMetadata and save any changed attrs to the db. + + Ensures none of the fields are in the blacklist. + """ + descriptor = get_modulestore(course_location).get_item(course_location) + + dirty = False + + for k, v in jsondict.iteritems(): + # should it be an error if one of the filtered list items is in the payload? + if k not in cls.FILTERED_LIST and (k not in descriptor.metadata or descriptor.metadata[k] != v): + dirty = True + descriptor.metadata[k] = v + + if dirty: + get_modulestore(course_location).update_metadata(course_location, descriptor.metadata) + + # Could just generate and return a course obj w/o doing any db reads, but I put the reads in as a means to confirm + # it persisted correctly + return cls.fetch(course_location) + + @classmethod + def delete_key(cls, course_location, payload): + ''' + Remove the given metadata key(s) from the course. payload can be a single key or [key..] + ''' + descriptor = get_modulestore(course_location).get_item(course_location) + + for key in payload['deleteKeys']: + if key in descriptor.metadata: + del descriptor.metadata[key] + + get_modulestore(course_location).update_metadata(course_location, descriptor.metadata) + + return cls.fetch(course_location) + \ No newline at end of file diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index 5bc9b53fc4..26a8adc92c 100644 --- a/cms/envs/acceptance.py +++ b/cms/envs/acceptance.py @@ -1,5 +1,5 @@ """ -This config file extends the test environment configuration +This config file extends the test environment configuration so that we can run the lettuce acceptance tests. """ from .test import * @@ -21,14 +21,14 @@ DATA_DIR = COURSES_ROOT # } # } -# Set this up so that rake lms[acceptance] and running the +# Set this up so that rake lms[acceptance] and running the # harvest command both use the same (test) database # which they can flush without messing up your dev db DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': ENV_ROOT / "db" / "test_mitx.db", - 'TEST_NAME': ENV_ROOT / "db" / "test_mitx.db", + 'TEST_NAME': ENV_ROOT / "db" / "test_mitx.db", } } diff --git a/cms/envs/aws.py b/cms/envs/aws.py index b44baacb0b..a147f84531 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -5,8 +5,22 @@ import json from .common import * from logsettings import get_logger_config +import os -############################### ALWAYS THE SAME ################################ +# specified as an environment variable. Typically this is set +# in the service's upstart script and corresponds exactly to the service name. +# Service variants apply config differences via env and auth JSON files, +# the names of which correspond to the variant. +SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None) + +# when not variant is specified we attempt to load an unvaried +# config set. +CONFIG_PREFIX = "" + +if SERVICE_VARIANT: + CONFIG_PREFIX = SERVICE_VARIANT + "." + +############### ALWAYS THE SAME ################################ DEBUG = False TEMPLATE_DEBUG = False @@ -14,9 +28,9 @@ EMAIL_BACKEND = 'django_ses.SESBackend' SESSION_ENGINE = 'django.contrib.sessions.backends.cache' DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage' -########################### NON-SECURE ENV CONFIG ############################## +############# NON-SECURE ENV CONFIG ############################## # Things like server locations, ports, etc. -with open(ENV_ROOT / "cms.env.json") as env_file: +with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file: ENV_TOKENS = json.load(env_file) LMS_BASE = ENV_TOKENS.get('LMS_BASE') @@ -35,15 +49,12 @@ for feature, value in ENV_TOKENS.get('MITX_FEATURES', {}).items(): LOGGING = get_logger_config(LOG_DIR, logging_env=ENV_TOKENS['LOGGING_ENV'], syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514), - debug=False) + debug=False, + service_variant=SERVICE_VARIANT) -with open(ENV_ROOT / "repos.json") as repos_file: - REPOS = json.load(repos_file) - - -############################## SECURE AUTH ITEMS ############################### +################ SECURE AUTH ITEMS ############################### # Secret things: passwords, access keys, etc. -with open(ENV_ROOT / "cms.auth.json") as auth_file: +with open(ENV_ROOT / CONFIG_PREFIX + "auth.json") as auth_file: AUTH_TOKENS = json.load(auth_file) AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"] diff --git a/cms/envs/common.py b/cms/envs/common.py index c047d689ce..a83f61d8f9 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -20,7 +20,6 @@ Longer TODO: """ import sys -import tempfile import os.path import os import lms.envs.common @@ -33,8 +32,8 @@ MITX_FEATURES = { 'USE_DJANGO_PIPELINE': True, 'GITHUB_PUSH': False, 'ENABLE_DISCUSSION_SERVICE': False, - 'AUTH_USE_MIT_CERTIFICATES' : False, - 'STUB_VIDEO_FOR_TESTING': False, # do not display video when running automated acceptance tests + 'AUTH_USE_MIT_CERTIFICATES': False, + 'STUB_VIDEO_FOR_TESTING': False, # do not display video when running automated acceptance tests } ENABLE_JASMINE = False @@ -59,7 +58,8 @@ sys.path.append(COMMON_ROOT / 'lib') ############################# WEB CONFIGURATION ############################# # This is where we stick our compiled template files. -MAKO_MODULE_DIR = tempfile.mkdtemp('mako') +from tempdir import mkdtemp_clean +MAKO_MODULE_DIR = mkdtemp_clean('mako') MAKO_TEMPLATES = {} MAKO_TEMPLATES['main'] = [ PROJECT_ROOT / 'templates', @@ -74,8 +74,8 @@ TEMPLATE_DIRS = MAKO_TEMPLATES['main'] MITX_ROOT_URL = '' -LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/login' -LOGIN_URL = MITX_ROOT_URL + '/login' +LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/signin' +LOGIN_URL = MITX_ROOT_URL + '/signin' TEMPLATE_CONTEXT_PROCESSORS = ( @@ -165,13 +165,6 @@ STATICFILES_DIRS = [ # This is how you would use the textbook images locally # ("book", ENV_ROOT / "book_images") ] -if os.path.isdir(GITHUB_REPO_ROOT): - STATICFILES_DIRS += [ - # TODO (cpennington): When courses aren't loaded from github, remove this - (course_dir, GITHUB_REPO_ROOT / course_dir) - for course_dir in os.listdir(GITHUB_REPO_ROOT) - if os.path.isdir(GITHUB_REPO_ROOT / course_dir) - ] # Locale/Internationalization TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name @@ -179,6 +172,9 @@ LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identi USE_I18N = True USE_L10N = True +# Tracking +TRACK_MAX_EVENT = 10000 + # Messages MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage' @@ -229,7 +225,7 @@ PIPELINE_JS = { 'source_filenames': sorted( rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.coffee') + rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.coffee') - ) + ['js/base.js'], + ) + ['js/hesitate.js', 'js/base.js'], 'output_filename': 'js/cms-application.js', }, 'module-js': { @@ -281,8 +277,13 @@ INSTALLED_APPS = ( 'contentstore', 'auth', 'student', # misleading name due to sharing with lms + 'course_groups', # not used in cms (yet), but tests run + + # tracking + 'track', # For asset pipelining 'pipeline', 'staticfiles', + 'static_replace', ) diff --git a/cms/envs/dev.py b/cms/envs/dev.py index e29ee62e20..3dee93a398 100644 --- a/cms/envs/dev.py +++ b/cms/envs/dev.py @@ -12,7 +12,7 @@ TEMPLATE_DEBUG = DEBUG LOGGING = get_logger_config(ENV_ROOT / "log", logging_env="dev", tracking_filename="tracking.log", - dev_env = True, + dev_env=True, debug=True) modulestore_options = { @@ -41,7 +41,7 @@ CONTENTSTORE = { 'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore', 'OPTIONS': { 'host': 'localhost', - 'db' : 'xcontent', + 'db': 'xcontent', } } diff --git a/cms/envs/dev_ike.py b/cms/envs/dev_ike.py index 5fb120854b..1ebf219d44 100644 --- a/cms/envs/dev_ike.py +++ b/cms/envs/dev_ike.py @@ -9,8 +9,6 @@ import socket MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES'] = True -MITX_FEATURES['USE_DJANGO_PIPELINE']=False # don't recompile scss - -SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https') # django 1.4 for nginx ssl proxy - +MITX_FEATURES['USE_DJANGO_PIPELINE'] = False # don't recompile scss +SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https') # django 1.4 for nginx ssl proxy diff --git a/cms/envs/test.py b/cms/envs/test.py index d9a2597cbb..abe03edd41 100644 --- a/cms/envs/test.py +++ b/cms/envs/test.py @@ -11,7 +11,6 @@ from .common import * import os from path import path - # Nose Test Runner INSTALLED_APPS += ('django_nose',) NOSE_ARGS = ['--with-xunit'] @@ -20,7 +19,7 @@ TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' TEST_ROOT = path('test_root') # Makes the tests run much faster... -SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead +SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead # Want static files in the same dir for running on jenkins. STATIC_ROOT = TEST_ROOT / "staticfiles" @@ -28,6 +27,9 @@ STATIC_ROOT = TEST_ROOT / "staticfiles" GITHUB_REPO_ROOT = TEST_ROOT / "data" COMMON_TEST_DATA_ROOT = COMMON_ROOT / "test" / "data" +# Makes the tests run much faster... +SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead + # TODO (cpennington): We need to figure out how envs/test.py can inject things into common.py so that we don't have to repeat this sort of thing STATICFILES_DIRS = [ COMMON_ROOT / "static", @@ -63,7 +65,7 @@ CONTENTSTORE = { 'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore', 'OPTIONS': { 'host': 'localhost', - 'db' : 'xcontent', + 'db': 'xcontent', } } @@ -72,23 +74,12 @@ DATABASES = { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': ENV_ROOT / "db" / "cms.db", }, - - # The following are for testing purposes... - 'edX/toy/2012_Fall': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': ENV_ROOT / "db" / "course1.db", - }, - - 'edx/full/6.002_Spring_2012': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': ENV_ROOT / "db" / "course2.db", - } } LMS_BASE = "localhost:8000" CACHES = { - # This is the cache used for most things. Askbot will not work without a + # This is the cache used for most things. Askbot will not work without a # functioning cache -- it relies on caching to load its settings in places. # In staging/prod envs, the sessions also live here. 'default': { @@ -115,4 +106,4 @@ CACHES = { PASSWORD_HASHERS = ( 'django.contrib.auth.hashers.SHA1PasswordHasher', 'django.contrib.auth.hashers.MD5PasswordHasher', -) \ No newline at end of file +) diff --git a/cms/manage.py b/cms/manage.py index f8773c0641..723fa59da1 100644 --- a/cms/manage.py +++ b/cms/manage.py @@ -2,7 +2,7 @@ from django.core.management import execute_manager import imp try: - imp.find_module('settings') # Assumed to be in the same directory. + imp.find_module('settings') # Assumed to be in the same directory. except ImportError: import sys sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. " diff --git a/cms/static/client_templates/advanced_entry.html b/cms/static/client_templates/advanced_entry.html new file mode 100644 index 0000000000..0312fdd344 --- /dev/null +++ b/cms/static/client_templates/advanced_entry.html @@ -0,0 +1,16 @@ +
        2. +
          + + + Keys are case sensitive and cannot contain spaces or start with a number +
          + +
          + + +
          + +
          + Delete +
          +
          3. \ No newline at end of file diff --git a/cms/static/client_templates/course_grade_policy.html b/cms/static/client_templates/course_grade_policy.html index c9a21280dd..db129614f6 100644 --- a/cms/static/client_templates/course_grade_policy.html +++ b/cms/static/client_templates/course_grade_policy.html @@ -1,69 +1,37 @@ -
        3. -
          - +
        4. +
          + + + e.g. Homework, Midterm Exams +
          -
          -
          - - e.g. Homework, Labs, Midterm Exams, Final Exam -
          -
          - - -
          - - -
          -
          - - e.g. HW, Midterm, Final -
          -
          -
          - -
          - - -
          -
          - - e.g. 25% -
          -
          -
          - -
          - - -
          -
          - - total exercises assigned -
          -
          -
          - -
          - - -
          -
          - - total exercises that won't be graded -
          -
          -
          - Delete +
          + + + e.g. HW, Midterm +
          + +
          + + + e.g. 25% +
          + +
          + + + total exercises assigned +
          + +
          + + + total exercises that won't be graded +
          + +
          + Delete +
          5. diff --git a/cms/static/coffee/files.json b/cms/static/coffee/files.json index b396bec944..2249813b04 100644 --- a/cms/static/coffee/files.json +++ b/cms/static/coffee/files.json @@ -1,6 +1,10 @@ { "js_files": [ + "/static/js/vendor/RequireJS.js", "/static/js/vendor/jquery.min.js", + "/static/js/vendor/jquery-ui.min.js", + "/static/js/vendor/jquery.ui.draggable.js", + "/static/js/vendor/jquery.cookie.js", "/static/js/vendor/json2.js", "/static/js/vendor/underscore-min.js", "/static/js/vendor/backbone-min.js" diff --git a/cms/static/coffee/src/views/tabs.coffee b/cms/static/coffee/src/views/tabs.coffee index 1fbc6ffa7f..9fbe4e5789 100644 --- a/cms/static/coffee/src/views/tabs.coffee +++ b/cms/static/coffee/src/views/tabs.coffee @@ -1,6 +1,4 @@ class CMS.Views.TabsEdit extends Backbone.View - events: - 'click .new-tab': 'addNewTab' initialize: => @$('.component').each((idx, element) => @@ -13,9 +11,10 @@ class CMS.Views.TabsEdit extends Backbone.View ) ) + @options.mast.find('.new-tab').on('click', @addNewTab) @$('.components').sortable( handle: '.drag-handle' - update: (event, ui) => alert 'not yet implemented!' + update: @tabMoved helper: 'clone' opacity: '0.5' placeholder: 'component-placeholder' @@ -24,6 +23,20 @@ class CMS.Views.TabsEdit extends Backbone.View items: '> .component' ) + tabMoved: (event, ui) => + tabs = [] + @$('.component').each((idx, element) => + tabs.push($(element).data('id')) + ) + $.ajax({ + type:'POST', + url: '/reorder_static_tabs', + data: JSON.stringify({ + tabs : tabs + }), + contentType: 'application/json' + }) + addNewTab: (event) => event.preventDefault() diff --git a/cms/static/css/tiny-mce.css b/cms/static/css/tiny-mce.css index 63d2bada94..8c69c4af75 100644 --- a/cms/static/css/tiny-mce.css +++ b/cms/static/css/tiny-mce.css @@ -1,89 +1,140 @@ +@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local("Open Sans Bold"),local("OpenSans-Bold"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzKRDOzjiPcYnFooOUGCOsRk.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local("Open Sans Light"),local("OpenSans-Light"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTaRDOzjiPcYnFooOUGCOsRk.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:local("Open Sans Bold Italic"),local("OpenSans-BoldItalic"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxhbnBKKEOwRKgsHDreGcocg.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:local("Open Sans Light Italic"),local("OpenSansLight-Italic"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxvR_54zmj3SbGZQh3vCOwvY.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local("Open Sans Italic"),local("OpenSans-Italic"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBrrIa-7acMAeDBVuclsi6Gc.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local("Open Sans"),local("OpenSans"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3bO3LdcAZYWl9Si6vvxL-qU.woff) format("woff")} + .mceContentBody { - padding: 10px; - background-color: #fff; - font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 1.6; - color: #3c3c3c; - scrollbar-3dlight-color: #F0F0EE; - scrollbar-arrow-color: #676662; - scrollbar-base-color: #F0F0EE; - scrollbar-darkshadow-color: #DDDDDD; - scrollbar-face-color: #E0E0DD; - scrollbar-highlight-color: #F0F0EE; - scrollbar-shadow-color: #F0F0EE; - scrollbar-track-color: #F5F5F5; + padding: 10px; + background-color: #fff; + font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif; + font-size: 16px; + line-height: 1.6; + color: #3c3c3c; + scrollbar-3dlight-color: #F0F0EE; + scrollbar-arrow-color: #676662; + scrollbar-base-color: #F0F0EE; + scrollbar-darkshadow-color: #DDDDDD; + scrollbar-face-color: #E0E0DD; + scrollbar-highlight-color: #F0F0EE; + scrollbar-shadow-color: #F0F0EE; + scrollbar-track-color: #F5F5F5; } h1 { - color: #3c3c3c; - font-weight: normal; - font-size: 2em; - line-height: 1.4em; - letter-spacing: 1px; + color: #3c3c3c; + font-weight: normal; + font-size: 2em; + line-height: 1.4em; + letter-spacing: 1px; + margin: 0 0 1.416em 0; } h2 { - color: #646464; - font-weight: normal; - font-size: 1.2em; - line-height: 1.2em; - letter-spacing: 1px; - margin-bottom: 15px; - text-transform: uppercase; - -webkit-font-smoothing: antialiased; + color: #646464; + font-weight: normal; + font-size: 1.2em; + line-height: 1.2em; + letter-spacing: 1px; + margin-bottom: 15px; + text-transform: uppercase; + -webkit-font-smoothing: antialiased; +} + +h3, h4, h5, h6 { + margin: 0 0 10px 0; + font-weight: 600; } h3 { - font-size: 1.2em; - font-weight: 600; + font-size: 1.2em; +} + +h4 { + font-size: 1em; +} + +h5 { + font-size: .83em; +} + +h6 { + font-size: 0.75em; } p { - margin-bottom: 1.416em; - font-size: 1em; - line-height: 1.6em !important; - color: $baseFontColor; + margin-bottom: 1.416em; + font-size: 1em; + line-height: 1.6em !important; + color: #3c3c3c; } em, i { - font-style: italic; + font-style: italic; } strong, b { - font-style: bold; + font-style: bold; } p + p, ul + p, ol + p { - margin-top: 20px; + margin-top: 20px; } ol, ul { - margin: 1em 0; - padding: 0 0 0 1em; + margin: 1em 0; + padding: 0 0 0 1em; + color: #3c3c3c; + } ol li, ul li { - margin-bottom: 0.708em; + margin-bottom: 0.708em; } ol { - list-style: decimal outside none; + list-style: decimal outside none; } ul { - list-style: disc outside none; + list-style: disc outside none; } a, a:link, a:visited, a:hover, a:active { - color: #1d9dd9; -} + color: #1d9dd9; +} img { - max-width: 100%; + max-width: 100%; +} + +pre { + margin: 1em 0; + color: #3c3c3c; + font-family: monospace, serif; + font-size: 1em; + white-space: pre-wrap; + word-wrap: break-word; } code { - font-family: monospace, serif; - background: none; -} \ No newline at end of file + font-family: monospace, serif; + background: none; + color: #3c3c3c; + padding: 0; +} + +table { + width: 100%; + border-collapse: collapse; + font-size: 16px; +} + +th { + background: #eee; + font-weight: bold; +} + +table td, th { + margin: 20px 0; + padding: 10px; + border: 1px solid #ccc !important; + text-align: left; + font-size: 14px; +} diff --git a/cms/static/img/hiw-feature1.png b/cms/static/img/hiw-feature1.png new file mode 100644 index 0000000000..3cfd48d066 Binary files /dev/null and b/cms/static/img/hiw-feature1.png differ diff --git a/cms/static/img/hiw-feature2.png b/cms/static/img/hiw-feature2.png new file mode 100644 index 0000000000..9442325dd5 Binary files /dev/null and b/cms/static/img/hiw-feature2.png differ diff --git a/cms/static/img/hiw-feature3.png b/cms/static/img/hiw-feature3.png new file mode 100644 index 0000000000..fa6b81ae89 Binary files /dev/null and b/cms/static/img/hiw-feature3.png differ diff --git a/cms/static/img/html-icon.png b/cms/static/img/html-icon.png index e739f2fc11..8f576178b2 100644 Binary files a/cms/static/img/html-icon.png and b/cms/static/img/html-icon.png differ diff --git a/cms/static/img/large-advanced-icon.png b/cms/static/img/large-advanced-icon.png new file mode 100644 index 0000000000..c6a19ea5a9 Binary files /dev/null and b/cms/static/img/large-advanced-icon.png differ diff --git a/cms/static/img/large-annotations-icon.png b/cms/static/img/large-annotations-icon.png new file mode 100644 index 0000000000..249193521f Binary files /dev/null and b/cms/static/img/large-annotations-icon.png differ diff --git a/cms/static/img/large-discussion-icon.png b/cms/static/img/large-discussion-icon.png index 2f0bfea98f..cebf332769 100644 Binary files a/cms/static/img/large-discussion-icon.png and b/cms/static/img/large-discussion-icon.png differ diff --git a/cms/static/img/large-freeform-icon.png b/cms/static/img/large-freeform-icon.png index b1d195a7ca..0d5e454f58 100644 Binary files a/cms/static/img/large-freeform-icon.png and b/cms/static/img/large-freeform-icon.png differ diff --git a/cms/static/img/large-openended-icon.png b/cms/static/img/large-openended-icon.png new file mode 100644 index 0000000000..4d31815413 Binary files /dev/null and b/cms/static/img/large-openended-icon.png differ diff --git a/cms/static/img/large-problem-icon.png b/cms/static/img/large-problem-icon.png index b962d42b14..a30ab8eac8 100644 Binary files a/cms/static/img/large-problem-icon.png and b/cms/static/img/large-problem-icon.png differ diff --git a/cms/static/img/large-video-icon.png b/cms/static/img/large-video-icon.png index 392851324c..f1ab048b4c 100644 Binary files a/cms/static/img/large-video-icon.png and b/cms/static/img/large-video-icon.png differ diff --git a/cms/static/img/logo-edx-studio-white.png b/cms/static/img/logo-edx-studio-white.png new file mode 100644 index 0000000000..3e3ee63622 Binary files /dev/null and b/cms/static/img/logo-edx-studio-white.png differ diff --git a/cms/static/img/logo-edx-studio.png b/cms/static/img/logo-edx-studio.png new file mode 100644 index 0000000000..006194a195 Binary files /dev/null and b/cms/static/img/logo-edx-studio.png differ diff --git a/cms/static/img/pl-1x1-000.png b/cms/static/img/pl-1x1-000.png new file mode 100644 index 0000000000..b94b7a9746 Binary files /dev/null and b/cms/static/img/pl-1x1-000.png differ diff --git a/cms/static/img/pl-1x1-fff.png b/cms/static/img/pl-1x1-fff.png new file mode 100644 index 0000000000..7081c75d36 Binary files /dev/null and b/cms/static/img/pl-1x1-fff.png differ diff --git a/cms/static/img/preview-lms-staticpages.png b/cms/static/img/preview-lms-staticpages.png new file mode 100644 index 0000000000..05a62f7c7f Binary files /dev/null and b/cms/static/img/preview-lms-staticpages.png differ diff --git a/cms/static/img/thumb-hiw-feature1.png b/cms/static/img/thumb-hiw-feature1.png new file mode 100644 index 0000000000..b2dc0c00ee Binary files /dev/null and b/cms/static/img/thumb-hiw-feature1.png differ diff --git a/cms/static/img/thumb-hiw-feature2.png b/cms/static/img/thumb-hiw-feature2.png new file mode 100644 index 0000000000..e96bcad1aa Binary files /dev/null and b/cms/static/img/thumb-hiw-feature2.png differ diff --git a/cms/static/img/thumb-hiw-feature3.png b/cms/static/img/thumb-hiw-feature3.png new file mode 100644 index 0000000000..f694fca516 Binary files /dev/null and b/cms/static/img/thumb-hiw-feature3.png differ diff --git a/cms/static/js/base.js b/cms/static/js/base.js index e99fc9a4da..d8b32cb0e8 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -5,7 +5,7 @@ var $newComponentItem; var $changedInput; var $spinner; -$(document).ready(function() { +$(document).ready(function () { $body = $('body'); $modal = $('.history-modal'); $modalCover = $('
          '); @@ -13,7 +13,7 @@ $(document).ready(function() { // pipelining (note, this doesn't happen on local runtimes). So if we set it on window, when we can access it from other // scopes (namely the course-info tab) window.$modalCover = $modalCover; - + // Control whether template caching in local memory occurs (see template_loader.js). Caching screws up development but may // be a good optimization in production (it works fairly well) window.cachetemplates = false; @@ -31,44 +31,85 @@ $(document).ready(function() { $modal.bind('click', hideModal); $modalCover.bind('click', hideModal); - $('.assets .upload-button').bind('click', showUploadModal); + $('.uploads .upload-button').bind('click', showUploadModal); $('.upload-modal .close-button').bind('click', hideModal); - $body.on('click', '.embeddable-xml-input', function(){ $(this).select(); }); + $body.on('click', '.embeddable-xml-input', function () { + $(this).select(); + }); $('.unit .item-actions .delete-button').bind('click', deleteUnit); $('.new-unit-item').bind('click', createNewUnit); + $('body').addClass('js'); + + // lean/simple modal + $('a[rel*=modal]').leanModal({overlay : 0.80, closeButton: '.action-modal-close' }); + $('a.action-modal-close').click(function(e){ + (e).preventDefault(); + }); + + // nav - dropdown related + $body.click(function (e) { + $('.nav-dropdown .nav-item .wrapper-nav-sub').removeClass('is-shown'); + $('.nav-dropdown .nav-item .title').removeClass('is-selected'); + }); + + $('.nav-dropdown .nav-item .title').click(function (e) { + + $subnav = $(this).parent().find('.wrapper-nav-sub'); + $title = $(this).parent().find('.title'); + e.preventDefault(); + e.stopPropagation(); + + if ($subnav.hasClass('is-shown')) { + $subnav.removeClass('is-shown'); + $title.removeClass('is-selected'); + } + + else { + $('.nav-dropdown .nav-item .title').removeClass('is-selected'); + $('.nav-dropdown .nav-item .wrapper-nav-sub').removeClass('is-shown'); + $title.addClass('is-selected'); + $subnav.addClass('is-shown'); + } + }); + + // general link management - new window/tab + $('a[rel="external"]').attr('title', 'This link will open in a new browser window/tab').click(function (e) { + window.open($(this).attr('href')); + e.preventDefault(); + }); + + // general link management - lean modal window + $('a[rel="modal"]').attr('title', 'This link will open in a modal window').leanModal({overlay: 0.50, closeButton: '.action-modal-close' }); + $('.action-modal-close').click(function (e) { + (e).preventDefault(); + }); + // toggling overview section details - $(function(){ - if($('.courseware-section').length > 0) { - $('.toggle-button-sections').addClass('is-shown'); - } + $(function () { + if ($('.courseware-section').length > 0) { + $('.toggle-button-sections').addClass('is-shown'); + } }); $('.toggle-button-sections').bind('click', toggleSections); // autosave when a field is updated on the subsection page $body.on('keyup', '.subsection-display-name-input, .unit-subtitle, .policy-list-value', checkForNewValue); - $('.subsection-display-name-input, .unit-subtitle, .policy-list-name, .policy-list-value').each(function(i) { + $('.subsection-display-name-input, .unit-subtitle, .policy-list-name, .policy-list-value').each(function (i) { this.val = $(this).val(); }); $("#start_date, #start_time, #due_date, #due_time").bind('change', autosaveInput); $('.sync-date, .remove-date').bind('click', autosaveInput); - // making the unit list sortable - $('.sortable-unit-list').sortable({ - axis: 'y', - handle: '.drag-handle', - update: onUnitReordered - }); - // expand/collapse methods for optional date setters $('.set-date').bind('click', showDateSetter); $('.remove-date').bind('click', removeDateSetter); // add new/delete section $('.new-courseware-section-button').bind('click', addNewSection); $('.delete-section-button').bind('click', deleteSection); - + // add new/delete subsection $('.new-subsection-item').bind('click', addNewSubsection); $('.delete-subsection-button').bind('click', deleteSubsection); @@ -82,25 +123,11 @@ $(document).ready(function() { // import form setup $('.import .file-input').bind('change', showImportSubmit); - $('.import .choose-file-button, .import .choose-file-button-inline').bind('click', function(e) { + $('.import .choose-file-button, .import .choose-file-button-inline').bind('click', function (e) { e.preventDefault(); $('.import .file-input').click(); }); - // Subsection reordering - $('.subsection-list > ol').sortable({ - axis: 'y', - handle: '.section-item .drag-handle', - update: onSubsectionReordered - }); - - // Section reordering - $('.courseware-overview').sortable({ - axis: 'y', - handle: 'header .drag-handle', - update: onSectionReordered - }); - $('.new-course-button').bind('click', addNewCourse); // section name editing @@ -119,12 +146,12 @@ $(document).ready(function() { $body.on('click', '.section-published-date .schedule-button', editSectionPublishDate); $body.on('click', '.edit-subsection-publish-settings .save-button', saveSetSectionScheduleDate); $body.on('click', '.edit-subsection-publish-settings .cancel-button', hideModal); - $body.on('change', '.edit-subsection-publish-settings .start-date', function() { - if($('.edit-subsection-publish-settings').find('.start-time').val() == '') { - $('.edit-subsection-publish-settings').find('.start-time').val('12:00am'); + $body.on('change', '.edit-subsection-publish-settings .start-date', function () { + if ($('.edit-subsection-publish-settings').find('.start-time').val() == '') { + $('.edit-subsection-publish-settings').find('.start-time').val('12:00am'); } }); - $('.edit-subsection-publish-settings').on('change', '.start-date, .start-time', function() { + $('.edit-subsection-publish-settings').on('change', '.start-date, .start-time', function () { $('.edit-subsection-publish-settings').find('.save-button').show(); }); }); @@ -135,24 +162,26 @@ $(document).ready(function() { // } function toggleSections(e) { - e.preventDefault(); + e.preventDefault(); - $section = $('.courseware-section'); - sectionCount = $section.length; - $button = $(this); - $labelCollapsed = $('up Collapse All Sections'); - $labelExpanded = $('down Expand All Sections'); + $section = $('.courseware-section'); + sectionCount = $section.length; + $button = $(this); + $labelCollapsed = $('up Collapse All Sections'); + $labelExpanded = $('down Expand All Sections'); - var buttonLabel = $button.hasClass('is-activated') ? $labelCollapsed : $labelExpanded; - $button.toggleClass('is-activated').html(buttonLabel); + var buttonLabel = $button.hasClass('is-activated') ? $labelCollapsed : $labelExpanded; + $button.toggleClass('is-activated').html(buttonLabel); - if($button.hasClass('is-activated')) { - $section.addClass('collapsed'); - $section.find('.expand-collapse-icon').removeClass('collapsed').addClass('expand'); - } else { - $section.removeClass('collapsed'); - $section.find('.expand-collapse-icon').removeClass('expand').addClass('collapse'); - } + if ($button.hasClass('is-activated')) { + $section.addClass('collapsed'); + // first child in order to avoid the icons on the subsection lists which are not in the first child + $section.find('header .expand-collapse-icon').removeClass('collapse').addClass('expand'); + } else { + $section.removeClass('collapsed'); + // first child in order to avoid the icons on the subsection lists which are not in the first child + $section.find('header .expand-collapse-icon').removeClass('expand').addClass('collapse'); + } } function editSectionPublishDate(e) { @@ -162,16 +191,16 @@ function editSectionPublishDate(e) { $modal.attr('data-id', $(this).attr('data-id')); $modal.find('.start-date').val($(this).attr('data-date')); $modal.find('.start-time').val($(this).attr('data-time')); - if($modal.find('.start-date').val() == '' && $modal.find('.start-time').val() == '') { + if ($modal.find('.start-date').val() == '' && $modal.find('.start-time').val() == '') { $modal.find('.save-button').hide(); - } + } $modal.find('.section-name').html('"' + $(this).closest('.courseware-section').find('.section-name-span').text() + '"'); $modalCover.show(); } function showImportSubmit(e) { var filepath = $(this).val(); - if(filepath.substr(filepath.length - 6, 6) == 'tar.gz') { + if (filepath.substr(filepath.length - 6, 6) == 'tar.gz') { $('.error-block').hide(); $('.file-name').html($(this).val().replace('C:\\fakepath\\', '')); $('.file-name-block').show(); @@ -192,7 +221,7 @@ function syncReleaseDate(e) { function addPolicyMetadata(e) { e.preventDefault(); - var template =$('#add-new-policy-element-template > li'); + var template = $('#add-new-policy-element-template > li'); var newNode = template.clone(); var _parent_el = $(this).parent('ol:.policy-list'); newNode.insertBefore('.add-policy-data'); @@ -214,7 +243,7 @@ function cancelPolicyMetadata(e) { e.preventDefault(); var $policyElement = $(this).parents('.policy-list-element'); - if(!$policyElement.hasClass('editing')) { + if (!$policyElement.hasClass('editing')) { $policyElement.remove(); } else { $policyElement.removeClass('new-policy-list-element'); @@ -227,74 +256,24 @@ function cancelPolicyMetadata(e) { function removePolicyMetadata(e) { e.preventDefault(); - if(!confirm('Are you sure you wish to delete this item. It cannot be reversed!')) - return; - + if (!confirm('Are you sure you wish to delete this item. It cannot be reversed!')) + return; + policy_name = $(this).data('policy-name'); var _parent_el = $(this).parent('li:.policy-list-element'); if ($(_parent_el).hasClass("new-policy-list-element")) { - _parent_el.remove(); + _parent_el.remove(); } else { _parent_el.appendTo("#policy-to-delete"); } saveSubsection() } - -// This method only changes the ordering of the child objects in a subsection -function onUnitReordered() { - var subsection_id = $(this).data('subsection-id'); - - var _els = $(this).children('li:.leaf'); - var children = _els.map(function(idx, el) { return $(el).data('id'); }).get(); - - // call into server to commit the new order - $.ajax({ - url: "/save_item", - type: "POST", - dataType: "json", - contentType: "application/json", - data:JSON.stringify({ 'id' : subsection_id, 'children' : children}) - }); -} - -function onSubsectionReordered() { - var section_id = $(this).data('section-id'); - - var _els = $(this).children('li:.branch'); - var children = _els.map(function(idx, el) { return $(el).data('id'); }).get(); - - // call into server to commit the new order - $.ajax({ - url: "/save_item", - type: "POST", - dataType: "json", - contentType: "application/json", - data:JSON.stringify({ 'id' : section_id, 'children' : children}) - }); -} - -function onSectionReordered() { - var course_id = $(this).data('course-id'); - - var _els = $(this).children('section:.branch'); - var children = _els.map(function(idx, el) { return $(el).data('id'); }).get(); - - // call into server to commit the new order - $.ajax({ - url: "/save_item", - type: "POST", - dataType: "json", - contentType: "application/json", - data:JSON.stringify({ 'id' : course_id, 'children' : children}) - }); -} - function getEdxTimeFromDateTimeVals(date_val, time_val, format) { var edxTimeStr = null; if (date_val != '') { - if (time_val == '') + if (time_val == '') time_val = '00:00'; // Note, we are using date.js utility which has better parsing abilities than the built in JS date parsing @@ -309,30 +288,30 @@ function getEdxTimeFromDateTimeVals(date_val, time_val, format) { } function getEdxTimeFromDateTimeInputs(date_id, time_id, format) { - var input_date = $('#'+date_id).val(); - var input_time = $('#'+time_id).val(); + var input_date = $('#' + date_id).val(); + var input_time = $('#' + time_id).val(); return getEdxTimeFromDateTimeVals(input_date, input_time, format); } function checkForNewValue(e) { - if($(this).parents('.new-policy-list-element')[0]) { + if ($(this).parents('.new-policy-list-element')[0]) { return; } - if(this.val) { - this.hasChanged = this.val != $(this).val(); + if (this.val) { + this.hasChanged = this.val != $(this).val(); } else { this.hasChanged = false; } this.val = $(this).val(); - if(this.hasChanged) { - if(this.saveTimer) { + if (this.hasChanged) { + if (this.saveTimer) { clearTimeout(this.saveTimer); } - this.saveTimer = setTimeout(function() { + this.saveTimer = setTimeout(function () { $changedInput = $(e.target); saveSubsection(); this.saveTimer = null; @@ -341,11 +320,11 @@ function checkForNewValue(e) { } function autosaveInput(e) { - if(this.saveTimer) { + if (this.saveTimer) { clearTimeout(this.saveTimer); } - this.saveTimer = setTimeout(function() { + this.saveTimer = setTimeout(function () { $changedInput = $(e.target); saveSubsection(); this.saveTimer = null; @@ -353,7 +332,7 @@ function autosaveInput(e) { } function saveSubsection() { - if($changedInput && !$changedInput.hasClass('no-spinner')) { + if ($changedInput && !$changedInput.hasClass('no-spinner')) { $spinner.css({ 'position': 'absolute', 'top': Math.floor($changedInput.position().top + ($changedInput.outerHeight() / 2) + 3), @@ -363,30 +342,30 @@ function saveSubsection() { $changedInput.after($spinner); $spinner.show(); } - + var id = $('.subsection-body').data('id'); // pull all 'normalized' metadata editable fields on page var metadata_fields = $('input[data-metadata-name]'); - + var metadata = {}; - for(var i=0; i< metadata_fields.length;i++) { - var el = metadata_fields[i]; - metadata[$(el).data("metadata-name")] = el.value; - } + for (var i = 0; i < metadata_fields.length; i++) { + var el = metadata_fields[i]; + metadata[$(el).data("metadata-name")] = el.value; + } // now add 'free-formed' metadata which are presented to the user as dual input fields (name/value) - $('ol.policy-list > li.policy-list-element').each( function(i, element) { + $('ol.policy-list > li.policy-list-element').each(function (i, element) { var name = $(element).children('.policy-list-name').val(); metadata[name] = $(element).children('.policy-list-value').val(); }); // now add any 'removed' policy metadata which is stored in a separate hidden div // 'null' presented to the server means 'remove' - $("#policy-to-delete > li.policy-list-element").each(function(i, element) { + $("#policy-to-delete > li.policy-list-element").each(function (i, element) { var name = $(element).children('.policy-list-name').val(); if (name != "") - metadata[name] = null; + metadata[name] = null; }); // Piece back together the date/time UI elements into one date/time string @@ -396,18 +375,18 @@ function saveSubsection() { metadata['due'] = getEdxTimeFromDateTimeInputs('due_date', 'due_time', 'MMMM dd HH:mm'); $.ajax({ - url: "/save_item", - type: "POST", - dataType: "json", - contentType: "application/json", - data:JSON.stringify({ 'id' : id, 'metadata' : metadata}), - success: function() { + url: "/save_item", + type: "POST", + dataType: "json", + contentType: "application/json", + data: JSON.stringify({ 'id': id, 'metadata': metadata}), + success: function () { $spinner.delay(500).fadeOut(150); - }, - error: function() { + }, + error: function () { showToastMessage('There has been an error while saving your changes.'); - } - }); + } + }); } @@ -418,14 +397,14 @@ function createNewUnit(e) { template = $(this).data('template'); $.post('/clone_item', - {'parent_location' : parent, - 'template' : template, - 'display_name': 'New Unit' - }, - function(data) { - // redirect to the edit page - window.location = "/edit/" + data['id']; - }); + {'parent_location': parent, + 'template': template, + 'display_name': 'New Unit' + }, + function (data) { + // redirect to the edit page + window.location = "/edit/" + data['id']; + }); } function deleteUnit(e) { @@ -444,16 +423,16 @@ function deleteSection(e) { } function _deleteItem($el) { - if(!confirm('Are you sure you wish to delete this item. It cannot be reversed!')) - return; - + if (!confirm('Are you sure you wish to delete this item. It cannot be reversed!')) + return; + var id = $el.data('id'); - - $.post('/delete_item', - {'id': id, 'delete_children' : true, 'delete_all_versions' : true}, - function(data) { - $el.remove(); - }); + + $.post('/delete_item', + {'id': id, 'delete_children': true, 'delete_all_versions': true}, + function (data) { + $el.remove(); + }); } function showUploadModal(e) { @@ -480,7 +459,7 @@ function startUpload(e) { $('.upload-modal .progress-bar').removeClass('loaded').show(); } -function resetUploadBar(){ +function resetUploadBar() { var percentVal = '0%'; $('.upload-modal .progress-fill').width(percentVal); $('.upload-modal .progress-fill').html(percentVal); @@ -493,7 +472,7 @@ function showUploadFeedback(event, position, total, percentComplete) { } function displayFinishedUpload(xhr) { - if(xhr.status = 200){ + if (xhr.status = 200) { markAsLoaded(); } @@ -517,10 +496,10 @@ function displayFinishedUpload(xhr) { function markAsLoaded() { $('.upload-modal .copy-button').css('display', 'inline-block'); $('.upload-modal .progress-bar').addClass('loaded'); -} +} function hideModal(e) { - if(e) { + if (e) { e.preventDefault(); } // Unit editors do not want the modal cover to hide when users click outside @@ -534,7 +513,7 @@ function hideModal(e) { } function onKeyUp(e) { - if(e.which == 87) { + if (e.which == 87) { $body.toggleClass('show-wip hide-wip'); } } @@ -584,14 +563,14 @@ function showToastMessage(message, $button, lifespan) { var $content = $('
          '); $content.html(message); $toast.append($content); - if($button) { + if ($button) { $button.addClass('action-button'); $button.bind('click', hideToastMessage); $content.append($button); } $closeBtn.bind('click', hideToastMessage); - if($('.toast-notification')[0]) { + if ($('.toast-notification')[0]) { var targetY = $('.toast-notification').offset().top + $('.toast-notification').outerHeight(); $toast.css('top', (targetY + 10) + 'px'); } @@ -599,8 +578,8 @@ function showToastMessage(message, $button, lifespan) { $body.prepend($toast); $toast.fadeIn(200); - if(lifespan) { - $toast.timer = setTimeout(function() { + if (lifespan) { + $toast.timer = setTimeout(function () { $toast.fadeOut(300); }, lifespan * 1000); } @@ -626,7 +605,7 @@ function addNewSection(e, isTemplate) { } function checkForCancel(e) { - if(e.which == 27) { + if (e.which == 27) { $body.unbind('keyup', checkForCancel); e.data.$cancelButton.click(); } @@ -642,11 +621,11 @@ function saveNewSection(e) { var display_name = $(this).find('.new-section-name').val(); $.post('/clone_item', { - 'parent_location' : parent, - 'template' : template, + 'parent_location': parent, + 'template': template, 'display_name': display_name, }, - function(data) { + function (data) { if (data.id != undefined) location.reload(); } @@ -665,7 +644,7 @@ function addNewCourse(e) { $(e.target).hide(); var $newCourse = $($('#new-course-template').html()); var $cancelButton = $newCourse.find('.new-course-cancel'); - $('.new-course-button').after($newCourse); + $('.inner-wrapper').prepend($newCourse); $newCourse.find('.new-course-name').focus().select(); $newCourse.find('form').bind('submit', saveNewCourse); $cancelButton.bind('click', cancelNewCourse); @@ -681,18 +660,18 @@ function saveNewCourse(e) { var number = $newCourse.find('.new-course-number').val(); var display_name = $newCourse.find('.new-course-name').val(); - if (org == '' || number == '' || display_name == ''){ + if (org == '' || number == '' || display_name == '') { alert('You must specify all fields in order to create a new course.'); return; } $.post('/create_new_course', { - 'template' : template, - 'org' : org, - 'number' : number, - 'display_name': display_name + 'template': template, + 'org': org, + 'number': number, + 'display_name': display_name }, - function(data) { + function (data) { if (data.id != undefined) { window.location = '/' + data.id.replace(/.*:\/\//, ''); } else if (data.ErrMsg != undefined) { @@ -736,13 +715,13 @@ function saveNewSubsection(e) { var display_name = $(this).find('.new-subsection-name-input').val(); $.post('/clone_item', { - 'parent_location' : parent, - 'template' : template, - 'display_name': display_name + 'parent_location': parent, + 'template': template, + 'display_name': display_name }, - function(data) { + function (data) { if (data.id != undefined) { - location.reload(); + location.reload(); } } ); @@ -789,21 +768,20 @@ function saveEditSectionName(e) { } var $_this = $(this); - // call into server to commit the new order + // call into server to commit the new order $.ajax({ url: "/save_item", type: "POST", dataType: "json", contentType: "application/json", - data:JSON.stringify({ 'id' : id, 'metadata' : {'display_name' : display_name}}) - }).success(function() - { - $spinner.delay(250).fadeOut(250); - $_this.closest('h3').find('.section-name-span').html(display_name).show(); - $_this.hide(); - $_this.closest('.section-name').bind('click', editSectionName); - e.stopPropagation(); - }); + data: JSON.stringify({ 'id': id, 'metadata': {'display_name': display_name}}) + }).success(function () { + $spinner.delay(250).fadeOut(250); + $_this.closest('h3').find('.section-name-span').html(display_name).show(); + $_this.hide(); + $_this.closest('.section-name').bind('click', editSectionName); + e.stopPropagation(); + }); } function setSectionScheduleDate(e) { @@ -834,21 +812,20 @@ function saveSetSectionScheduleDate(e) { type: "POST", dataType: "json", contentType: "application/json", - data:JSON.stringify({ 'id' : id, 'metadata' : {'start' : start}}) - }).success(function() - { - var $thisSection = $('.courseware-section[data-id="' + id + '"]'); - $thisSection.find('.section-published-date').html('Will Release: ' + input_date + ' at ' + input_time + 'Edit'); - $thisSection.find('.section-published-date').animate({ - 'background-color': 'rgb(182,37,104)' - }, 300).animate({ - 'background-color': '#edf1f5' - }, 300).animate({ - 'background-color': 'rgb(182,37,104)' - }, 300).animate({ - 'background-color': '#edf1f5' - }, 300); - - hideModal(); - }); -} + data: JSON.stringify({ 'id': id, 'metadata': {'start': start}}) + }).success(function () { + var $thisSection = $('.courseware-section[data-id="' + id + '"]'); + $thisSection.find('.section-published-date').html('Will Release: ' + input_date + ' at ' + input_time + 'Edit'); + $thisSection.find('.section-published-date').animate({ + 'background-color': 'rgb(182,37,104)' + }, 300).animate({ + 'background-color': '#edf1f5' + }, 300).animate({ + 'background-color': 'rgb(182,37,104)' + }, 300).animate({ + 'background-color': '#edf1f5' + }, 300); + + hideModal(); + }); +} \ No newline at end of file diff --git a/cms/static/js/hesitate.js b/cms/static/js/hesitate.js new file mode 100644 index 0000000000..c5848a6c0c --- /dev/null +++ b/cms/static/js/hesitate.js @@ -0,0 +1,48 @@ +/* + * Create a HesitateEvent and assign it as the event to execute: + * $(el).on('mouseEnter', CMS.HesitateEvent( expand, 'mouseLeave').trigger); + * It calls the executeOnTimeOut function with the event.currentTarget after the configurable timeout IFF the cancelSelector event + * did not occur on the event.currentTarget. + * + * More specifically, when trigger is called (triggered by the event you bound it to), it starts a timer + * which the cancelSelector event will cancel or if the timer finished, it executes the executeOnTimeOut function + * passing it the original event (whose currentTarget s/b the specific ele). It never accumulates events; however, it doesn't hurt for your + * code to minimize invocations of trigger by binding to mouseEnter v mouseOver and such. + * + * NOTE: if something outside of this wants to cancel the event, invoke cachedhesitation.untrigger(null | anything); + */ + +CMS.HesitateEvent = function(executeOnTimeOut, cancelSelector, onlyOnce) { + this.executeOnTimeOut = executeOnTimeOut; + this.cancelSelector = cancelSelector; + this.timeoutEventId = null; + this.originalEvent = null; + this.onlyOnce = (onlyOnce === true); +}; + +CMS.HesitateEvent.DURATION = 800; + +CMS.HesitateEvent.prototype.trigger = function(event) { + if (event.data.timeoutEventId == null) { + event.data.timeoutEventId = window.setTimeout( + function() { event.data.fireEvent(event); }, + CMS.HesitateEvent.DURATION); + event.data.originalEvent = event; + $(event.data.originalEvent.delegateTarget).on(event.data.cancelSelector, event.data, event.data.untrigger); + } +}; + +CMS.HesitateEvent.prototype.fireEvent = function(event) { + event.data.timeoutEventId = null; + $(event.data.originalEvent.delegateTarget).off(event.data.cancelSelector, event.data.untrigger); + if (event.data.onlyOnce) $(event.data.originalEvent.delegateTarget).off(event.data.originalEvent.type, event.data.trigger); + event.data.executeOnTimeOut(event.data.originalEvent); +}; + +CMS.HesitateEvent.prototype.untrigger = function(event) { + if (event.data.timeoutEventId) { + window.clearTimeout(event.data.timeoutEventId); + $(event.data.originalEvent.delegateTarget).off(event.data.cancelSelector, event.data.untrigger); + } + event.data.timeoutEventId = null; +}; \ No newline at end of file diff --git a/cms/static/js/models/settings/advanced.js b/cms/static/js/models/settings/advanced.js new file mode 100644 index 0000000000..5741eb88dd --- /dev/null +++ b/cms/static/js/models/settings/advanced.js @@ -0,0 +1,62 @@ +if (!CMS.Models['Settings']) CMS.Models.Settings = {}; + +CMS.Models.Settings.Advanced = Backbone.Model.extend({ + // the key for a newly added policy-- before the user has entered a key value + new_key : "__new_advanced_key__", + + defaults: { + // the properties are whatever the user types in (in addition to whatever comes originally from the server) + }, + // which keys to send as the deleted keys on next save + deleteKeys : [], + blacklistKeys : [], // an array which the controller should populate directly for now [static not instance based] + + validate: function (attrs) { + var errors = {}; + for (var key in attrs) { + if (key === this.new_key || _.isEmpty(key)) { + errors[key] = "A key must be entered."; + } + else if (_.contains(this.blacklistKeys, key)) { + errors[key] = key + " is a reserved keyword or can be edited on another screen"; + } + } + if (!_.isEmpty(errors)) return errors; + }, + + save : function (attrs, options) { + // wraps the save call w/ the deletion of the removed keys after we know the saved ones worked + options = options ? _.clone(options) : {}; + // add saveSuccess to the success + var success = options.success; + options.success = function(model, resp, options) { + model.afterSave(model); + if (success) success(model, resp, options); + }; + Backbone.Model.prototype.save.call(this, attrs, options); + }, + + afterSave : function(self) { + // remove deleted attrs + if (!_.isEmpty(self.deleteKeys)) { + // remove the to be deleted keys from the returned model + _.each(self.deleteKeys, function(key) { self.unset(key); }); + // not able to do via backbone since we're not destroying the model + $.ajax({ + url : self.url, + // json to and fro + contentType : "application/json", + dataType : "json", + // delete + type : 'DELETE', + // data + data : JSON.stringify({ deleteKeys : self.deleteKeys}) + }) + .fail(function(hdr, status, error) { CMS.ServerError(self, "Deleting keys:" + status); }) + .done(function(data, status, error) { + // clear deleteKeys on success + self.deleteKeys = []; + }); + } + } +}); diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js index ab80179142..148df7a325 100644 --- a/cms/static/js/models/settings/course_details.js +++ b/cms/static/js/models/settings/course_details.js @@ -1,83 +1,78 @@ if (!CMS.Models['Settings']) CMS.Models.Settings = new Object(); CMS.Models.Settings.CourseDetails = Backbone.Model.extend({ - defaults: { - location : null, // the course's Location model, required - start_date: null, // maps to 'start' - end_date: null, // maps to 'end' - enrollment_start: null, - enrollment_end: null, - syllabus: null, - overview: "", - intro_video: null, - effort: null // an int or null - }, - - // When init'g from html script, ensure you pass {parse: true} as an option (2nd arg to reset) - parse: function(attributes) { - if (attributes['course_location']) { - attributes.location = new CMS.Models.Location(attributes.course_location, {parse:true}); - } - if (attributes['start_date']) { - attributes.start_date = new Date(attributes.start_date); - } - if (attributes['end_date']) { - attributes.end_date = new Date(attributes.end_date); - } - if (attributes['enrollment_start']) { - attributes.enrollment_start = new Date(attributes.enrollment_start); - } - if (attributes['enrollment_end']) { - attributes.enrollment_end = new Date(attributes.enrollment_end); - } - return attributes; - }, - - validate: function(newattrs) { - // Returns either nothing (no return call) so that validate works or an object of {field: errorstring} pairs - // A bit funny in that the video key validation is asynchronous; so, it won't stop the validation. - var errors = {}; - if (newattrs.start_date && newattrs.end_date && newattrs.start_date >= newattrs.end_date) { - errors.end_date = "The course end date cannot be before the course start date."; - } - if (newattrs.start_date && newattrs.enrollment_start && newattrs.start_date < newattrs.enrollment_start) { - errors.enrollment_start = "The course start date cannot be before the enrollment start date."; - } - if (newattrs.enrollment_start && newattrs.enrollment_end && newattrs.enrollment_start >= newattrs.enrollment_end) { - errors.enrollment_end = "The enrollment start date cannot be after the enrollment end date."; - } - if (newattrs.end_date && newattrs.enrollment_end && newattrs.end_date < newattrs.enrollment_end) { - errors.enrollment_end = "The enrollment end date cannot be after the course end date."; - } - if (newattrs.intro_video && newattrs.intro_video !== this.get('intro_video')) { - if (this._videokey_illegal_chars.exec(newattrs.intro_video)) { - errors.intro_video = "Key should only contain letters, numbers, _, or -"; - } - // TODO check if key points to a real video using google's youtube api - } - if (!_.isEmpty(errors)) return errors; - // NOTE don't return empty errors as that will be interpreted as an error state - }, - - url: function() { - var location = this.get('location'); - return '/' + location.get('org') + "/" + location.get('course') + '/settings/' + location.get('name') + '/section/details'; - }, - - _videokey_illegal_chars : /[^a-zA-Z0-9_-]/g, - save_videosource: function(newsource) { - // newsource either is
          diff --git a/cms/templates/activation_complete.html b/cms/templates/activation_complete.html index 5d9437ccb3..1e195a632c 100644 --- a/cms/templates/activation_complete.html +++ b/cms/templates/activation_complete.html @@ -5,7 +5,7 @@

          Activation Complete!

          -

          Thanks for activating your account. Log in here.

          +

          Thanks for activating your account. Log in here.

          diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 01766e2dac..a5a9144b07 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -1,7 +1,7 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="bodyclass">assets -<%block name="title">Courseware Assets +<%block name="bodyclass">is-signedin course uploads +<%block name="title">Uploads & Files <%namespace name='static' file='static_content.html'/> @@ -28,17 +28,32 @@ {{uploadDate}} - + +
          +
          +
          + Course Content +

          Files & Uploads

          +
          + + +
          +
          +
          - - Upload New Asset -
          @@ -69,7 +84,7 @@ ${asset['uploadDate']} - + % endfor @@ -100,7 +115,7 @@
          - +
          diff --git a/cms/templates/base.html b/cms/templates/base.html index 84f10fc2d1..498897bd11 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -5,23 +5,29 @@ + + <%block name="title"></%block> | + % if context_course: + <% ctx_loc = context_course.location %> + ${context_course.display_name} | + % endif + edX Studio + + + + <%static:css group='base-style'/> - + - <%block name="title"></%block> - - - - <%block name="header_extras"> - <%include file="widgets/header.html" args="active_tab=active_tab"/> + <%include file="widgets/header.html" /> <%include file="courseware_vendor_js.html"/> @@ -47,9 +53,9 @@ <%block name="content"> + <%include file="widgets/footer.html" /> <%block name="jsextra"> - diff --git a/cms/templates/course_index.html b/cms/templates/course_index.html index e490ad7817..5c8772c1ed 100644 --- a/cms/templates/course_index.html +++ b/cms/templates/course_index.html @@ -1,5 +1,5 @@ <%inherit file="base.html" /> -<%block name="title">Course Manager + <%include file="widgets/header.html"/> <%block name="content"> diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html index f4fa661b6e..55dcaaa068 100644 --- a/cms/templates/course_info.html +++ b/cms/templates/course_info.html @@ -2,14 +2,16 @@ <%namespace name='static' file='static_content.html'/> -<%block name="title">Course Info -<%block name="bodyclass">course-info +<%block name="title">Updates +<%block name="bodyclass">is-signedin course course-info updates + <%block name="jsextra"> + @@ -18,8 +20,8 @@ <%block name="content"> +
          +
          +
          + Course Content +

          Static Pages

          +
          + + +
          +
          + +
          +
          +
          +

          Static Pages are additional pages that supplement your Courseware. Other course authors have used them to share a syllabus, calendar, handouts, and more.

          + +
          +
          +
          +
          -
          -

          Here you can add and manage additional pages for your course

          -

          These pages will be added to the primary navigation menu alongside Courseware, Course Info, Discussion, etc.

          -
          - -
          - - New Page - -
            @@ -43,4 +67,17 @@
          + +
          +

          How Static Pages are Used in Your Course

          +
          + Preview of how Static Pages are used in your course +
          These pages will be presented in your course's main navigation alongside Courseware, Course Info, Discussion, etc.
          +
          + + + ␡ + close modal + +
          \ No newline at end of file diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index c334724121..43775122d4 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -7,8 +7,9 @@ %> <%! from django.core.urlresolvers import reverse %> -<%block name="bodyclass">subsection <%block name="title">CMS Subsection +<%block name="bodyclass">is-signedin course subsection + <%namespace name="units" file="widgets/units.html" /> <%namespace name='static' file='static_content.html'/> @@ -21,11 +22,7 @@
          - -
          -
          - - +
          @@ -48,7 +45,7 @@
          -

          Subsection Settings

          +

          Subsection Settings

          @@ -101,6 +98,7 @@
          +
          <%block name="jsextra"> @@ -111,6 +109,8 @@ + + - - + \ No newline at end of file diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index 36930f5386..722e756203 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -1,17 +1,31 @@ <%inherit file="base.html" /> <%block name="title">Course Staff Manager -<%block name="bodyclass">users +<%block name="bodyclass">is-signedin course users settings team + <%block name="content"> +
          +
          +
          + Course Settings +

          Course Team

          +
          + + +
          +
          +
          -
          - %if allow_actions: - - New User - - %endif -

          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.

          @@ -97,7 +111,7 @@ $cancelButton.bind('click', hideNewUserForm); $('.new-user-button').bind('click', showNewUserForm); - $body.bind('keyup', { $cancelButton: $cancelButton }, checkForCancel); + $('body').bind('keyup', { $cancelButton: $cancelButton }, checkForCancel); $('.remove-user').click(function() { $.ajax({ diff --git a/cms/templates/overview.html b/cms/templates/overview.html index a20531200e..1098a6885e 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -6,7 +6,8 @@ from datetime import datetime %> <%! from django.core.urlresolvers import reverse %> -<%block name="title">CMS Courseware Overview +<%block name="title">Course Outline +<%block name="bodyclass">is-signedin course outline <%namespace name='static' file='static_content.html'/> <%namespace name="units" file="widgets/units.html" /> @@ -18,6 +19,7 @@ + + - - - + + <%block name="content"> - -
          -
          -

          Settings

          -
          -
          - -
          -
          +
          +
          +
          + Settings +

          Schedule & Details

          +
          +
          +
          -
          -

          Course Details

          - -
          +
          +
          +
          + +
          -

          Basic Information

          - The nuts and bolts of your course +

          Basic Information

          + The nuts and bolts of your course
          -
          - -
          -
          - - This is used in your course URL, and cannot be changed -
          -
          -
          +
            +
          1. + + +
            2. -
            - -
            -
            - - This is used in your course URL, and cannot be changed -
            -
            -
            +
          2. + + +
            3. -
            - -
            -
            - - This is used in your course URL, and cannot be changed -
            -
            -
            -
          +
        5. + + +
          6. +

        + These are used in your course URL, and cannot be changed +
        -
        +
        -

        Course Schedule

        - Important steps and segments of your course +

        Course Schedule

        + Important steps and segments of your course
        -
        -

        Course Dates:

        - -
        -
        -
        - - +
          +
        1. +
          + + First day the course begins
          -
          - - +
          + +
          -
          -
        +

        2. -
        -
        -
        - - - Last day the course is active +
      2. +
        + + + Last day your course is active
        -
        - - +
        + +
        -
        -
        3. -
        + +
      -
      -

      Enrollment Dates:

      - -
      -
      -
      - - +
        +
      1. +
        + + First day students can enroll
        -
        - - +
        + +
        -
        -
      + -
      -
      -
      - - +
    3. +
      + + Last day students can enroll
      -
      - - +
      + +
      -
      -
      4. -
      - - - + + +
      -
      -
      -

      Introducing Your Course

      - Information for perspective students -
      +
      +
      +

      Introducing Your Course

      + Information for prospective students +
      -
      - -
      -
      - - Introductions, prerequisites, FAQs that are used on your course summary page -
      -
      -
      +
        +
      1. + + + Introductions, prerequisites, FAQs that are used on your course summary page +
        2. -
        - -
        +
      2. +
        - + - Delete Video
        +
        + Delete Current Video +
        - - Video restrictions go here + + Enter your YouTube video's ID (along with any restriction parameters)
        -
        3. -
        -
      + + +
      -
      +
      -

      Requirements

      - Expectations of the students taking this course +

      Requirements

      + Expectations of the students taking this course
      -
      - -
      -
      - +
        +
      1. + + Time spent on all course work -
      -
      -
      -
      -
      - -
      -

      Faculty

      - -
      -
      -

      Faculty Members

      - Individuals instructing and help with this course -
      - -
      -
      -
        -
      • -
        - -
        - -
        -
        - -
        - -
        - -
        -
        - -
        - -
        -
        -
        - Delete Faculty Photo -
        -
        -
        -
        - -
        - -
        - - A brief description of your education, experience, and expertise -
        -
        - - Delete Faculty Member
        • - -
      • -
        - -
        - -
        -
        - -
        - -
        - -
        -
        - -
        - -
        -
        - - Upload Faculty Photo - - Max size: 30KB -
        -
        -
        - -
        - -
        -
        - - A brief description of your education, experience, and expertise -
        -
        -
        -
        • -
      - - - New Faculty Member - -
      -
      -
      - -
      - -
      -

      Grading

      - -
      -
      -

      Overall Grade Range

      - Course grade ranges and their values -
      - -
      - -
      - -
      -
      -
        -
      1. 0
        2. -
      2. 10
        3. -
      3. 20
        4. -
      4. 30
        5. -
      5. 40
        6. -
      6. 50
        7. -
      7. 60
        8. -
      8. 70
        9. -
      9. 80
        10. -
      10. 90
        11. -
      11. 100
      -
        -
      -
      -
      -
      - -
      + + -
      -
      -

      General Grading

      - Deadlines and Requirements -
      +
      - -
      -
      -

      Assignment Types

      -
      - -
      -
      -
        -
      - - - New Assignment Type - -
      -
      -
      -
      - -
      -

      Problems

      - -
      -
      -

      General Settings

      - Course-wide settings for all problems -
      - -
      -

      Problem Randomization:

      - -
      -
      - - -
      - - randomize all problems -
      -
      - -
      - - -
      - - do not randomize problems -
      -
      - -
      - - -
      - - randomize problems per student -
      -
      -
      -
      - -
      -

      Show Answers:

      - -
      -
      - - -
      - - Answers will be shown after the number of attempts has been met -
      -
      - -
      - - -
      - - Answers will never be shown, regardless of attempts -
      -
      -
      -
      - -
      - - -
      -
      - - Students will this have this number of chances to answer a problem. To set infinite atttempts, use "0" -
      -
      -
      -
      - -
      -
      -

      [Assignment Type Name]

      -
      - -
      -

      Problem Randomization:

      - -
      -
      - - -
      - - randomize all problems -
      -
      - -
      - - -
      - - do not randomize problems -
      +

      Additionally, details provided on this page are also used in edX's catalog of courses, which new and returning students use to choose new courses to study.

      -
      - - -
      - - randomize problems per student -
      -
      -
      -
      - -
      -

      Show Answers:

      - -
      -
      - - -
      - - Answers will be shown after the number of attempts has been met -
      -
      - -
      - - -
      - - Answers will never be shown, regardless of attempts -
      -
      -
      -
      - -
      - - -
      -
      - - Students will this have this number of chances to answer a problem. To set infinite atttempts, use "0" -
      -
      -
      -
      -
      - -
      -

      Discussions

      - -
      -
      -

      General Settings

      - Course-wide settings for online discussion -
      - -
      -

      Anonymous Discussions:

      - -
      -
      - - -
      - - Students and faculty will be able to post anonymously -
      -
      - -
      - - -
      - - Posting anonymously is not allowed. Any previous anonymous posts will be reverted to non-anonymous -
      -
      -
      -
      - -
      -

      Anonymous Discussions:

      - -
      -
      - - -
      - - Students and faculty will be able to post anonymously -
      -
      - -
      - - -
      - - This option is disabled since there are previous discussions that are anonymous. -
      -
      -
      -
      - -
      -

      Discussion Categories

      - -
      - - - - New Discussion Category - -
      -
      -
      -
      -
      - -
      -
      -
      - +
      + % if context_course: + <% ctx_loc = context_course.location %> + <%! from django.core.urlresolvers import reverse %> +

      Other Course Settings

      + + % endif +
      + + +
      + \ No newline at end of file diff --git a/cms/templates/settings_advanced.html b/cms/templates/settings_advanced.html new file mode 100644 index 0000000000..ceee406398 --- /dev/null +++ b/cms/templates/settings_advanced.html @@ -0,0 +1,124 @@ +<%inherit file="base.html" /> +<%! from django.core.urlresolvers import reverse %> +<%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"> + + + + + + + + + + +<%block name="content"> +
      +
      +
      + Settings +

      Advanced Settings

      +
      + +
      +
      + +
      + Your policy changes have been saved. +
      + +
      + There was an error saving your information. Please see below. +
      + +
      +
      +

      Manual Policy Definition

      + Manually Edit Course Policy Values (JSON Key / Value pairs) +
      + +

      Warning: Add only manual policy data that you are familiar + with.

      + +
        + +
      + +
      + + New Manual Policy + +
      +
      +
      +
      + + +
      +
      + + +
      +
      +
      + ⚠ + +

      Note: Your changes will not take effect until you save your + progress. Take care with key and value formatting, as validation is not implemented.

      +
      + +
      + +
      +
      +
      + \ No newline at end of file diff --git a/cms/templates/settings_discussions_faculty.html b/cms/templates/settings_discussions_faculty.html new file mode 100644 index 0000000000..fc30b6eebb --- /dev/null +++ b/cms/templates/settings_discussions_faculty.html @@ -0,0 +1,430 @@ + +<%inherit file="base.html" /> +<%block name="title">Schedule and details +<%block name="bodyclass">is-signedin course settings + + +<%namespace name='static' file='static_content.html'/> +<%! +from contentstore import utils +%> + + +<%block name="jsextra"> + + + + + + + + +<%block name="content"> + +
      +
      +

      Settings

      +
      +
      + +
      +

      Faculty

      + +
      +
      +

      Faculty Members

      + Individuals instructing and help with this course +
      + +
      +
      +
        +
      • +
        + +
        + +
        +
        + +
        + +
        + +
        +
        + +
        + +
        +
        +
        + Delete Faculty Photo +
        +
        +
        +
        + +
        + +
        + + A brief description of your education, experience, and expertise +
        +
        + + Delete Faculty Member +
        • + +
      • +
        + +
        + +
        +
        + +
        + +
        + +
        +
        + +
        + +
        +
        + + Upload Faculty Photo + + Max size: 30KB +
        +
        +
        + +
        + +
        +
        + + A brief description of your education, experience, and expertise +
        +
        +
        +
        • +
      + + + New Faculty Member + +
      +
      +
      + +
      + +
      +

      Problems

      + +
      +
      +

      General Settings

      + Course-wide settings for all problems +
      + +
      +

      Problem Randomization:

      + +
      +
      + + +
      + + randomize all problems +
      +
      + +
      + + +
      + + do not randomize problems +
      +
      + +
      + + +
      + + randomize problems per student +
      +
      +
      +
      + +
      +

      Show Answers:

      + +
      +
      + + +
      + + Answers will be shown after the number of attempts has been met +
      +
      + +
      + + +
      + + Answers will never be shown, regardless of attempts +
      +
      +
      +
      + +
      + + +
      +
      + + Students will this have this number of chances to answer a problem. To set infinite atttempts, use "0" +
      +
      +
      +
      + +
      +
      +

      [Assignment Type Name]

      +
      + +
      +

      Problem Randomization:

      + +
      +
      + + +
      + + randomize all problems +
      +
      + +
      + + +
      + + do not randomize problems +
      +
      + +
      + + +
      + + randomize problems per student +
      +
      +
      +
      + +
      +

      Show Answers:

      + +
      +
      + + +
      + + Answers will be shown after the number of attempts has been met +
      +
      + +
      + + +
      + + Answers will never be shown, regardless of attempts +
      +
      +
      +
      + +
      + + +
      +
      + + Students will this have this number of chances to answer a problem. To set infinite atttempts, use "0" +
      +
      +
      +
      +
      + +
      +

      Discussions

      + +
      +
      +

      General Settings

      + Course-wide settings for online discussion +
      + +
      +

      Anonymous Discussions:

      + +
      +
      + + +
      + + Students and faculty will be able to post anonymously +
      +
      + +
      + + +
      + + Posting anonymously is not allowed. Any previous anonymous posts will be reverted to non-anonymous +
      +
      +
      +
      + +
      +

      Anonymous Discussions:

      + +
      +
      + + +
      + + Students and faculty will be able to post anonymously +
      +
      + +
      + + +
      + + This option is disabled since there are previous discussions that are anonymous. +
      +
      +
      +
      + +
      +

      Discussion Categories

      + +
      + + + + New Discussion Category + +
      +
      +
      +
      +
      +
      +
      +
      +
      + diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html new file mode 100644 index 0000000000..923cc35313 --- /dev/null +++ b/cms/templates/settings_graders.html @@ -0,0 +1,152 @@ +<%inherit file="base.html" /> +<%block name="title">Grading +<%block name="bodyclass">is-signedin course grading settings + +<%namespace name='static' file='static_content.html'/> +<%! +from contentstore import utils +%> + +<%block name="jsextra"> + + + + + + + + + + + + + +<%block name="content"> +
      +
      +
      + Settings +

      Grading

      +
      +
      +
      + +
      +
      +
      +
      +
      +
      +

      Overall Grade Range

      + Your overall grading scale for student final grades +
      + +
        +
      1. +
        + +
        +
        +
          +
        1. 0
          2. +
        2. 10
          3. +
        3. 20
          4. +
        4. 30
          5. +
        5. 40
          6. +
        6. 50
          7. +
        7. 60
          8. +
        8. 70
          9. +
        9. 80
          10. +
        10. 90
          11. +
        11. 100
          12. +
        +
          +
        +
        +
        +
        +
        2. +
      +
      + +
      + +
      +
      +

      Grading Rules & Policies

      + Deadlines, requirements, and logistics around grading student work +
      + +
        +
      1. + + + Leeway on due dates +
        2. +
      +
      + +
      + +
      +
      +

      Assignment Types

      + Categories and labels for any exercises that are gradable +
      + +
        + +
      + +
      + + New Assignment Type + +
      +
      +
      +
      + + +
      +
      + diff --git a/cms/templates/signup.html b/cms/templates/signup.html index 2c60b758e6..30c5c1cf2b 100644 --- a/cms/templates/signup.html +++ b/cms/templates/signup.html @@ -1,94 +1,141 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Sign up -<%block name="bodyclass">no-header +<%block name="title">Sign Up +<%block name="bodyclass">not-signedin signup <%block name="content"> -
      +
      +
      +
      +

      Sign Up for edX Studio

      + +
      - +
      +

      I've never authored a course online before. Is there help?

      +

      Absolutely. We have created an online course, edX101, that describes some best practices: from filming video, creating exercises, to the basics of running an online course. Additionally, we're always here to help, just drop us a note.

      +
      + +
      +
      + - + ); + }); + })(this) + \ No newline at end of file diff --git a/cms/templates/unit.html b/cms/templates/unit.html index ef94d51576..5cd872ce98 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -1,8 +1,9 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> <%namespace name="units" file="widgets/units.html" /> -<%block name="bodyclass">unit -<%block name="title">CMS Unit +<%block name="title">Individual Unit +<%block name="bodyclass">is-signedin course unit + <%block name="jsextra"> @@ -35,7 +44,7 @@
      -

      +

        % for id in components:
      1. @@ -56,38 +65,66 @@
      % for type, templates in sorted(component_templates.items()):
      -

      Select ${type} component type:

      - - + % if type == "problem": +
      + + % endif +
      +
        + % for name, location, has_markdown, is_empty in templates: + % if has_markdown or type != "problem": + % if is_empty: +
      • + + ${name} + +
        • + + % else: +
      • + + ${name} + +
        • + % endif + % endif + + %endfor +
      +
      + % if type == "problem": +
      +
        + % for name, location, has_markdown, is_empty in templates: + % if not has_markdown: + % if is_empty: +
      • + + ${name} + +
        • + + % else: +
      • + + ${name} + + +
        • + % endif + % endif + % endfor +
      +
      +
      + % endif Cancel
      % endfor @@ -98,7 +135,7 @@
      -

      Unit Settings

      +

      Unit Settings

      @@ -126,7 +163,7 @@
      -

      Unit Location

      +

      Unit Location

        diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html new file mode 100644 index 0000000000..0f265dfc2c --- /dev/null +++ b/cms/templates/widgets/footer.html @@ -0,0 +1,30 @@ +<%! from django.core.urlresolvers import reverse %> + +
        + +
        \ No newline at end of file diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 5f41452339..a063e4b526 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -1,40 +1,117 @@ <%! from django.core.urlresolvers import reverse %> -<% active_tab_class = 'active-tab-' + active_tab if active_tab else '' %> -
        -
        -
        -
        - % if context_course: - <% ctx_loc = context_course.location %> - › - ${context_course.display_name} › - % endif -
        +
        + + +
        + % if user.is_authenticated(): + + % else: + + % endif +
        +
        +
      \ No newline at end of file diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index 74d35cd646..8ca07a7928 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -1,20 +1,20 @@ <%include file="metadata-edit.html" />
      - %if markdown != '' or data == '\n\n': + %if enable_markdown:
        -
        • +
        • -
        • -
        • -
        • -
        • @@ -34,8 +34,8 @@
        -
        Header
        -
        +
        Heading 1
        +
        @@ -56,7 +56,7 @@
        -
        Check Multiple
        +
        Checkboxes
        @@ -67,7 +67,7 @@
        -
        String Response
        +
        Text Input
        @@ -76,7 +76,7 @@
        -
        Numerical Response
        +
        Numerical Input
        @@ -85,7 +85,7 @@
      -
      Option Response
      +
      Dropdown
      diff --git a/cms/templates/widgets/source-edit.html b/cms/templates/widgets/source-edit.html index f0922831e1..c7460c9cf7 100644 --- a/cms/templates/widgets/source-edit.html +++ b/cms/templates/widgets/source-edit.html @@ -10,7 +10,7 @@

      High Level Source Editing

      -
      +
      @@ -18,6 +18,9 @@ + + +
      @@ -25,88 +28,148 @@
      - diff --git a/cms/urls.py b/cms/urls.py index 6f8736551b..7b7b5e9375 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -6,7 +6,8 @@ from django.conf.urls import patterns, include, url # admin.autodiscover() urlpatterns = ('', - url(r'^$', 'contentstore.views.index', name='index'), + url(r'^$', 'contentstore.views.howitworks', name='homepage'), + url(r'^listing', 'contentstore.views.index', name='index'), 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'), @@ -17,6 +18,7 @@ urlpatterns = ('', url(r'^publish_draft$', 'contentstore.views.publish_draft', name='publish_draft'), url(r'^unpublish_unit$', 'contentstore.views.unpublish_unit', name='unpublish_unit'), url(r'^create_new_course', 'contentstore.views.create_new_course', name='create_new_course'), + url(r'^reorder_static_tabs', 'contentstore.views.reorder_static_tabs', name='reorder_static_tabs'), url(r'^(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.course_index', name='course_index'), @@ -41,13 +43,18 @@ urlpatterns = ('', '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.*)$', 'contentstore.views.course_info_updates', name='course_info'), - url(r'^(?P[^/]+)/(?P[^/]+)/settings/(?P[^/]+)$', 'contentstore.views.get_course_settings', name='course_settings'), - url(r'^(?P[^/]+)/(?P[^/]+)/settings/(?P[^/]+)/section/(?P
      [^/]+).*$', 'contentstore.views.course_settings_updates', name='course_settings'), - url(r'^(?P[^/]+)/(?P[^/]+)/grades/(?P[^/]+)/(?P.*)$', 'contentstore.views.course_grader_updates', name='course_settings'), + url(r'^(?P[^/]+)/(?P[^/]+)/settings-details/(?P[^/]+)$', 'contentstore.views.get_course_settings', name='course_settings'), + url(r'^(?P[^/]+)/(?P[^/]+)/settings-grading/(?P[^/]+)$', 'contentstore.views.course_config_graders_page', name='course_settings'), + url(r'^(?P[^/]+)/(?P[^/]+)/settings-details/(?P[^/]+)/section/(?P
      [^/]+).*$', 'contentstore.views.course_settings_updates', name='course_settings'), + url(r'^(?P[^/]+)/(?P[^/]+)/settings-grading/(?P[^/]+)/(?P.*)$', 'contentstore.views.course_grader_updates', name='course_settings'), + # This is the URL to initially render the course advanced settings. + url(r'^(?P[^/]+)/(?P[^/]+)/settings-advanced/(?P[^/]+)$', 'contentstore.views.course_config_advanced_page', name='course_advanced_settings'), + # This is the URL used by BackBone for updating and re-fetching the model. + url(r'^(?P[^/]+)/(?P[^/]+)/settings-advanced/(?P[^/]+)/update.*$', 'contentstore.views.course_advanced_updates', name='course_advanced_settings_updates'), url(r'^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/gradeas.*$', 'contentstore.views.assignment_type_update', name='assignment_type_update'), - url(r'^pages/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.static_pages', + url(r'^pages/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.static_pages', name='static_pages'), url(r'^edit_static/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.edit_static', name='edit_static'), url(r'^edit_tabs/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.edit_tabs', name='edit_tabs'), @@ -55,7 +62,7 @@ urlpatterns = ('', # this is a generic method to return the data/metadata associated with a xmodule url(r'^module_info/(?P.*)$', 'contentstore.views.module_info', name='module_info'), - + # temporary landing page for a course url(r'^edge/(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$', 'contentstore.views.landing', name='landing'), @@ -67,19 +74,23 @@ urlpatterns = ('', # temporary landing page for edge url(r'^edge$', 'contentstore.views.edge', name='edge'), + # noop to squelch ajax errors + url(r'^event$', 'contentstore.views.event', name='event'), url(r'^heartbeat$', include('heartbeat.urls')), ) # User creation and updating views urlpatterns += ( + url(r'^howitworks$', 'contentstore.views.howitworks', name='howitworks'), url(r'^signup$', 'contentstore.views.signup', name='signup'), url(r'^create_account$', 'student.views.create_account'), url(r'^activate/(?P[^/]*)$', 'student.views.activate_account', name='activate'), # form page - url(r'^login$', 'contentstore.views.login_page', name='login'), + url(r'^login$', 'contentstore.views.old_login_redirect', name='old_login'), + url(r'^signin$', 'contentstore.views.login_page', name='login'), # ajax view that actually does the work url(r'^login_post$', 'student.views.login_user', name='login_post'), diff --git a/common/djangoapps/cache_toolbox/core.py b/common/djangoapps/cache_toolbox/core.py index 3bd184bc2c..a9c7002aa6 100644 --- a/common/djangoapps/cache_toolbox/core.py +++ b/common/djangoapps/cache_toolbox/core.py @@ -14,6 +14,7 @@ from django.db import DEFAULT_DB_ALIAS from . import app_settings from xmodule.contentstore.content import StaticContent + def get_instance(model, instance_or_pk, timeout=None, using=None): """ Returns the ``model`` instance with a primary key of ``instance_or_pk``. @@ -108,11 +109,14 @@ def instance_key(model, instance_or_pk): getattr(instance_or_pk, 'pk', instance_or_pk), ) + def set_cached_content(content): cache.set(str(content.location), content) + def get_cached_content(location): return cache.get(str(location)) + def del_cached_content(location): cache.delete(str(location)) diff --git a/common/djangoapps/contentserver/middleware.py b/common/djangoapps/contentserver/middleware.py index bc5d80842e..c5e887801e 100644 --- a/common/djangoapps/contentserver/middleware.py +++ b/common/djangoapps/contentserver/middleware.py @@ -12,7 +12,7 @@ from xmodule.exceptions import NotFoundError class StaticContentServer(object): def process_request(self, request): # look to see if the request is prefixed with 'c4x' tag - if request.path.startswith('/' + XASSET_LOCATION_TAG +'/'): + if request.path.startswith('/' + XASSET_LOCATION_TAG + '/'): loc = StaticContent.get_location_from_path(request.path) # first look in our cache so we don't have to round-trip to the DB content = get_cached_content(loc) @@ -21,7 +21,9 @@ class StaticContentServer(object): try: content = contentstore().find(loc) except NotFoundError: - raise Http404 + response = HttpResponse() + response.status_code = 404 + return response # since we fetched it from DB, let's cache it going forward set_cached_content(content) diff --git a/lms/djangoapps/portal/__init__.py b/common/djangoapps/course_groups/__init__.py similarity index 100% rename from lms/djangoapps/portal/__init__.py rename to common/djangoapps/course_groups/__init__.py diff --git a/common/djangoapps/course_groups/cohorts.py b/common/djangoapps/course_groups/cohorts.py new file mode 100644 index 0000000000..f0234ec71a --- /dev/null +++ b/common/djangoapps/course_groups/cohorts.py @@ -0,0 +1,257 @@ +""" +This file contains the logic for cohort groups, as exposed internally to the +forums, and to the cohort admin views. +""" + +from django.contrib.auth.models import User +from django.http import Http404 +import logging +import random + +from courseware import courses +from student.models import get_user_by_username_or_email +from .models import CourseUserGroup + +log = logging.getLogger(__name__) + + +def is_course_cohorted(course_id): + """ + Given a course id, return a boolean for whether or not the course is + cohorted. + + Raises: + Http404 if the course doesn't exist. + """ + return courses.get_course_by_id(course_id).is_cohorted + + +def get_cohort_id(user, course_id): + """ + Given a course id and a user, return the id of the cohort that user is + assigned to in that course. If they don't have a cohort, return None. + """ + cohort = get_cohort(user, course_id) + return None if cohort is None else cohort.id + + +def is_commentable_cohorted(course_id, commentable_id): + """ + Args: + course_id: string + commentable_id: string + + Returns: + Bool: is this commentable cohorted? + + Raises: + Http404 if the course doesn't exist. + """ + course = courses.get_course_by_id(course_id) + + if not course.is_cohorted: + # this is the easy case :) + ans = False + elif commentable_id in course.top_level_discussion_topic_ids: + # top level discussions have to be manually configured as cohorted + # (default is not) + ans = commentable_id in course.cohorted_discussions + else: + # inline discussions are cohorted by default + ans = True + + log.debug("is_commentable_cohorted({0}, {1}) = {2}".format(course_id, + commentable_id, + ans)) + return ans + + +def get_cohorted_commentables(course_id): + """ + Given a course_id return a list of strings representing cohorted commentables + """ + + course = courses.get_course_by_id(course_id) + + if not course.is_cohorted: + # this is the easy case :) + ans = [] + else: + ans = course.cohorted_discussions + + return ans + + +def get_cohort(user, course_id): + """ + Given a django User and a course_id, return the user's cohort in that + cohort. + + Arguments: + user: a Django User object. + course_id: string in the format 'org/course/run' + + Returns: + A CourseUserGroup object if the course is cohorted and the User has a + cohort, else None. + + Raises: + ValueError if the course_id doesn't exist. + """ + # First check whether the course is cohorted (users shouldn't be in a cohort + # in non-cohorted courses, but settings can change after course starts) + try: + course = courses.get_course_by_id(course_id) + except Http404: + raise ValueError("Invalid course_id") + + if not course.is_cohorted: + return None + + try: + return CourseUserGroup.objects.get(course_id=course_id, + group_type=CourseUserGroup.COHORT, + users__id=user.id) + except CourseUserGroup.DoesNotExist: + # Didn't find the group. We'll go on to create one if needed. + pass + + if not course.auto_cohort: + return None + + choices = course.auto_cohort_groups + if len(choices) == 0: + # Nowhere to put user + log.warning("Course %s is auto-cohorted, but there are no" + " auto_cohort_groups specified", + course_id) + return None + + # Put user in a random group, creating it if needed + group_name = random.choice(choices) + group, created = CourseUserGroup.objects.get_or_create( + course_id=course_id, + group_type=CourseUserGroup.COHORT, + name=group_name) + + user.course_groups.add(group) + return group + + +def get_course_cohorts(course_id): + """ + Get a list of all the cohorts in the given course. + + Arguments: + course_id: string in the format 'org/course/run' + + Returns: + A list of CourseUserGroup objects. Empty if there are no cohorts. Does + not check whether the course is cohorted. + """ + return list(CourseUserGroup.objects.filter(course_id=course_id, + group_type=CourseUserGroup.COHORT)) + +### Helpers for cohort management views + + +def get_cohort_by_name(course_id, name): + """ + Return the CourseUserGroup object for the given cohort. Raises DoesNotExist + it isn't present. + """ + return CourseUserGroup.objects.get(course_id=course_id, + group_type=CourseUserGroup.COHORT, + name=name) + + +def get_cohort_by_id(course_id, cohort_id): + """ + Return the CourseUserGroup object for the given cohort. Raises DoesNotExist + it isn't present. Uses the course_id for extra validation... + """ + return CourseUserGroup.objects.get(course_id=course_id, + group_type=CourseUserGroup.COHORT, + id=cohort_id) + + +def add_cohort(course_id, name): + """ + Add a cohort to a course. Raises ValueError if a cohort of the same name already + exists. + """ + log.debug("Adding cohort %s to %s", name, course_id) + if CourseUserGroup.objects.filter(course_id=course_id, + group_type=CourseUserGroup.COHORT, + name=name).exists(): + raise ValueError("Can't create two cohorts with the same name") + + return CourseUserGroup.objects.create(course_id=course_id, + group_type=CourseUserGroup.COHORT, + name=name) + + +class CohortConflict(Exception): + """ + Raised when user to be added is already in another cohort in same course. + """ + pass + + +def add_user_to_cohort(cohort, username_or_email): + """ + Look up the given user, and if successful, add them to the specified cohort. + + Arguments: + cohort: CourseUserGroup + username_or_email: string. Treated as email if has '@' + + Returns: + User object. + + Raises: + User.DoesNotExist if can't find user. + + ValueError if user already present in this cohort. + + CohortConflict if user already in another cohort. + """ + user = get_user_by_username_or_email(username_or_email) + + # If user in any cohorts in this course already, complain + course_cohorts = CourseUserGroup.objects.filter( + course_id=cohort.course_id, + users__id=user.id, + group_type=CourseUserGroup.COHORT) + if course_cohorts.exists(): + if course_cohorts[0] == cohort: + raise ValueError("User {0} already present in cohort {1}".format( + user.username, + cohort.name)) + else: + raise CohortConflict("User {0} is in another cohort {1} in course" + .format(user.username, + course_cohorts[0].name)) + + cohort.users.add(user) + return user + + +def get_course_cohort_names(course_id): + """ + Return a list of the cohort names in a course. + """ + return [c.name for c in get_course_cohorts(course_id)] + + +def delete_empty_cohort(course_id, name): + """ + Remove an empty cohort. Raise ValueError if cohort is not empty. + """ + cohort = get_cohort_by_name(course_id, name) + if cohort.users.exists(): + raise ValueError( + "Can't delete non-empty cohort {0} in course {1}".format( + name, course_id)) + + cohort.delete() diff --git a/common/djangoapps/course_groups/models.py b/common/djangoapps/course_groups/models.py new file mode 100644 index 0000000000..8bab17493b --- /dev/null +++ b/common/djangoapps/course_groups/models.py @@ -0,0 +1,33 @@ +import logging + +from django.contrib.auth.models import User +from django.db import models + +log = logging.getLogger(__name__) + + +class CourseUserGroup(models.Model): + """ + This model represents groups of users in a course. Groups may have different types, + which may be treated specially. For example, a user can be in at most one cohort per + course, and cohorts are used to split up the forums by group. + """ + class Meta: + unique_together = (('name', 'course_id'), ) + + name = models.CharField(max_length=255, + help_text=("What is the name of this group? " + "Must be unique within a course.")) + users = models.ManyToManyField(User, db_index=True, related_name='course_groups', + help_text="Who is in this group?") + + # Note: groups associated with particular runs of a course. E.g. Fall 2012 and Spring + # 2013 versions of 6.00x will have separate groups. + course_id = models.CharField(max_length=255, db_index=True, + help_text="Which course is this group associated with?") + + # For now, only have group type 'cohort', but adding a type field to support + # things like 'question_discussion', 'friends', 'off-line-class', etc + COHORT = 'cohort' + GROUP_TYPE_CHOICES = ((COHORT, 'Cohort'),) + group_type = models.CharField(max_length=20, choices=GROUP_TYPE_CHOICES) diff --git a/common/djangoapps/course_groups/tests/tests.py b/common/djangoapps/course_groups/tests/tests.py new file mode 100644 index 0000000000..efed39d536 --- /dev/null +++ b/common/djangoapps/course_groups/tests/tests.py @@ -0,0 +1,245 @@ +import django.test +from django.contrib.auth.models import User +from django.conf import settings + +from django.test.utils import override_settings + +from course_groups.models import CourseUserGroup +from course_groups.cohorts import (get_cohort, get_course_cohorts, + is_commentable_cohorted) + +from xmodule.modulestore.django import modulestore, _MODULESTORES + +# NOTE: running this with the lms.envs.test config works without +# manually overriding the modulestore. However, running with +# cms.envs.test doesn't. + + +def xml_store_config(data_dir): + return { + 'default': { + 'ENGINE': 'xmodule.modulestore.xml.XMLModuleStore', + 'OPTIONS': { + 'data_dir': data_dir, + 'default_class': 'xmodule.hidden_module.HiddenDescriptor', + } + } +} + +TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT +TEST_DATA_XML_MODULESTORE = xml_store_config(TEST_DATA_DIR) + + +@override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE) +class TestCohorts(django.test.TestCase): + + + @staticmethod + def topic_name_to_id(course, name): + """ + Given a discussion topic name, return an id for that name (includes + course and url_name). + """ + return "{course}_{run}_{name}".format(course=course.location.course, + run=course.url_name, + name=name) + + + @staticmethod + def config_course_cohorts(course, discussions, + cohorted, + cohorted_discussions=None, + auto_cohort=None, + auto_cohort_groups=None): + """ + Given a course with no discussion set up, add the discussions and set + the cohort config appropriately. + + Arguments: + course: CourseDescriptor + discussions: list of topic names strings. Picks ids and sort_keys + automatically. + cohorted: bool. + cohorted_discussions: optional list of topic names. If specified, + converts them to use the same ids as topic names. + auto_cohort: optional bool. + auto_cohort_groups: optional list of strings + (names of groups to put students into). + + Returns: + Nothing -- modifies course in place. + """ + def to_id(name): + return TestCohorts.topic_name_to_id(course, name) + + topics = dict((name, {"sort_key": "A", + "id": to_id(name)}) + for name in discussions) + + course.metadata["discussion_topics"] = topics + + d = {"cohorted": cohorted} + if cohorted_discussions is not None: + d["cohorted_discussions"] = [to_id(name) + for name in cohorted_discussions] + + if auto_cohort is not None: + d["auto_cohort"] = auto_cohort + if auto_cohort_groups is not None: + d["auto_cohort_groups"] = auto_cohort_groups + + course.metadata["cohort_config"] = d + + + def setUp(self): + """ + Make sure that course is reloaded every time--clear out the modulestore. + """ + # don't like this, but don't know a better way to undo all changes made + # to course. We don't have a course.clone() method. + _MODULESTORES.clear() + + + def test_get_cohort(self): + """ + Make sure get_cohort() does the right thing when the course is cohorted + """ + course = modulestore().get_course("edX/toy/2012_Fall") + self.assertEqual(course.id, "edX/toy/2012_Fall") + self.assertFalse(course.is_cohorted) + + user = User.objects.create(username="test", email="a@b.com") + other_user = User.objects.create(username="test2", email="a2@b.com") + + self.assertIsNone(get_cohort(user, course.id), "No cohort created yet") + + cohort = CourseUserGroup.objects.create(name="TestCohort", + course_id=course.id, + group_type=CourseUserGroup.COHORT) + + cohort.users.add(user) + + self.assertIsNone(get_cohort(user, course.id), + "Course isn't cohorted, so shouldn't have a cohort") + + # Make the course cohorted... + self.config_course_cohorts(course, [], cohorted=True) + + self.assertEquals(get_cohort(user, course.id).id, cohort.id, + "Should find the right cohort") + + self.assertEquals(get_cohort(other_user, course.id), None, + "other_user shouldn't have a cohort") + + def test_auto_cohorting(self): + """ + Make sure get_cohort() does the right thing when the course is auto_cohorted + """ + course = modulestore().get_course("edX/toy/2012_Fall") + self.assertEqual(course.id, "edX/toy/2012_Fall") + self.assertFalse(course.is_cohorted) + + user1 = User.objects.create(username="test", email="a@b.com") + user2 = User.objects.create(username="test2", email="a2@b.com") + user3 = User.objects.create(username="test3", email="a3@b.com") + + cohort = CourseUserGroup.objects.create(name="TestCohort", + course_id=course.id, + group_type=CourseUserGroup.COHORT) + + # user1 manually added to a cohort + cohort.users.add(user1) + + # Make the course auto cohorted... + self.config_course_cohorts(course, [], cohorted=True, + auto_cohort=True, + auto_cohort_groups=["AutoGroup"]) + + self.assertEquals(get_cohort(user1, course.id).id, cohort.id, + "user1 should stay put") + + self.assertEquals(get_cohort(user2, course.id).name, "AutoGroup", + "user2 should be auto-cohorted") + + # Now make the group list empty + self.config_course_cohorts(course, [], cohorted=True, + auto_cohort=True, + auto_cohort_groups=[]) + + self.assertEquals(get_cohort(user3, course.id), None, + "No groups->no auto-cohorting") + + # Now make it different + self.config_course_cohorts(course, [], cohorted=True, + auto_cohort=True, + auto_cohort_groups=["OtherGroup"]) + + self.assertEquals(get_cohort(user3, course.id).name, "OtherGroup", + "New list->new group") + self.assertEquals(get_cohort(user2, course.id).name, "AutoGroup", + "user2 should still be in originally placed cohort") + + + def test_get_course_cohorts(self): + course1_id = 'a/b/c' + course2_id = 'e/f/g' + + # add some cohorts to course 1 + cohort = CourseUserGroup.objects.create(name="TestCohort", + course_id=course1_id, + group_type=CourseUserGroup.COHORT) + + cohort = CourseUserGroup.objects.create(name="TestCohort2", + course_id=course1_id, + group_type=CourseUserGroup.COHORT) + + + # second course should have no cohorts + self.assertEqual(get_course_cohorts(course2_id), []) + + cohorts = sorted([c.name for c in get_course_cohorts(course1_id)]) + self.assertEqual(cohorts, ['TestCohort', 'TestCohort2']) + + + def test_is_commentable_cohorted(self): + course = modulestore().get_course("edX/toy/2012_Fall") + self.assertFalse(course.is_cohorted) + + def to_id(name): + return self.topic_name_to_id(course, name) + + # no topics + self.assertFalse(is_commentable_cohorted(course.id, to_id("General")), + "Course doesn't even have a 'General' topic") + + # not cohorted + self.config_course_cohorts(course, ["General", "Feedback"], + cohorted=False) + + self.assertFalse(is_commentable_cohorted(course.id, to_id("General")), + "Course isn't cohorted") + + # cohorted, but top level topics aren't + self.config_course_cohorts(course, ["General", "Feedback"], + cohorted=True) + + self.assertTrue(course.is_cohorted) + self.assertFalse(is_commentable_cohorted(course.id, to_id("General")), + "Course is cohorted, but 'General' isn't.") + + self.assertTrue( + is_commentable_cohorted(course.id, to_id("random")), + "Non-top-level discussion is always cohorted in cohorted courses.") + + # cohorted, including "Feedback" top-level topics aren't + self.config_course_cohorts(course, ["General", "Feedback"], + cohorted=True, + cohorted_discussions=["Feedback"]) + + self.assertTrue(course.is_cohorted) + self.assertFalse(is_commentable_cohorted(course.id, to_id("General")), + "Course is cohorted, but 'General' isn't.") + + self.assertTrue( + is_commentable_cohorted(course.id, to_id("Feedback")), + "Feedback was listed as cohorted. Should be.") diff --git a/common/djangoapps/course_groups/views.py b/common/djangoapps/course_groups/views.py new file mode 100644 index 0000000000..6d5ac43fb0 --- /dev/null +++ b/common/djangoapps/course_groups/views.py @@ -0,0 +1,222 @@ +from django_future.csrf import ensure_csrf_cookie +from django.contrib.auth.decorators import login_required +from django.views.decorators.http import require_POST +from django.contrib.auth.models import User +from django.core.context_processors import csrf +from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.core.urlresolvers import reverse +from django.http import HttpResponse, HttpResponseForbidden, Http404 +from django.shortcuts import redirect +import json +import logging +import re + +from courseware.courses import get_course_with_access +from mitxmako.shortcuts import render_to_response, render_to_string + +from .models import CourseUserGroup +from . import cohorts + +import track.views + + +log = logging.getLogger(__name__) + + +def json_http_response(data): + """ + Return an HttpResponse with the data json-serialized and the right content + type header. + """ + return HttpResponse(json.dumps(data), content_type="application/json") + + +def split_by_comma_and_whitespace(s): + """ + Split a string both by commas and whitespice. Returns a list. + """ + return re.split(r'[\s,]+', s) + + +@ensure_csrf_cookie +def list_cohorts(request, course_id): + """ + Return json dump of dict: + + {'success': True, + 'cohorts': [{'name': name, 'id': id}, ...]} + """ + get_course_with_access(request.user, course_id, 'staff') + + all_cohorts = [{'name': c.name, 'id': c.id} + for c in cohorts.get_course_cohorts(course_id)] + + return json_http_response({'success': True, + 'cohorts': all_cohorts}) + + +@ensure_csrf_cookie +@require_POST +def add_cohort(request, course_id): + """ + Return json of dict: + {'success': True, + 'cohort': {'id': id, + 'name': name}} + + or + + {'success': False, + 'msg': error_msg} if there's an error + """ + get_course_with_access(request.user, course_id, 'staff') + + name = request.POST.get("name") + if not name: + return json_http_response({'success': False, + 'msg': "No name specified"}) + + try: + cohort = cohorts.add_cohort(course_id, name) + except ValueError as err: + return json_http_response({'success': False, + 'msg': str(err)}) + + return json_http_response({'success': 'True', + 'cohort': { + 'id': cohort.id, + 'name': cohort.name + }}) + + +@ensure_csrf_cookie +def users_in_cohort(request, course_id, cohort_id): + """ + Return users in the cohort. Show up to 100 per page, and page + using the 'page' GET attribute in the call. Format: + + Returns: + Json dump of dictionary in the following format: + {'success': True, + 'page': page, + 'num_pages': paginator.num_pages, + 'users': [{'username': ..., 'email': ..., 'name': ...}] + } + """ + get_course_with_access(request.user, course_id, 'staff') + + # this will error if called with a non-int cohort_id. That's ok--it + # shoudn't happen for valid clients. + cohort = cohorts.get_cohort_by_id(course_id, int(cohort_id)) + + paginator = Paginator(cohort.users.all(), 100) + page = request.GET.get('page') + try: + users = paginator.page(page) + except PageNotAnInteger: + # return the first page + page = 1 + users = paginator.page(page) + except EmptyPage: + # Page is out of range. Return last page + page = paginator.num_pages + contacts = paginator.page(page) + + user_info = [{'username': u.username, + 'email': u.email, + 'name': '{0} {1}'.format(u.first_name, u.last_name)} + for u in users] + + return json_http_response({'success': True, + 'page': page, + 'num_pages': paginator.num_pages, + 'users': user_info}) + + +@ensure_csrf_cookie +@require_POST +def add_users_to_cohort(request, course_id, cohort_id): + """ + Return json dict of: + + {'success': True, + 'added': [{'username': username, + 'name': name, + 'email': email}, ...], + 'conflict': [{'username_or_email': ..., + 'msg': ...}], # in another cohort + 'present': [str1, str2, ...], # already there + 'unknown': [str1, str2, ...]} + """ + get_course_with_access(request.user, course_id, 'staff') + + cohort = cohorts.get_cohort_by_id(course_id, cohort_id) + + users = request.POST.get('users', '') + added = [] + present = [] + conflict = [] + unknown = [] + for username_or_email in split_by_comma_and_whitespace(users): + try: + user = cohorts.add_user_to_cohort(cohort, username_or_email) + added.append({'username': user.username, + 'name': "{0} {1}".format(user.first_name, user.last_name), + 'email': user.email, + }) + except ValueError: + present.append(username_or_email) + except User.DoesNotExist: + unknown.append(username_or_email) + except cohorts.CohortConflict as err: + conflict.append({'username_or_email': username_or_email, + 'msg': str(err)}) + + + return json_http_response({'success': True, + 'added': added, + 'present': present, + 'conflict': conflict, + 'unknown': unknown}) + + +@ensure_csrf_cookie +@require_POST +def remove_user_from_cohort(request, course_id, cohort_id): + """ + Expects 'username': username in POST data. + + Return json dict of: + + {'success': True} or + {'success': False, + 'msg': error_msg} + """ + get_course_with_access(request.user, course_id, 'staff') + + username = request.POST.get('username') + if username is None: + return json_http_response({'success': False, + 'msg': 'No username specified'}) + + cohort = cohorts.get_cohort_by_id(course_id, cohort_id) + try: + user = User.objects.get(username=username) + cohort.users.remove(user) + return json_http_response({'success': True}) + except User.DoesNotExist: + log.debug('no user') + return json_http_response({'success': False, + 'msg': "No user '{0}'".format(username)}) + + +def debug_cohort_mgmt(request, course_id): + """ + Debugging view for dev. + """ + # add staff check to make sure it's safe if it's accidentally deployed. + get_course_with_access(request.user, course_id, 'staff') + + context = {'cohorts_ajax_url': reverse('cohorts', + kwargs={'course_id': course_id})} + return render_to_response('/course_groups/debug.html', context) diff --git a/common/djangoapps/external_auth/admin.py b/common/djangoapps/external_auth/admin.py index e93325bcb2..1ee18dadc1 100644 --- a/common/djangoapps/external_auth/admin.py +++ b/common/djangoapps/external_auth/admin.py @@ -5,8 +5,9 @@ django admin pages for courseware model from external_auth.models import * from django.contrib import admin + class ExternalAuthMapAdmin(admin.ModelAdmin): - search_fields = ['external_id','user__username'] + search_fields = ['external_id', 'user__username'] date_hierarchy = 'dtcreated' admin.site.register(ExternalAuthMap, ExternalAuthMapAdmin) diff --git a/common/djangoapps/external_auth/models.py b/common/djangoapps/external_auth/models.py index e43b306bbb..6c2f38d8b3 100644 --- a/common/djangoapps/external_auth/models.py +++ b/common/djangoapps/external_auth/models.py @@ -12,20 +12,20 @@ file and check it in at the same time as your model changes. To do that, from django.db import models from django.contrib.auth.models import User + class ExternalAuthMap(models.Model): class Meta: unique_together = (('external_id', 'external_domain'), ) external_id = models.CharField(max_length=255, db_index=True) external_domain = models.CharField(max_length=255, db_index=True) - external_credentials = models.TextField(blank=True) # JSON dictionary + external_credentials = models.TextField(blank=True) # JSON dictionary external_email = models.CharField(max_length=255, db_index=True) - external_name = models.CharField(blank=True,max_length=255, db_index=True) + external_name = models.CharField(blank=True, max_length=255, db_index=True) user = models.OneToOneField(User, unique=True, db_index=True, null=True) - internal_password = models.CharField(blank=True, max_length=31) # randomly generated - dtcreated = models.DateTimeField('creation date',auto_now_add=True) - dtsignup = models.DateTimeField('signup date',null=True) # set after signup - + internal_password = models.CharField(blank=True, max_length=31) # randomly generated + dtcreated = models.DateTimeField('creation date', auto_now_add=True) + dtsignup = models.DateTimeField('signup date', null=True) # set after signup + def __unicode__(self): s = "[%s] = (%s / %s)" % (self.external_id, self.external_name, self.external_email) return s - diff --git a/common/djangoapps/external_auth/tests/test_openid_provider.py b/common/djangoapps/external_auth/tests/test_openid_provider.py index 9c522f88b4..570dfbf9ee 100644 --- a/common/djangoapps/external_auth/tests/test_openid_provider.py +++ b/common/djangoapps/external_auth/tests/test_openid_provider.py @@ -13,9 +13,10 @@ from django.test import TestCase, LiveServerTestCase from django.core.urlresolvers import reverse from django.test.client import RequestFactory + class MyFetcher(HTTPFetcher): """A fetcher that uses server-internal calls for performing HTTP - requests. + requests. """ def __init__(self, client): @@ -42,7 +43,7 @@ class MyFetcher(HTTPFetcher): if headers and 'Accept' in headers: data['CONTENT_TYPE'] = headers['Accept'] response = self.client.get(url, data) - + # Translate the test client response to the fetcher's HTTP response abstraction content = response.content final_url = url @@ -60,6 +61,7 @@ class MyFetcher(HTTPFetcher): status=status, ) + class OpenIdProviderTest(TestCase): # def setUp(self): @@ -78,7 +80,7 @@ class OpenIdProviderTest(TestCase): provider_url = reverse('openid-provider-xrds') factory = RequestFactory() request = factory.request() - abs_provider_url = request.build_absolute_uri(location = provider_url) + abs_provider_url = request.build_absolute_uri(location=provider_url) # In order for this absolute URL to work (i.e. to get xrds, then authentication) # in the test environment, we either need a live server that works with the default @@ -86,10 +88,10 @@ class OpenIdProviderTest(TestCase): # Here we do the latter: fetcher = MyFetcher(self.client) openid.fetchers.setDefaultFetcher(fetcher, wrap_exceptions=False) - + # now we can begin the login process by invoking a local openid client, # with a pointer to the (also-local) openid provider: - with self.settings(OPENID_SSO_SERVER_URL = abs_provider_url): + with self.settings(OPENID_SSO_SERVER_URL=abs_provider_url): url = reverse('openid-login') resp = self.client.post(url) code = 200 @@ -107,7 +109,7 @@ class OpenIdProviderTest(TestCase): provider_url = reverse('openid-provider-login') factory = RequestFactory() request = factory.request() - abs_provider_url = request.build_absolute_uri(location = provider_url) + abs_provider_url = request.build_absolute_uri(location=provider_url) # In order for this absolute URL to work (i.e. to get xrds, then authentication) # in the test environment, we either need a live server that works with the default @@ -115,10 +117,10 @@ class OpenIdProviderTest(TestCase): # Here we do the latter: fetcher = MyFetcher(self.client) openid.fetchers.setDefaultFetcher(fetcher, wrap_exceptions=False) - + # now we can begin the login process by invoking a local openid client, # with a pointer to the (also-local) openid provider: - with self.settings(OPENID_SSO_SERVER_URL = abs_provider_url): + with self.settings(OPENID_SSO_SERVER_URL=abs_provider_url): url = reverse('openid-login') resp = self.client.post(url) code = 200 @@ -143,43 +145,43 @@ class OpenIdProviderTest(TestCase): self.assertContains(resp, '', html=True) # this should work on the server: self.assertContains(resp, '', html=True) - + # not included here are elements that will vary from run to run: # # - - + + def testOpenIdSetup(self): if not settings.MITX_FEATURES.get('AUTH_USE_OPENID_PROVIDER'): return url = reverse('openid-provider-login') post_args = { - "openid.mode" : "checkid_setup", - "openid.return_to" : "http://testserver/openid/complete/?janrain_nonce=2013-01-23T06%3A20%3A17ZaN7j6H", - "openid.assoc_handle" : "{HMAC-SHA1}{50ff8120}{rh87+Q==}", - "openid.claimed_id" : "http://specs.openid.net/auth/2.0/identifier_select", - "openid.ns" : "http://specs.openid.net/auth/2.0", - "openid.realm" : "http://testserver/", - "openid.identity" : "http://specs.openid.net/auth/2.0/identifier_select", - "openid.ns.ax" : "http://openid.net/srv/ax/1.0", - "openid.ax.mode" : "fetch_request", - "openid.ax.required" : "email,fullname,old_email,firstname,old_nickname,lastname,old_fullname,nickname", - "openid.ax.type.fullname" : "http://axschema.org/namePerson", - "openid.ax.type.lastname" : "http://axschema.org/namePerson/last", - "openid.ax.type.firstname" : "http://axschema.org/namePerson/first", - "openid.ax.type.nickname" : "http://axschema.org/namePerson/friendly", - "openid.ax.type.email" : "http://axschema.org/contact/email", - "openid.ax.type.old_email" : "http://schema.openid.net/contact/email", - "openid.ax.type.old_nickname" : "http://schema.openid.net/namePerson/friendly", - "openid.ax.type.old_fullname" : "http://schema.openid.net/namePerson", + "openid.mode": "checkid_setup", + "openid.return_to": "http://testserver/openid/complete/?janrain_nonce=2013-01-23T06%3A20%3A17ZaN7j6H", + "openid.assoc_handle": "{HMAC-SHA1}{50ff8120}{rh87+Q==}", + "openid.claimed_id": "http://specs.openid.net/auth/2.0/identifier_select", + "openid.ns": "http://specs.openid.net/auth/2.0", + "openid.realm": "http://testserver/", + "openid.identity": "http://specs.openid.net/auth/2.0/identifier_select", + "openid.ns.ax": "http://openid.net/srv/ax/1.0", + "openid.ax.mode": "fetch_request", + "openid.ax.required": "email,fullname,old_email,firstname,old_nickname,lastname,old_fullname,nickname", + "openid.ax.type.fullname": "http://axschema.org/namePerson", + "openid.ax.type.lastname": "http://axschema.org/namePerson/last", + "openid.ax.type.firstname": "http://axschema.org/namePerson/first", + "openid.ax.type.nickname": "http://axschema.org/namePerson/friendly", + "openid.ax.type.email": "http://axschema.org/contact/email", + "openid.ax.type.old_email": "http://schema.openid.net/contact/email", + "openid.ax.type.old_nickname": "http://schema.openid.net/namePerson/friendly", + "openid.ax.type.old_fullname": "http://schema.openid.net/namePerson", } resp = self.client.post(url, post_args) code = 200 self.assertEqual(resp.status_code, code, "got code {0} for url '{1}'. Expected code {2}" .format(resp.status_code, url, code)) - - + + # In order for this absolute URL to work (i.e. to get xrds, then authentication) # in the test environment, we either need a live server that works with the default # fetcher (i.e. urlopen2), or a test server that is reached through a custom fetcher. @@ -196,11 +198,11 @@ class OpenIdProviderLiveServerTest(LiveServerTestCase): provider_url = reverse('openid-provider-xrds') factory = RequestFactory() request = factory.request() - abs_provider_url = request.build_absolute_uri(location = provider_url) + abs_provider_url = request.build_absolute_uri(location=provider_url) # now we can begin the login process by invoking a local openid client, # with a pointer to the (also-local) openid provider: - with self.settings(OPENID_SSO_SERVER_URL = abs_provider_url): + with self.settings(OPENID_SSO_SERVER_URL=abs_provider_url): url = reverse('openid-login') resp = self.client.post(url) code = 200 diff --git a/common/djangoapps/external_auth/views.py b/common/djangoapps/external_auth/views.py index d557b33e9c..effae923b3 100644 --- a/common/djangoapps/external_auth/views.py +++ b/common/djangoapps/external_auth/views.py @@ -215,7 +215,7 @@ def ssl_dn_extract_info(dn): else: return None return (user, email, fullname) - + def ssl_get_cert_from_request(request): """ @@ -460,7 +460,7 @@ def provider_login(request): openid_request.answer(False), {}) # checkid_setup, so display login page - # (by falling through to the provider_login at the + # (by falling through to the provider_login at the # bottom of this method). elif openid_request.mode == 'checkid_setup': if openid_request.idSelect(): @@ -482,7 +482,7 @@ def provider_login(request): # handle login redirection: these are also sent to this view function, # but are distinguished by lacking the openid mode. We also know that - # they are posts, because they come from the popup + # they are posts, because they come from the popup elif request.method == 'POST' and 'openid_setup' in request.session: # get OpenID request from session openid_setup = request.session['openid_setup'] @@ -495,7 +495,7 @@ def provider_login(request): return default_render_failure(request, "Invalid OpenID trust root") # check if user with given email exists - # Failure is redirected to this method (by using the original URL), + # Failure is redirected to this method (by using the original URL), # which will bring up the login dialog. email = request.POST.get('email', None) try: @@ -542,17 +542,17 @@ def provider_login(request): # missing fields is up to the Consumer. The proper change # should only return the username, however this will likely # break the CS50 client. Temporarily we will be returning - # username filling in for fullname in addition to username + # username filling in for fullname in addition to username # as sreg nickname. - - # Note too that this is hardcoded, and not really responding to + + # Note too that this is hardcoded, and not really responding to # the extensions that were registered in the first place. results = { 'nickname': user.username, 'email': user.email, 'fullname': user.username } - + # the request succeeded: return provider_respond(server, openid_request, response, results) diff --git a/common/djangoapps/mitxmako/makoloader.py b/common/djangoapps/mitxmako/makoloader.py index 1379027e07..d623e8bcff 100644 --- a/common/djangoapps/mitxmako/makoloader.py +++ b/common/djangoapps/mitxmako/makoloader.py @@ -9,37 +9,39 @@ from django.template.loaders.app_directories import Loader as AppDirectoriesLoad from mitxmako.template import Template import mitxmako.middleware +import tempdir log = logging.getLogger(__name__) + class MakoLoader(object): """ This is a Django loader object which will load the template as a Mako template if the first line is "## mako". It is based off BaseLoader in django.template.loader. """ - + is_usable = False def __init__(self, base_loader): # base_loader is an instance of a BaseLoader subclass self.base_loader = base_loader - + module_directory = getattr(settings, 'MAKO_MODULE_DIR', None) - + if module_directory is None: log.warning("For more caching of mako templates, set the MAKO_MODULE_DIR in settings!") - module_directory = tempfile.mkdtemp() - + module_directory = tempdir.mkdtemp_clean() + self.module_directory = module_directory - - + + def __call__(self, template_name, template_dirs=None): return self.load_template(template_name, template_dirs) def load_template(self, template_name, template_dirs=None): source, file_path = self.load_template_source(template_name, template_dirs) - + if source.startswith("## mako\n"): # This is a mako template template = Template(filename=file_path, module_directory=self.module_directory, uri=template_name) @@ -56,23 +58,24 @@ class MakoLoader(object): # This allows for correct identification (later) of the actual template that does # not exist. return source, file_path - + def load_template_source(self, template_name, template_dirs=None): # Just having this makes the template load as an instance, instead of a class. return self.base_loader.load_template_source(template_name, template_dirs) def reset(self): self.base_loader.reset() - + class MakoFilesystemLoader(MakoLoader): is_usable = True - + def __init__(self): MakoLoader.__init__(self, FilesystemLoader()) - + + class MakoAppDirectoriesLoader(MakoLoader): is_usable = True - + def __init__(self): MakoLoader.__init__(self, AppDirectoriesLoader()) diff --git a/common/djangoapps/mitxmako/middleware.py b/common/djangoapps/mitxmako/middleware.py index 64cb2e5415..3f66f8cc48 100644 --- a/common/djangoapps/mitxmako/middleware.py +++ b/common/djangoapps/mitxmako/middleware.py @@ -13,7 +13,7 @@ # limitations under the License. from mako.lookup import TemplateLookup -import tempfile +import tempdir from django.template import RequestContext from django.conf import settings @@ -29,7 +29,7 @@ class MakoMiddleware(object): module_directory = getattr(settings, 'MAKO_MODULE_DIR', None) if module_directory is None: - module_directory = tempfile.mkdtemp() + module_directory = tempdir.mkdtemp_clean() for location in template_locations: lookup[location] = TemplateLookup(directories=template_locations[location], diff --git a/common/djangoapps/mitxmako/template.py b/common/djangoapps/mitxmako/template.py index 947dc8c1a4..6ef8058c7c 100644 --- a/common/djangoapps/mitxmako/template.py +++ b/common/djangoapps/mitxmako/template.py @@ -20,13 +20,15 @@ from mitxmako import middleware django_variables = ['lookup', 'output_encoding', 'encoding_errors'] # TODO: We should make this a Django Template subclass that simply has the MakoTemplate inside of it? (Intead of inheriting from MakoTemplate) + + class Template(MakoTemplate): """ This bridges the gap between a Mako template and a djano template. It can be rendered like it is a django template because the arguments are transformed in a way that MakoTemplate can understand. """ - + def __init__(self, *args, **kwargs): """Overrides base __init__ to provide django variable overrides""" if not kwargs.get('no_django', False): @@ -34,8 +36,8 @@ class Template(MakoTemplate): overrides['lookup'] = overrides['lookup']['main'] kwargs.update(overrides) super(Template, self).__init__(*args, **kwargs) - - + + def render(self, context_instance): """ This takes a render call with a context (from Django) and translates @@ -43,7 +45,7 @@ class Template(MakoTemplate): """ # collapse context_instance to a single dictionary for mako context_dictionary = {} - + # In various testing contexts, there might not be a current request context. if middleware.requestcontext is not None: for d in middleware.requestcontext: @@ -53,5 +55,5 @@ class Template(MakoTemplate): context_dictionary['settings'] = settings context_dictionary['MITX_ROOT_URL'] = settings.MITX_ROOT_URL context_dictionary['django_context'] = context_instance - + return super(Template, self).render_unicode(**context_dictionary) diff --git a/common/djangoapps/mitxmako/templatetag_helpers.py b/common/djangoapps/mitxmako/templatetag_helpers.py index e254625d3d..cd871a0fc5 100644 --- a/common/djangoapps/mitxmako/templatetag_helpers.py +++ b/common/djangoapps/mitxmako/templatetag_helpers.py @@ -2,14 +2,15 @@ from django.template import loader from django.template.base import Template, Context from django.template.loader import get_template, select_template + def django_template_include(file_name, mako_context): """ This can be used within a mako template to include a django template in the way that a django-style {% include %} does. Pass it context which can be the mako context ('context') or a dictionary. """ - - dictionary = dict( mako_context ) + + dictionary = dict(mako_context) return loader.render_to_string(file_name, dictionary=dictionary) @@ -18,7 +19,7 @@ def render_inclusion(func, file_name, takes_context, django_context, *args, **kw This allows a mako template to call a template tag function (written for django templates) that is an "inclusion tag". These functions are decorated with @register.inclusion_tag. - + -func: This is the function that is registered as an inclusion tag. You must import it directly using a python import statement. -file_name: This is the filename of the template, passed into the @@ -29,10 +30,10 @@ def render_inclusion(func, file_name, takes_context, django_context, *args, **kw a copy of the django context is available as 'django_context'. -*args and **kwargs are the arguments to func. """ - + if takes_context: args = [django_context] + list(args) - + _dict = func(*args, **kwargs) if isinstance(file_name, Template): t = file_name @@ -40,14 +41,12 @@ def render_inclusion(func, file_name, takes_context, django_context, *args, **kw t = select_template(file_name) else: t = get_template(file_name) - + nodelist = t.nodelist - + new_context = Context(_dict) csrf_token = django_context.get('csrf_token', None) if csrf_token is not None: new_context['csrf_token'] = csrf_token - - return nodelist.render(new_context) - + return nodelist.render(new_context) diff --git a/common/djangoapps/static_replace.py b/common/djangoapps/static_replace.py deleted file mode 100644 index e75362d784..0000000000 --- a/common/djangoapps/static_replace.py +++ /dev/null @@ -1,73 +0,0 @@ -import logging -import re - -from staticfiles.storage import staticfiles_storage -from staticfiles import finders -from django.conf import settings - -from xmodule.modulestore.django import modulestore -from xmodule.modulestore.xml import XMLModuleStore -from xmodule.contentstore.content import StaticContent - -log = logging.getLogger(__name__) - -def try_staticfiles_lookup(path): - """ - Try to lookup a path in staticfiles_storage. If it fails, return - a dead link instead of raising an exception. - """ - try: - url = staticfiles_storage.url(path) - except Exception as err: - log.warning("staticfiles_storage couldn't find path {0}: {1}".format( - path, str(err))) - # Just return the original path; don't kill everything. - url = path - return url - - -def replace(static_url, prefix=None, course_namespace=None): - if prefix is None: - prefix = '' - else: - prefix = prefix + '/' - - quote = static_url.group('quote') - - servable = ( - # If in debug mode, we'll serve up anything that the finders can find - (settings.DEBUG and finders.find(static_url.group('rest'), True)) or - # Otherwise, we'll only serve up stuff that the storages can find - staticfiles_storage.exists(static_url.group('rest')) - ) - - if servable: - return static_url.group(0) - else: - # don't error if file can't be found - # cdodge: to support the change over to Mongo backed content stores, lets - # use the utility functions in StaticContent.py - if static_url.group('prefix') == '/static/' and not isinstance(modulestore(), XMLModuleStore): - if course_namespace is None: - raise BaseException('You must pass in course_namespace when remapping static content urls with MongoDB stores') - url = StaticContent.convert_legacy_static_url(static_url.group('rest'), course_namespace) - else: - url = try_staticfiles_lookup(prefix + static_url.group('rest')) - - new_link = "".join([quote, url, quote]) - return new_link - - - -def replace_urls(text, staticfiles_prefix=None, replace_prefix='/static/', course_namespace=None): - - def replace_url(static_url): - return replace(static_url, staticfiles_prefix, course_namespace = course_namespace) - - return re.sub(r""" - (?x) # flags=re.VERBOSE - (?P\\?['"]) # the opening quotes - (?P{prefix}) # the prefix - (?P.*?) # everything else in the url - (?P=quote) # the first matching closing quote - """.format(prefix=replace_prefix), replace_url, text) diff --git a/common/djangoapps/static_replace/__init__.py b/common/djangoapps/static_replace/__init__.py new file mode 100644 index 0000000000..fb1f48d143 --- /dev/null +++ b/common/djangoapps/static_replace/__init__.py @@ -0,0 +1,114 @@ +import logging +import re + +from staticfiles.storage import staticfiles_storage +from staticfiles import finders +from django.conf import settings + +from xmodule.modulestore.django import modulestore +from xmodule.modulestore.xml import XMLModuleStore +from xmodule.contentstore.content import StaticContent + +log = logging.getLogger(__name__) + + +def _url_replace_regex(prefix): + """ + Match static urls in quotes that don't end in '?raw'. + + To anyone contemplating making this more complicated: + http://xkcd.com/1171/ + """ + return r""" + (?x) # flags=re.VERBOSE + (?P\\?['"]) # the opening quotes + (?P{prefix}) # the prefix + (?P.*?) # everything else in the url + (?P=quote) # the first matching closing quote + """.format(prefix=prefix) + + +def try_staticfiles_lookup(path): + """ + Try to lookup a path in staticfiles_storage. If it fails, return + a dead link instead of raising an exception. + """ + try: + url = staticfiles_storage.url(path) + except Exception as err: + log.warning("staticfiles_storage couldn't find path {0}: {1}".format( + path, str(err))) + # Just return the original path; don't kill everything. + url = path + return url + + +def replace_course_urls(text, course_id): + """ + Replace /course/$stuff urls with /courses/$course_id/$stuff urls + + text: The text to replace + course_module: A CourseDescriptor + + returns: text with the links replaced + """ + + + def replace_course_url(match): + quote = match.group('quote') + rest = match.group('rest') + return "".join([quote, '/courses/' + course_id + '/', rest, quote]) + + return re.sub(_url_replace_regex('/course/'), replace_course_url, text) + + +def replace_static_urls(text, data_directory, course_namespace=None): + """ + Replace /static/$stuff urls either with their correct url as generated by collectstatic, + (/static/$md5_hashed_stuff) or by the course-specific content static url + /static/$course_data_dir/$stuff, or, if course_namespace is not None, by the + correct url in the contentstore (c4x://) + + text: The source text to do the substitution in + data_directory: The directory in which course data is stored + course_namespace: The course identifier used to distinguish static content for this course in studio + """ + + def replace_static_url(match): + original = match.group(0) + prefix = match.group('prefix') + quote = match.group('quote') + rest = match.group('rest') + + # Don't mess with things that end in '?raw' + if rest.endswith('?raw'): + return original + + # course_namespace is not None, then use studio style urls + if course_namespace is not None and not isinstance(modulestore(), XMLModuleStore): + url = StaticContent.convert_legacy_static_url(rest, course_namespace) + # In debug mode, if we can find the url as is, + elif settings.DEBUG and finders.find(rest, True): + return original + # Otherwise, look the file up in staticfiles_storage, and append the data directory if needed + else: + course_path = "/".join((data_directory, rest)) + + try: + if staticfiles_storage.exists(rest): + url = staticfiles_storage.url(rest) + else: + url = staticfiles_storage.url(course_path) + # And if that fails, assume that it's course content, and add manually data directory + except Exception as err: + log.warning("staticfiles_storage couldn't find path {0}: {1}".format( + rest, str(err))) + url = "".join([prefix, course_path]) + + return "".join([quote, url, quote]) + + return re.sub( + _url_replace_regex('/static/(?!{data_dir})'.format(data_dir=data_directory)), + replace_static_url, + text + ) diff --git a/common/djangoapps/static_replace/management/__init__.py b/common/djangoapps/static_replace/management/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common/djangoapps/static_replace/management/commands/__init__.py b/common/djangoapps/static_replace/management/commands/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common/djangoapps/static_replace/management/commands/clear_collectstatic_cache.py b/common/djangoapps/static_replace/management/commands/clear_collectstatic_cache.py new file mode 100644 index 0000000000..60b7c58047 --- /dev/null +++ b/common/djangoapps/static_replace/management/commands/clear_collectstatic_cache.py @@ -0,0 +1,15 @@ +### +### Script for importing courseware from XML format +### + +from django.core.management.base import NoArgsCommand +from django.core.cache import get_cache + + +class Command(NoArgsCommand): + help = \ +'''Import the specified data directory into the default ModuleStore''' + + def handle_noargs(self, **options): + staticfiles_cache = get_cache('staticfiles') + staticfiles_cache.clear() diff --git a/common/djangoapps/static_replace/test/test_static_replace.py b/common/djangoapps/static_replace/test/test_static_replace.py new file mode 100644 index 0000000000..f23610e1bd --- /dev/null +++ b/common/djangoapps/static_replace/test/test_static_replace.py @@ -0,0 +1,111 @@ +import re + +from nose.tools import assert_equals, assert_true, assert_false +from static_replace import (replace_static_urls, replace_course_urls, + _url_replace_regex) +from mock import patch, Mock +from xmodule.modulestore import Location +from xmodule.modulestore.mongo import MongoModuleStore +from xmodule.modulestore.xml import XMLModuleStore + +DATA_DIRECTORY = 'data_dir' +COURSE_ID = 'org/course/run' +NAMESPACE = Location('org', 'course', 'run', None, None) +STATIC_SOURCE = '"/static/file.png"' + + +def test_multi_replace(): + course_source = '"/course/file.png"' + + assert_equals( + replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY), + replace_static_urls(replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY), DATA_DIRECTORY) + ) + assert_equals( + replace_course_urls(course_source, COURSE_ID), + replace_course_urls(replace_course_urls(course_source, COURSE_ID), COURSE_ID) + ) + + +@patch('static_replace.staticfiles_storage') +def test_storage_url_exists(mock_storage): + mock_storage.exists.return_value = True + mock_storage.url.return_value = '/static/file.png' + + assert_equals('"/static/file.png"', replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY)) + mock_storage.exists.called_once_with('file.png') + mock_storage.url.called_once_with('data_dir/file.png') + + +@patch('static_replace.staticfiles_storage') +def test_storage_url_not_exists(mock_storage): + mock_storage.exists.return_value = False + mock_storage.url.return_value = '/static/data_dir/file.png' + + assert_equals('"/static/data_dir/file.png"', replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY)) + mock_storage.exists.called_once_with('file.png') + mock_storage.url.called_once_with('file.png') + + +@patch('static_replace.StaticContent') +@patch('static_replace.modulestore') +def test_mongo_filestore(mock_modulestore, mock_static_content): + + mock_modulestore.return_value = Mock(MongoModuleStore) + mock_static_content.convert_legacy_static_url.return_value = "c4x://mock_url" + + # No namespace => no change to path + assert_equals('"/static/data_dir/file.png"', replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY)) + + # Namespace => content url + assert_equals( + '"' + mock_static_content.convert_legacy_static_url.return_value + '"', + replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY, NAMESPACE) + ) + + mock_static_content.convert_legacy_static_url.assert_called_once_with('file.png', NAMESPACE) + + +@patch('static_replace.settings') +@patch('static_replace.modulestore') +@patch('static_replace.staticfiles_storage') +def test_data_dir_fallback(mock_storage, mock_modulestore, mock_settings): + mock_modulestore.return_value = Mock(XMLModuleStore) + mock_storage.url.side_effect = Exception + + mock_storage.exists.return_value = True + assert_equals('"/static/data_dir/file.png"', replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY)) + + mock_storage.exists.return_value = False + assert_equals('"/static/data_dir/file.png"', replace_static_urls(STATIC_SOURCE, DATA_DIRECTORY)) + + +def test_raw_static_check(): + """ + Make sure replace_static_urls leaves alone things that end in '.raw' + """ + path = '"/static/foo.png?raw"' + assert_equals(path, replace_static_urls(path, DATA_DIRECTORY)) + + text = 'text
      0: + record['registration_error'] = registration.upload_error_message + if len(registration.testcenter_user.upload_error_message) > 0: + record['demographics_error'] = registration.testcenter_user.upload_error_message + if registration.needs_uploading: + record['needs_uploading'] = True + + output.append(record) + + # dump output: + with open(outputfile, 'w') as outfile: + dump(output, outfile, indent=2) diff --git a/common/djangoapps/student/management/commands/pearson_export_cdd.py b/common/djangoapps/student/management/commands/pearson_export_cdd.py index 67230c7f74..bad98b9d25 100644 --- a/common/djangoapps/student/management/commands/pearson_export_cdd.py +++ b/common/djangoapps/student/management/commands/pearson_export_cdd.py @@ -1,15 +1,17 @@ import csv +import os from collections import OrderedDict from datetime import datetime -from os.path import isdir from optparse import make_option -from django.core.management.base import BaseCommand +from django.conf import settings +from django.core.management.base import BaseCommand, CommandError from student.models import TestCenterUser + class Command(BaseCommand): - + CSV_TO_MODEL_FIELDS = OrderedDict([ # Skipping optional field CandidateID ("ClientCandidateID", "client_candidate_id"), @@ -34,43 +36,52 @@ class Command(BaseCommand): ("FAXCountryCode", "fax_country_code"), ("CompanyName", "company_name"), # Skipping optional field CustomQuestion - ("LastUpdate", "user_updated_at"), # in UTC, so same as what we store + ("LastUpdate", "user_updated_at"), # in UTC, so same as what we store ]) + # define defaults, even thought 'store_true' shouldn't need them. + # (call_command will set None as default value for all options that don't have one, + # so one cannot rely on presence/absence of flags in that world.) option_list = BaseCommand.option_list + ( - make_option( - '--dump_all', - action='store_true', - dest='dump_all', - ), + make_option('--dest-from-settings', + action='store_true', + dest='dest-from-settings', + default=False, + help='Retrieve the destination to export to from django.'), + make_option('--destination', + action='store', + dest='destination', + default=None, + help='Where to store the exported files') ) - - args = '' - help = """ - Export user demographic information from TestCenterUser model into a tab delimited - text file with a format that Pearson expects. - """ - def handle(self, *args, **kwargs): - if len(args) < 1: - print Command.help - return - # update time should use UTC in order to be comparable to the user_updated_at + def handle(self, **options): + # update time should use UTC in order to be comparable to the user_updated_at # field uploaded_at = datetime.utcnow() - # if specified destination is an existing directory, then + # if specified destination is an existing directory, then # create a filename for it automatically. If it doesn't exist, - # or exists as a file, then we will just write to it. + # then we will create the directory. # Name will use timestamp -- this is UTC, so it will look funny, - # but it should at least be consistent with the other timestamps + # but it should at least be consistent with the other timestamps # used in the system. - dest = args[0] - if isdir(dest): - destfile = os.path.join(dest, uploaded_at.strftime("cdd-%Y%m%d-%H%M%S.dat")) + if 'dest-from-settings' in options and options['dest-from-settings']: + if 'LOCAL_EXPORT' in settings.PEARSON: + dest = settings.PEARSON['LOCAL_EXPORT'] + else: + raise CommandError('--dest-from-settings was enabled but the' + 'PEARSON[LOCAL_EXPORT] setting was not set.') + elif 'destination' in options and options['destination']: + dest = options['destination'] else: - destfile = dest - + raise CommandError('--destination or --dest-from-settings must be used') + + if not os.path.isdir(dest): + os.makedirs(dest) + + destfile = os.path.join(dest, uploaded_at.strftime("cdd-%Y%m%d-%H%M%S.dat")) + # strings must be in latin-1 format. CSV parser will # otherwise convert unicode objects to ascii. def ensure_encoding(value): @@ -78,8 +89,8 @@ class Command(BaseCommand): return value.encode('iso-8859-1') else: return value - - dump_all = kwargs['dump_all'] + +# dump_all = options['dump_all'] with open(destfile, "wb") as outfile: writer = csv.DictWriter(outfile, @@ -89,7 +100,7 @@ class Command(BaseCommand): extrasaction='ignore') writer.writeheader() for tcu in TestCenterUser.objects.order_by('id'): - if dump_all or tcu.needs_uploading: + if tcu.needs_uploading: # or dump_all record = dict((csv_field, ensure_encoding(getattr(tcu, model_field))) for csv_field, model_field in Command.CSV_TO_MODEL_FIELDS.items()) @@ -97,6 +108,3 @@ class Command(BaseCommand): writer.writerow(record) tcu.uploaded_at = uploaded_at tcu.save() - - - diff --git a/common/djangoapps/student/management/commands/pearson_export_ead.py b/common/djangoapps/student/management/commands/pearson_export_ead.py index de3bfc04ee..03dbce0024 100644 --- a/common/djangoapps/student/management/commands/pearson_export_ead.py +++ b/common/djangoapps/student/management/commands/pearson_export_ead.py @@ -1,15 +1,17 @@ import csv +import os from collections import OrderedDict from datetime import datetime -from os.path import isdir, join from optparse import make_option -from django.core.management.base import BaseCommand +from django.conf import settings +from django.core.management.base import BaseCommand, CommandError + +from student.models import TestCenterRegistration, ACCOMMODATION_REJECTED_CODE -from student.models import TestCenterRegistration class Command(BaseCommand): - + CSV_TO_MODEL_FIELDS = OrderedDict([ ('AuthorizationTransactionType', 'authorization_transaction_type'), ('AuthorizationID', 'authorization_id'), @@ -20,51 +22,60 @@ class Command(BaseCommand): ('Accommodations', 'accommodation_code'), ('EligibilityApptDateFirst', 'eligibility_appointment_date_first'), ('EligibilityApptDateLast', 'eligibility_appointment_date_last'), - ("LastUpdate", "user_updated_at"), # in UTC, so same as what we store + ("LastUpdate", "user_updated_at"), # in UTC, so same as what we store ]) - args = '' - help = """ - Export user registration information from TestCenterRegistration model into a tab delimited - text file with a format that Pearson expects. - """ - option_list = BaseCommand.option_list + ( - make_option( - '--dump_all', - action='store_true', - dest='dump_all', - ), - make_option( - '--force_add', - action='store_true', - dest='force_add', - ), + make_option('--dest-from-settings', + action='store_true', + dest='dest-from-settings', + default=False, + help='Retrieve the destination to export to from django.'), + make_option('--destination', + action='store', + dest='destination', + default=None, + help='Where to store the exported files'), + make_option('--dump_all', + action='store_true', + dest='dump_all', + default=False, + ), + make_option('--force_add', + action='store_true', + dest='force_add', + default=False, + ), ) - - - def handle(self, *args, **kwargs): - if len(args) < 1: - print Command.help - return - # update time should use UTC in order to be comparable to the user_updated_at + def handle(self, **options): + # update time should use UTC in order to be comparable to the user_updated_at # field uploaded_at = datetime.utcnow() - # if specified destination is an existing directory, then + # if specified destination is an existing directory, then # create a filename for it automatically. If it doesn't exist, - # or exists as a file, then we will just write to it. + # then we will create the directory. # Name will use timestamp -- this is UTC, so it will look funny, - # but it should at least be consistent with the other timestamps + # but it should at least be consistent with the other timestamps # used in the system. - dest = args[0] - if isdir(dest): - destfile = join(dest, uploaded_at.strftime("ead-%Y%m%d-%H%M%S.dat")) + if 'dest-from-settings' in options and options['dest-from-settings']: + if 'LOCAL_EXPORT' in settings.PEARSON: + dest = settings.PEARSON['LOCAL_EXPORT'] + else: + raise CommandError('--dest-from-settings was enabled but the' + 'PEARSON[LOCAL_EXPORT] setting was not set.') + elif 'destination' in options and options['destination']: + dest = options['destination'] else: - destfile = dest + raise CommandError('--destination or --dest-from-settings must be used') - dump_all = kwargs['dump_all'] + if not os.path.isdir(dest): + os.makedirs(dest) + + destfile = os.path.join(dest, uploaded_at.strftime("ead-%Y%m%d-%H%M%S.dat")) + + dump_all = options['dump_all'] with open(destfile, "wb") as outfile: writer = csv.DictWriter(outfile, @@ -81,13 +92,11 @@ class Command(BaseCommand): record["LastUpdate"] = record["LastUpdate"].strftime("%Y/%m/%d %H:%M:%S") record["EligibilityApptDateFirst"] = record["EligibilityApptDateFirst"].strftime("%Y/%m/%d") record["EligibilityApptDateLast"] = record["EligibilityApptDateLast"].strftime("%Y/%m/%d") - if kwargs['force_add']: + if record["Accommodations"] == ACCOMMODATION_REJECTED_CODE: + record["Accommodations"] = "" + if options['force_add']: record['AuthorizationTransactionType'] = 'Add' writer.writerow(record) tcr.uploaded_at = uploaded_at tcr.save() - - - - diff --git a/common/djangoapps/student/management/commands/pearson_import_conf_zip.py b/common/djangoapps/student/management/commands/pearson_import_conf_zip.py new file mode 100644 index 0000000000..d0b2938df0 --- /dev/null +++ b/common/djangoapps/student/management/commands/pearson_import_conf_zip.py @@ -0,0 +1,118 @@ +import csv + +from zipfile import ZipFile, is_zipfile +from time import strptime, strftime + +from collections import OrderedDict +from datetime import datetime +from os.path import isdir +from optparse import make_option +from dogapi import dog_http_api, dog_stats_api + +from django.core.management.base import BaseCommand, CommandError +from django.conf import settings + +from student.models import TestCenterUser, TestCenterRegistration + + +class Command(BaseCommand): + + dog_http_api.api_key = settings.DATADOG_API + args = '' + help = """ + Import Pearson confirmation files and update TestCenterUser + and TestCenterRegistration tables with status. + """ + + @staticmethod + def datadog_error(string, tags): + dog_http_api.event("Pearson Import", string, alert_type='error', tags=[tags]) + + def handle(self, *args, **kwargs): + if len(args) < 1: + print Command.help + return + + source_zip = args[0] + if not is_zipfile(source_zip): + error = "Input file is not a zipfile: \"{}\"".format(source_zip) + Command.datadog_error(error, source_zip) + raise CommandError(error) + + # loop through all files in zip, and process them based on filename prefix: + with ZipFile(source_zip, 'r') as zipfile: + for fileinfo in zipfile.infolist(): + with zipfile.open(fileinfo) as zipentry: + if fileinfo.filename.startswith("eac-"): + self.process_eac(zipentry) + elif fileinfo.filename.startswith("vcdc-"): + self.process_vcdc(zipentry) + else: + error = "Unrecognized confirmation file type\"{}\" in confirmation zip file \"{}\"".format(fileinfo.filename, zipfile) + Command.datadog_error(error, source_zip) + raise CommandError(error) + + def process_eac(self, eacfile): + print "processing eac" + reader = csv.DictReader(eacfile, delimiter="\t") + for row in reader: + client_authorization_id = row['ClientAuthorizationID'] + if not client_authorization_id: + if row['Status'] == 'Error': + Command.datadog_error("Error in EAD file processing ({}): {}".format(row['Date'], row['Message']), eacfile.name) + else: + Command.datadog_error("Encountered bad record: {}".format(row), eacfile.name) + else: + try: + registration = TestCenterRegistration.objects.get(client_authorization_id=client_authorization_id) + Command.datadog_error("Found authorization record for user {}".format(registration.testcenter_user.user.username), eacfile.name) + # now update the record: + registration.upload_status = row['Status'] + registration.upload_error_message = row['Message'] + try: + registration.processed_at = strftime('%Y-%m-%d %H:%M:%S', strptime(row['Date'], '%Y/%m/%d %H:%M:%S')) + except ValueError as ve: + Command.datadog_error("Bad Date value found for {}: message {}".format(client_authorization_id, ve), eacfile.name) + # store the authorization Id if one is provided. (For debugging) + if row['AuthorizationID']: + try: + registration.authorization_id = int(row['AuthorizationID']) + except ValueError as ve: + Command.datadog_error("Bad AuthorizationID value found for {}: message {}".format(client_authorization_id, ve), eacfile.name) + + registration.confirmed_at = datetime.utcnow() + registration.save() + except TestCenterRegistration.DoesNotExist: + Command.datadog_error("Failed to find record for client_auth_id {}".format(client_authorization_id), eacfile.name) + + def process_vcdc(self, vcdcfile): + print "processing vcdc" + reader = csv.DictReader(vcdcfile, delimiter="\t") + for row in reader: + client_candidate_id = row['ClientCandidateID'] + if not client_candidate_id: + if row['Status'] == 'Error': + Command.datadog_error("Error in CDD file processing ({}): {}".format(row['Date'], row['Message']), vcdcfile.name) + else: + Command.datadog_error("Encountered bad record: {}".format(row), vcdcfile.name) + else: + try: + tcuser = TestCenterUser.objects.get(client_candidate_id=client_candidate_id) + Command.datadog_error("Found demographics record for user {}".format(tcuser.user.username), vcdcfile.name) + # now update the record: + tcuser.upload_status = row['Status'] + tcuser.upload_error_message = row['Message'] + try: + tcuser.processed_at = strftime('%Y-%m-%d %H:%M:%S', strptime(row['Date'], '%Y/%m/%d %H:%M:%S')) + except ValueError as ve: + Command.datadog_error("Bad Date value found for {}: message {}".format(client_candidate_id, ve), vcdcfile.name) + # store the candidate Id if one is provided. (For debugging) + if row['CandidateID']: + try: + tcuser.candidate_id = int(row['CandidateID']) + except ValueError as ve: + Command.datadog_error("Bad CandidateID value found for {}: message {}".format(client_candidate_id, ve), vcdcfile.name) + tcuser.confirmed_at = datetime.utcnow() + tcuser.save() + except TestCenterUser.DoesNotExist: + Command.datadog_error(" Failed to find record for client_candidate_id {}".format(client_candidate_id), vcdcfile.name) diff --git a/common/djangoapps/student/management/commands/pearson_make_tc_registration.py b/common/djangoapps/student/management/commands/pearson_make_tc_registration.py index 81a478d19d..b10cf143a0 100644 --- a/common/djangoapps/student/management/commands/pearson_make_tc_registration.py +++ b/common/djangoapps/student/management/commands/pearson_make_tc_registration.py @@ -9,6 +9,7 @@ from student.views import course_from_id from xmodule.course_module import CourseDescriptor from xmodule.modulestore.exceptions import ItemNotFoundError + class Command(BaseCommand): option_list = BaseCommand.option_list + ( # registration info: @@ -16,23 +17,23 @@ class Command(BaseCommand): '--accommodation_request', action='store', dest='accommodation_request', - ), + ), make_option( '--accommodation_code', action='store', dest='accommodation_code', - ), + ), make_option( '--client_authorization_id', action='store', dest='client_authorization_id', - ), - # exam info: + ), + # exam info: make_option( '--exam_series_code', action='store', dest='exam_series_code', - ), + ), make_option( '--eligibility_appointment_date_first', action='store', @@ -51,26 +52,32 @@ class Command(BaseCommand): action='store', dest='authorization_id', help='ID we receive from Pearson for a particular authorization' - ), + ), make_option( '--upload_status', action='store', dest='upload_status', help='status value assigned by Pearson' - ), + ), make_option( '--upload_error_message', action='store', dest='upload_error_message', help='error message provided by Pearson on a failure.' - ), + ), # control values: make_option( '--ignore_registration_dates', action='store_true', dest='ignore_registration_dates', help='find exam info for course based on exam_series_code, even if the exam is not active.' - ), + ), + make_option( + '--create_dummy_exam', + action='store_true', + dest='create_dummy_exam', + help='create dummy exam info for course, even if course exists' + ), ) args = "" help = "Create or modify a TestCenterRegistration entry for a given Student" @@ -97,21 +104,26 @@ class Command(BaseCommand): testcenter_user = TestCenterUser.objects.get(user=student) except TestCenterUser.DoesNotExist: raise CommandError("User \"{}\" does not have an existing demographics record".format(username)) - - # check to see if a course_id was specified, and use information from that: - try: - course = course_from_id(course_id) - if 'ignore_registration_dates' in our_options: - examlist = [exam for exam in course.test_center_exams if exam.exam_series_code == our_options.get('exam_series_code')] - exam = examlist[0] if len(examlist) > 0 else None - else: - exam = course.current_test_center_exam - except ItemNotFoundError: - # otherwise use explicit values (so we don't have to define a course): + + # get an "exam" object. Check to see if a course_id was specified, and use information from that: + exam = None + create_dummy_exam = 'create_dummy_exam' in our_options and our_options['create_dummy_exam'] + if not create_dummy_exam: + try: + course = course_from_id(course_id) + if 'ignore_registration_dates' in our_options: + examlist = [exam for exam in course.test_center_exams if exam.exam_series_code == our_options.get('exam_series_code')] + exam = examlist[0] if len(examlist) > 0 else None + else: + exam = course.current_test_center_exam + except ItemNotFoundError: + pass + else: + # otherwise use explicit values (so we don't have to define a course): exam_name = "Dummy Placeholder Name" - exam_info = { 'Exam_Series_Code': our_options['exam_series_code'], - 'First_Eligible_Appointment_Date' : our_options['eligibility_appointment_date_first'], - 'Last_Eligible_Appointment_Date' : our_options['eligibility_appointment_date_last'], + exam_info = {'Exam_Series_Code': our_options['exam_series_code'], + 'First_Eligible_Appointment_Date': our_options['eligibility_appointment_date_first'], + 'Last_Eligible_Appointment_Date': our_options['eligibility_appointment_date_last'], } exam = CourseDescriptor.TestCenterExam(course_id, exam_name, exam_info) # update option values for date_first and date_last to use YYYY-MM-DD format @@ -120,18 +132,18 @@ class Command(BaseCommand): our_options['eligibility_appointment_date_last'] = strftime("%Y-%m-%d", exam.last_eligible_appointment_date) if exam is None: - raise CommandError("Exam for course_id {%s} does not exist".format(course_id)) + raise CommandError("Exam for course_id {} does not exist".format(course_id)) exam_code = exam.exam_series_code - - UPDATE_FIELDS = ( 'accommodation_request', + + UPDATE_FIELDS = ('accommodation_request', 'accommodation_code', 'client_authorization_id', 'exam_series_code', 'eligibility_appointment_date_first', 'eligibility_appointment_date_last', ) - + # create and save the registration: needs_updating = False registrations = get_testcenter_registration(student, course_id, exam_code) @@ -141,56 +153,55 @@ class Command(BaseCommand): if fieldname in our_options and registration.__getattribute__(fieldname) != our_options[fieldname]: needs_updating = True; else: - accommodation_request = our_options.get('accommodation_request','') + accommodation_request = our_options.get('accommodation_request', '') registration = TestCenterRegistration.create(testcenter_user, exam, accommodation_request) needs_updating = True - + if needs_updating: # first update the record with the new values, if any: for fieldname in UPDATE_FIELDS: - if fieldname in our_options and fieldname not in TestCenterRegistrationForm.Meta.fields: + if fieldname in our_options and fieldname not in TestCenterRegistrationForm.Meta.fields: registration.__setattr__(fieldname, our_options[fieldname]) - - # the registration form normally populates the data dict with + + # the registration form normally populates the data dict with # the accommodation request (if any). But here we want to # specify only those values that might change, so update the dict with existing # values. form_options = dict(our_options) for propname in TestCenterRegistrationForm.Meta.fields: - if propname not in form_options: + if propname not in form_options: form_options[propname] = registration.__getattribute__(propname) form = TestCenterRegistrationForm(instance=registration, data=form_options) if form.is_valid(): form.update_and_save() - print "Updated registration information for user's registration: username \"{}\" course \"{}\", examcode \"{}\"".format(student.username, course_id, exam_code) + print "Updated registration information for user's registration: username \"{}\" course \"{}\", examcode \"{}\"".format(student.username, course_id, exam_code) else: if (len(form.errors) > 0): print "Field Form errors encountered:" for fielderror in form.errors: - print "Field Form Error: %s" % fielderror + for msg in form.errors[fielderror]: + print "Field Form Error: {} -- {}".format(fielderror, msg) if (len(form.non_field_errors()) > 0): print "Non-field Form errors encountered:" for nonfielderror in form.non_field_errors: print "Non-field Form Error: %s" % nonfielderror - + else: print "No changes necessary to make to existing user's registration." - + # override internal values: change_internal = False if 'exam_series_code' in our_options: exam_code = our_options['exam_series_code'] registration = get_testcenter_registration(student, course_id, exam_code)[0] - for internal_field in [ 'upload_error_message', 'upload_status', 'authorization_id']: + for internal_field in ['upload_error_message', 'upload_status', 'authorization_id']: if internal_field in our_options: registration.__setattr__(internal_field, our_options[internal_field]) change_internal = True - + if change_internal: print "Updated confirmation information in existing user's registration." registration.save() else: print "No changes necessary to make to confirmation information in existing user's registration." - - diff --git a/common/djangoapps/student/management/commands/pearson_make_tc_user.py b/common/djangoapps/student/management/commands/pearson_make_tc_user.py index da9bfc3bd0..10ef0bd067 100644 --- a/common/djangoapps/student/management/commands/pearson_make_tc_user.py +++ b/common/djangoapps/student/management/commands/pearson_make_tc_user.py @@ -1,64 +1,65 @@ from optparse import make_option from django.contrib.auth.models import User -from django.core.management.base import BaseCommand +from django.core.management.base import BaseCommand, CommandError from student.models import TestCenterUser, TestCenterUserForm + class Command(BaseCommand): option_list = BaseCommand.option_list + ( - # demographics: + # demographics: make_option( '--first_name', action='store', dest='first_name', - ), + ), make_option( '--middle_name', action='store', dest='middle_name', - ), + ), make_option( '--last_name', action='store', dest='last_name', - ), + ), make_option( '--suffix', action='store', dest='suffix', - ), + ), make_option( '--salutation', action='store', dest='salutation', - ), + ), make_option( '--address_1', action='store', dest='address_1', - ), + ), make_option( '--address_2', action='store', dest='address_2', - ), + ), make_option( '--address_3', action='store', dest='address_3', - ), + ), make_option( '--city', action='store', dest='city', - ), + ), make_option( '--state', action='store', dest='state', help='Two letter code (e.g. MA)' - ), + ), make_option( '--postal_code', action='store', @@ -75,12 +76,12 @@ class Command(BaseCommand): action='store', dest='phone', help='Pretty free-form (parens, spaces, dashes), but no country code' - ), + ), make_option( '--extension', action='store', dest='extension', - ), + ), make_option( '--phone_country_code', action='store', @@ -92,7 +93,7 @@ class Command(BaseCommand): action='store', dest='fax', help='Pretty free-form (parens, spaces, dashes), but no country code' - ), + ), make_option( '--fax_country_code', action='store', @@ -103,26 +104,26 @@ class Command(BaseCommand): '--company_name', action='store', dest='company_name', - ), + ), # internal values: make_option( '--client_candidate_id', action='store', dest='client_candidate_id', help='ID we assign a user to identify them to Pearson' - ), + ), make_option( '--upload_status', action='store', dest='upload_status', help='status value assigned by Pearson' - ), + ), make_option( '--upload_error_message', action='store', dest='upload_error_message', help='error message provided by Pearson on a failure.' - ), + ), ) args = "" help = "Create or modify a TestCenterUser entry for a given Student" @@ -142,48 +143,48 @@ class Command(BaseCommand): student = User.objects.get(username=username) try: testcenter_user = TestCenterUser.objects.get(user=student) - needs_updating = testcenter_user.needs_update(our_options) + needs_updating = testcenter_user.needs_update(our_options) except TestCenterUser.DoesNotExist: # do additional initialization here: testcenter_user = TestCenterUser.create(student) needs_updating = True - + if needs_updating: - # the registration form normally populates the data dict with + # the registration form normally populates the data dict with # all values from the testcenter_user. But here we only want to # specify those values that change, so update the dict with existing # values. form_options = dict(our_options) for propname in TestCenterUser.user_provided_fields(): - if propname not in form_options: + if propname not in form_options: form_options[propname] = testcenter_user.__getattribute__(propname) form = TestCenterUserForm(instance=testcenter_user, data=form_options) if form.is_valid(): form.update_and_save() else: + errorlist = [] if (len(form.errors) > 0): - print "Field Form errors encountered:" - for fielderror in form.errors: - print "Field Form Error: %s" % fielderror - if (len(form.non_field_errors()) > 0): - print "Non-field Form errors encountered:" - for nonfielderror in form.non_field_errors: - print "Non-field Form Error: %s" % nonfielderror - + errorlist.append("Field Form errors encountered:") + for fielderror in form.errors: + errorlist.append("Field Form Error: {}".format(fielderror)) + if (len(form.non_field_errors()) > 0): + errorlist.append("Non-field Form errors encountered:") + for nonfielderror in form.non_field_errors: + errorlist.append("Non-field Form Error: {}".format(nonfielderror)) + raise CommandError("\n".join(errorlist)) else: print "No changes necessary to make to existing user's demographics." - + # override internal values: change_internal = False testcenter_user = TestCenterUser.objects.get(user=student) - for internal_field in [ 'upload_error_message', 'upload_status', 'client_candidate_id']: + for internal_field in ['upload_error_message', 'upload_status', 'client_candidate_id']: if internal_field in our_options: testcenter_user.__setattr__(internal_field, our_options[internal_field]) change_internal = True - + if change_internal: testcenter_user.save() print "Updated confirmation information in existing user's demographics." else: print "No changes necessary to make to confirmation information in existing user's demographics." - diff --git a/common/djangoapps/student/management/commands/pearson_transfer.py b/common/djangoapps/student/management/commands/pearson_transfer.py new file mode 100644 index 0000000000..5eded6484a --- /dev/null +++ b/common/djangoapps/student/management/commands/pearson_transfer.py @@ -0,0 +1,163 @@ +import os +from optparse import make_option +from stat import S_ISDIR + +from django.conf import settings +from django.core.management.base import BaseCommand, CommandError +from django.core.management import call_command +from dogapi import dog_http_api, dog_stats_api +import paramiko +import boto + +dog_http_api.api_key = settings.DATADOG_API + + +class Command(BaseCommand): + help = """ + This command handles the importing and exporting of student records for + Pearson. It uses some other Django commands to export and import the + files and then uploads over SFTP to Pearson and stuffs the entry in an + S3 bucket for archive purposes. + + Usage: django-admin.py pearson-transfer --mode [import|export|both] + """ + + option_list = BaseCommand.option_list + ( + make_option('--mode', + action='store', + dest='mode', + default='both', + choices=('import', 'export', 'both'), + help='mode is import, export, or both'), + ) + + def handle(self, **options): + + if not hasattr(settings, 'PEARSON'): + raise CommandError('No PEARSON entries in auth/env.json.') + + # check settings needed for either import or export: + for value in ['SFTP_HOSTNAME', 'SFTP_USERNAME', 'SFTP_PASSWORD', 'S3_BUCKET']: + if value not in settings.PEARSON: + raise CommandError('No entry in the PEARSON settings' + '(env/auth.json) for {0}'.format(value)) + + for value in ['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY']: + if not hasattr(settings, value): + raise CommandError('No entry in the AWS settings' + '(env/auth.json) for {0}'.format(value)) + + # check additional required settings for import and export: + if options['mode'] in ('export', 'both'): + for value in ['LOCAL_EXPORT', 'SFTP_EXPORT']: + if value not in settings.PEARSON: + raise CommandError('No entry in the PEARSON settings' + '(env/auth.json) for {0}'.format(value)) + # make sure that the import directory exists or can be created: + source_dir = settings.PEARSON['LOCAL_EXPORT'] + if not os.path.isdir(source_dir): + os.makedirs(source_dir) + + if options['mode'] in ('import', 'both'): + for value in ['LOCAL_IMPORT', 'SFTP_IMPORT']: + if value not in settings.PEARSON: + raise CommandError('No entry in the PEARSON settings' + '(env/auth.json) for {0}'.format(value)) + # make sure that the import directory exists or can be created: + dest_dir = settings.PEARSON['LOCAL_IMPORT'] + if not os.path.isdir(dest_dir): + os.makedirs(dest_dir) + + + def sftp(files_from, files_to, mode, deleteAfterCopy=False): + with dog_stats_api.timer('pearson.{0}'.format(mode), tags='sftp'): + try: + t = paramiko.Transport((settings.PEARSON['SFTP_HOSTNAME'], 22)) + t.connect(username=settings.PEARSON['SFTP_USERNAME'], + password=settings.PEARSON['SFTP_PASSWORD']) + sftp = paramiko.SFTPClient.from_transport(t) + + if mode == 'export': + try: + sftp.chdir(files_to) + except IOError: + raise CommandError('SFTP destination path does not exist: {}'.format(files_to)) + for filename in os.listdir(files_from): + sftp.put(files_from + '/' + filename, filename) + if deleteAfterCopy: + os.remove(os.path.join(files_from, filename)) + else: + try: + sftp.chdir(files_from) + except IOError: + raise CommandError('SFTP source path does not exist: {}'.format(files_from)) + for filename in sftp.listdir('.'): + # skip subdirectories + if not S_ISDIR(sftp.stat(filename).st_mode): + sftp.get(filename, files_to + '/' + filename) + # delete files from sftp server once they are successfully pulled off: + if deleteAfterCopy: + sftp.remove(filename) + except: + dog_http_api.event('pearson {0}'.format(mode), + 'sftp uploading failed', + alert_type='error') + raise + finally: + sftp.close() + t.close() + + def s3(files_from, bucket, mode, deleteAfterCopy=False): + with dog_stats_api.timer('pearson.{0}'.format(mode), tags='s3'): + try: + for filename in os.listdir(files_from): + source_file = os.path.join(files_from, filename) + # use mode as name of directory into which to write files + dest_file = os.path.join(mode, filename) + upload_file_to_s3(bucket, source_file, dest_file) + if deleteAfterCopy: + os.remove(files_from + '/' + filename) + except: + dog_http_api.event('pearson {0}'.format(mode), + 's3 archiving failed') + raise + + def upload_file_to_s3(bucket, source_file, dest_file): + """ + Upload file to S3 + """ + s3 = boto.connect_s3(settings.AWS_ACCESS_KEY_ID, + settings.AWS_SECRET_ACCESS_KEY) + from boto.s3.key import Key + b = s3.get_bucket(bucket) + k = Key(b) + k.key = "{filename}".format(filename=dest_file) + k.set_contents_from_filename(source_file) + + def export_pearson(): + options = {'dest-from-settings': True} + call_command('pearson_export_cdd', **options) + call_command('pearson_export_ead', **options) + mode = 'export' + sftp(settings.PEARSON['LOCAL_EXPORT'], settings.PEARSON['SFTP_EXPORT'], mode, deleteAfterCopy=False) + s3(settings.PEARSON['LOCAL_EXPORT'], settings.PEARSON['S3_BUCKET'], mode, deleteAfterCopy=True) + + def import_pearson(): + mode = 'import' + try: + sftp(settings.PEARSON['SFTP_IMPORT'], settings.PEARSON['LOCAL_IMPORT'], mode, deleteAfterCopy=True) + s3(settings.PEARSON['LOCAL_IMPORT'], settings.PEARSON['S3_BUCKET'], mode, deleteAfterCopy=False) + except Exception as e: + dog_http_api.event('Pearson Import failure', str(e)) + raise e + else: + for filename in os.listdir(settings.PEARSON['LOCAL_IMPORT']): + filepath = os.path.join(settings.PEARSON['LOCAL_IMPORT'], filename) + call_command('pearson_import_conf_zip', filepath) + os.remove(filepath) + + # actually do the work! + if options['mode'] in ('export', 'both'): + export_pearson() + if options['mode'] in ('import', 'both'): + import_pearson() diff --git a/common/djangoapps/student/management/commands/tests/__init__.py b/common/djangoapps/student/management/commands/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common/djangoapps/student/management/commands/tests/test_pearson.py b/common/djangoapps/student/management/commands/tests/test_pearson.py new file mode 100644 index 0000000000..65d628fba0 --- /dev/null +++ b/common/djangoapps/student/management/commands/tests/test_pearson.py @@ -0,0 +1,386 @@ +''' +Created on Jan 17, 2013 + +@author: brian +''' +import logging +import os +from tempfile import mkdtemp +import cStringIO +import shutil +import sys + +from django.test import TestCase +from django.core.management import call_command +from nose.plugins.skip import SkipTest + +from student.models import User, TestCenterRegistration, TestCenterUser, get_testcenter_registration + +log = logging.getLogger(__name__) + + +def create_tc_user(username): + user = User.objects.create_user(username, '{}@edx.org'.format(username), 'fakepass') + options = { + 'first_name': 'TestFirst', + 'last_name': 'TestLast', + 'address_1': 'Test Address', + 'city': 'TestCity', + 'state': 'Alberta', + 'postal_code': 'A0B 1C2', + 'country': 'CAN', + 'phone': '252-1866', + 'phone_country_code': '1', + } + call_command('pearson_make_tc_user', username, **options) + return TestCenterUser.objects.get(user=user) + + +def create_tc_registration(username, course_id='org1/course1/term1', exam_code='exam1', accommodation_code=None): + + options = {'exam_series_code': exam_code, + 'eligibility_appointment_date_first': '2013-01-01T00:00', + 'eligibility_appointment_date_last': '2013-12-31T23:59', + 'accommodation_code': accommodation_code, + 'create_dummy_exam': True, + } + + call_command('pearson_make_tc_registration', username, course_id, **options) + user = User.objects.get(username=username) + registrations = get_testcenter_registration(user, course_id, exam_code) + return registrations[0] + + +def create_multiple_registrations(prefix='test'): + username1 = '{}_multiple1'.format(prefix) + create_tc_user(username1) + create_tc_registration(username1) + create_tc_registration(username1, course_id='org1/course2/term1') + create_tc_registration(username1, exam_code='exam2') + username2 = '{}_multiple2'.format(prefix) + create_tc_user(username2) + create_tc_registration(username2) + username3 = '{}_multiple3'.format(prefix) + create_tc_user(username3) + create_tc_registration(username3, course_id='org1/course2/term1') + username4 = '{}_multiple4'.format(prefix) + create_tc_user(username4) + create_tc_registration(username4, exam_code='exam2') + + +def get_command_error_text(*args, **options): + stderr_string = None + old_stderr = sys.stderr + sys.stderr = cStringIO.StringIO() + try: + call_command(*args, **options) + except SystemExit, why1: + # The goal here is to catch CommandError calls. + # But these are actually translated into nice messages, + # and sys.exit(1) is then called. For testing, we + # want to catch what sys.exit throws, and get the + # relevant text either from stdout or stderr. + if (why1.message > 0): + stderr_string = sys.stderr.getvalue() + else: + raise why1 + except Exception, why: + raise why + + finally: + sys.stderr = old_stderr + + if stderr_string is None: + raise Exception("Expected call to {} to fail, but it succeeded!".format(args[0])) + return stderr_string + + +def get_error_string_for_management_call(*args, **options): + stdout_string = None + old_stdout = sys.stdout + old_stderr = sys.stderr + sys.stdout = cStringIO.StringIO() + sys.stderr = cStringIO.StringIO() + try: + call_command(*args, **options) + except SystemExit, why1: + # The goal here is to catch CommandError calls. + # But these are actually translated into nice messages, + # and sys.exit(1) is then called. For testing, we + # want to catch what sys.exit throws, and get the + # relevant text either from stdout or stderr. + if (why1.message == 1): + stdout_string = sys.stdout.getvalue() + stderr_string = sys.stderr.getvalue() + else: + raise why1 + except Exception, why: + raise why + + finally: + sys.stdout = old_stdout + sys.stderr = old_stderr + + if stdout_string is None: + raise Exception("Expected call to {} to fail, but it succeeded!".format(args[0])) + return stdout_string, stderr_string + + +def get_file_info(dirpath): + filelist = os.listdir(dirpath) + print 'Files found: {}'.format(filelist) + numfiles = len(filelist) + if numfiles == 1: + filepath = os.path.join(dirpath, filelist[0]) + with open(filepath, 'r') as cddfile: + filecontents = cddfile.readlines() + numlines = len(filecontents) + return filepath, numlines + else: + raise Exception("Expected to find a single file in {}, but found {}".format(dirpath, filelist)) + + +class PearsonTestCase(TestCase): + ''' + Base class for tests running Pearson-related commands + ''' + + def assertErrorContains(self, error_message, expected): + self.assertTrue(error_message.find(expected) >= 0, 'error message "{}" did not contain "{}"'.format(error_message, expected)) + + def setUp(self): + self.import_dir = mkdtemp(prefix="import") + self.addCleanup(shutil.rmtree, self.import_dir) + self.export_dir = mkdtemp(prefix="export") + self.addCleanup(shutil.rmtree, self.export_dir) + + def tearDown(self): + pass + # and clean up the database: +# TestCenterUser.objects.all().delete() +# TestCenterRegistration.objects.all().delete() + + +class PearsonCommandTestCase(PearsonTestCase): + + def test_missing_demographic_fields(self): + # We won't bother to test all details of form validation here. + # It is enough to show that it works here, but deal with test cases for the form + # validation in the student tests, not these management tests. + username = 'baduser' + User.objects.create_user(username, '{}@edx.org'.format(username), 'fakepass') + options = {} + error_string = get_command_error_text('pearson_make_tc_user', username, **options) + self.assertTrue(error_string.find('Field Form errors encountered:') >= 0) + self.assertTrue(error_string.find('Field Form Error: city') >= 0) + self.assertTrue(error_string.find('Field Form Error: first_name') >= 0) + self.assertTrue(error_string.find('Field Form Error: last_name') >= 0) + self.assertTrue(error_string.find('Field Form Error: country') >= 0) + self.assertTrue(error_string.find('Field Form Error: phone_country_code') >= 0) + self.assertTrue(error_string.find('Field Form Error: phone') >= 0) + self.assertTrue(error_string.find('Field Form Error: address_1') >= 0) + self.assertErrorContains(error_string, 'Field Form Error: address_1') + + def test_create_good_testcenter_user(self): + testcenter_user = create_tc_user("test_good_user") + self.assertIsNotNone(testcenter_user) + + def test_create_good_testcenter_registration(self): + username = 'test_good_registration' + create_tc_user(username) + registration = create_tc_registration(username) + self.assertIsNotNone(registration) + + def test_cdd_missing_option(self): + error_string = get_command_error_text('pearson_export_cdd', **{}) + self.assertErrorContains(error_string, 'Error: --destination or --dest-from-settings must be used') + + def test_ead_missing_option(self): + error_string = get_command_error_text('pearson_export_ead', **{}) + self.assertErrorContains(error_string, 'Error: --destination or --dest-from-settings must be used') + + def test_export_single_cdd(self): + # before we generate any tc_users, we expect there to be nothing to output: + options = {'dest-from-settings': True} + with self.settings(PEARSON={'LOCAL_EXPORT': self.export_dir}): + call_command('pearson_export_cdd', **options) + (filepath, numlines) = get_file_info(self.export_dir) + self.assertEquals(numlines, 1, "Expect cdd file to have no non-header lines") + os.remove(filepath) + + # generating a tc_user should result in a line in the output + username = 'test_single_cdd' + create_tc_user(username) + call_command('pearson_export_cdd', **options) + (filepath, numlines) = get_file_info(self.export_dir) + self.assertEquals(numlines, 2, "Expect cdd file to have one non-header line") + os.remove(filepath) + + # output after registration should not have any entries again. + call_command('pearson_export_cdd', **options) + (filepath, numlines) = get_file_info(self.export_dir) + self.assertEquals(numlines, 1, "Expect cdd file to have no non-header lines") + os.remove(filepath) + + # if we modify the record, then it should be output again: + user_options = {'first_name': 'NewTestFirst', } + call_command('pearson_make_tc_user', username, **user_options) + call_command('pearson_export_cdd', **options) + (filepath, numlines) = get_file_info(self.export_dir) + self.assertEquals(numlines, 2, "Expect cdd file to have one non-header line") + os.remove(filepath) + + def test_export_single_ead(self): + # before we generate any registrations, we expect there to be nothing to output: + options = {'dest-from-settings': True} + with self.settings(PEARSON={'LOCAL_EXPORT': self.export_dir}): + call_command('pearson_export_ead', **options) + (filepath, numlines) = get_file_info(self.export_dir) + self.assertEquals(numlines, 1, "Expect ead file to have no non-header lines") + os.remove(filepath) + + # generating a registration should result in a line in the output + username = 'test_single_ead' + create_tc_user(username) + create_tc_registration(username) + call_command('pearson_export_ead', **options) + (filepath, numlines) = get_file_info(self.export_dir) + self.assertEquals(numlines, 2, "Expect ead file to have one non-header line") + os.remove(filepath) + + # output after registration should not have any entries again. + call_command('pearson_export_ead', **options) + (filepath, numlines) = get_file_info(self.export_dir) + self.assertEquals(numlines, 1, "Expect ead file to have no non-header lines") + os.remove(filepath) + + # if we modify the record, then it should be output again: + create_tc_registration(username, accommodation_code='EQPMNT') + call_command('pearson_export_ead', **options) + (filepath, numlines) = get_file_info(self.export_dir) + self.assertEquals(numlines, 2, "Expect ead file to have one non-header line") + os.remove(filepath) + + def test_export_multiple(self): + create_multiple_registrations("export") + with self.settings(PEARSON={'LOCAL_EXPORT': self.export_dir}): + options = {'dest-from-settings': True} + call_command('pearson_export_cdd', **options) + (filepath, numlines) = get_file_info(self.export_dir) + self.assertEquals(numlines, 5, "Expect cdd file to have four non-header lines: total was {}".format(numlines)) + os.remove(filepath) + + call_command('pearson_export_ead', **options) + (filepath, numlines) = get_file_info(self.export_dir) + self.assertEquals(numlines, 7, "Expect ead file to have six non-header lines: total was {}".format(numlines)) + os.remove(filepath) + + +# def test_bad_demographic_option(self): +# username = 'nonuser' +# output_string, stderrmsg = get_error_string_for_management_call('pearson_make_tc_user', username, **{'--garbage' : None }) +# print stderrmsg +# self.assertErrorContains(stderrmsg, 'Unexpected option') +# +# def test_missing_demographic_user(self): +# username = 'nonuser' +# output_string, error_string = get_error_string_for_management_call('pearson_make_tc_user', username, **{}) +# self.assertErrorContains(error_string, 'User matching query does not exist') + +# credentials for a test SFTP site: +SFTP_HOSTNAME = 'ec2-23-20-150-101.compute-1.amazonaws.com' +SFTP_USERNAME = 'pearsontest' +SFTP_PASSWORD = 'password goes here' + +S3_BUCKET = 'edx-pearson-archive' +AWS_ACCESS_KEY_ID = 'put yours here' +AWS_SECRET_ACCESS_KEY = 'put yours here' + + +class PearsonTransferTestCase(PearsonTestCase): + ''' + Class for tests running Pearson transfers + ''' + + def test_transfer_config(self): + with self.settings(DATADOG_API='FAKE_KEY'): + # TODO: why is this failing with the wrong error message?! + stderrmsg = get_command_error_text('pearson_transfer', **{'mode': 'garbage'}) + self.assertErrorContains(stderrmsg, 'Error: No PEARSON entries') + with self.settings(DATADOG_API='FAKE_KEY'): + stderrmsg = get_command_error_text('pearson_transfer') + self.assertErrorContains(stderrmsg, 'Error: No PEARSON entries') + with self.settings(DATADOG_API='FAKE_KEY', + PEARSON={'LOCAL_EXPORT': self.export_dir, + 'LOCAL_IMPORT': self.import_dir}): + stderrmsg = get_command_error_text('pearson_transfer') + self.assertErrorContains(stderrmsg, 'Error: No entry in the PEARSON settings') + + def test_transfer_export_missing_dest_dir(self): + raise SkipTest() + create_multiple_registrations('export_missing_dest') + with self.settings(DATADOG_API='FAKE_KEY', + PEARSON={'LOCAL_EXPORT': self.export_dir, + 'SFTP_EXPORT': 'this/does/not/exist', + 'SFTP_HOSTNAME': SFTP_HOSTNAME, + 'SFTP_USERNAME': SFTP_USERNAME, + 'SFTP_PASSWORD': SFTP_PASSWORD, + 'S3_BUCKET': S3_BUCKET, + }, + AWS_ACCESS_KEY_ID=AWS_ACCESS_KEY_ID, + AWS_SECRET_ACCESS_KEY=AWS_SECRET_ACCESS_KEY): + options = {'mode': 'export'} + stderrmsg = get_command_error_text('pearson_transfer', **options) + self.assertErrorContains(stderrmsg, 'Error: SFTP destination path does not exist') + + def test_transfer_export(self): + raise SkipTest() + create_multiple_registrations("transfer_export") + with self.settings(DATADOG_API='FAKE_KEY', + PEARSON={'LOCAL_EXPORT': self.export_dir, + 'SFTP_EXPORT': 'results/topvue', + 'SFTP_HOSTNAME': SFTP_HOSTNAME, + 'SFTP_USERNAME': SFTP_USERNAME, + 'SFTP_PASSWORD': SFTP_PASSWORD, + 'S3_BUCKET': S3_BUCKET, + }, + AWS_ACCESS_KEY_ID=AWS_ACCESS_KEY_ID, + AWS_SECRET_ACCESS_KEY=AWS_SECRET_ACCESS_KEY): + options = {'mode': 'export'} +# call_command('pearson_transfer', **options) +# # confirm that the export directory is still empty: +# self.assertEqual(len(os.listdir(self.export_dir)), 0, "expected export directory to be empty") + + def test_transfer_import_missing_source_dir(self): + raise SkipTest() + create_multiple_registrations('import_missing_src') + with self.settings(DATADOG_API='FAKE_KEY', + PEARSON={'LOCAL_IMPORT': self.import_dir, + 'SFTP_IMPORT': 'this/does/not/exist', + 'SFTP_HOSTNAME': SFTP_HOSTNAME, + 'SFTP_USERNAME': SFTP_USERNAME, + 'SFTP_PASSWORD': SFTP_PASSWORD, + 'S3_BUCKET': S3_BUCKET, + }, + AWS_ACCESS_KEY_ID=AWS_ACCESS_KEY_ID, + AWS_SECRET_ACCESS_KEY=AWS_SECRET_ACCESS_KEY): + options = {'mode': 'import'} + stderrmsg = get_command_error_text('pearson_transfer', **options) + self.assertErrorContains(stderrmsg, 'Error: SFTP source path does not exist') + + def test_transfer_import(self): + raise SkipTest() + create_multiple_registrations('import_missing_src') + with self.settings(DATADOG_API='FAKE_KEY', + PEARSON={'LOCAL_IMPORT': self.import_dir, + 'SFTP_IMPORT': 'results', + 'SFTP_HOSTNAME': SFTP_HOSTNAME, + 'SFTP_USERNAME': SFTP_USERNAME, + 'SFTP_PASSWORD': SFTP_PASSWORD, + 'S3_BUCKET': S3_BUCKET, + }, + AWS_ACCESS_KEY_ID=AWS_ACCESS_KEY_ID, + AWS_SECRET_ACCESS_KEY=AWS_SECRET_ACCESS_KEY): + options = {'mode': 'import'} + call_command('pearson_transfer', **options) + self.assertEqual(len(os.listdir(self.import_dir)), 0, "expected import directory to be empty") diff --git a/common/djangoapps/student/migrations/0020_add_test_center_user.py b/common/djangoapps/student/migrations/0020_add_test_center_user.py index e308e2d7e0..6c0bf5c4ee 100644 --- a/common/djangoapps/student/migrations/0020_add_test_center_user.py +++ b/common/djangoapps/student/migrations/0020_add_test_center_user.py @@ -185,4 +185,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['student'] \ No newline at end of file + complete_apps = ['student'] diff --git a/common/djangoapps/student/migrations/0021_remove_askbot.py b/common/djangoapps/student/migrations/0021_remove_askbot.py index 83ad6791f2..8f76e5078c 100644 --- a/common/djangoapps/student/migrations/0021_remove_askbot.py +++ b/common/djangoapps/student/migrations/0021_remove_askbot.py @@ -36,7 +36,7 @@ class Migration(SchemaMigration): for column in ASKBOT_AUTH_USER_COLUMNS: db.delete_column('auth_user', column) except Exception as ex: - print "Couldn't remove askbot because of {0} -- it was probably never here to begin with.".format(ex) + print "Couldn't remove askbot because of {0} -- it was probably never here to begin with.".format(ex) def backwards(self, orm): raise RuntimeError("Cannot reverse this migration: there's no going back to Askbot.") diff --git a/common/djangoapps/student/migrations/0022_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py b/common/djangoapps/student/migrations/0022_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py index f7e2571685..769ad6737d 100644 --- a/common/djangoapps/student/migrations/0022_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py +++ b/common/djangoapps/student/migrations/0022_auto__add_courseenrollmentallowed__add_unique_courseenrollmentallowed_.py @@ -152,4 +152,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['student'] \ No newline at end of file + complete_apps = ['student'] diff --git a/common/djangoapps/student/migrations/0023_add_test_center_registration.py b/common/djangoapps/student/migrations/0023_add_test_center_registration.py index c5af38dd37..4c7de6dcd9 100644 --- a/common/djangoapps/student/migrations/0023_add_test_center_registration.py +++ b/common/djangoapps/student/migrations/0023_add_test_center_registration.py @@ -238,4 +238,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['student'] \ No newline at end of file + complete_apps = ['student'] diff --git a/common/djangoapps/student/migrations/0024_add_allow_certificate.py b/common/djangoapps/student/migrations/0024_add_allow_certificate.py new file mode 100644 index 0000000000..56eccf8d70 --- /dev/null +++ b/common/djangoapps/student/migrations/0024_add_allow_certificate.py @@ -0,0 +1,172 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'UserProfile.allow_certificate' + db.add_column('auth_userprofile', 'allow_certificate', + self.gf('django.db.models.fields.BooleanField')(default=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'UserProfile.allow_certificate' + db.delete_column('auth_userprofile', 'allow_certificate') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'student.courseenrollment': { + 'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'CourseEnrollment'}, + 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'student.courseenrollmentallowed': { + 'Meta': {'unique_together': "(('email', 'course_id'),)", 'object_name': 'CourseEnrollmentAllowed'}, + 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'student.pendingemailchange': { + 'Meta': {'object_name': 'PendingEmailChange'}, + 'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'new_email': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) + }, + 'student.pendingnamechange': { + 'Meta': {'object_name': 'PendingNameChange'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'new_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'rationale': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) + }, + 'student.registration': { + 'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"}, + 'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'}) + }, + 'student.testcenterregistration': { + 'Meta': {'object_name': 'TestCenterRegistration'}, + 'accommodation_code': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), + 'accommodation_request': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'blank': 'True'}), + 'authorization_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}), + 'client_authorization_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}), + 'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), + 'course_id': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'eligibility_appointment_date_first': ('django.db.models.fields.DateField', [], {'db_index': 'True'}), + 'eligibility_appointment_date_last': ('django.db.models.fields.DateField', [], {'db_index': 'True'}), + 'exam_series_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'processed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), + 'testcenter_user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['student.TestCenterUser']"}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}), + 'upload_error_message': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'upload_status': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), + 'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}) + }, + 'student.testcenteruser': { + 'Meta': {'object_name': 'TestCenterUser'}, + 'address_1': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'address_2': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}), + 'address_3': ('django.db.models.fields.CharField', [], {'max_length': '40', 'blank': 'True'}), + 'candidate_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'db_index': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}), + 'client_candidate_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'}), + 'company_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '50', 'blank': 'True'}), + 'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'extension': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '8', 'blank': 'True'}), + 'fax': ('django.db.models.fields.CharField', [], {'max_length': '35', 'blank': 'True'}), + 'fax_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), + 'middle_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '35'}), + 'phone_country_code': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'blank': 'True'}), + 'processed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}), + 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), + 'state': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}), + 'suffix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}), + 'upload_error_message': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'upload_status': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '20', 'blank': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'unique': 'True'}), + 'user_updated_at': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}) + }, + 'student.userprofile': { + 'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"}, + 'allow_certificate': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}), + 'gender': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}), + 'goals': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'level_of_education': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '6', 'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'mailing_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'meta': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}), + 'year_of_birth': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}) + }, + 'student.usertestgroup': { + 'Meta': {'object_name': 'UserTestGroup'}, + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'db_index': 'True', 'symmetrical': 'False'}) + } + } + + complete_apps = ['student'] diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py index f13a691215..54bdd77297 100644 --- a/common/djangoapps/student/models.py +++ b/common/djangoapps/student/models.py @@ -1,30 +1,5 @@ """ -Models for Student Information - -Replication Notes - -TODO: Update this to be consistent with reality (no portal servers, no more askbot) - -In our live deployment, we intend to run in a scenario where there is a pool of -Portal servers that hold the canoncial user information and that user -information is replicated to slave Course server pools. Each Course has a set of -servers that serves only its content and has users that are relevant only to it. - -We replicate the following tables into the Course DBs where the user is -enrolled. Only the Portal servers should ever write to these models. -* UserProfile -* CourseEnrollment - -We do a partial replication of: -* User -- Askbot extends this and uses the extra fields, so we replicate only - the stuff that comes with basic django_auth and ignore the rest.) - -There are a couple different scenarios: - -1. There's an update of User or UserProfile -- replicate it to all Course DBs - that the user is enrolled in (found via CourseEnrollment). -2. There's a change in CourseEnrollment. We need to push copies of UserProfile, - CourseEnrollment, and the base fields in User +Models for User Information (students, staff, etc) Migration Notes @@ -115,6 +90,7 @@ class UserProfile(models.Model): ) mailing_address = models.TextField(blank=True, null=True) goals = models.TextField(blank=True, null=True) + allow_certificate = models.BooleanField(default=1) def get_meta(self): js_str = self.meta @@ -131,6 +107,7 @@ class UserProfile(models.Model): TEST_CENTER_STATUS_ACCEPTED = "Accepted" TEST_CENTER_STATUS_ERROR = "Error" + class TestCenterUser(models.Model): """This is our representation of the User for in-person testing, and specifically for Pearson at this point. A few things to note: @@ -146,8 +123,8 @@ class TestCenterUser(models.Model): The field names and lengths are modeled on the conventions and constraints of Pearson's data import system, including oddities such as suffix having a limit of 255 while last_name only gets 50. - - Also storing here the confirmation information received from Pearson (if any) + + Also storing here the confirmation information received from Pearson (if any) as to the success or failure of the upload. (VCDC file) """ # Our own record keeping... @@ -197,7 +174,7 @@ class TestCenterUser(models.Model): uploaded_at = models.DateTimeField(null=True, blank=True, db_index=True) # confirmation back from the test center, as well as timestamps - # on when they processed the request, and when we received + # on when they processed the request, and when we received # confirmation back. processed_at = models.DateTimeField(null=True, db_index=True) upload_status = models.CharField(max_length=20, blank=True, db_index=True) # 'Error' or 'Accepted' @@ -211,79 +188,80 @@ class TestCenterUser(models.Model): @property def needs_uploading(self): return self.uploaded_at is None or self.uploaded_at < self.user_updated_at - + @staticmethod def user_provided_fields(): - return [ 'first_name', 'middle_name', 'last_name', 'suffix', 'salutation', - 'address_1', 'address_2', 'address_3', 'city', 'state', 'postal_code', 'country', + return ['first_name', 'middle_name', 'last_name', 'suffix', 'salutation', + 'address_1', 'address_2', 'address_3', 'city', 'state', 'postal_code', 'country', 'phone', 'extension', 'phone_country_code', 'fax', 'fax_country_code', 'company_name'] - + @property def email(self): return self.user.email - + def needs_update(self, fields): for fieldname in TestCenterUser.user_provided_fields(): if fieldname in fields and getattr(self, fieldname) != fields[fieldname]: return True - - return False - + + return False + @staticmethod def _generate_edx_id(prefix): NUM_DIGITS = 12 - return u"{}{:012}".format(prefix, randint(1, 10**NUM_DIGITS-1)) - + return u"{}{:012}".format(prefix, randint(1, 10 ** NUM_DIGITS - 1)) + @staticmethod def _generate_candidate_id(): return TestCenterUser._generate_edx_id("edX") - + @classmethod def create(cls, user): testcenter_user = cls(user=user) - # testcenter_user.candidate_id remains unset + # testcenter_user.candidate_id remains unset # assign an ID of our own: cand_id = cls._generate_candidate_id() while TestCenterUser.objects.filter(client_candidate_id=cand_id).exists(): cand_id = cls._generate_candidate_id() - testcenter_user.client_candidate_id = cand_id + testcenter_user.client_candidate_id = cand_id return testcenter_user @property def is_accepted(self): return self.upload_status == TEST_CENTER_STATUS_ACCEPTED - + @property def is_rejected(self): return self.upload_status == TEST_CENTER_STATUS_ERROR - + @property def is_pending(self): return not self.is_accepted and not self.is_rejected + class TestCenterUserForm(ModelForm): class Meta: model = TestCenterUser - fields = ( 'first_name', 'middle_name', 'last_name', 'suffix', 'salutation', - 'address_1', 'address_2', 'address_3', 'city', 'state', 'postal_code', 'country', + fields = ('first_name', 'middle_name', 'last_name', 'suffix', 'salutation', + 'address_1', 'address_2', 'address_3', 'city', 'state', 'postal_code', 'country', 'phone', 'extension', 'phone_country_code', 'fax', 'fax_country_code', 'company_name') - + def update_and_save(self): new_user = self.save(commit=False) # create additional values here: new_user.user_updated_at = datetime.utcnow() new_user.upload_status = '' new_user.save() - log.info("Updated demographic information for user's test center exam registration: username \"{}\" ".format(new_user.user.username)) - + log.info("Updated demographic information for user's test center exam registration: username \"{}\" ".format(new_user.user.username)) + # add validation: - + def clean_country(self): code = self.cleaned_data['country'] - if code and len(code) != 3: + if code and (len(code) != 3 or not code.isalpha()): raise forms.ValidationError(u'Must be three characters (ISO 3166-1): e.g. USA, CAN, MNG') - return code - + return code.upper() + def clean(self): def _can_encode_as_latin(fieldvalue): try: @@ -291,40 +269,40 @@ class TestCenterUserForm(ModelForm): except UnicodeEncodeError: return False return True - + cleaned_data = super(TestCenterUserForm, self).clean() - + # check for interactions between fields: if 'country' in cleaned_data: country = cleaned_data.get('country') if country == 'USA' or country == 'CAN': if 'state' in cleaned_data and len(cleaned_data['state']) == 0: - self._errors['state'] = self.error_class([u'Required if country is USA or CAN.']) + self._errors['state'] = self.error_class([u'Required if country is USA or CAN.']) del cleaned_data['state'] if 'postal_code' in cleaned_data and len(cleaned_data['postal_code']) == 0: - self._errors['postal_code'] = self.error_class([u'Required if country is USA or CAN.']) + self._errors['postal_code'] = self.error_class([u'Required if country is USA or CAN.']) del cleaned_data['postal_code'] - + if 'fax' in cleaned_data and len(cleaned_data['fax']) > 0 and 'fax_country_code' in cleaned_data and len(cleaned_data['fax_country_code']) == 0: - self._errors['fax_country_code'] = self.error_class([u'Required if fax is specified.']) + self._errors['fax_country_code'] = self.error_class([u'Required if fax is specified.']) del cleaned_data['fax_country_code'] # check encoding for all fields: cleaned_data_fields = [fieldname for fieldname in cleaned_data] for fieldname in cleaned_data_fields: if not _can_encode_as_latin(cleaned_data[fieldname]): - self._errors[fieldname] = self.error_class([u'Must only use characters in Latin-1 (iso-8859-1) encoding']) + self._errors[fieldname] = self.error_class([u'Must only use characters in Latin-1 (iso-8859-1) encoding']) del cleaned_data[fieldname] # Always return the full collection of cleaned data. return cleaned_data - -# our own code to indicate that a request has been rejected. -ACCOMMODATION_REJECTED_CODE = 'NONE' - + +# our own code to indicate that a request has been rejected. +ACCOMMODATION_REJECTED_CODE = 'NONE' + ACCOMMODATION_CODES = ( - (ACCOMMODATION_REJECTED_CODE, 'No Accommodation Granted'), + (ACCOMMODATION_REJECTED_CODE, 'No Accommodation Granted'), ('EQPMNT', 'Equipment'), ('ET12ET', 'Extra Time - 1/2 Exam Time'), ('ET30MN', 'Extra Time - 30 Minutes'), @@ -334,11 +312,12 @@ ACCOMMODATION_CODES = ( ('SRRERC', 'Separate Room and Reader/Recorder'), ('SRRECR', 'Separate Room and Recorder'), ('SRSEAN', 'Separate Room and Service Animal'), - ('SRSGNR', 'Separate Room and Sign Language Interpreter'), + ('SRSGNR', 'Separate Room and Sign Language Interpreter'), ) -ACCOMMODATION_CODE_DICT = { code : name for (code, name) in ACCOMMODATION_CODES } - +ACCOMMODATION_CODE_DICT = {code: name for (code, name) in ACCOMMODATION_CODES} + + class TestCenterRegistration(models.Model): """ This is our representation of a user's registration for in-person testing, @@ -353,20 +332,20 @@ class TestCenterRegistration(models.Model): of Pearson's data import system. """ # to find an exam registration, we key off of the user and course_id. - # If multiple exams per course are possible, we would also need to add the + # If multiple exams per course are possible, we would also need to add the # exam_series_code. testcenter_user = models.ForeignKey(TestCenterUser, default=None) course_id = models.CharField(max_length=128, db_index=True) - + created_at = models.DateTimeField(auto_now_add=True, db_index=True) updated_at = models.DateTimeField(auto_now=True, db_index=True) # user_updated_at happens only when the user makes a change to their data, # and is something Pearson needs to know to manage updates. Unlike # updated_at, this will not get incremented when we do a batch data import. - # The appointment dates, the exam count, and the accommodation codes can be updated, + # The appointment dates, the exam count, and the accommodation codes can be updated, # but hopefully this won't happen often. user_updated_at = models.DateTimeField(db_index=True) - # "client_authorization_id" is our unique identifier for the authorization. + # "client_authorization_id" is our unique identifier for the authorization. # This must be present for an update or delete to be sent to Pearson. client_authorization_id = models.CharField(max_length=20, unique=True, db_index=True) @@ -376,10 +355,10 @@ class TestCenterRegistration(models.Model): eligibility_appointment_date_last = models.DateField(db_index=True) # this is really a list of codes, using an '*' as a delimiter. - # So it's not a choice list. We use the special value of ACCOMMODATION_REJECTED_CODE + # So it's not a choice list. We use the special value of ACCOMMODATION_REJECTED_CODE # to indicate the rejection of an accommodation request. accommodation_code = models.CharField(max_length=64, blank=True) - + # store the original text of the accommodation request. accommodation_request = models.CharField(max_length=1024, blank=True, db_index=True) @@ -387,7 +366,7 @@ class TestCenterRegistration(models.Model): uploaded_at = models.DateTimeField(null=True, db_index=True) # confirmation back from the test center, as well as timestamps - # on when they processed the request, and when we received + # on when they processed the request, and when we received # confirmation back. processed_at = models.DateTimeField(null=True, db_index=True) upload_status = models.CharField(max_length=20, blank=True, db_index=True) # 'Error' or 'Accepted' @@ -397,11 +376,11 @@ class TestCenterRegistration(models.Model): # (However, it may never be set if we are always initiating such candidate creation.) authorization_id = models.IntegerField(null=True, db_index=True) confirmed_at = models.DateTimeField(null=True, db_index=True) - + @property def candidate_id(self): return self.testcenter_user.candidate_id - + @property def client_candidate_id(self): return self.testcenter_user.client_candidate_id @@ -412,25 +391,36 @@ class TestCenterRegistration(models.Model): return 'Update' elif self.uploaded_at is None: return 'Add' + elif self.registration_is_rejected: + # Assume that if the registration was rejected before, + # it is more likely this is the (first) correction + # than a second correction in flight before the first was + # processed. + return 'Add' else: # TODO: decide what to send when we have uploaded an initial version, - # but have not received confirmation back from that upload. If the + # but have not received confirmation back from that upload. If the # registration here has been changed, then we don't know if this changed - # registration should be submitted as an 'add' or an 'update'. + # registration should be submitted as an 'add' or an 'update'. # - # If the first registration were lost or in error (e.g. bad code), + # If the first registration were lost or in error (e.g. bad code), # the second should be an "Add". If the first were processed successfully, # then the second should be an "Update". We just don't know.... return 'Update' - + @property def exam_authorization_count(self): - # TODO: figure out if this should really go in the database (with a default value). + # Someday this could go in the database (with a default value). But at present, + # we do not expect anyone to be authorized to take an exam more than once. return 1 - + + @property + def needs_uploading(self): + return self.uploaded_at is None or self.uploaded_at < self.user_updated_at + @classmethod def create(cls, testcenter_user, exam, accommodation_request): - registration = cls(testcenter_user = testcenter_user) + registration = cls(testcenter_user=testcenter_user) registration.course_id = exam.course_id registration.accommodation_request = accommodation_request.strip() registration.exam_series_code = exam.exam_series_code @@ -443,7 +433,7 @@ class TestCenterRegistration(models.Model): @staticmethod def _generate_authorization_id(): return TestCenterUser._generate_edx_id("edXexam") - + @staticmethod def _create_client_authorization_id(): """ @@ -455,8 +445,8 @@ class TestCenterRegistration(models.Model): while TestCenterRegistration.objects.filter(client_authorization_id=auth_id).exists(): auth_id = TestCenterRegistration._generate_authorization_id() return auth_id - - # methods for providing registration status details on registration page: + + # methods for providing registration status details on registration page: @property def demographics_is_accepted(self): return self.testcenter_user.is_accepted @@ -464,7 +454,7 @@ class TestCenterRegistration(models.Model): @property def demographics_is_rejected(self): return self.testcenter_user.is_rejected - + @property def demographics_is_pending(self): return self.testcenter_user.is_pending @@ -476,7 +466,7 @@ class TestCenterRegistration(models.Model): @property def accommodation_is_rejected(self): return len(self.accommodation_request) > 0 and self.accommodation_code == ACCOMMODATION_REJECTED_CODE - + @property def accommodation_is_pending(self): return len(self.accommodation_request) > 0 and len(self.accommodation_code) == 0 @@ -488,20 +478,20 @@ class TestCenterRegistration(models.Model): @property def registration_is_accepted(self): return self.upload_status == TEST_CENTER_STATUS_ACCEPTED - + @property def registration_is_rejected(self): return self.upload_status == TEST_CENTER_STATUS_ERROR - + @property def registration_is_pending(self): return not self.registration_is_accepted and not self.registration_is_rejected - # methods for providing registration status summary on dashboard page: + # methods for providing registration status summary on dashboard page: @property def is_accepted(self): return self.registration_is_accepted and self.demographics_is_accepted - + @property def is_rejected(self): return self.registration_is_rejected or self.demographics_is_rejected @@ -509,54 +499,94 @@ class TestCenterRegistration(models.Model): @property def is_pending(self): return not self.is_accepted and not self.is_rejected - + def get_accommodation_codes(self): return self.accommodation_code.split('*') def get_accommodation_names(self): - return [ ACCOMMODATION_CODE_DICT.get(code, "Unknown code " + code) for code in self.get_accommodation_codes() ] + return [ACCOMMODATION_CODE_DICT.get(code, "Unknown code " + code) for code in self.get_accommodation_codes()] @property def registration_signup_url(self): return settings.PEARSONVUE_SIGNINPAGE_URL - + + def demographics_status(self): + if self.demographics_is_accepted: + return "Accepted" + elif self.demographics_is_rejected: + return "Rejected" + else: + return "Pending" + + def accommodation_status(self): + if self.accommodation_is_skipped: + return "Skipped" + elif self.accommodation_is_accepted: + return "Accepted" + elif self.accommodation_is_rejected: + return "Rejected" + else: + return "Pending" + + def registration_status(self): + if self.registration_is_accepted: + return "Accepted" + elif self.registration_is_rejected: + return "Rejected" + else: + return "Pending" + + class TestCenterRegistrationForm(ModelForm): class Meta: model = TestCenterRegistration - fields = ( 'accommodation_request', 'accommodation_code' ) + fields = ('accommodation_request', 'accommodation_code') def clean_accommodation_request(self): code = self.cleaned_data['accommodation_request'] if code and len(code) > 0: return code.strip() return code - + def update_and_save(self): registration = self.save(commit=False) # create additional values here: registration.user_updated_at = datetime.utcnow() registration.upload_status = '' registration.save() - log.info("Updated registration information for user's test center exam registration: username \"{}\" course \"{}\", examcode \"{}\"".format(registration.testcenter_user.user.username, registration.course_id, registration.exam_series_code)) + log.info("Updated registration information for user's test center exam registration: username \"{}\" course \"{}\", examcode \"{}\"".format(registration.testcenter_user.user.username, registration.course_id, registration.exam_series_code)) + + def clean_accommodation_code(self): + code = self.cleaned_data['accommodation_code'] + if code: + code = code.upper() + codes = code.split('*') + for codeval in codes: + if codeval not in ACCOMMODATION_CODE_DICT: + raise forms.ValidationError(u'Invalid accommodation code specified: "{}"'.format(codeval)) + return code + + - # TODO: add validation code for values added to accommodation_code field. - - - def get_testcenter_registration(user, course_id, exam_series_code): try: tcu = TestCenterUser.objects.get(user=user) except TestCenterUser.DoesNotExist: return [] return TestCenterRegistration.objects.filter(testcenter_user=tcu, course_id=course_id, exam_series_code=exam_series_code) - + +# nosetests thinks that anything with _test_ in the name is a test. +# Correct this (https://nose.readthedocs.org/en/latest/finding_tests.html) +get_testcenter_registration.__test__ = False + + def unique_id_for_user(user): """ Return a unique id for a user, suitable for inserting into e.g. personalized survey links. """ # include the secret key as a salt, and to make the ids unique across - # different LMS installs. + # different LMS installs. h = hashlib.md5() h.update(settings.SECRET_KEY) h.update(str(user.id)) @@ -638,7 +668,21 @@ class CourseEnrollmentAllowed(models.Model): #cache_relation(User.profile) -#### Helper methods for use from python manage.py shell. +#### Helper methods for use from python manage.py shell and other classes. + + +def get_user_by_username_or_email(username_or_email): + """ + Return a User object, looking up by email if username_or_email contains a + '@', otherwise by username. + + Raises: + User.DoesNotExist is lookup fails. + """ + if '@' in username_or_email: + return User.objects.get(email=username_or_email) + else: + return User.objects.get(username=username_or_email) def get_user(email): @@ -728,168 +772,3 @@ 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)) - - -########################## REPLICATION SIGNALS ################################# -# @receiver(post_save, sender=User) -def replicate_user_save(sender, **kwargs): - user_obj = kwargs['instance'] - if not should_replicate(user_obj): - return - for course_db_name in db_names_to_replicate_to(user_obj.id): - replicate_user(user_obj, course_db_name) - - -# @receiver(post_save, sender=CourseEnrollment) -def replicate_enrollment_save(sender, **kwargs): - """This is called when a Student enrolls in a course. It has to do the - following: - - 1. Make sure the User is copied into the Course DB. It may already exist - (someone deleting and re-adding a course). This has to happen first or - the foreign key constraint breaks. - 2. Replicate the CourseEnrollment. - 3. Replicate the UserProfile. - """ - if not is_portal(): - return - - enrollment_obj = kwargs['instance'] - log.debug("Replicating user because of new enrollment") - for course_db_name in db_names_to_replicate_to(enrollment_obj.user.id): - replicate_user(enrollment_obj.user, course_db_name) - - log.debug("Replicating enrollment because of new enrollment") - replicate_model(CourseEnrollment.save, enrollment_obj, enrollment_obj.user_id) - - log.debug("Replicating user profile because of new enrollment") - user_profile = UserProfile.objects.get(user_id=enrollment_obj.user_id) - replicate_model(UserProfile.save, user_profile, enrollment_obj.user_id) - - -# @receiver(post_delete, sender=CourseEnrollment) -def replicate_enrollment_delete(sender, **kwargs): - enrollment_obj = kwargs['instance'] - return replicate_model(CourseEnrollment.delete, enrollment_obj, enrollment_obj.user_id) - - -# @receiver(post_save, sender=UserProfile) -def replicate_userprofile_save(sender, **kwargs): - """We just updated the UserProfile (say an update to the name), so push that - change to all Course DBs that we're enrolled in.""" - user_profile_obj = kwargs['instance'] - return replicate_model(UserProfile.save, user_profile_obj, user_profile_obj.user_id) - - -######### Replication functions ######### -USER_FIELDS_TO_COPY = ["id", "username", "first_name", "last_name", "email", - "password", "is_staff", "is_active", "is_superuser", - "last_login", "date_joined"] - - -def replicate_user(portal_user, course_db_name): - """Replicate a User to the correct Course DB. This is more complicated than - it should be because Askbot extends the auth_user table and adds its own - fields. So we need to only push changes to the standard fields and leave - the rest alone so that Askbot changes at the Course DB level don't get - overridden. - """ - try: - course_user = User.objects.using(course_db_name).get(id=portal_user.id) - log.debug("User {0} found in Course DB, replicating fields to {1}" - .format(course_user, course_db_name)) - except User.DoesNotExist: - log.debug("User {0} not found in Course DB, creating copy in {1}" - .format(portal_user, course_db_name)) - course_user = User() - - for field in USER_FIELDS_TO_COPY: - setattr(course_user, field, getattr(portal_user, field)) - - mark_handled(course_user) - course_user.save(using=course_db_name) - unmark(course_user) - - -def replicate_model(model_method, instance, user_id): - """ - model_method is the model action that we want replicated. For instance, - UserProfile.save - """ - if not should_replicate(instance): - return - - course_db_names = db_names_to_replicate_to(user_id) - log.debug("Replicating {0} for user {1} to DBs: {2}" - .format(model_method, user_id, course_db_names)) - - mark_handled(instance) - for db_name in course_db_names: - model_method(instance, using=db_name) - unmark(instance) - - -######### Replication Helpers ######### - - -def is_valid_course_id(course_id): - """Right now, the only database that's not a course database is 'default'. - I had nicer checking in here originally -- it would scan the courses that - were in the system and only let you choose that. But it was annoying to run - tests with, since we don't have course data for some for our course test - databases. Hence the lazy version. - """ - return course_id != 'default' - - -def is_portal(): - """Are we in the portal pool? Only Portal servers are allowed to replicate - their changes. For now, only Portal servers see multiple DBs, so we use - that to decide.""" - return len(settings.DATABASES) > 1 - - -def db_names_to_replicate_to(user_id): - """Return a list of DB names that this user_id is enrolled in.""" - return [c.course_id - for c in CourseEnrollment.objects.filter(user_id=user_id) - if is_valid_course_id(c.course_id)] - - -def marked_handled(instance): - """Have we marked this instance as being handled to avoid infinite loops - caused by saving models in post_save hooks for the same models?""" - return hasattr(instance, '_do_not_copy_to_course_db') and instance._do_not_copy_to_course_db - - -def mark_handled(instance): - """You have to mark your instance with this function or else we'll go into - an infinite loop since we're putting listeners on Model saves/deletes and - the act of replication requires us to call the same model method. - - We create a _replicated attribute to differentiate the first save of this - model vs. the duplicate save we force on to the course database. Kind of - a hack -- suggestions welcome. - """ - instance._do_not_copy_to_course_db = True - - -def unmark(instance): - """If we don't unmark a model after we do replication, then consecutive - save() calls won't be properly replicated.""" - instance._do_not_copy_to_course_db = False - - -def should_replicate(instance): - """Should this instance be replicated? We need to be a Portal server and - the instance has to not have been marked_handled.""" - if marked_handled(instance): - # Basically, avoid an infinite loop. You should - log.debug("{0} should not be replicated because it's been marked" - .format(instance)) - return False - if not is_portal(): - log.debug("{0} should not be replicated because we're not a portal." - .format(instance)) - return False - return True diff --git a/common/djangoapps/student/tests.py b/common/djangoapps/student/tests.py index 4c7c9e2592..6a2d75e3d8 100644 --- a/common/djangoapps/student/tests.py +++ b/common/djangoapps/student/tests.py @@ -5,16 +5,11 @@ when you run "manage.py test". Replace this with more appropriate tests for your application. """ import logging -from datetime import datetime -from hashlib import sha1 from django.test import TestCase -from mock import patch, Mock -from nose.plugins.skip import SkipTest +from mock import Mock -from .models import (User, UserProfile, CourseEnrollment, - replicate_user, USER_FIELDS_TO_COPY, - unique_id_for_user) +from .models import unique_id_for_user from .views import process_survey_link, _cert_info COURSE_1 = 'edX/toy/2012_Fall' @@ -22,184 +17,6 @@ COURSE_2 = 'edx/full/6.002_Spring_2012' log = logging.getLogger(__name__) -class ReplicationTest(TestCase): - - multi_db = True - - def test_user_replication(self): - """Test basic user replication.""" - raise SkipTest() - portal_user = User.objects.create_user('rusty', 'rusty@edx.org', 'fakepass') - portal_user.first_name='Rusty' - portal_user.last_name='Skids' - portal_user.is_staff=True - portal_user.is_active=True - portal_user.is_superuser=True - portal_user.last_login=datetime(2012, 1, 1) - portal_user.date_joined=datetime(2011, 1, 1) - # This is an Askbot field and will break if askbot is not included - - if hasattr(portal_user, 'seen_response_count'): - portal_user.seen_response_count = 10 - - portal_user.save(using='default') - - # We replicate this user to Course 1, then pull the same user and verify - # that the fields copied over properly. - replicate_user(portal_user, COURSE_1) - course_user = User.objects.using(COURSE_1).get(id=portal_user.id) - - # Make sure the fields we care about got copied over for this user. - for field in USER_FIELDS_TO_COPY: - self.assertEqual(getattr(portal_user, field), - getattr(course_user, field), - "{0} not copied from {1} to {2}".format( - field, portal_user, course_user - )) - - # This hasattr lameness is here because we don't want this test to be - # triggered when we're being run by CMS tests (Askbot doesn't exist - # there, so the test will fail). - # - # seen_response_count isn't a field we care about, so it shouldn't have - # been copied over. - if hasattr(portal_user, 'seen_response_count'): - portal_user.seen_response_count = 20 - replicate_user(portal_user, COURSE_1) - course_user = User.objects.using(COURSE_1).get(id=portal_user.id) - self.assertEqual(portal_user.seen_response_count, 20) - self.assertEqual(course_user.seen_response_count, 0) - - # Another replication should work for an email change however, since - # it's a field we care about. - portal_user.email = "clyde@edx.org" - replicate_user(portal_user, COURSE_1) - course_user = User.objects.using(COURSE_1).get(id=portal_user.id) - self.assertEqual(portal_user.email, course_user.email) - - # During this entire time, the user data should never have made it over - # to COURSE_2 - self.assertRaises(User.DoesNotExist, - User.objects.using(COURSE_2).get, - id=portal_user.id) - - - def test_enrollment_for_existing_user_info(self): - """Test the effect of Enrolling in a class if you've already got user - data to be copied over.""" - raise SkipTest() - # Create our User - portal_user = User.objects.create_user('jack', 'jack@edx.org', 'fakepass') - portal_user.first_name = "Jack" - portal_user.save() - - # Set up our UserProfile info - portal_user_profile = UserProfile.objects.create( - user=portal_user, - name="Jack Foo", - level_of_education=None, - gender='m', - mailing_address=None, - goals="World domination", - ) - portal_user_profile.save() - - # Now let's see if creating a CourseEnrollment copies all the relevant - # data. - portal_enrollment = CourseEnrollment.objects.create(user=portal_user, - course_id=COURSE_1) - portal_enrollment.save() - - # Grab all the copies we expect - course_user = User.objects.using(COURSE_1).get(id=portal_user.id) - self.assertEquals(portal_user, course_user) - self.assertRaises(User.DoesNotExist, - User.objects.using(COURSE_2).get, - id=portal_user.id) - - course_enrollment = CourseEnrollment.objects.using(COURSE_1).get(id=portal_enrollment.id) - self.assertEquals(portal_enrollment, course_enrollment) - self.assertRaises(CourseEnrollment.DoesNotExist, - CourseEnrollment.objects.using(COURSE_2).get, - id=portal_enrollment.id) - - course_user_profile = UserProfile.objects.using(COURSE_1).get(id=portal_user_profile.id) - self.assertEquals(portal_user_profile, course_user_profile) - self.assertRaises(UserProfile.DoesNotExist, - UserProfile.objects.using(COURSE_2).get, - id=portal_user_profile.id) - - log.debug("Make sure our seen_response_count is not replicated.") - if hasattr(portal_user, 'seen_response_count'): - portal_user.seen_response_count = 200 - course_user = User.objects.using(COURSE_1).get(id=portal_user.id) - self.assertEqual(portal_user.seen_response_count, 200) - self.assertEqual(course_user.seen_response_count, 0) - portal_user.save() - - course_user = User.objects.using(COURSE_1).get(id=portal_user.id) - self.assertEqual(portal_user.seen_response_count, 200) - self.assertEqual(course_user.seen_response_count, 0) - - portal_user.email = 'jim@edx.org' - portal_user.save() - course_user = User.objects.using(COURSE_1).get(id=portal_user.id) - self.assertEqual(portal_user.email, 'jim@edx.org') - self.assertEqual(course_user.email, 'jim@edx.org') - - - - def test_enrollment_for_user_info_after_enrollment(self): - """Test the effect of modifying User data after you've enrolled.""" - raise SkipTest() - - # Create our User - portal_user = User.objects.create_user('patty', 'patty@edx.org', 'fakepass') - portal_user.first_name = "Patty" - portal_user.save() - - # Set up our UserProfile info - portal_user_profile = UserProfile.objects.create( - user=portal_user, - name="Patty Foo", - level_of_education=None, - gender='f', - mailing_address=None, - goals="World peace", - ) - portal_user_profile.save() - - # Now let's see if creating a CourseEnrollment copies all the relevant - # data when things are saved. - portal_enrollment = CourseEnrollment.objects.create(user=portal_user, - course_id=COURSE_1) - portal_enrollment.save() - - portal_user.last_name = "Bar" - portal_user.save() - portal_user_profile.gender = 'm' - portal_user_profile.save() - - # Grab all the copies we expect, and make sure it doesn't end up in - # places we don't expect. - course_user = User.objects.using(COURSE_1).get(id=portal_user.id) - self.assertEquals(portal_user, course_user) - self.assertRaises(User.DoesNotExist, - User.objects.using(COURSE_2).get, - id=portal_user.id) - - course_enrollment = CourseEnrollment.objects.using(COURSE_1).get(id=portal_enrollment.id) - self.assertEquals(portal_enrollment, course_enrollment) - self.assertRaises(CourseEnrollment.DoesNotExist, - CourseEnrollment.objects.using(COURSE_2).get, - id=portal_enrollment.id) - - course_user_profile = UserProfile.objects.using(COURSE_1).get(id=portal_user_profile.id) - self.assertEquals(portal_user_profile, course_user_profile) - self.assertRaises(UserProfile.DoesNotExist, - UserProfile.objects.using(COURSE_2).get, - id=portal_user_profile.id) - class CourseEndingTest(TestCase): """Test things related to course endings: certificates, surveys, etc""" @@ -224,7 +41,7 @@ class CourseEndingTest(TestCase): {'status': 'processing', 'show_disabled_download_button': False, 'show_download_url': False, - 'show_survey_button': False,}) + 'show_survey_button': False, }) cert_status = {'status': 'unavailable'} self.assertEqual(_cert_info(user, course, cert_status), diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 61b49e6022..6ac57c1182 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -1,12 +1,10 @@ import datetime import feedparser -#import itertools import json import logging import random import string import sys -#import time import urllib import uuid @@ -16,17 +14,19 @@ from django.contrib.auth import logout, authenticate, login from django.contrib.auth.forms import PasswordResetForm from django.contrib.auth.models import User from django.contrib.auth.decorators import login_required +from django.core.cache import cache 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.db import IntegrityError -from django.http import HttpResponse, HttpResponseForbidden, Http404 +from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.shortcuts import redirect +from django_future.csrf import ensure_csrf_cookie, csrf_exempt + from mitxmako.shortcuts import render_to_response, render_to_string from bs4 import BeautifulSoup -from django.core.cache import cache -from django_future.csrf import ensure_csrf_cookie, csrf_exempt from student.models import (Registration, UserProfile, TestCenterUser, TestCenterUserForm, TestCenterRegistration, TestCenterRegistrationForm, PendingNameChange, PendingEmailChange, @@ -38,18 +38,22 @@ from certificates.models import CertificateStatuses, certificate_status_for_stud from xmodule.course_module import CourseDescriptor from xmodule.modulestore.exceptions import ItemNotFoundError from xmodule.modulestore.django import modulestore +from xmodule.modulestore import Location -#from datetime import date from collections import namedtuple from courseware.courses import get_courses, sort_by_announcement from courseware.access import has_access +from courseware.models import StudentModuleCache +from courseware.views import get_module_for_descriptor, jump_to +from courseware.module_render import get_instance_module from statsd import statsd log = logging.getLogger("mitx.student") Article = namedtuple('Article', 'title url author image deck publication publish_date') + def csrf_token(context): ''' A csrf token that can be included in a form. ''' @@ -73,8 +77,8 @@ def index(request, extra_context={}, user=None): ''' # The course selection work is done in courseware.courses. - domain = settings.MITX_FEATURES.get('FORCE_UNIVERSITY_DOMAIN') # normally False - if domain==False: # do explicit check, because domain=None is valid + domain = settings.MITX_FEATURES.get('FORCE_UNIVERSITY_DOMAIN') # normally False + if domain == False: # do explicit check, because domain=None is valid domain = request.META.get('HTTP_HOST') courses = get_courses(None, domain=domain) @@ -97,6 +101,7 @@ import re day_pattern = re.compile('\s\d+,\s') multimonth_pattern = re.compile('\s?\-\s?\S+\s') + def get_date_for_press(publish_date): import datetime # strip off extra months, and just use the first: @@ -107,9 +112,10 @@ def get_date_for_press(publish_date): date = datetime.datetime.strptime(date, "%B, %Y") return date + def press(request): json_articles = cache.get("student_press_json_articles") - if json_articles == None: + if json_articles is None: if hasattr(settings, 'RSS_URL'): content = urllib.urlopen(settings.PRESS_URL).read() json_articles = json.loads(content) @@ -135,7 +141,7 @@ def cert_info(user, course): Get the certificate info needed to render the dashboard section for the given student and course. Returns a dictionary with keys: - 'status': one of 'generating', 'ready', 'notpassing', 'processing' + 'status': one of 'generating', 'ready', 'notpassing', 'processing', 'restricted' 'show_download_url': bool 'download_url': url, only present if show_download_url is True 'show_disabled_download_button': bool -- true if state is 'generating' @@ -148,6 +154,7 @@ def cert_info(user, course): return _cert_info(user, course, certificate_status_for_student(user, course.id)) + def _cert_info(user, course, cert_status): """ Implements the logic for cert_info -- split out for testing. @@ -168,15 +175,16 @@ def _cert_info(user, course, cert_status): CertificateStatuses.regenerating: 'generating', CertificateStatuses.downloadable: 'ready', CertificateStatuses.notpassing: 'notpassing', + CertificateStatuses.restricted: 'restricted', } status = template_state.get(cert_status['status'], default_status) d = {'status': status, 'show_download_url': status == 'ready', - 'show_disabled_download_button': status == 'generating',} + 'show_disabled_download_button': status == 'generating', } - if (status in ('generating', 'ready', 'notpassing') and + if (status in ('generating', 'ready', 'notpassing', 'restricted') and course.end_of_course_survey_url is not None): d.update({ 'show_survey_button': True, @@ -192,7 +200,7 @@ def _cert_info(user, course, cert_status): else: d['download_url'] = cert_status['download_url'] - if status in ('generating', 'ready', 'notpassing'): + if status in ('generating', 'ready', 'notpassing', 'restricted'): if 'grade' not in cert_status: # Note: as of 11/20/2012, we know there are students in this state-- cs169.1x, # who need to be regraded (we weren't tracking 'notpassing' at first). @@ -203,6 +211,7 @@ def _cert_info(user, course, cert_status): return d + @login_required @ensure_csrf_cookie def dashboard(request): @@ -236,9 +245,9 @@ def dashboard(request): show_courseware_links_for = frozenset(course.id for course in courses if has_access(request.user, course, 'load')) - cert_statuses = { course.id: cert_info(request.user, course) for course in courses} + cert_statuses = {course.id: cert_info(request.user, course) for course in courses} - exam_registrations = { course.id: exam_registration_info(request.user, course) for course in courses} + 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) @@ -247,7 +256,7 @@ def dashboard(request): 'message': message, 'staff_access': staff_access, 'errored_courses': errored_courses, - 'show_courseware_links_for' : show_courseware_links_for, + 'show_courseware_links_for': show_courseware_links_for, 'cert_statuses': cert_statuses, 'news': top_news, 'exam_registrations': exam_registrations, @@ -292,7 +301,7 @@ def change_enrollment(request): action = request.POST.get("enrollment_action", "") course_id = request.POST.get("course_id", None) - if course_id == None: + if course_id is None: return HttpResponse(json.dumps({'success': False, 'error': 'There was an error receiving the course id.'})) @@ -311,7 +320,7 @@ def change_enrollment(request): 'error': 'enrollment in {} not allowed at this time' .format(course.display_name)} - org, course_num, run=course_id.split("/") + org, course_num, run = course_id.split("/") statsd.increment("common.student.enrollment", tags=["org:{0}".format(org), "course:{0}".format(course_num), @@ -325,7 +334,7 @@ def change_enrollment(request): enrollment = CourseEnrollment.objects.get(user=user, course_id=course_id) enrollment.delete() - org, course_num, run=course_id.split("/") + org, course_num, run = course_id.split("/") statsd.increment("common.student.unenrollment", tags=["org:{0}".format(org), "course:{0}".format(course_num), @@ -344,7 +353,7 @@ def change_enrollment(request): def accounts_login(request, error=""): - return render_to_response('accounts_login.html', { 'error': error }) + return render_to_response('accounts_login.html', {'error': error}) @@ -376,7 +385,7 @@ def login_user(request, error=""): try: login(request, user) if request.POST.get('remember') == 'true': - request.session.set_expiry(None) # or change to 604800 for 7 days + request.session.set_expiry(604800) log.debug("Setting user session to never expire") else: request.session.set_expiry(0) @@ -423,6 +432,7 @@ def change_setting(request): return HttpResponse(json.dumps({'success': True, 'location': up.location, })) + def _do_create_account(post_vars): """ Given cleaned post variables, create the User and UserProfile objects, as well as the @@ -544,13 +554,13 @@ def create_account(request, post_override=None): try: validate_slug(post_vars['username']) except ValidationError: - js['value'] = "Username should only consist of A-Z and 0-9.".format(field=a) + js['value'] = "Username should only consist of A-Z and 0-9, with no spaces.".format(field=a) js['field'] = 'username' return HttpResponse(json.dumps(js)) # Ok, looks like everything is legit. Create the account. ret = _do_create_account(post_vars) - if isinstance(ret,HttpResponse): # if there was an error then return that + if isinstance(ret, HttpResponse): # if there was an error then return that return ret (user, profile, registration) = ret @@ -590,7 +600,7 @@ def create_account(request, post_override=None): eamap.user = login_user eamap.dtsignup = datetime.datetime.now() eamap.save() - log.debug('Updated ExternalAuthMap for %s to be %s' % (post_vars['username'],eamap)) + log.debug('Updated ExternalAuthMap for %s to be %s' % (post_vars['username'], eamap)) if settings.MITX_FEATURES.get('BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH'): log.debug('bypassing activation email') @@ -602,6 +612,7 @@ def create_account(request, post_override=None): js = {'success': True} return HttpResponse(json.dumps(js), mimetype="application/json") + def exam_registration_info(user, course): """ Returns a Registration object if the user is currently registered for a current exam of the course. Returns None if the user is not registered, or if there is no @@ -619,6 +630,7 @@ def exam_registration_info(user, course): registration = None return registration + @login_required @ensure_csrf_cookie def begin_exam_registration(request, course_id): @@ -662,6 +674,7 @@ def begin_exam_registration(request, course_id): return render_to_response('test_center_register.html', context) + @ensure_csrf_cookie def create_exam_registration(request, post_override=None): ''' @@ -724,7 +737,7 @@ def create_exam_registration(request, post_override=None): # this registration screen. else: - accommodation_request = post_vars.get('accommodation_request','') + accommodation_request = post_vars.get('accommodation_request', '') registration = TestCenterRegistration.create(testcenter_user, exam, accommodation_request) needs_saving = True log.info("User {0} enrolled in course {1} creating new exam registration".format(user.username, course_id)) @@ -833,16 +846,17 @@ def password_reset(request): form = PasswordResetForm(request.POST) if form.is_valid(): - form.save(use_https = request.is_secure(), - from_email = settings.DEFAULT_FROM_EMAIL, - request = request, - domain_override = request.get_host()) - return HttpResponse(json.dumps({'success':True, + form.save(use_https=request.is_secure(), + from_email=settings.DEFAULT_FROM_EMAIL, + request=request, + domain_override=request.get_host()) + return HttpResponse(json.dumps({'success': True, 'value': render_to_string('registration/password_reset_done.html', {})})) else: return HttpResponse(json.dumps({'success': False, 'error': 'Invalid e-mail'})) + @ensure_csrf_cookie def reactivation_email(request): ''' Send an e-mail to reactivate a deactivated account, or to @@ -855,6 +869,7 @@ def reactivation_email(request): 'error': 'No inactive user with this e-mail exists'})) return reactivation_email_for_user(user) + def reactivation_email_for_user(user): reg = Registration.objects.get(user=user) @@ -995,11 +1010,11 @@ def pending_name_changes(request): changes = list(PendingNameChange.objects.all()) js = {'students': [{'new_name': c.new_name, - 'rationale':c.rationale, - 'old_name':UserProfile.objects.get(user=c.user).name, - 'email':c.user.email, - 'uid':c.user.id, - 'cid':c.id} for c in changes]} + 'rationale': c.rationale, + 'old_name': UserProfile.objects.get(user=c.user).name, + 'email': c.user.email, + 'uid': c.user.id, + 'cid': c.id} for c in changes]} return render_to_response('name_changes.html', js) @@ -1054,32 +1069,141 @@ def accept_name_change(request): return accept_name_change_by_id(int(request.POST['id'])) -# TODO: This is a giant kludge to give Pearson something to test against ASAP. -# Will need to get replaced by something that actually ties into TestCenterUser @csrf_exempt def test_center_login(request): - if not settings.MITX_FEATURES.get('ENABLE_PEARSON_HACK_TEST'): - raise Http404 - - client_candidate_id = request.POST.get("clientCandidateID") - # registration_id = request.POST.get("registrationID") - exit_url = request.POST.get("exitURL") + # errors are returned by navigating to the error_url, adding a query parameter named "code" + # which contains the error code describing the exceptional condition. + def makeErrorURL(error_url, error_code): + log.error("generating error URL with error code {}".format(error_code)) + return "{}?code={}".format(error_url, error_code); + + # get provided error URL, which will be used as a known prefix for returning error messages to the + # Pearson shell. error_url = request.POST.get("errorURL") + # TODO: check that the parameters have not been tampered with, by comparing the code provided by Pearson + # with the code we calculate for the same parameters. + if 'code' not in request.POST: + return HttpResponseRedirect(makeErrorURL(error_url, "missingSecurityCode")); + code = request.POST.get("code") + + # calculate SHA for query string + # TODO: figure out how to get the original query string, so we can hash it and compare. + + + if 'clientCandidateID' not in request.POST: + return HttpResponseRedirect(makeErrorURL(error_url, "missingClientCandidateID")); + client_candidate_id = request.POST.get("clientCandidateID") + + # TODO: check remaining parameters, and maybe at least log if they're not matching + # expected values.... + # registration_id = request.POST.get("registrationID") + # exit_url = request.POST.get("exitURL") + + # find testcenter_user that matches the provided ID: + 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)) + return HttpResponseRedirect(makeErrorURL(error_url, "invalidClientCandidateID")); + + # 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, + # while we currently have no record of RegistrationID values at all. + if 'vueExamSeriesCode' not in request.POST: + # 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)) + return HttpResponseRedirect(makeErrorURL(error_url, "missingPartnerID")); + exam_series_code = request.POST.get('vueExamSeriesCode') + # special case for supporting test user: + if client_candidate_id == "edX003671291147" and exam_series_code != '6002x001': + log.warning("test user {} using unexpected exam code {}, coercing to 6002x001".format(client_candidate_id, exam_series_code)) + exam_series_code = '6002x001' + + 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)) + return HttpResponseRedirect(makeErrorURL(error_url, "noTestsAssigned")); + + # TODO: figure out what to do if there are more than one registrations.... + # for now, just take the first... + registration = registrations[0] + + 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)) + 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)) + 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)) + + # check if the test has already been taken + timelimit_descriptor = modulestore().get_instance(course_id, Location(location)) + if not timelimit_descriptor: + log.error("cand {} on exam {} for course {}: descriptor not found for location {}".format(client_candidate_id, exam_series_code, course_id, location)) + return HttpResponseRedirect(makeErrorURL(error_url, "missingClientProgram")); + + timelimit_module_cache = StudentModuleCache.cache_for_descriptor_descendents(course_id, testcenteruser.user, + timelimit_descriptor, depth=None) + timelimit_module = get_module_for_descriptor(request.user, request, timelimit_descriptor, + timelimit_module_cache, course_id, position=None) + if not timelimit_module.category == 'timelimit': + log.error("cand {} on exam {} for course {}: non-timelimit module at location {}".format(client_candidate_id, exam_series_code, course_id, location)) + 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)) + return HttpResponseRedirect(makeErrorURL(error_url, "allTestsTaken")); + + # check if we need to provide an accommodation: + time_accommodation_mapping = {'ET12ET' : 'ADDHALFTIME', + 'ET30MN' : 'ADD30MIN', + 'ETDBTM' : 'ADDDOUBLE', } + + time_accommodation_code = None + for code in registration.get_accommodation_codes(): + if code in time_accommodation_mapping: + time_accommodation_code = time_accommodation_mapping[code] + # special, hard-coded client ID used by Pearson shell for testing: if client_candidate_id == "edX003671291147": - user = authenticate(username=settings.PEARSON_TEST_USER, - password=settings.PEARSON_TEST_PASSWORD) - login(request, user) - return redirect('/courses/MITx/6.002x/2012_Fall/courseware/Final_Exam/Final_Exam_Fall_2012/') - else: - return HttpResponseForbidden() + time_accommodation_code = 'TESTING' + + if time_accommodation_code: + timelimit_module.accommodation_code = time_accommodation_code + instance_module = get_instance_module(course_id, testcenteruser.user, timelimit_module, timelimit_module_cache) + instance_module.state = timelimit_module.get_instance_state() + instance_module.save() + 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 + # backend annotation on the user object, indicating which backend + # against which the user was authenticated. We're authenticating here + # against the registration entry, and assuming that the request given + # this information is correct, we allow the user to be logged in + # without a password. This could all be formalized in a backend object + # that does the above checking. + # TODO: (brian) create a backend class to do this. + # testcenteruser.user.backend = "%s.%s" % (backend.__module__, backend.__class__.__name__) + testcenteruser.user.backend = "%s.%s" % ("TestcenterAuthenticationModule", "TestcenterAuthenticationClass") + login(request, testcenteruser.user) + + # And start the test: + return jump_to(request, course_id, location) def _get_news(top=None): "Return the n top news items on settings.RSS_URL" feed_data = cache.get("students_index_rss_feed_data") - if feed_data == None: + if feed_data is None: if hasattr(settings, 'RSS_URL'): feed_data = urllib.urlopen(settings.RSS_URL).read() else: diff --git a/lms/djangoapps/terrain/__init__.py b/common/djangoapps/terrain/__init__.py similarity index 89% rename from lms/djangoapps/terrain/__init__.py rename to common/djangoapps/terrain/__init__.py index dd6869e7fd..3445a01d17 100644 --- a/lms/djangoapps/terrain/__init__.py +++ b/common/djangoapps/terrain/__init__.py @@ -3,4 +3,4 @@ # See https://groups.google.com/forum/?fromgroups=#!msg/lettuce-users/5VyU9B4HcX8/USgbGIJdS5QJ from terrain.browser import * from terrain.steps import * -from terrain.factories import * \ No newline at end of file +from terrain.factories import * diff --git a/lms/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py similarity index 79% rename from lms/djangoapps/terrain/browser.py rename to common/djangoapps/terrain/browser.py index 1c2d401680..8c2a8ba7a5 100644 --- a/lms/djangoapps/terrain/browser.py +++ b/common/djangoapps/terrain/browser.py @@ -8,20 +8,24 @@ logger.info("Loading the lettuce acceptance testing terrain file...") from django.core.management import call_command + @before.harvest def initial_setup(server): - # Launch firefox + # Launch the browser app (choose one of these below) world.browser = Browser('chrome') + # world.browser = Browser('firefox') + @before.each_scenario def reset_data(scenario): - # Clean out the django test database defined in the + # Clean out the django test database defined in the # envs/acceptance.py file: mitx_all/db/test_mitx.db logger.debug("Flushing the test database...") call_command('flush', interactive=False) + @after.all def teardown_browser(total): # Quit firefox world.browser.quit() - pass \ No newline at end of file + pass diff --git a/lms/djangoapps/terrain/factories.py b/common/djangoapps/terrain/factories.py similarity index 92% rename from lms/djangoapps/terrain/factories.py rename to common/djangoapps/terrain/factories.py index 377ce54d56..bb7ae012c8 100644 --- a/lms/djangoapps/terrain/factories.py +++ b/common/djangoapps/terrain/factories.py @@ -1,4 +1,5 @@ from student.models import User, UserProfile, Registration +from django.contrib.auth.models import Group from datetime import datetime from factory import Factory from xmodule.modulestore import Location @@ -7,6 +8,13 @@ from time import gmtime from uuid import uuid4 from xmodule.timeparse import stringify_time + +class GroupFactory(Factory): + FACTORY_FOR = Group + + name = 'staff_MITx/999/Robot_Super_Course' + + class UserProfileFactory(Factory): FACTORY_FOR = UserProfile @@ -17,12 +25,14 @@ class UserProfileFactory(Factory): mailing_address = None goals = 'World domination' + class RegistrationFactory(Factory): FACTORY_FOR = Registration user = None activation_key = uuid4().hex + class UserFactory(Factory): FACTORY_FOR = User @@ -37,12 +47,15 @@ class UserFactory(Factory): last_login = datetime(2012, 1, 1) date_joined = datetime(2011, 1, 1) -def XMODULE_COURSE_CREATION(class_to_create, **kwargs): + +def XMODULE_COURSE_CREATION(class_to_create, **kwargs): return XModuleCourseFactory._create(class_to_create, **kwargs) + def XMODULE_ITEM_CREATION(class_to_create, **kwargs): return XModuleItemFactory._create(class_to_create, **kwargs) + class XModuleCourseFactory(Factory): """ Factory for XModule courses. @@ -58,7 +71,7 @@ class XModuleCourseFactory(Factory): org = kwargs.get('org') number = kwargs.get('number') display_name = kwargs.get('display_name') - location = Location('i4x', org, number, + location = Location('i4x', org, number, 'course', Location.clean(display_name)) store = modulestore('direct') @@ -72,20 +85,22 @@ class XModuleCourseFactory(Factory): new_course.metadata['data_dir'] = uuid4().hex new_course.metadata['start'] = stringify_time(gmtime()) - new_course.tabs = [{"type": "courseware"}, + new_course.tabs = [{"type": "courseware"}, {"type": "course_info", "name": "Course Info"}, {"type": "discussion", "name": "Discussion"}, {"type": "wiki", "name": "Wiki"}, {"type": "progress", "name": "Progress"}] # Update the data in the mongo datastore - store.update_metadata(new_course.location.url(), new_course.own_metadata) + store.update_metadata(new_course.location.url(), new_course.own_metadata) return new_course + class Course: pass + class CourseFactory(XModuleCourseFactory): FACTORY_FOR = Course @@ -94,6 +109,7 @@ class CourseFactory(XModuleCourseFactory): number = '999' display_name = 'Robot Super Course' + class XModuleItemFactory(Factory): """ Factory for XModule items. @@ -110,7 +126,7 @@ class XModuleItemFactory(Factory): """ DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info'] - + parent_location = Location(kwargs.get('parent_location')) template = Location(kwargs.get('template')) display_name = kwargs.get('display_name') @@ -137,12 +153,14 @@ class XModuleItemFactory(Factory): return new_item + class Item: pass + class ItemFactory(XModuleItemFactory): FACTORY_FOR = Item parent_location = 'i4x://MITx/999/course/Robot_Super_Course' template = 'i4x://edx/templates/chapter/Empty' - display_name = 'Section One' \ No newline at end of file + display_name = 'Section One' diff --git a/lms/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py similarity index 90% rename from lms/djangoapps/terrain/steps.py rename to common/djangoapps/terrain/steps.py index 6824fa16ce..88fba697b2 100644 --- a/lms/djangoapps/terrain/steps.py +++ b/common/djangoapps/terrain/steps.py @@ -1,8 +1,6 @@ from lettuce import world, step from factories import * -from django.core.management import call_command from lettuce.django import django_url -from django.conf import settings from django.contrib.auth.models import User from student.models import CourseEnrollment from urllib import quote_plus @@ -15,79 +13,107 @@ import os.path from logging import getLogger logger = getLogger(__name__) + @step(u'I wait (?:for )?"(\d+)" seconds?$') def wait(step, seconds): time.sleep(float(seconds)) + +@step('I reload the page$') +def reload_the_page(step): + world.browser.reload() + + @step('I (?:visit|access|open) the homepage$') def i_visit_the_homepage(step): world.browser.visit(django_url('/')) assert world.browser.is_element_present_by_css('header.global', 10) + @step(u'I (?:visit|access|open) the dashboard$') def i_visit_the_dashboard(step): world.browser.visit(django_url('/dashboard')) assert world.browser.is_element_present_by_css('section.container.dashboard', 5) + @step('I should be on the dashboard page$') def i_should_be_on_the_dashboard(step): assert world.browser.is_element_present_by_css('section.container.dashboard', 5) assert world.browser.title == 'Dashboard' + @step(u'I (?:visit|access|open) the courses page$') def i_am_on_the_courses_page(step): world.browser.visit(django_url('/courses')) assert world.browser.is_element_present_by_css('section.courses') + @step(u'I press the "([^"]*)" button$') def and_i_press_the_button(step, value): button_css = 'input[value="%s"]' % value world.browser.find_by_css(button_css).first.click() + @step(u'I click the link with the text "([^"]*)"$') def click_the_link_with_the_text_group1(step, linktext): world.browser.find_link_by_text(linktext).first.click() + @step('I should see that the path is "([^"]*)"$') def i_should_see_that_the_path_is(step, path): assert world.browser.url == django_url(path) + @step(u'the page title should be "([^"]*)"$') def the_page_title_should_be(step, title): assert_equals(world.browser.title, title) + @step('I am a logged in user$') def i_am_logged_in_user(step): create_user('robot') - log_in('robot@edx.org','test') + log_in('robot@edx.org', 'test') + @step('I am not logged in$') def i_am_not_logged_in(step): world.browser.cookies.delete() + @step('I am registered for a course$') def i_am_registered_for_a_course(step): create_user('robot') u = User.objects.get(username='robot') CourseEnrollment.objects.get_or_create(user=u, course_id='MITx/6.002x/2012_Fall') + @step('I am registered for course "([^"]*)"$') def i_am_registered_for_course_by_id(step, course_id): register_by_course_id(course_id) + @step('I am staff for course "([^"]*)"$') def i_am_staff_for_course_by_id(step, course_id): register_by_course_id(course_id, True) + @step('I log in$') def i_log_in(step): - log_in('robot@edx.org','test') + log_in('robot@edx.org', 'test') + @step(u'I am an edX user$') def i_am_an_edx_user(step): create_user('robot') #### helper functions + +@world.absorb +def scroll_to_bottom(): + # Maximize the browser + world.browser.execute_script("window.scrollTo(0, screen.height);") + + @world.absorb def create_user(uname): portal_user = UserFactory.build(username=uname, email=uname + '@edx.org') @@ -100,11 +126,12 @@ def create_user(uname): user_profile = UserProfileFactory(user=portal_user) + @world.absorb -def log_in(email, password): +def log_in(email, password): world.browser.cookies.delete() world.browser.visit(django_url('/')) - world.browser.is_element_present_by_css('header.global', 10) + world.browser.is_element_present_by_css('header.global', 10) world.browser.click_link_by_href('#login-modal') login_form = world.browser.find_by_css('form#login_form') login_form.find_by_name('email').fill(email) @@ -114,15 +141,17 @@ def log_in(email, password): # wait for the page to redraw assert world.browser.is_element_present_by_css('.content-wrapper', 10) + @world.absorb def register_by_course_id(course_id, is_staff=False): create_user('robot') u = User.objects.get(username='robot') if is_staff: - u.is_staff=True - u.save() + u.is_staff = True + u.save() CourseEnrollment.objects.get_or_create(user=u, course_id=course_id) + @world.absorb def save_the_html(path='/tmp'): u = world.browser.url @@ -132,6 +161,7 @@ def save_the_html(path='/tmp'): f.write(html) f.close + @world.absorb def save_the_course_content(path='/tmp'): html = world.browser.html.encode('ascii', 'ignore') @@ -140,12 +170,12 @@ def save_the_course_content(path='/tmp'): # get rid of the header, we only want to compare the body soup.head.decompose() - # for now, remove the data-id attributes, because they are + # for now, remove the data-id attributes, because they are # causing mismatches between cms-master and master for item in soup.find_all(attrs={'data-id': re.compile('.*')}): del item['data-id'] - # we also need to remove them from unrendered problems, + # we also need to remove them from unrendered problems, # where they are contained in the text of divs instead of # in attributes of tags # Be careful of whether or not it was the last attribute @@ -164,7 +194,7 @@ def save_the_course_content(path='/tmp'): # use string slicing to grab everything after 'courseware/' in the URL u = world.browser.url - section_url = u[u.find('courseware/')+11:] + section_url = u[u.find('courseware/') + 11:] if not os.path.exists(path): os.makedirs(path) diff --git a/common/djangoapps/track/migrations/0001_initial.py b/common/djangoapps/track/migrations/0001_initial.py index 0546203cf8..6ec146dd10 100644 --- a/common/djangoapps/track/migrations/0001_initial.py +++ b/common/djangoapps/track/migrations/0001_initial.py @@ -45,4 +45,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['track'] \ No newline at end of file + complete_apps = ['track'] diff --git a/common/djangoapps/track/migrations/0002_auto__add_field_trackinglog_host__chg_field_trackinglog_event_type__ch.py b/common/djangoapps/track/migrations/0002_auto__add_field_trackinglog_host__chg_field_trackinglog_event_type__ch.py index 4c73aa3bfd..0bb0cde42e 100644 --- a/common/djangoapps/track/migrations/0002_auto__add_field_trackinglog_host__chg_field_trackinglog_event_type__ch.py +++ b/common/djangoapps/track/migrations/0002_auto__add_field_trackinglog_host__chg_field_trackinglog_event_type__ch.py @@ -48,4 +48,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['track'] \ No newline at end of file + complete_apps = ['track'] diff --git a/common/djangoapps/track/models.py b/common/djangoapps/track/models.py index dfdf7a0558..b6a16706c1 100644 --- a/common/djangoapps/track/models.py +++ b/common/djangoapps/track/models.py @@ -2,21 +2,20 @@ from django.db import models from django.db import models + class TrackingLog(models.Model): - dtcreated = models.DateTimeField('creation date',auto_now_add=True) - username = models.CharField(max_length=32,blank=True) - ip = models.CharField(max_length=32,blank=True) + dtcreated = models.DateTimeField('creation date', auto_now_add=True) + username = models.CharField(max_length=32, blank=True) + ip = models.CharField(max_length=32, blank=True) event_source = models.CharField(max_length=32) - event_type = models.CharField(max_length=512,blank=True) + event_type = models.CharField(max_length=512, blank=True) event = models.TextField(blank=True) - agent = models.CharField(max_length=256,blank=True) - page = models.CharField(max_length=512,blank=True,null=True) + agent = models.CharField(max_length=256, blank=True) + page = models.CharField(max_length=512, blank=True, null=True) time = models.DateTimeField('event time') - host = models.CharField(max_length=64,blank=True) + host = models.CharField(max_length=64, blank=True) def __unicode__(self): s = "[%s] %s@%s: %s | %s | %s | %s" % (self.time, self.username, self.ip, self.event_source, self.event_type, self.page, self.event) return s - - diff --git a/common/djangoapps/track/views.py b/common/djangoapps/track/views.py index 54bd476799..ae3a1dcb3e 100644 --- a/common/djangoapps/track/views.py +++ b/common/djangoapps/track/views.py @@ -17,19 +17,21 @@ from track.models import TrackingLog log = logging.getLogger("tracking") -LOGFIELDS = ['username','ip','event_source','event_type','event','agent','page','time','host'] +LOGFIELDS = ['username', 'ip', 'event_source', 'event_type', 'event', 'agent', 'page', 'time', 'host'] + def log_event(event): event_str = json.dumps(event) log.info(event_str[:settings.TRACK_MAX_EVENT]) if settings.MITX_FEATURES.get('ENABLE_SQL_TRACKING_LOGS'): event['time'] = dateutil.parser.parse(event['time']) - tldat = TrackingLog(**dict( (x,event[x]) for x in LOGFIELDS )) + tldat = TrackingLog(**dict((x, event[x]) for x in LOGFIELDS)) try: tldat.save() except Exception as err: log.exception(err) + def user_track(request): try: # TODO: Do the same for many of the optional META parameters username = request.user.username @@ -87,13 +89,14 @@ def server_track(request, event_type, event, page=None): "host": request.META['SERVER_NAME'], } - if event_type.startswith("/event_logs") and request.user.is_staff: # don't log + if event_type.startswith("/event_logs") and request.user.is_staff: # don't log return log_event(event) + @login_required @ensure_csrf_cookie -def view_tracking_log(request,args=''): +def view_tracking_log(request, args=''): if not request.user.is_staff: return redirect('/') nlen = 100 @@ -104,16 +107,15 @@ def view_tracking_log(request,args=''): nlen = int(arg) if arg.startswith('username='): username = arg[9:] - + record_instances = TrackingLog.objects.all().order_by('-time') if username: record_instances = record_instances.filter(username=username) record_instances = record_instances[0:nlen] - + # fix dtstamp fmt = '%a %d-%b-%y %H:%M:%S' # "%Y-%m-%d %H:%M:%S %Z%z" for rinst in record_instances: rinst.dtstr = rinst.time.replace(tzinfo=pytz.utc).astimezone(pytz.timezone('US/Eastern')).strftime(fmt) - return render_to_response('tracking_log.html',{'records':record_instances}) - + return render_to_response('tracking_log.html', {'records': record_instances}) diff --git a/common/djangoapps/util/cache.py b/common/djangoapps/util/cache.py index 89b5dffd5e..8ab1b06acd 100644 --- a/common/djangoapps/util/cache.py +++ b/common/djangoapps/util/cache.py @@ -58,4 +58,3 @@ def cache_if_anonymous(view_func): return view_func(request, *args, **kwargs) return _decorated - diff --git a/common/djangoapps/util/converters.py b/common/djangoapps/util/converters.py index 7f96dc6c30..ec2d29ecfa 100644 --- a/common/djangoapps/util/converters.py +++ b/common/djangoapps/util/converters.py @@ -1,7 +1,9 @@ -import time, datetime +import time +import datetime import re import calendar + def time_to_date(time_obj): """ Convert a time.time_struct to a true universal time (can pass to js Date constructor) @@ -9,16 +11,20 @@ def time_to_date(time_obj): # TODO change to using the isoformat() function on datetime. js date can parse those return calendar.timegm(time_obj) * 1000 + def jsdate_to_time(field): """ Convert a universal time (iso format) or msec since epoch to a time obj """ if field is None: return field - elif isinstance(field, basestring): # iso format but ignores time zone assuming it's Z - d=datetime.datetime(*map(int, re.split('[^\d]', field)[:6])) # stop after seconds. Debatable + elif isinstance(field, basestring): + # ISO format but ignores time zone assuming it's Z. + d = datetime.datetime(*map(int, re.split('[^\d]', field)[:6])) # stop after seconds. Debatable return d.utctimetuple() - elif isinstance(field, int) or isinstance(field, float): + elif isinstance(field, (int, long, float)): return time.gmtime(field / 1000) elif isinstance(field, time.struct_time): - return field \ No newline at end of file + return field + else: + raise ValueError("Couldn't convert %r to time" % field) diff --git a/common/djangoapps/util/json_request.py b/common/djangoapps/util/json_request.py index 4beff7bdc8..840a8282f9 100644 --- a/common/djangoapps/util/json_request.py +++ b/common/djangoapps/util/json_request.py @@ -13,7 +13,7 @@ def expect_json(view_function): def expect_json_with_cloned_request(request, *args, **kwargs): # cdodge: fix postback errors in CMS. The POST 'content-type' header can include additional information # e.g. 'charset', so we can't do a direct string compare - if request.META.get('CONTENT_TYPE','').lower().startswith("application/json"): + if request.META.get('CONTENT_TYPE', '').lower().startswith("application/json"): cloned_request = copy.copy(request) cloned_request.POST = cloned_request.POST.copy() cloned_request.POST.update(json.loads(request.body)) diff --git a/common/djangoapps/util/views.py b/common/djangoapps/util/views.py index 0ccdd03301..cece37757b 100644 --- a/common/djangoapps/util/views.py +++ b/common/djangoapps/util/views.py @@ -93,6 +93,7 @@ def accepts(request, media_type): accept = parse_accept_header(request.META.get("HTTP_ACCEPT", "")) return media_type in [t for (t, p, q) in accept] + def debug_request(request): """Return a pretty printed version of the request""" diff --git a/common/djangoapps/xmodule_modifiers.py b/common/djangoapps/xmodule_modifiers.py index 5c19a2f1d7..7b19c27553 100644 --- a/common/djangoapps/xmodule_modifiers.py +++ b/common/djangoapps/xmodule_modifiers.py @@ -2,16 +2,17 @@ import re import json import logging import time +import static_replace from django.conf import settings from functools import wraps -from static_replace import replace_urls from mitxmako.shortcuts import render_to_string from xmodule.seq_module import SequenceModule from xmodule.vertical_module import VerticalModule log = logging.getLogger("mitx.xmodule_modifiers") + def wrap_xmodule(get_html, module, template, context=None): """ Wraps the results of get_html in a standard
      with identifying @@ -32,7 +33,7 @@ def wrap_xmodule(get_html, module, template, context=None): def _get_html(): context.update({ 'content': get_html(), - 'display_name' : module.metadata.get('display_name') if module.metadata is not None else None, + 'display_name': module.metadata.get('display_name') if module.metadata is not None else None, 'class_': module.__class__.__name__, 'module_name': module.js_module_name }) @@ -49,10 +50,11 @@ def replace_course_urls(get_html, course_id): """ @wraps(get_html) def _get_html(): - return replace_urls(get_html(), staticfiles_prefix='/courses/'+course_id, replace_prefix='/course/') + return static_replace.replace_course_urls(get_html(), course_id) return _get_html -def replace_static_urls(get_html, prefix, course_namespace=None): + +def replace_static_urls(get_html, data_dir, course_namespace=None): """ Updates the supplied module with a new get_html function that wraps the old get_html function and substitutes urls of the form /static/... @@ -61,7 +63,7 @@ def replace_static_urls(get_html, prefix, course_namespace=None): @wraps(get_html) def _get_html(): - return replace_urls(get_html(), staticfiles_prefix=prefix, course_namespace = course_namespace) + return static_replace.replace_static_urls(get_html(), data_dir, course_namespace) return _get_html @@ -99,7 +101,7 @@ def add_histogram(get_html, module, user): @wraps(get_html) def _get_html(): - if type(module) in [SequenceModule, VerticalModule]: # TODO: make this more general, eg use an XModule attribute instead + if type(module) in [SequenceModule, VerticalModule]: # TODO: make this more general, eg use an XModule attribute instead return get_html() module_id = module.id @@ -115,35 +117,35 @@ def add_histogram(get_html, module, user): # doesn't like symlinks) filepath = filename data_dir = osfs.root_path.rsplit('/')[-1] - giturl = module.metadata.get('giturl','https://github.com/MITx') - edit_link = "%s/%s/tree/master/%s" % (giturl,data_dir,filepath) + giturl = module.metadata.get('giturl', 'https://github.com/MITx') + edit_link = "%s/%s/tree/master/%s" % (giturl, data_dir, filepath) else: edit_link = False # Need to define all the variables that are about to be used giturl = "" data_dir = "" - source_file = module.metadata.get('source_file','') # source used to generate the problem XML, eg latex or word + source_file = module.metadata.get('source_file', '') # source used to generate the problem XML, eg latex or word # useful to indicate to staff if problem has been released or not # TODO (ichuang): use _has_access_descriptor.can_load in lms.courseware.access, instead of now>mstart comparison here now = time.gmtime() is_released = "unknown" - mstart = getattr(module.descriptor,'start') + mstart = getattr(module.descriptor, 'start') if mstart is not None: is_released = "Yes!" if (now > mstart) else "Not yet" staff_context = {'definition': module.definition.get('data'), 'metadata': json.dumps(module.metadata, indent=4), 'location': module.location, - 'xqa_key': module.metadata.get('xqa_key',''), - 'source_file' : source_file, - 'source_url': '%s/%s/tree/master/%s' % (giturl,data_dir,source_file), + 'xqa_key': module.metadata.get('xqa_key', ''), + 'source_file': source_file, + 'source_url': '%s/%s/tree/master/%s' % (giturl, data_dir, source_file), 'category': str(module.__class__.__name__), # Template uses element_id in js function names, so can't allow dashes - 'element_id': module.location.html_id().replace('-','_'), + 'element_id': module.location.html_id().replace('-', '_'), 'edit_link': edit_link, 'user': user, - 'xqa_server' : settings.MITX_FEATURES.get('USE_XQA_SERVER','http://xqa:server@content-qa.mitx.mit.edu/xqa'), + 'xqa_server': settings.MITX_FEATURES.get('USE_XQA_SERVER', 'http://xqa:server@content-qa.mitx.mit.edu/xqa'), 'histogram': json.dumps(histogram), 'render_histogram': render_histogram, 'module_content': get_html(), @@ -152,4 +154,3 @@ def add_histogram(get_html, module, user): return render_to_string("staff_problem_info.html", staff_context) return _get_html - diff --git a/common/lib/capa/capa/calc.py b/common/lib/capa/capa/calc.py index 40ac14308e..0f062d17d5 100644 --- a/common/lib/capa/capa/calc.py +++ b/common/lib/capa/capa/calc.py @@ -121,9 +121,9 @@ def evaluator(variables, functions, string, cs=False): # confusing. They may also conflict with variables if we ever allow e.g. # 5R instead of 5*R suffixes = {'%': 0.01, 'k': 1e3, 'M': 1e6, 'G': 1e9, - 'T': 1e12,# 'P':1e15,'E':1e18,'Z':1e21,'Y':1e24, + 'T': 1e12, # 'P':1e15,'E':1e18,'Z':1e21,'Y':1e24, 'c': 1e-2, 'm': 1e-3, 'u': 1e-6, - 'n': 1e-9, 'p': 1e-12}# ,'f':1e-15,'a':1e-18,'z':1e-21,'y':1e-24} + 'n': 1e-9, 'p': 1e-12} # ,'f':1e-15,'a':1e-18,'z':1e-21,'y':1e-24} def super_float(text): ''' Like float, but with si extensions. 1k goes to 1000''' diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py index 4b0faa91a1..14c590a660 100644 --- a/common/lib/capa/capa/capa_problem.py +++ b/common/lib/capa/capa/capa_problem.py @@ -75,7 +75,7 @@ global_context = {'random': random, 'draganddrop': verifiers.draganddrop} # These should be removed from HTML output, including all subelements -html_problem_semantics = ["codeparam", "responseparam", "answer", "script", "hintgroup", "openendedparam","openendedrubric"] +html_problem_semantics = ["codeparam", "responseparam", "answer", "script", "hintgroup", "openendedparam", "openendedrubric"] log = logging.getLogger('mitx.' + __name__) @@ -146,6 +146,13 @@ class LoncapaProblem(object): if not self.student_answers: # True when student_answers is an empty dict self.set_initial_display() + # dictionary of InputType objects associated with this problem + # input_id string -> InputType object + self.inputs = {} + + self.extracted_tree = self._extract_html(self.tree) + + def do_reset(self): ''' Reset internal state to unfinished, with no answers @@ -324,7 +331,27 @@ class LoncapaProblem(object): ''' Main method called externally to get the HTML to be rendered for this capa Problem. ''' - return contextualize_text(etree.tostring(self._extract_html(self.tree)), self.context) + html = contextualize_text(etree.tostring(self._extract_html(self.tree)), self.context) + return html + + + def handle_input_ajax(self, get): + ''' + InputTypes can support specialized AJAX calls. Find the correct input and pass along the correct data + + Also, parse out the dispatch from the get so that it can be passed onto the input type nicely + ''' + + # pull out the id + input_id = get['input_id'] + if self.inputs[input_id]: + dispatch = get['dispatch'] + return self.inputs[input_id].handle_ajax(dispatch, get) + else: + log.warning("Could not find matching input for id: %s" % problem_id) + return {} + + # ======= Private Methods Below ======== @@ -453,11 +480,13 @@ class LoncapaProblem(object): exec code in context, context except Exception as err: log.exception("Error while execing script code: " + code) - msg = "Error while executing script code: %s" % str(err).replace('<','<') + msg = "Error while executing script code: %s" % str(err).replace('<', '<') raise responsetypes.LoncapaProblemError(msg) finally: sys.path = original_path + + def _extract_html(self, problemtree): # private ''' Main (private) function which converts Problem XML tree to HTML. @@ -468,6 +497,7 @@ class LoncapaProblem(object): Used by get_html. ''' + if (problemtree.tag == 'script' and problemtree.get('type') and 'javascript' in problemtree.get('type')): # leave javascript intact. @@ -484,8 +514,9 @@ class LoncapaProblem(object): msg = '' hint = '' hintmode = None + input_id = problemtree.get('id') if problemid in self.correct_map: - pid = problemtree.get('id') + pid = input_id status = self.correct_map.get_correctness(pid) msg = self.correct_map.get_msg(pid) hint = self.correct_map.get_hint(pid) @@ -496,21 +527,23 @@ class LoncapaProblem(object): value = self.student_answers[problemid] # do the rendering - state = {'value': value, 'status': status, - 'id': problemtree.get('id'), + 'id': input_id, 'feedback': {'message': msg, 'hint': hint, - 'hintmode': hintmode,}} + 'hintmode': hintmode, }} input_type_cls = inputtypes.registry.get_class_for_tag(problemtree.tag) - the_input = input_type_cls(self.system, problemtree, state) - return the_input.get_html() + # save the input type so that we can make ajax calls on it if we need to + self.inputs[input_id] = input_type_cls(self.system, problemtree, state) + return self.inputs[input_id].get_html() # let each Response render itself if problemtree in self.responders: - return self.responders[problemtree].render_html(self._extract_html) + overall_msg = self.correct_map.get_overall_message() + return self.responders[problemtree].render_html(self._extract_html, + response_msg=overall_msg) # let each custom renderer render itself: if problemtree.tag in customrender.registry.registered_tags(): diff --git a/common/lib/capa/capa/chem/__init__.py b/common/lib/capa/capa/chem/__init__.py index 8b13789179..e69de29bb2 100644 --- a/common/lib/capa/capa/chem/__init__.py +++ b/common/lib/capa/capa/chem/__init__.py @@ -1 +0,0 @@ - diff --git a/common/lib/capa/capa/chem/chemcalc.py b/common/lib/capa/capa/chem/chemcalc.py index 389e688cf4..5b80005044 100644 --- a/common/lib/capa/capa/chem/chemcalc.py +++ b/common/lib/capa/capa/chem/chemcalc.py @@ -17,17 +17,17 @@ from nltk.tree import Tree ARROWS = ('<->', '->') ## Defines a simple pyparsing tokenizer for chemical equations -elements = ['Ac','Ag','Al','Am','Ar','As','At','Au','B','Ba','Be', - 'Bh','Bi','Bk','Br','C','Ca','Cd','Ce','Cf','Cl','Cm', - 'Cn','Co','Cr','Cs','Cu','Db','Ds','Dy','Er','Es','Eu', - 'F','Fe','Fl','Fm','Fr','Ga','Gd','Ge','H','He','Hf', - 'Hg','Ho','Hs','I','In','Ir','K','Kr','La','Li','Lr', - 'Lu','Lv','Md','Mg','Mn','Mo','Mt','N','Na','Nb','Nd', - 'Ne','Ni','No','Np','O','Os','P','Pa','Pb','Pd','Pm', - 'Po','Pr','Pt','Pu','Ra','Rb','Re','Rf','Rg','Rh','Rn', - 'Ru','S','Sb','Sc','Se','Sg','Si','Sm','Sn','Sr','Ta', - 'Tb','Tc','Te','Th','Ti','Tl','Tm','U','Uuo','Uup', - 'Uus','Uut','V','W','Xe','Y','Yb','Zn','Zr'] +elements = ['Ac', 'Ag', 'Al', 'Am', 'Ar', 'As', 'At', 'Au', 'B', 'Ba', 'Be', + 'Bh', 'Bi', 'Bk', 'Br', 'C', 'Ca', 'Cd', 'Ce', 'Cf', 'Cl', 'Cm', + 'Cn', 'Co', 'Cr', 'Cs', 'Cu', 'Db', 'Ds', 'Dy', 'Er', 'Es', 'Eu', + 'F', 'Fe', 'Fl', 'Fm', 'Fr', 'Ga', 'Gd', 'Ge', 'H', 'He', 'Hf', + 'Hg', 'Ho', 'Hs', 'I', 'In', 'Ir', 'K', 'Kr', 'La', 'Li', 'Lr', + 'Lu', 'Lv', 'Md', 'Mg', 'Mn', 'Mo', 'Mt', 'N', 'Na', 'Nb', 'Nd', + 'Ne', 'Ni', 'No', 'Np', 'O', 'Os', 'P', 'Pa', 'Pb', 'Pd', 'Pm', + 'Po', 'Pr', 'Pt', 'Pu', 'Ra', 'Rb', 'Re', 'Rf', 'Rg', 'Rh', 'Rn', + 'Ru', 'S', 'Sb', 'Sc', 'Se', 'Sg', 'Si', 'Sm', 'Sn', 'Sr', 'Ta', + 'Tb', 'Tc', 'Te', 'Th', 'Ti', 'Tl', 'Tm', 'U', 'Uuo', 'Uup', + 'Uus', 'Uut', 'V', 'W', 'Xe', 'Y', 'Yb', 'Zn', 'Zr'] digits = map(str, range(10)) symbols = list("[](){}^+-/") phases = ["(s)", "(l)", "(g)", "(aq)"] @@ -252,7 +252,7 @@ def _get_final_tree(s): ''' tokenized = tokenizer.parseString(s) parsed = parser.parse(tokenized) - merged = _merge_children(parsed, {'S','group'}) + merged = _merge_children(parsed, {'S', 'group'}) final = _clean_parse_tree(merged) return final diff --git a/common/lib/capa/capa/correctmap.py b/common/lib/capa/capa/correctmap.py index c7386219b1..9e76fc20bf 100644 --- a/common/lib/capa/capa/correctmap.py +++ b/common/lib/capa/capa/correctmap.py @@ -3,6 +3,7 @@ # # Used by responsetypes and capa_problem + class CorrectMap(object): """ Stores map between answer_id and response evaluation result for each question @@ -26,6 +27,7 @@ class CorrectMap(object): self.cmap = dict() self.items = self.cmap.items self.keys = self.cmap.keys + self.overall_message = "" self.set(*args, **kwargs) def __getitem__(self, *args, **kwargs): @@ -103,16 +105,21 @@ class CorrectMap(object): return self.is_queued(answer_id) and self.cmap[answer_id]['queuestate']['key'] == test_key def get_queuetime_str(self, answer_id): - return self.cmap[answer_id]['queuestate']['time'] + if self.cmap[answer_id]['queuestate']: + return self.cmap[answer_id]['queuestate']['time'] + else: + return None def get_npoints(self, answer_id): - npoints = self.get_property(answer_id, 'npoints') - if npoints is not None: - return npoints - elif self.is_correct(answer_id): - return 1 - # if not correct and no points have been assigned, return 0 - return 0 + """ Return the number of points for an answer: + If the answer is correct, return the assigned + number of points (default: 1 point) + Otherwise, return 0 points """ + if self.is_correct(answer_id): + npoints = self.get_property(answer_id, 'npoints') + return npoints if npoints is not None else 1 + else: + return 0 def set_property(self, answer_id, property, value): if answer_id in self.cmap: @@ -152,6 +159,15 @@ class CorrectMap(object): if not isinstance(other_cmap, CorrectMap): raise Exception('CorrectMap.update called with invalid argument %s' % other_cmap) self.cmap.update(other_cmap.get_dict()) + self.set_overall_message(other_cmap.get_overall_message()) + def set_overall_message(self, message_str): + """ Set a message that applies to the question as a whole, + rather than to individual inputs. """ + self.overall_message = str(message_str) if message_str else "" + def get_overall_message(self): + """ Retrieve a message that applies to the question as a whole. + If no message is available, returns the empty string """ + return self.overall_message diff --git a/common/lib/capa/capa/customrender.py b/common/lib/capa/capa/customrender.py index ef1044e8b1..a925a5970d 100644 --- a/common/lib/capa/capa/customrender.py +++ b/common/lib/capa/capa/customrender.py @@ -22,6 +22,8 @@ log = logging.getLogger('mitx.' + __name__) registry = TagRegistry() #----------------------------------------------------------------------------- + + class MathRenderer(object): tags = ['math'] @@ -77,6 +79,7 @@ registry.register(MathRenderer) #----------------------------------------------------------------------------- + class SolutionRenderer(object): ''' A solution is just a ... which is given an ID, that is used for displaying an @@ -97,4 +100,3 @@ class SolutionRenderer(object): return etree.XML(html) registry.register(SolutionRenderer) - diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py index 0b0e86ce66..1d6c340f37 100644 --- a/common/lib/capa/capa/inputtypes.py +++ b/common/lib/capa/capa/inputtypes.py @@ -54,6 +54,7 @@ log = logging.getLogger('mitx.' + __name__) registry = TagRegistry() + class Attribute(object): """ Allows specifying required and optional attributes for input types. @@ -214,6 +215,18 @@ class InputTypeBase(object): """ pass + def handle_ajax(self, dispatch, get): + """ + InputTypes that need to handle specialized AJAX should override this. + + Input: + dispatch: a string that can be used to determine how to handle the data passed in + get: a dictionary containing the data that was sent with the ajax call + + Output: + a dictionary object that can be serialized into JSON. This will be sent back to the Javascript. + """ + pass def _get_render_context(self): """ @@ -413,7 +426,7 @@ class JavascriptInput(InputTypeBase): return [Attribute('params', None), Attribute('problem_state', None), Attribute('display_class', None), - Attribute('display_file', None),] + Attribute('display_file', None), ] def setup(self): @@ -477,12 +490,13 @@ class TextLine(InputTypeBase): def _extra_context(self): return {'do_math': self.do_math, - 'preprocessor': self.preprocessor,} + 'preprocessor': self.preprocessor, } registry.register(TextLine) #----------------------------------------------------------------------------- + class FileSubmission(InputTypeBase): """ Upload some files (e.g. for programming assignments) @@ -508,7 +522,7 @@ class FileSubmission(InputTypeBase): Convert the list of allowed files to a convenient format. """ return [Attribute('allowed_files', '[]', transform=cls.parse_files), - Attribute('required_files', '[]', transform=cls.parse_files),] + Attribute('required_files', '[]', transform=cls.parse_files), ] def setup(self): """ @@ -524,7 +538,7 @@ class FileSubmission(InputTypeBase): self.msg = FileSubmission.submitted_msg def _extra_context(self): - return {'queue_len': self.queue_len,} + return {'queue_len': self.queue_len, } return context registry.register(FileSubmission) @@ -582,7 +596,7 @@ class CodeInput(InputTypeBase): def _extra_context(self): """Defined queue_len, add it """ - return {'queue_len': self.queue_len,} + return {'queue_len': self.queue_len, } registry.register(CodeInput) @@ -606,7 +620,7 @@ class Schematic(InputTypeBase): Attribute('parts', None), Attribute('analyses', None), Attribute('initial_value', None), - Attribute('submit_analyses', None),] + Attribute('submit_analyses', None), ] return context @@ -614,6 +628,7 @@ registry.register(Schematic) #----------------------------------------------------------------------------- + class ImageInput(InputTypeBase): """ Clickable image as an input field. Element should specify the image source, height, @@ -635,7 +650,7 @@ class ImageInput(InputTypeBase): """ return [Attribute('src'), Attribute('height'), - Attribute('width'),] + Attribute('width'), ] def setup(self): @@ -660,6 +675,7 @@ registry.register(ImageInput) #----------------------------------------------------------------------------- + class Crystallography(InputTypeBase): """ An input for crystallography -- user selects 3 points on the axes, and we get a plane. @@ -728,18 +744,19 @@ class ChemicalEquationInput(InputTypeBase): """ Can set size of text field. """ - return [Attribute('size', '20'),] + return [Attribute('size', '20'), ] def _extra_context(self): """ TODO (vshnayder): Get rid of this once we have a standard way of requiring js to be loaded. """ - return {'previewer': '/static/js/capa/chemical_equation_preview.js',} + return {'previewer': '/static/js/capa/chemical_equation_preview.js', } registry.register(ChemicalEquationInput) #----------------------------------------------------------------------------- + class DragAndDropInput(InputTypeBase): """ Input for drag and drop problems. Allows student to drag and drop images and @@ -829,3 +846,108 @@ class DragAndDropInput(InputTypeBase): registry.register(DragAndDropInput) #-------------------------------------------------------------------------------------------------------------------- + + +class EditAMoleculeInput(InputTypeBase): + """ + An input type for edit-a-molecule. Integrates with the molecule editor java applet. + + Example: + + + + options: size -- width of the textbox. + """ + + template = "editamolecule.html" + tags = ['editamoleculeinput'] + + @classmethod + def get_attributes(cls): + """ + Can set size of text field. + """ + return [Attribute('file'), + Attribute('missing', None)] + + def _extra_context(self): + """ + """ + context = { + 'applet_loader': '/static/js/capa/editamolecule.js', + } + + return context + +registry.register(EditAMoleculeInput) + +#----------------------------------------------------------------------------- + +class DesignProtein2dInput(InputTypeBase): + """ + An input type for design of a protein in 2D. Integrates with the Protex java applet. + + Example: + + + """ + + template = "designprotein2dinput.html" + tags = ['designprotein2dinput'] + + @classmethod + def get_attributes(cls): + """ + Note: width, hight, and target_shape are required. + """ + return [Attribute('width'), + Attribute('height'), + Attribute('target_shape') + ] + + def _extra_context(self): + """ + """ + context = { + 'applet_loader': '/static/js/capa/design-protein-2d.js', + } + + return context + +registry.register(DesignProtein2dInput) + +#----------------------------------------------------------------------------- + +class EditAGeneInput(InputTypeBase): + """ + An input type for editing a gene. Integrates with the genex java applet. + + Example: + + + """ + + template = "editageneinput.html" + tags = ['editageneinput'] + + @classmethod + def get_attributes(cls): + """ + Note: width, hight, and dna_sequencee are required. + """ + return [Attribute('width'), + Attribute('height'), + Attribute('dna_sequence') + ] + + def _extra_context(self): + """ + """ + context = { + 'applet_loader': '/static/js/capa/edit-a-gene.js', + } + + return context + +registry.register(EditAGeneInput) + diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py index 5f0e1639b2..97077ace8f 100644 --- a/common/lib/capa/capa/responsetypes.py +++ b/common/lib/capa/capa/responsetypes.py @@ -174,27 +174,33 @@ class LoncapaResponse(object): ''' return sum(self.maxpoints.values()) - def render_html(self, renderer): + def render_html(self, renderer, response_msg=''): ''' Return XHTML Element tree representation of this Response. Arguments: - renderer : procedure which produces HTML given an ElementTree + - response_msg: a message displayed at the end of the Response ''' # render ourself as a + our content tree = etree.Element('span') # problem author can make this span display:inline - if self.xml.get('inline',''): - tree.set('class','inline') - + if self.xml.get('inline', ''): + tree.set('class', 'inline') + for item in self.xml: # call provided procedure to do the rendering item_xhtml = renderer(item) if item_xhtml is not None: tree.append(item_xhtml) tree.tail = self.xml.tail + + # Add a
      for the message at the end of the response + if response_msg: + tree.append(self._render_response_msg_html(response_msg)) + return tree def evaluate_answers(self, student_answers, old_cmap): @@ -319,6 +325,29 @@ class LoncapaResponse(object): def __unicode__(self): return u'LoncapaProblem Response %s' % self.xml.tag + def _render_response_msg_html(self, response_msg): + """ Render a
      for a message that applies to the entire response. + + *response_msg* is a string, which may contain XHTML markup + + Returns an etree element representing the response message
      """ + # First try wrapping the text in a
      and parsing + # it as an XHTML tree + try: + response_msg_div = etree.XML('
      %s
      ' % str(response_msg)) + + # If we can't do that, create the
      and set the message + # as the text of the
      + except: + response_msg_div = etree.Element('div') + response_msg_div.text = str(response_msg) + + + # Set the css class of the message
      + response_msg_div.set("class", "response_message") + + return response_msg_div + #----------------------------------------------------------------------------- @@ -632,8 +661,14 @@ class MultipleChoiceResponse(LoncapaResponse): # define correct choices (after calling secondary setup) xml = self.xml - cxml = xml.xpath('//*[@id=$id]//choice[@correct="true"]', id=xml.get('id')) - self.correct_choices = [contextualize_text(choice.get('name'), self.context) for choice in cxml] + cxml = xml.xpath('//*[@id=$id]//choice', id=xml.get('id')) + + # contextualize correct attribute and then select ones for which + # correct = "true" + self.correct_choices = [ + contextualize_text(choice.get('name'), self.context) + for choice in cxml + if contextualize_text(choice.get('correct'), self.context) == "true"] def mc_setup_response(self): ''' @@ -875,7 +910,8 @@ def sympy_check2(): allowed_inputfields = ['textline', 'textbox', 'crystallography', 'chemicalequationinput', 'vsepr_input', - 'drag_and_drop_input'] + 'drag_and_drop_input', 'editamoleculeinput', + 'designprotein2dinput', 'editageneinput'] def setup_response(self): xml = self.xml @@ -958,6 +994,7 @@ def sympy_check2(): # not expecting 'unknown's correct = ['unknown'] * len(idset) messages = [''] * len(idset) + overall_message = "" # put these in the context of the check function evaluator # note that this doesn't help the "cfn" version - only the exec version @@ -989,6 +1026,10 @@ def sympy_check2(): # the list of messages to be filled in by the check function 'messages': messages, + # a message that applies to the entire response + # instead of a particular input + 'overall_message': overall_message, + # any options to be passed to the cfn 'options': self.xml.get('options'), 'testdat': 'hello world', @@ -998,11 +1039,12 @@ def sympy_check2(): self.context['debug'] = self.system.DEBUG # exec the check function - if type(self.code) == str: + if isinstance(self.code, basestring): try: exec self.code in self.context['global_context'], self.context correct = self.context['correct'] messages = self.context['messages'] + overall_message = self.context['overall_message'] except Exception as err: print "oops in customresponse (code) error %s" % err print "context = ", self.context @@ -1037,34 +1079,100 @@ def sympy_check2(): log.error(traceback.format_exc()) raise Exception("oops in customresponse (cfn) error %s" % err) log.debug("[courseware.capa.responsetypes.customresponse.get_score] ret = %s" % ret) + if type(ret) == dict: - correct = ['correct'] * len(idset) if ret['ok'] else ['incorrect'] * len(idset) - msg = ret['msg'] - if 1: - # try to clean up message html - msg = '' + msg + '' - msg = msg.replace('<', '<') - #msg = msg.replace('<','<') - msg = etree.tostring(fromstring_bs(msg, convertEntities=None), - pretty_print=True) - #msg = etree.tostring(fromstring_bs(msg),pretty_print=True) - msg = msg.replace(' ', '') - #msg = re.sub('(.*)','\\1',msg,flags=re.M|re.DOTALL) # python 2.7 - msg = re.sub('(?ms)(.*)', '\\1', msg) + # One kind of dictionary the check function can return has the + # form {'ok': BOOLEAN, 'msg': STRING} + # If there are multiple inputs, they all get marked + # to the same correct/incorrect value + if 'ok' in ret: + correct = ['correct'] * len(idset) if ret['ok'] else ['incorrect'] * len(idset) + msg = ret.get('msg', None) + msg = self.clean_message_html(msg) - messages[0] = msg + # If there is only one input, apply the message to that input + # Otherwise, apply the message to the whole problem + if len(idset) > 1: + overall_message = msg + else: + messages[0] = msg + + + # Another kind of dictionary the check function can return has + # the form: + # {'overall_message': STRING, + # 'input_list': [{ 'ok': BOOLEAN, 'msg': STRING }, ...] } + # + # This allows the function to return an 'overall message' + # that applies to the entire problem, as well as correct/incorrect + # status and messages for individual inputs + elif 'input_list' in ret: + overall_message = ret.get('overall_message', '') + input_list = ret['input_list'] + + correct = [] + messages = [] + for input_dict in input_list: + correct.append('correct' if input_dict['ok'] else 'incorrect') + msg = self.clean_message_html(input_dict['msg']) if 'msg' in input_dict else None + messages.append(msg) + + # Otherwise, we do not recognize the dictionary + # Raise an exception + else: + log.error(traceback.format_exc()) + raise Exception("CustomResponse: check function returned an invalid dict") + + # The check function can return a boolean value, + # indicating whether all inputs should be marked + # correct or incorrect else: correct = ['correct'] * len(idset) if ret else ['incorrect'] * len(idset) # build map giving "correct"ness of the answer(s) correct_map = CorrectMap() + + overall_message = self.clean_message_html(overall_message) + correct_map.set_overall_message(overall_message) + for k in range(len(idset)): npoints = self.maxpoints[idset[k]] if correct[k] == 'correct' else 0 correct_map.set(idset[k], correct[k], msg=messages[k], npoints=npoints) return correct_map + def clean_message_html(self, msg): + + # If *msg* is an empty string, then the code below + # will return "". To avoid this, we first check + # that *msg* is a non-empty string. + if msg: + + # When we parse *msg* using etree, there needs to be a root + # element, so we wrap the *msg* text in tags + msg = '' + msg + '' + + # Replace < characters + msg = msg.replace('<', '<') + + # Use etree to prettify the HTML + msg = etree.tostring(fromstring_bs(msg, convertEntities=None), + pretty_print=True) + + msg = msg.replace(' ', '') + + # Remove the tags we introduced earlier, so we're + # left with just the prettified message markup + msg = re.sub('(?ms)(.*)', '\\1', msg) + + # Strip leading and trailing whitespace + return msg.strip() + + # If we start with an empty string, then return an empty string + else: + return "" + def get_answers(self): ''' Give correct answer expected for this response. @@ -1294,7 +1402,7 @@ class CodeResponse(LoncapaResponse): # State associated with the queueing request queuestate = {'key': queuekey, - 'time': qtime,} + 'time': qtime, } cmap = CorrectMap() if error: diff --git a/common/lib/capa/capa/templates/chemicalequationinput.html b/common/lib/capa/capa/templates/chemicalequationinput.html index becd2a330a..dd177dc920 100644 --- a/common/lib/capa/capa/templates/chemicalequationinput.html +++ b/common/lib/capa/capa/templates/chemicalequationinput.html @@ -31,7 +31,6 @@
      -

      % if status in ['unsubmitted', 'correct', 'incorrect', 'incomplete']: diff --git a/common/lib/capa/capa/templates/choicegroup.html b/common/lib/capa/capa/templates/choicegroup.html index 457d9e7817..b9d8164321 100644 --- a/common/lib/capa/capa/templates/choicegroup.html +++ b/common/lib/capa/capa/templates/choicegroup.html @@ -1,23 +1,35 @@
      -
      - % if status == 'unsubmitted': - - % elif status == 'correct': - - % elif status == 'incorrect': - - % elif status == 'incomplete': - - % endif -
      % for choice_id, choice_description in choices: - + /> + + ${choice_description} + + + % endfor
      diff --git a/common/lib/capa/capa/templates/codeinput.html b/common/lib/capa/capa/templates/codeinput.html index 5c2ff2aca5..eb8cad0d70 100644 --- a/common/lib/capa/capa/templates/codeinput.html +++ b/common/lib/capa/capa/templates/codeinput.html @@ -50,6 +50,7 @@ }, smartIndent: false }); + $("#textbox_${id}").find('.CodeMirror-scroll').height(${int(13.5*eval(rows))}); });
      diff --git a/common/lib/capa/capa/templates/designprotein2dinput.html b/common/lib/capa/capa/templates/designprotein2dinput.html new file mode 100644 index 0000000000..6733566ab9 --- /dev/null +++ b/common/lib/capa/capa/templates/designprotein2dinput.html @@ -0,0 +1,35 @@ +
      +
      +
      + + % if status == 'unsubmitted': +
      + % elif status == 'correct': +
      + % elif status == 'incorrect': +
      + % elif status == 'incomplete': +
      + % endif + +
      + + + +

      + % if status == 'unsubmitted': + unanswered + % elif status == 'correct': + correct + % elif status == 'incorrect': + incorrect + % elif status == 'incomplete': + incomplete + % endif +

      + +

      + % if status in ['unsubmitted', 'correct', 'incorrect', 'incomplete']: +
      +% endif +
      diff --git a/common/lib/capa/capa/templates/editageneinput.html b/common/lib/capa/capa/templates/editageneinput.html new file mode 100644 index 0000000000..8dd4fa89d1 --- /dev/null +++ b/common/lib/capa/capa/templates/editageneinput.html @@ -0,0 +1,39 @@ +
      +
      + + % if status == 'unsubmitted': +
      + % elif status == 'correct': +
      + % elif status == 'incorrect': +
      + % elif status == 'incomplete': +
      + % endif + + + + + + Applet failed to run. No Java plug-in was found. + + + + +

      + % if status == 'unsubmitted': + unanswered + % elif status == 'correct': + correct + % elif status == 'incorrect': + incorrect + % elif status == 'incomplete': + incomplete + % endif +

      + +

      + % if status in ['unsubmitted', 'correct', 'incorrect', 'incomplete']: +
      +% endif +
      diff --git a/common/lib/capa/capa/templates/editamolecule.html b/common/lib/capa/capa/templates/editamolecule.html new file mode 100644 index 0000000000..5658c26e22 --- /dev/null +++ b/common/lib/capa/capa/templates/editamolecule.html @@ -0,0 +1,43 @@ +
      +
      + + % if status == 'unsubmitted': +
      + % elif status == 'correct': +
      + % elif status == 'incorrect': +
      + % elif status == 'incomplete': +
      + % endif + +
      +
      + +
      + + + + + +

      + +

      + % if status == 'unsubmitted': + unanswered + % elif status == 'correct': + correct + % elif status == 'incorrect': + incorrect + % elif status == 'incomplete': + incomplete + % endif +

      +

      + + + + % if status in ['unsubmitted', 'correct', 'incorrect', 'incomplete']: +
      + % endif +
      diff --git a/common/lib/capa/capa/tests/__init__.py b/common/lib/capa/capa/tests/__init__.py index b06975f6ce..89cb5a5ee9 100644 --- a/common/lib/capa/capa/tests/__init__.py +++ b/common/lib/capa/capa/tests/__init__.py @@ -8,6 +8,7 @@ import xml.sax.saxutils as saxutils TEST_DIR = os.path.dirname(os.path.realpath(__file__)) + def tst_render_template(template, context): """ A test version of render to template. Renders to the repr of the context, completely ignoring @@ -25,7 +26,7 @@ test_system = Mock( user=Mock(), filestore=fs.osfs.OSFS(os.path.join(TEST_DIR, "test_files")), debug=True, - xqueue={'interface':None, 'callback_url':'/', 'default_queuename': 'testqueue', 'waittime': 10}, + xqueue={'interface': None, 'callback_url': '/', 'default_queuename': 'testqueue', 'waittime': 10}, node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"), - anonymous_student_id = 'student' + anonymous_student_id='student' ) diff --git a/common/lib/capa/capa/tests/response_xml_factory.py b/common/lib/capa/capa/tests/response_xml_factory.py new file mode 100644 index 0000000000..fe918ec5db --- /dev/null +++ b/common/lib/capa/capa/tests/response_xml_factory.py @@ -0,0 +1,668 @@ +from lxml import etree +from abc import ABCMeta, abstractmethod + +class ResponseXMLFactory(object): + """ Abstract base class for capa response XML factories. + Subclasses override create_response_element and + create_input_element to produce XML of particular response types""" + + __metaclass__ = ABCMeta + + @abstractmethod + def create_response_element(self, **kwargs): + """ Subclasses override to return an etree element + representing the capa response XML + (e.g. ). + + The tree should NOT contain any input elements + (such as ) as these will be added later.""" + return None + + @abstractmethod + def create_input_element(self, **kwargs): + """ Subclasses override this to return an etree element + representing the capa input XML (such as )""" + return None + + def build_xml(self, **kwargs): + """ Construct an XML string for a capa response + based on **kwargs. + + **kwargs is a dictionary that will be passed + to create_response_element() and create_input_element(). + See the subclasses below for other keyword arguments + you can specify. + + For all response types, **kwargs can contain: + + *question_text*: The text of the question to display, + wrapped in

      tags. + + *explanation_text*: The detailed explanation that will + be shown if the user answers incorrectly. + + *script*: The embedded Python script (a string) + + *num_responses*: The number of responses to create [DEFAULT: 1] + + *num_inputs*: The number of input elements + to create [DEFAULT: 1] + + Returns a string representation of the XML tree. + """ + + # Retrieve keyward arguments + question_text = kwargs.get('question_text', '') + explanation_text = kwargs.get('explanation_text', '') + script = kwargs.get('script', None) + num_responses = kwargs.get('num_responses', 1) + num_inputs = kwargs.get('num_inputs', 1) + + # The root is + root = etree.Element("problem") + + # Add a script if there is one + if script: + script_element = etree.SubElement(root, "script") + script_element.set("type", "loncapa/python") + script_element.text = str(script) + + # The problem has a child

      with question text + question = etree.SubElement(root, "p") + question.text = question_text + + # Add the response(s) + for i in range(0, int(num_responses)): + response_element = self.create_response_element(**kwargs) + root.append(response_element) + + # Add input elements + for j in range(0, int(num_inputs)): + input_element = self.create_input_element(**kwargs) + if not (None == input_element): + response_element.append(input_element) + + # The problem has an explanation of the solution + if explanation_text: + explanation = etree.SubElement(root, "solution") + explanation_div = etree.SubElement(explanation, "div") + explanation_div.set("class", "detailed-solution") + explanation_div.text = explanation_text + + return etree.tostring(root) + + @staticmethod + def textline_input_xml(**kwargs): + """ Create a XML element + + Uses **kwargs: + + *math_display*: If True, then includes a MathJax display of user input + + *size*: An integer representing the width of the text line + """ + math_display = kwargs.get('math_display', False) + size = kwargs.get('size', None) + + input_element = etree.Element('textline') + + if math_display: + input_element.set('math', '1') + + if size: + input_element.set('size', str(size)) + + return input_element + + @staticmethod + def choicegroup_input_xml(**kwargs): + """ Create a XML element + + Uses **kwargs: + + *choice_type*: Can be "checkbox", "radio", or "multiple" + + *choices*: List of True/False values indicating whether + a particular choice is correct or not. + Users must choose *all* correct options in order + to be marked correct. + DEFAULT: [True] + + *choice_names": List of strings identifying the choices. + If specified, you must ensure that + len(choice_names) == len(choices) + """ + # Names of group elements + group_element_names = {'checkbox': 'checkboxgroup', + 'radio': 'radiogroup', + 'multiple': 'choicegroup' } + + # Retrieve **kwargs + choices = kwargs.get('choices', [True]) + choice_type = kwargs.get('choice_type', 'multiple') + choice_names = kwargs.get('choice_names', [None] * len(choices)) + + # Create the , , or element + assert(choice_type in group_element_names) + group_element = etree.Element(group_element_names[choice_type]) + + # Create the elements + for (correct_val, name) in zip(choices, choice_names): + choice_element = etree.SubElement(group_element, "choice") + choice_element.set("correct", "true" if correct_val else "false") + + # Add some text describing the choice + etree.SubElement(choice_element, "startouttext") + etree.text = "Choice description" + etree.SubElement(choice_element, "endouttext") + + # Add a name identifying the choice, if one exists + if name: + choice_element.set("name", str(name)) + + return group_element + + +class NumericalResponseXMLFactory(ResponseXMLFactory): + """ Factory for producing XML trees """ + + def create_response_element(self, **kwargs): + """ Create a XML element. + Uses **kwarg keys: + + *answer*: The correct answer (e.g. "5") + + *tolerance*: The tolerance within which a response + is considered correct. Can be a decimal (e.g. "0.01") + or percentage (e.g. "2%") + """ + + answer = kwargs.get('answer', None) + tolerance = kwargs.get('tolerance', None) + + response_element = etree.Element('numericalresponse') + + if answer: + response_element.set('answer', str(answer)) + + if tolerance: + responseparam_element = etree.SubElement(response_element, 'responseparam') + responseparam_element.set('type', 'tolerance') + responseparam_element.set('default', str(tolerance)) + + return response_element + + def create_input_element(self, **kwargs): + return ResponseXMLFactory.textline_input_xml(**kwargs) + + +class CustomResponseXMLFactory(ResponseXMLFactory): + """ Factory for producing XML trees """ + + def create_response_element(self, **kwargs): + """ Create a XML element. + + Uses **kwargs: + + *cfn*: the Python code to run. Can be inline code, + or the name of a function defined in earlier - - -

      Hints can be provided to students, based on the last response given, as well as the history of responses given. Here is an example of a hint produced by a Formula Response problem.

      - -

      -What is the equation of the line which passess through ($x1,$y1) and -($x2,$y2)?

      - -

      The correct answer is $answer. A common error is to invert the equation for the slope. Enter -$wrongans to see a hint.

      - - - - - - y = - - - - - You have inverted the slope in the question. - - - - - diff --git a/common/lib/capa/capa/tests/test_files/imageresponse.xml b/common/lib/capa/capa/tests/test_files/imageresponse.xml deleted file mode 100644 index 41c9f01218..0000000000 --- a/common/lib/capa/capa/tests/test_files/imageresponse.xml +++ /dev/null @@ -1,40 +0,0 @@ - -

      -Two skiers are on frictionless black diamond ski slopes. -Hello

       - - - -Click on the image where the top skier will stop momentarily if the top skier starts from rest. - -Click on the image where the lower skier will stop momentarily if the lower skier starts from rest. - -Click on either of the two positions as discussed previously. - -Click on either of the two positions as discussed previously. - -Click on either of the two positions as discussed previously. - -

      Use conservation of energy.

       -       -       - - - - - - - -Click on either of the two positions as discussed previously. - -Click on either of the two positions as discussed previously. - - -Click on either of the two positions as discussed previously. - -

      Use conservation of energy.

       -       -       - - -       diff --git a/common/lib/capa/capa/tests/test_files/javascriptresponse.xml b/common/lib/capa/capa/tests/test_files/javascriptresponse.xml deleted file mode 100644 index 439866e62c..0000000000 --- a/common/lib/capa/capa/tests/test_files/javascriptresponse.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/common/lib/capa/capa/tests/test_files/js/.gitignore b/common/lib/capa/capa/tests/test_files/js/.gitignore new file mode 100644 index 0000000000..d2910668f2 --- /dev/null +++ b/common/lib/capa/capa/tests/test_files/js/.gitignore @@ -0,0 +1,4 @@ +test_problem_display.js +test_problem_generator.js +test_problem_grader.js +xproblem.js \ No newline at end of file diff --git a/common/lib/capa/capa/tests/test_files/js/compiled/c9a9cd4242d84c924fe5f8324e9ae79d.js b/common/lib/capa/capa/tests/test_files/js/compiled/c9a9cd4242d84c924fe5f8324e9ae79d.js deleted file mode 100644 index 6670c6a09a..0000000000 --- a/common/lib/capa/capa/tests/test_files/js/compiled/c9a9cd4242d84c924fe5f8324e9ae79d.js +++ /dev/null @@ -1,50 +0,0 @@ -// Generated by CoffeeScript 1.3.3 -(function() { - var MinimaxProblemDisplay, root, - __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; - - MinimaxProblemDisplay = (function(_super) { - - __extends(MinimaxProblemDisplay, _super); - - function MinimaxProblemDisplay(state, submission, evaluation, container, submissionField, parameters) { - this.state = state; - this.submission = submission; - this.evaluation = evaluation; - this.container = container; - this.submissionField = submissionField; - this.parameters = parameters != null ? parameters : {}; - MinimaxProblemDisplay.__super__.constructor.call(this, this.state, this.submission, this.evaluation, this.container, this.submissionField, this.parameters); - } - - MinimaxProblemDisplay.prototype.render = function() {}; - - MinimaxProblemDisplay.prototype.createSubmission = function() { - var id, value, _ref, _results; - this.newSubmission = {}; - if (this.submission != null) { - _ref = this.submission; - _results = []; - for (id in _ref) { - value = _ref[id]; - _results.push(this.newSubmission[id] = value); - } - return _results; - } - }; - - MinimaxProblemDisplay.prototype.getCurrentSubmission = function() { - return this.newSubmission; - }; - - return MinimaxProblemDisplay; - - })(XProblemDisplay); - - root = typeof exports !== "undefined" && exports !== null ? exports : this; - - root.TestProblemDisplay = TestProblemDisplay; - -}).call(this); -; diff --git a/common/lib/capa/capa/tests/test_files/js/compiled/javascriptresponse.js b/common/lib/capa/capa/tests/test_files/js/compiled/javascriptresponse.js deleted file mode 100644 index 6670c6a09a..0000000000 --- a/common/lib/capa/capa/tests/test_files/js/compiled/javascriptresponse.js +++ /dev/null @@ -1,50 +0,0 @@ -// Generated by CoffeeScript 1.3.3 -(function() { - var MinimaxProblemDisplay, root, - __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; - - MinimaxProblemDisplay = (function(_super) { - - __extends(MinimaxProblemDisplay, _super); - - function MinimaxProblemDisplay(state, submission, evaluation, container, submissionField, parameters) { - this.state = state; - this.submission = submission; - this.evaluation = evaluation; - this.container = container; - this.submissionField = submissionField; - this.parameters = parameters != null ? parameters : {}; - MinimaxProblemDisplay.__super__.constructor.call(this, this.state, this.submission, this.evaluation, this.container, this.submissionField, this.parameters); - } - - MinimaxProblemDisplay.prototype.render = function() {}; - - MinimaxProblemDisplay.prototype.createSubmission = function() { - var id, value, _ref, _results; - this.newSubmission = {}; - if (this.submission != null) { - _ref = this.submission; - _results = []; - for (id in _ref) { - value = _ref[id]; - _results.push(this.newSubmission[id] = value); - } - return _results; - } - }; - - MinimaxProblemDisplay.prototype.getCurrentSubmission = function() { - return this.newSubmission; - }; - - return MinimaxProblemDisplay; - - })(XProblemDisplay); - - root = typeof exports !== "undefined" && exports !== null ? exports : this; - - root.TestProblemDisplay = TestProblemDisplay; - -}).call(this); -; diff --git a/common/lib/capa/capa/tests/test_files/js/test_problem_display.js b/common/lib/capa/capa/tests/test_files/js/test_problem_display.js deleted file mode 100644 index 35b619c6ec..0000000000 --- a/common/lib/capa/capa/tests/test_files/js/test_problem_display.js +++ /dev/null @@ -1,49 +0,0 @@ -// Generated by CoffeeScript 1.3.3 -(function() { - var MinimaxProblemDisplay, root, - __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; - - MinimaxProblemDisplay = (function(_super) { - - __extends(MinimaxProblemDisplay, _super); - - function MinimaxProblemDisplay(state, submission, evaluation, container, submissionField, parameters) { - this.state = state; - this.submission = submission; - this.evaluation = evaluation; - this.container = container; - this.submissionField = submissionField; - this.parameters = parameters != null ? parameters : {}; - MinimaxProblemDisplay.__super__.constructor.call(this, this.state, this.submission, this.evaluation, this.container, this.submissionField, this.parameters); - } - - MinimaxProblemDisplay.prototype.render = function() {}; - - MinimaxProblemDisplay.prototype.createSubmission = function() { - var id, value, _ref, _results; - this.newSubmission = {}; - if (this.submission != null) { - _ref = this.submission; - _results = []; - for (id in _ref) { - value = _ref[id]; - _results.push(this.newSubmission[id] = value); - } - return _results; - } - }; - - MinimaxProblemDisplay.prototype.getCurrentSubmission = function() { - return this.newSubmission; - }; - - return MinimaxProblemDisplay; - - })(XProblemDisplay); - - root = typeof exports !== "undefined" && exports !== null ? exports : this; - - root.TestProblemDisplay = TestProblemDisplay; - -}).call(this); diff --git a/common/lib/capa/capa/tests/test_files/js/test_problem_generator.js b/common/lib/capa/capa/tests/test_files/js/test_problem_generator.js deleted file mode 100644 index b2f01ed252..0000000000 --- a/common/lib/capa/capa/tests/test_files/js/test_problem_generator.js +++ /dev/null @@ -1,29 +0,0 @@ -// Generated by CoffeeScript 1.3.3 -(function() { - var TestProblemGenerator, root, - __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; - - TestProblemGenerator = (function(_super) { - - __extends(TestProblemGenerator, _super); - - function TestProblemGenerator(seed, parameters) { - this.parameters = parameters != null ? parameters : {}; - TestProblemGenerator.__super__.constructor.call(this, seed, this.parameters); - } - - TestProblemGenerator.prototype.generate = function() { - this.problemState.value = this.parameters.value; - return this.problemState; - }; - - return TestProblemGenerator; - - })(XProblemGenerator); - - root = typeof exports !== "undefined" && exports !== null ? exports : this; - - root.generatorClass = TestProblemGenerator; - -}).call(this); diff --git a/common/lib/capa/capa/tests/test_files/js/test_problem_grader.js b/common/lib/capa/capa/tests/test_files/js/test_problem_grader.js deleted file mode 100644 index 34dfff35cc..0000000000 --- a/common/lib/capa/capa/tests/test_files/js/test_problem_grader.js +++ /dev/null @@ -1,50 +0,0 @@ -// Generated by CoffeeScript 1.3.3 -(function() { - var TestProblemGrader, root, - __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; - - TestProblemGrader = (function(_super) { - - __extends(TestProblemGrader, _super); - - function TestProblemGrader(submission, problemState, parameters) { - this.submission = submission; - this.problemState = problemState; - this.parameters = parameters != null ? parameters : {}; - TestProblemGrader.__super__.constructor.call(this, this.submission, this.problemState, this.parameters); - } - - TestProblemGrader.prototype.solve = function() { - return this.solution = { - 0: this.problemState.value - }; - }; - - TestProblemGrader.prototype.grade = function() { - var allCorrect, id, value, valueCorrect, _ref; - if (!(this.solution != null)) { - this.solve(); - } - allCorrect = true; - _ref = this.solution; - for (id in _ref) { - value = _ref[id]; - valueCorrect = this.submission != null ? value === this.submission[id] : false; - this.evaluation[id] = valueCorrect; - if (!valueCorrect) { - allCorrect = false; - } - } - return allCorrect; - }; - - return TestProblemGrader; - - })(XProblemGrader); - - root = typeof exports !== "undefined" && exports !== null ? exports : this; - - root.graderClass = TestProblemGrader; - -}).call(this); diff --git a/common/lib/capa/capa/tests/test_files/js/xproblem.js b/common/lib/capa/capa/tests/test_files/js/xproblem.js deleted file mode 100644 index 512cf22739..0000000000 --- a/common/lib/capa/capa/tests/test_files/js/xproblem.js +++ /dev/null @@ -1,78 +0,0 @@ -// Generated by CoffeeScript 1.3.3 -(function() { - var XProblemDisplay, XProblemGenerator, XProblemGrader, root; - - XProblemGenerator = (function() { - - function XProblemGenerator(seed, parameters) { - this.parameters = parameters != null ? parameters : {}; - this.random = new MersenneTwister(seed); - this.problemState = {}; - } - - XProblemGenerator.prototype.generate = function() { - return console.error("Abstract method called: XProblemGenerator.generate"); - }; - - return XProblemGenerator; - - })(); - - XProblemDisplay = (function() { - - function XProblemDisplay(state, submission, evaluation, container, submissionField, parameters) { - this.state = state; - this.submission = submission; - this.evaluation = evaluation; - this.container = container; - this.submissionField = submissionField; - this.parameters = parameters != null ? parameters : {}; - } - - XProblemDisplay.prototype.render = function() { - return console.error("Abstract method called: XProblemDisplay.render"); - }; - - XProblemDisplay.prototype.updateSubmission = function() { - return this.submissionField.val(JSON.stringify(this.getCurrentSubmission())); - }; - - XProblemDisplay.prototype.getCurrentSubmission = function() { - return console.error("Abstract method called: XProblemDisplay.getCurrentSubmission"); - }; - - return XProblemDisplay; - - })(); - - XProblemGrader = (function() { - - function XProblemGrader(submission, problemState, parameters) { - this.submission = submission; - this.problemState = problemState; - this.parameters = parameters != null ? parameters : {}; - this.solution = null; - this.evaluation = {}; - } - - XProblemGrader.prototype.solve = function() { - return console.error("Abstract method called: XProblemGrader.solve"); - }; - - XProblemGrader.prototype.grade = function() { - return console.error("Abstract method called: XProblemGrader.grade"); - }; - - return XProblemGrader; - - })(); - - root = typeof exports !== "undefined" && exports !== null ? exports : this; - - root.XProblemGenerator = XProblemGenerator; - - root.XProblemDisplay = XProblemDisplay; - - root.XProblemGrader = XProblemGrader; - -}).call(this); diff --git a/common/lib/capa/capa/tests/test_files/multi_bare.xml b/common/lib/capa/capa/tests/test_files/multi_bare.xml deleted file mode 100644 index 20bc8f853d..0000000000 --- a/common/lib/capa/capa/tests/test_files/multi_bare.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - This is foil One. - - - This is foil Two. - - - This is foil Three. - - - This is foil Four. - - - This is foil Five. - - - - diff --git a/common/lib/capa/capa/tests/test_files/multichoice.xml b/common/lib/capa/capa/tests/test_files/multichoice.xml deleted file mode 100644 index 60bf02ec59..0000000000 --- a/common/lib/capa/capa/tests/test_files/multichoice.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - This is foil One. - - - This is foil Two. - - - This is foil Three. - - - This is foil Four. - - - This is foil Five. - - - - diff --git a/common/lib/capa/capa/tests/test_files/optionresponse.xml b/common/lib/capa/capa/tests/test_files/optionresponse.xml deleted file mode 100644 index 99a17e8fac..0000000000 --- a/common/lib/capa/capa/tests/test_files/optionresponse.xml +++ /dev/null @@ -1,63 +0,0 @@ - - -

      -Why do bicycles benefit from having larger wheels when going up a bump as shown in the picture?
      -Assume that for both bicycles:
      -1.) The tires have equal air pressure.
      -2.) The bicycles never leave the contact with the bump.
      -3.) The bicycles have the same mass. The bicycle tires (regardless of size) have the same mass.
      -

      -       - -
        -
      • - -

        The bicycles with larger wheels have more time to go over the bump. This decreases the magnitude of the force needed to lift the bicycle.

        -         - - -
        • -
      • - -

        The bicycles with larger wheels always have a smaller vertical displacement regardless of speed.

        -         - - -
        • -
      • - -

        The bicycles with larger wheels experience a force backward with less magnitude for the same amount of time.

        -         - - -
        • -
      • - -

        The bicycles with larger wheels experience a force backward with less magnitude for a greater amount of time.

        -         - - -
        • -
      • - -

        The bicycles with larger wheels have more kinetic energy turned into gravitational potential energy.

        -         - - -
        • -
      • - -

        The bicycles with larger wheels have more rotational kinetic energy, so the horizontal velocity of the biker changes less.

        -         - - -
        • -
      - - -
      -
      -       -       -       -       diff --git a/common/lib/capa/capa/tests/test_files/stringresponse_with_hint.xml b/common/lib/capa/capa/tests/test_files/stringresponse_with_hint.xml deleted file mode 100644 index 86efdf0f18..0000000000 --- a/common/lib/capa/capa/tests/test_files/stringresponse_with_hint.xml +++ /dev/null @@ -1,25 +0,0 @@ - -

      Example: String Response Problem

      -
      -       - - Which US state has Lansing as its capital? - - - - - - - - - The state capital of Wisconsin is Madison. - - - The state capital of Minnesota is St. Paul. - - - The state you are looking for is also known as the 'Great Lakes State' - - - -       diff --git a/common/lib/capa/capa/tests/test_files/symbolicresponse.xml b/common/lib/capa/capa/tests/test_files/symbolicresponse.xml deleted file mode 100644 index 4dc2bc9d7b..0000000000 --- a/common/lib/capa/capa/tests/test_files/symbolicresponse.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -

      Example: Symbolic Math Response Problem

      - -

      -A symbolic math response problem presents one or more symbolic math -input fields for input. Correctness of input is evaluated based on -the symbolic properties of the expression entered. The student enters -text, but sees a proper symbolic rendition of the entered formula, in -real time, next to the input box. -

      - -

      This is a correct answer which may be entered below:

      -

      cos(theta)*[[1,0],[0,1]] + i*sin(theta)*[[0,1],[1,0]]

      - - - Compute [mathjax] U = \exp\left( i \theta \left[ \begin{matrix} 0 & 1 \\ 1 & 0 \end{matrix} \right] \right) [/mathjax] - and give the resulting \(2 \times 2\) matrix.
      - Your input should be typed in as a list of lists, eg [[1,2],[3,4]].
      - [mathjax]U=[/mathjax] - - -
      -       - -       -       diff --git a/common/lib/capa/capa/tests/test_files/truefalse.xml b/common/lib/capa/capa/tests/test_files/truefalse.xml deleted file mode 100644 index 60018f7a2d..0000000000 --- a/common/lib/capa/capa/tests/test_files/truefalse.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - This is foil One. - - - This is foil Two. - - - This is foil Three. - - - This is foil Four. - - - This is foil Five. - - - - diff --git a/common/lib/capa/capa/tests/test_html_render.py b/common/lib/capa/capa/tests/test_html_render.py new file mode 100644 index 0000000000..e4c54edca0 --- /dev/null +++ b/common/lib/capa/capa/tests/test_html_render.py @@ -0,0 +1,197 @@ +import unittest +from lxml import etree +import os +import textwrap +import json +import mock + +from capa.capa_problem import LoncapaProblem +from response_xml_factory import StringResponseXMLFactory, CustomResponseXMLFactory +from . import test_system + +class CapaHtmlRenderTest(unittest.TestCase): + + def test_include_html(self): + # Create a test file to include + self._create_test_file('test_include.xml', + 'Test include') + + # Generate some XML with an + xml_str = textwrap.dedent(""" + + + + """) + + # Create the problem + problem = LoncapaProblem(xml_str, '1', system=test_system) + + # Render the HTML + rendered_html = etree.XML(problem.get_html()) + + # Expect that the include file was embedded in the problem + test_element = rendered_html.find("test") + self.assertEqual(test_element.tag, "test") + self.assertEqual(test_element.text, "Test include") + + + def test_process_outtext(self): + # Generate some XML with and + xml_str = textwrap.dedent(""" + + Test text + + """) + + # Create the problem + problem = LoncapaProblem(xml_str, '1', system=test_system) + + # Render the HTML + rendered_html = etree.XML(problem.get_html()) + + # Expect that the and + # were converted to tags + span_element = rendered_html.find('span') + self.assertEqual(span_element.text, 'Test text') + + def test_render_script(self): + # Generate some XML with a + + """) + + # Create the problem + problem = LoncapaProblem(xml_str, '1', system=test_system) + + # Render the HTML + rendered_html = etree.XML(problem.get_html()) + + # Expect that the script element has been removed from the rendered HTML + script_element = rendered_html.find('script') + self.assertEqual(None, script_element) + + def test_render_response_xml(self): + # Generate some XML for a string response + kwargs = {'question_text': "Test question", + 'explanation_text': "Test explanation", + 'answer': 'Test answer', + 'hints': [('test prompt', 'test_hint', 'test hint text')]} + xml_str = StringResponseXMLFactory().build_xml(**kwargs) + + # Mock out the template renderer + test_system.render_template = mock.Mock() + test_system.render_template.return_value = "
      Input Template Render
      " + + # Create the problem and render the HTML + problem = LoncapaProblem(xml_str, '1', system=test_system) + rendered_html = etree.XML(problem.get_html()) + + # Expect problem has been turned into a
      + self.assertEqual(rendered_html.tag, "div") + + # Expect question text is in a

      child + question_element = rendered_html.find("p") + self.assertEqual(question_element.text, "Test question") + + # Expect that the response has been turned into a + response_element = rendered_html.find("span") + self.assertEqual(response_element.tag, "span") + + # Expect that the response + # that contains a

      for the textline + textline_element = response_element.find("div") + self.assertEqual(textline_element.text, 'Input Template Render') + + # Expect a child
      for the solution + # with the rendered template + solution_element = rendered_html.find("div") + self.assertEqual(solution_element.text, 'Input Template Render') + + # Expect that the template renderer was called with the correct + # arguments, once for the textline input and once for + # the solution + expected_textline_context = {'status': 'unsubmitted', + 'value': '', + 'preprocessor': None, + 'msg': '', + 'inline': False, + 'hidden': False, + 'do_math': False, + 'id': '1_2_1', + 'size': None} + + expected_solution_context = {'id': '1_solution_1'} + + expected_calls = [mock.call('textline.html', expected_textline_context), + mock.call('solutionspan.html', expected_solution_context), + mock.call('textline.html', expected_textline_context), + mock.call('solutionspan.html', expected_solution_context)] + + self.assertEqual(test_system.render_template.call_args_list, + expected_calls) + + + def test_render_response_with_overall_msg(self): + # CustomResponse script that sets an overall_message + script=textwrap.dedent(""" + def check_func(*args): + msg = '

      Test message 1

      Test message 2

      ' + return {'overall_message': msg, + 'input_list': [ {'ok': True, 'msg': '' } ] } + """) + + # Generate some XML for a CustomResponse + kwargs = {'script':script, 'cfn': 'check_func'} + xml_str = CustomResponseXMLFactory().build_xml(**kwargs) + + # Create the problem and render the html + problem = LoncapaProblem(xml_str, '1', system=test_system) + + # Grade the problem + correctmap = problem.grade_answers({'1_2_1': 'test'}) + + # Render the html + rendered_html = etree.XML(problem.get_html()) + + + # Expect that there is a
      within the response
      + # with css class response_message + msg_div_element = rendered_html.find(".//div[@class='response_message']") + self.assertEqual(msg_div_element.tag, "div") + self.assertEqual(msg_div_element.get('class'), "response_message") + + # Expect that the
      contains our message (as part of the XML tree) + msg_p_elements = msg_div_element.findall('p') + self.assertEqual(msg_p_elements[0].tag, "p") + self.assertEqual(msg_p_elements[0].text, "Test message 1") + + self.assertEqual(msg_p_elements[1].tag, "p") + self.assertEqual(msg_p_elements[1].text, "Test message 2") + + + def test_substitute_python_vars(self): + # Generate some XML with Python variables defined in a script + # and used later as attributes + xml_str = textwrap.dedent(""" + + + + + """) + + # Create the problem and render the HTML + problem = LoncapaProblem(xml_str, '1', system=test_system) + rendered_html = etree.XML(problem.get_html()) + + # Expect that the variable $test has been replaced with its value + span_element = rendered_html.find('span') + self.assertEqual(span_element.get('attr'), "TEST") + + def _create_test_file(self, path, content_str): + test_fp = test_system.filestore.open(path, "w") + test_fp.write(content_str) + test_fp.close() + + self.addCleanup(lambda: os.remove(test_fp.name)) diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py index 6c282baf95..4a5ea5c429 100644 --- a/common/lib/capa/capa/tests/test_inputtypes.py +++ b/common/lib/capa/capa/tests/test_inputtypes.py @@ -31,6 +31,7 @@ lookup_tag = inputtypes.registry.get_class_for_tag def quote_attr(s): return saxutils.quoteattr(s)[1:-1] # don't want the outer quotes + class OptionInputTest(unittest.TestCase): ''' Make sure option inputs work @@ -100,7 +101,7 @@ class ChoiceGroupTest(unittest.TestCase): 'input_type': expected_input_type, 'choices': [('foil1', 'This is foil One.'), ('foil2', 'This is foil Two.'), - ('foil3', 'This is foil Three.'),], + ('foil3', 'This is foil Three.'), ], 'name_array_suffix': expected_suffix, # what is this for?? } @@ -137,7 +138,7 @@ class JavascriptInputTest(unittest.TestCase): element = etree.fromstring(xml_str) - state = {'value': '3',} + state = {'value': '3', } the_input = lookup_tag('javascriptinput')(test_system, element, state) context = the_input._get_render_context() @@ -149,7 +150,7 @@ class JavascriptInputTest(unittest.TestCase): 'params': params, 'display_file': display_file, 'display_class': display_class, - 'problem_state': problem_state,} + 'problem_state': problem_state, } self.assertEqual(context, expected) @@ -165,7 +166,7 @@ class TextLineTest(unittest.TestCase): element = etree.fromstring(xml_str) - state = {'value': 'BumbleBee',} + state = {'value': 'BumbleBee', } the_input = lookup_tag('textline')(test_system, element, state) context = the_input._get_render_context() @@ -193,7 +194,7 @@ class TextLineTest(unittest.TestCase): element = etree.fromstring(xml_str) - state = {'value': 'BumbleBee',} + state = {'value': 'BumbleBee', } the_input = lookup_tag('textline')(test_system, element, state) context = the_input._get_render_context() @@ -231,7 +232,7 @@ class FileSubmissionTest(unittest.TestCase): state = {'value': 'BumbleBee.py', 'status': 'incomplete', - 'feedback' : {'message': '3'}, } + 'feedback': {'message': '3'}, } input_class = lookup_tag('filesubmission') the_input = input_class(test_system, element, state) @@ -275,7 +276,7 @@ class CodeInputTest(unittest.TestCase): state = {'value': 'print "good evening"', 'status': 'incomplete', - 'feedback' : {'message': '3'}, } + 'feedback': {'message': '3'}, } input_class = lookup_tag('codeinput') the_input = input_class(test_system, element, state) @@ -488,7 +489,7 @@ class ChemicalEquationTest(unittest.TestCase): element = etree.fromstring(xml_str) - state = {'value': 'H2OYeah',} + state = {'value': 'H2OYeah', } the_input = lookup_tag('chemicalequationinput')(test_system, element, state) context = the_input._get_render_context() diff --git a/common/lib/capa/capa/tests/test_responsetypes.py b/common/lib/capa/capa/tests/test_responsetypes.py index 9eecef3986..1b78dfce5c 100644 --- a/common/lib/capa/capa/tests/test_responsetypes.py +++ b/common/lib/capa/capa/tests/test_responsetypes.py @@ -8,6 +8,7 @@ import json from nose.plugins.skip import SkipTest import os import unittest +import textwrap from . import test_system @@ -16,92 +17,151 @@ from capa.correctmap import CorrectMap from capa.util import convert_files_to_filenames from capa.xqueue_interface import dateformat -class MultiChoiceTest(unittest.TestCase): - def test_MC_grade(self): - multichoice_file = os.path.dirname(__file__) + "/test_files/multichoice.xml" - test_lcp = lcp.LoncapaProblem(open(multichoice_file).read(), '1', system=test_system) - correct_answers = {'1_2_1': 'choice_foil3'} - self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct') - false_answers = {'1_2_1': 'choice_foil2'} - self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect') +class ResponseTest(unittest.TestCase): + """ Base class for tests of capa responses.""" + + xml_factory_class = None - def test_MC_bare_grades(self): - multichoice_file = os.path.dirname(__file__) + "/test_files/multi_bare.xml" - test_lcp = lcp.LoncapaProblem(open(multichoice_file).read(), '1', system=test_system) - correct_answers = {'1_2_1': 'choice_2'} - self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct') - false_answers = {'1_2_1': 'choice_1'} - self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect') + def setUp(self): + if self.xml_factory_class: + self.xml_factory = self.xml_factory_class() - def test_TF_grade(self): - truefalse_file = os.path.dirname(__file__) + "/test_files/truefalse.xml" - test_lcp = lcp.LoncapaProblem(open(truefalse_file).read(), '1', system=test_system) - correct_answers = {'1_2_1': ['choice_foil2', 'choice_foil1']} - self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct') - false_answers = {'1_2_1': ['choice_foil1']} - self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect') - false_answers = {'1_2_1': ['choice_foil1', 'choice_foil3']} - self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect') - false_answers = {'1_2_1': ['choice_foil3']} - self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect') - false_answers = {'1_2_1': ['choice_foil1', 'choice_foil2', 'choice_foil3']} - self.assertEquals(test_lcp.grade_answers(false_answers).get_correctness('1_2_1'), 'incorrect') + def build_problem(self, **kwargs): + xml = self.xml_factory.build_xml(**kwargs) + return lcp.LoncapaProblem(xml, '1', system=test_system) + + def assert_grade(self, problem, submission, expected_correctness): + input_dict = {'1_2_1': submission} + correct_map = problem.grade_answers(input_dict) + self.assertEquals(correct_map.get_correctness('1_2_1'), expected_correctness) + + def assert_multiple_grade(self, problem, correct_answers, incorrect_answers): + for input_str in correct_answers: + result = problem.grade_answers({'1_2_1': input_str}).get_correctness('1_2_1') + self.assertEqual(result, 'correct', + msg="%s should be marked correct" % str(input_str)) + + for input_str in incorrect_answers: + result = problem.grade_answers({'1_2_1': input_str}).get_correctness('1_2_1') + self.assertEqual(result, 'incorrect', + msg="%s should be marked incorrect" % str(input_str)) + +class MultiChoiceResponseTest(ResponseTest): + from response_xml_factory import MultipleChoiceResponseXMLFactory + xml_factory_class = MultipleChoiceResponseXMLFactory + + def test_multiple_choice_grade(self): + problem = self.build_problem(choices=[False, True, False]) + + # Ensure that we get the expected grades + self.assert_grade(problem, 'choice_0', 'incorrect') + self.assert_grade(problem, 'choice_1', 'correct') + self.assert_grade(problem, 'choice_2', 'incorrect') + + def test_named_multiple_choice_grade(self): + problem = self.build_problem(choices=[False, True, False], + choice_names=["foil_1", "foil_2", "foil_3"]) + + # Ensure that we get the expected grades + self.assert_grade(problem, 'choice_foil_1', 'incorrect') + self.assert_grade(problem, 'choice_foil_2', 'correct') + self.assert_grade(problem, 'choice_foil_3', 'incorrect') -class ImageResponseTest(unittest.TestCase): - def test_ir_grade(self): - imageresponse_file = os.path.dirname(__file__) + "/test_files/imageresponse.xml" - test_lcp = lcp.LoncapaProblem(open(imageresponse_file).read(), '1', system=test_system) - # testing regions only - correct_answers = { - #regions - '1_2_1': '(490,11)-(556,98)', - '1_2_2': '(242,202)-(296,276)', - '1_2_3': '(490,11)-(556,98);(242,202)-(296,276)', - '1_2_4': '(490,11)-(556,98);(242,202)-(296,276)', - '1_2_5': '(490,11)-(556,98);(242,202)-(296,276)', - #testing regions and rectanges - '1_3_1': 'rectangle="(490,11)-(556,98)" \ - regions="[[[10,10], [20,10], [20, 30]], [[100,100], [120,100], [120,150]]]"', - '1_3_2': 'rectangle="(490,11)-(556,98)" \ - regions="[[[10,10], [20,10], [20, 30]], [[100,100], [120,100], [120,150]]]"', - '1_3_3': 'regions="[[[10,10], [20,10], [20, 30]], [[100,100], [120,100], [120,150]]]"', - '1_3_4': 'regions="[[[10,10], [20,10], [20, 30]], [[100,100], [120,100], [120,150]]]"', - '1_3_5': 'regions="[[[10,10], [20,10], [20, 30]]]"', - '1_3_6': 'regions="[[10,10], [30,30], [15, 15]]"', - '1_3_7': 'regions="[[10,10], [30,30], [10, 30], [30, 10]]"', - } - test_answers = { - '1_2_1': '[500,20]', - '1_2_2': '[250,300]', - '1_2_3': '[500,20]', - '1_2_4': '[250,250]', - '1_2_5': '[10,10]', +class TrueFalseResponseTest(ResponseTest): + from response_xml_factory import TrueFalseResponseXMLFactory + xml_factory_class = TrueFalseResponseXMLFactory - '1_3_1': '[500,20]', - '1_3_2': '[15,15]', - '1_3_3': '[500,20]', - '1_3_4': '[115,115]', - '1_3_5': '[15,15]', - '1_3_6': '[20,20]', - '1_3_7': '[20,15]', - } + def test_true_false_grade(self): + problem = self.build_problem(choices=[False, True, True]) - # regions - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_1'), 'correct') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_2'), 'incorrect') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_3'), 'correct') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_4'), 'correct') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_5'), 'incorrect') + # Check the results + # Mark correct if and only if ALL (and only) correct choices selected + self.assert_grade(problem, 'choice_0', 'incorrect') + self.assert_grade(problem, 'choice_1', 'incorrect') + self.assert_grade(problem, 'choice_2', 'incorrect') + self.assert_grade(problem, ['choice_0', 'choice_1', 'choice_2'], 'incorrect') + self.assert_grade(problem, ['choice_0', 'choice_2'], 'incorrect') + self.assert_grade(problem, ['choice_0', 'choice_1'], 'incorrect') + self.assert_grade(problem, ['choice_1', 'choice_2'], 'correct') - # regions and rectangles - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_3_1'), 'correct') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_3_2'), 'correct') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_3_3'), 'incorrect') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_3_4'), 'correct') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_3_5'), 'correct') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_3_6'), 'incorrect') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_3_7'), 'correct') + # Invalid choices should be marked incorrect (we have no choice 3) + self.assert_grade(problem, 'choice_3', 'incorrect') + self.assert_grade(problem, 'not_a_choice', 'incorrect') + + def test_named_true_false_grade(self): + problem = self.build_problem(choices=[False, True, True], + choice_names=['foil_1','foil_2','foil_3']) + + # Check the results + # Mark correct if and only if ALL (and only) correct chocies selected + self.assert_grade(problem, 'choice_foil_1', 'incorrect') + self.assert_grade(problem, 'choice_foil_2', 'incorrect') + self.assert_grade(problem, 'choice_foil_3', 'incorrect') + self.assert_grade(problem, ['choice_foil_1', 'choice_foil_2', 'choice_foil_3'], 'incorrect') + self.assert_grade(problem, ['choice_foil_1', 'choice_foil_3'], 'incorrect') + self.assert_grade(problem, ['choice_foil_1', 'choice_foil_2'], 'incorrect') + self.assert_grade(problem, ['choice_foil_2', 'choice_foil_3'], 'correct') + + # Invalid choices should be marked incorrect + self.assert_grade(problem, 'choice_foil_4', 'incorrect') + self.assert_grade(problem, 'not_a_choice', 'incorrect') + +class ImageResponseTest(ResponseTest): + from response_xml_factory import ImageResponseXMLFactory + xml_factory_class = ImageResponseXMLFactory + + def test_rectangle_grade(self): + # Define a rectangle with corners (10,10) and (20,20) + problem = self.build_problem(rectangle="(10,10)-(20,20)") + + # Anything inside the rectangle (and along the borders) is correct + # Everything else is incorrect + correct_inputs = ["[12,19]", "[10,10]", "[20,20]", + "[10,15]", "[20,15]", "[15,10]", "[15,20]"] + incorrect_inputs = ["[4,6]", "[25,15]", "[15,40]", "[15,4]"] + self.assert_multiple_grade(problem, correct_inputs, incorrect_inputs) + + def test_multiple_rectangles_grade(self): + # Define two rectangles + rectangle_str = "(10,10)-(20,20);(100,100)-(200,200)" + + # Expect that only points inside the rectangles are marked correct + problem = self.build_problem(rectangle=rectangle_str) + correct_inputs = ["[12,19]", "[120, 130]"] + incorrect_inputs = ["[4,6]", "[25,15]", "[15,40]", "[15,4]", + "[50,55]", "[300, 14]", "[120, 400]"] + self.assert_multiple_grade(problem, correct_inputs, incorrect_inputs) + + def test_region_grade(self): + # Define a triangular region with corners (0,0), (5,10), and (0, 10) + region_str = "[ [1,1], [5,10], [0,10] ]" + + # Expect that only points inside the triangle are marked correct + problem = self.build_problem(regions=region_str) + correct_inputs = ["[2,4]", "[1,3]"] + incorrect_inputs = ["[0,0]", "[3,5]", "[5,15]", "[30, 12]"] + self.assert_multiple_grade(problem, correct_inputs, incorrect_inputs) + + def test_multiple_regions_grade(self): + # Define multiple regions that the user can select + region_str="[[[10,10], [20,10], [20, 30]], [[100,100], [120,100], [120,150]]]" + + # Expect that only points inside the regions are marked correct + problem = self.build_problem(regions=region_str) + correct_inputs = ["[15,12]", "[110,112]"] + incorrect_inputs = ["[0,0]", "[600,300]"] + self.assert_multiple_grade(problem, correct_inputs, incorrect_inputs) + + def test_region_and_rectangle_grade(self): + rectangle_str = "(100,100)-(200,200)" + region_str="[[10,10], [20,10], [20, 30]]" + + # Expect that only points inside the rectangle or region are marked correct + problem = self.build_problem(regions=region_str, rectangle=rectangle_str) + correct_inputs = ["[13,12]", "[110,112]"] + incorrect_inputs = ["[0,0]", "[600,300]"] + self.assert_multiple_grade(problem, correct_inputs, incorrect_inputs) class SymbolicResponseTest(unittest.TestCase): @@ -194,60 +254,165 @@ class SymbolicResponseTest(unittest.TestCase): self.assertEquals(test_lcp.grade_answers(wrong_answers).get_correctness('1_2_1'), 'incorrect') -class OptionResponseTest(unittest.TestCase): - ''' - Run this with +class OptionResponseTest(ResponseTest): + from response_xml_factory import OptionResponseXMLFactory + xml_factory_class = OptionResponseXMLFactory - python manage.py test courseware.OptionResponseTest - ''' - def test_or_grade(self): - optionresponse_file = os.path.dirname(__file__) + "/test_files/optionresponse.xml" - test_lcp = lcp.LoncapaProblem(open(optionresponse_file).read(), '1', system=test_system) - correct_answers = {'1_2_1': 'True', - '1_2_2': 'False'} - test_answers = {'1_2_1': 'True', - '1_2_2': 'True', - } - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_1'), 'correct') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_2'), 'incorrect') + def test_grade(self): + problem = self.build_problem(options=["first", "second", "third"], + correct_option="second") + + # Assert that we get the expected grades + self.assert_grade(problem, "first", "incorrect") + self.assert_grade(problem, "second", "correct") + self.assert_grade(problem, "third", "incorrect") + + # Options not in the list should be marked incorrect + self.assert_grade(problem, "invalid_option", "incorrect") -class FormulaResponseWithHintTest(unittest.TestCase): - ''' - Test Formula response problem with a hint - This problem also uses calc. - ''' - def test_or_grade(self): - problem_file = os.path.dirname(__file__) + "/test_files/formularesponse_with_hint.xml" - test_lcp = lcp.LoncapaProblem(open(problem_file).read(), '1', system=test_system) - correct_answers = {'1_2_1': '2.5*x-5.0'} - test_answers = {'1_2_1': '0.4*x-5.0'} - self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct') - cmap = test_lcp.grade_answers(test_answers) - self.assertEquals(cmap.get_correctness('1_2_1'), 'incorrect') - self.assertTrue('You have inverted' in cmap.get_hint('1_2_1')) +class FormulaResponseTest(ResponseTest): + from response_xml_factory import FormulaResponseXMLFactory + xml_factory_class = FormulaResponseXMLFactory + + def test_grade(self): + # Sample variables x and y in the range [-10, 10] + sample_dict = {'x': (-10, 10), 'y': (-10, 10)} + + # The expected solution is numerically equivalent to x+2y + problem = self.build_problem(sample_dict=sample_dict, + num_samples=10, + tolerance=0.01, + answer="x+2*y") + + # Expect an equivalent formula to be marked correct + # 2x - x + y + y = x + 2y + input_formula = "2*x - x + y + y" + self.assert_grade(problem, input_formula, "correct") + + # Expect an incorrect formula to be marked incorrect + # x + y != x + 2y + input_formula = "x + y" + self.assert_grade(problem, input_formula, "incorrect") + + def test_hint(self): + # Sample variables x and y in the range [-10, 10] + sample_dict = {'x': (-10, 10), 'y': (-10,10) } + + # Give a hint if the user leaves off the coefficient + # or leaves out x + hints = [('x + 3*y', 'y_coefficient', 'Check the coefficient of y'), + ('2*y', 'missing_x', 'Try including the variable x')] -class StringResponseWithHintTest(unittest.TestCase): - ''' - Test String response problem with a hint - ''' - def test_or_grade(self): - problem_file = os.path.dirname(__file__) + "/test_files/stringresponse_with_hint.xml" - test_lcp = lcp.LoncapaProblem(open(problem_file).read(), '1', system=test_system) - correct_answers = {'1_2_1': 'Michigan'} - test_answers = {'1_2_1': 'Minnesota'} - self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct') - cmap = test_lcp.grade_answers(test_answers) - self.assertEquals(cmap.get_correctness('1_2_1'), 'incorrect') - self.assertTrue('St. Paul' in cmap.get_hint('1_2_1')) + # The expected solution is numerically equivalent to x+2y + problem = self.build_problem(sample_dict=sample_dict, + num_samples=10, + tolerance=0.01, + answer="x+2*y", + hints=hints) + + # Expect to receive a hint if we add an extra y + input_dict = {'1_2_1': "x + 2*y + y"} + correct_map = problem.grade_answers(input_dict) + self.assertEquals(correct_map.get_hint('1_2_1'), + 'Check the coefficient of y') + + # Expect to receive a hint if we leave out x + input_dict = {'1_2_1': "2*y"} + correct_map = problem.grade_answers(input_dict) + self.assertEquals(correct_map.get_hint('1_2_1'), + 'Try including the variable x') -class CodeResponseTest(unittest.TestCase): - ''' - Test CodeResponse - TODO: Add tests for external grader messages - ''' + def test_script(self): + # Calculate the answer using a script + script = "calculated_ans = 'x+x'" + + # Sample x in the range [-10,10] + sample_dict = {'x': (-10, 10)} + + # The expected solution is numerically equivalent to 2*x + problem = self.build_problem(sample_dict=sample_dict, + num_samples=10, + tolerance=0.01, + answer="$calculated_ans", + script=script) + + # Expect that the inputs are graded correctly + self.assert_grade(problem, '2*x', 'correct') + self.assert_grade(problem, '3*x', 'incorrect') + + +class StringResponseTest(ResponseTest): + from response_xml_factory import StringResponseXMLFactory + xml_factory_class = StringResponseXMLFactory + + + def test_case_sensitive(self): + problem = self.build_problem(answer="Second", case_sensitive=True) + + # Exact string should be correct + self.assert_grade(problem, "Second", "correct") + + # Other strings and the lowercase version of the string are incorrect + self.assert_grade(problem, "Other String", "incorrect") + self.assert_grade(problem, "second", "incorrect") + + def test_case_insensitive(self): + problem = self.build_problem(answer="Second", case_sensitive=False) + + # Both versions of the string should be allowed, regardless + # of capitalization + self.assert_grade(problem, "Second", "correct") + self.assert_grade(problem, "second", "correct") + + # Other strings are not allowed + self.assert_grade(problem, "Other String", "incorrect") + + def test_hints(self): + hints = [("wisconsin", "wisc", "The state capital of Wisconsin is Madison"), + ("minnesota", "minn", "The state capital of Minnesota is St. Paul")] + + problem = self.build_problem(answer="Michigan", + case_sensitive=False, + hints=hints) + + # We should get a hint for Wisconsin + input_dict = {'1_2_1': 'Wisconsin'} + correct_map = problem.grade_answers(input_dict) + self.assertEquals(correct_map.get_hint('1_2_1'), + "The state capital of Wisconsin is Madison") + + # We should get a hint for Minnesota + input_dict = {'1_2_1': 'Minnesota'} + correct_map = problem.grade_answers(input_dict) + self.assertEquals(correct_map.get_hint('1_2_1'), + "The state capital of Minnesota is St. Paul") + + # We should NOT get a hint for Michigan (the correct answer) + input_dict = {'1_2_1': 'Michigan'} + correct_map = problem.grade_answers(input_dict) + self.assertEquals(correct_map.get_hint('1_2_1'), "") + + # We should NOT get a hint for any other string + input_dict = {'1_2_1': 'California'} + correct_map = problem.grade_answers(input_dict) + self.assertEquals(correct_map.get_hint('1_2_1'), "") + +class CodeResponseTest(ResponseTest): + from response_xml_factory import CodeResponseXMLFactory + xml_factory_class = CodeResponseXMLFactory + + def setUp(self): + super(CodeResponseTest, self).setUp() + + grader_payload = json.dumps({"grader": "ps04/grade_square.py"}) + self.problem = self.build_problem(initial_display="def square(x):", + answer_display="answer", + grader_payload=grader_payload, + num_responses=2) + @staticmethod def make_queuestate(key, time): timestr = datetime.strftime(time, dateformat) @@ -257,171 +422,487 @@ class CodeResponseTest(unittest.TestCase): """ Simple test of whether LoncapaProblem knows when it's been queued """ - problem_file = os.path.join(os.path.dirname(__file__), "test_files/coderesponse.xml") - with open(problem_file) as input_file: - test_lcp = lcp.LoncapaProblem(input_file.read(), '1', system=test_system) - answer_ids = sorted(test_lcp.get_question_answers()) + answer_ids = sorted(self.problem.get_question_answers()) - # CodeResponse requires internal CorrectMap state. Build it now in the unqueued state - cmap = CorrectMap() - for answer_id in answer_ids: - cmap.update(CorrectMap(answer_id=answer_id, queuestate=None)) - test_lcp.correct_map.update(cmap) + # CodeResponse requires internal CorrectMap state. Build it now in the unqueued state + cmap = CorrectMap() + for answer_id in answer_ids: + cmap.update(CorrectMap(answer_id=answer_id, queuestate=None)) + self.problem.correct_map.update(cmap) - self.assertEquals(test_lcp.is_queued(), False) + self.assertEquals(self.problem.is_queued(), False) - # Now we queue the LCP - cmap = CorrectMap() - for i, answer_id in enumerate(answer_ids): - queuestate = CodeResponseTest.make_queuestate(i, datetime.now()) - cmap.update(CorrectMap(answer_id=answer_ids[i], queuestate=queuestate)) - test_lcp.correct_map.update(cmap) + # Now we queue the LCP + cmap = CorrectMap() + for i, answer_id in enumerate(answer_ids): + queuestate = CodeResponseTest.make_queuestate(i, datetime.now()) + cmap.update(CorrectMap(answer_id=answer_ids[i], queuestate=queuestate)) + self.problem.correct_map.update(cmap) - self.assertEquals(test_lcp.is_queued(), True) + self.assertEquals(self.problem.is_queued(), True) def test_update_score(self): ''' Test whether LoncapaProblem.update_score can deliver queued result to the right subproblem ''' - problem_file = os.path.join(os.path.dirname(__file__), "test_files/coderesponse.xml") - with open(problem_file) as input_file: - test_lcp = lcp.LoncapaProblem(input_file.read(), '1', system=test_system) + answer_ids = sorted(self.problem.get_question_answers()) - answer_ids = sorted(test_lcp.get_question_answers()) + # CodeResponse requires internal CorrectMap state. Build it now in the queued state + old_cmap = CorrectMap() + for i, answer_id in enumerate(answer_ids): + queuekey = 1000 + i + queuestate = CodeResponseTest.make_queuestate(1000 + i, datetime.now()) + old_cmap.update(CorrectMap(answer_id=answer_ids[i], queuestate=queuestate)) - # CodeResponse requires internal CorrectMap state. Build it now in the queued state - old_cmap = CorrectMap() + # Message format common to external graders + grader_msg = 'MESSAGE' # Must be valid XML + correct_score_msg = json.dumps({'correct': True, 'score': 1, 'msg': grader_msg}) + incorrect_score_msg = json.dumps({'correct': False, 'score': 0, 'msg': grader_msg}) + + xserver_msgs = {'correct': correct_score_msg, + 'incorrect': incorrect_score_msg, } + + # Incorrect queuekey, state should not be updated + for correctness in ['correct', 'incorrect']: + self.problem.correct_map = CorrectMap() + self.problem.correct_map.update(old_cmap) # Deep copy + + self.problem.update_score(xserver_msgs[correctness], queuekey=0) + self.assertEquals(self.problem.correct_map.get_dict(), old_cmap.get_dict()) # Deep comparison + + for answer_id in answer_ids: + self.assertTrue(self.problem.correct_map.is_queued(answer_id)) # Should be still queued, since message undelivered + + # Correct queuekey, state should be updated + for correctness in ['correct', 'incorrect']: for i, answer_id in enumerate(answer_ids): - queuekey = 1000 + i - queuestate = CodeResponseTest.make_queuestate(1000+i, datetime.now()) - old_cmap.update(CorrectMap(answer_id=answer_ids[i], queuestate=queuestate)) + self.problem.correct_map = CorrectMap() + self.problem.correct_map.update(old_cmap) - # Message format common to external graders - grader_msg = 'MESSAGE' # Must be valid XML - correct_score_msg = json.dumps({'correct':True, 'score':1, 'msg': grader_msg}) - incorrect_score_msg = json.dumps({'correct':False, 'score':0, 'msg': grader_msg}) + new_cmap = CorrectMap() + new_cmap.update(old_cmap) + npoints = 1 if correctness == 'correct' else 0 + new_cmap.set(answer_id=answer_id, npoints=npoints, correctness=correctness, msg=grader_msg, queuestate=None) - xserver_msgs = {'correct': correct_score_msg, - 'incorrect': incorrect_score_msg,} + self.problem.update_score(xserver_msgs[correctness], queuekey=1000 + i) + self.assertEquals(self.problem.correct_map.get_dict(), new_cmap.get_dict()) - # Incorrect queuekey, state should not be updated - for correctness in ['correct', 'incorrect']: - test_lcp.correct_map = CorrectMap() - test_lcp.correct_map.update(old_cmap) # Deep copy - - test_lcp.update_score(xserver_msgs[correctness], queuekey=0) - self.assertEquals(test_lcp.correct_map.get_dict(), old_cmap.get_dict()) # Deep comparison - - for answer_id in answer_ids: - self.assertTrue(test_lcp.correct_map.is_queued(answer_id)) # Should be still queued, since message undelivered - - # Correct queuekey, state should be updated - for correctness in ['correct', 'incorrect']: - for i, answer_id in enumerate(answer_ids): - test_lcp.correct_map = CorrectMap() - test_lcp.correct_map.update(old_cmap) - - new_cmap = CorrectMap() - new_cmap.update(old_cmap) - npoints = 1 if correctness=='correct' else 0 - new_cmap.set(answer_id=answer_id, npoints=npoints, correctness=correctness, msg=grader_msg, queuestate=None) - - test_lcp.update_score(xserver_msgs[correctness], queuekey=1000 + i) - self.assertEquals(test_lcp.correct_map.get_dict(), new_cmap.get_dict()) - - for j, test_id in enumerate(answer_ids): - if j == i: - self.assertFalse(test_lcp.correct_map.is_queued(test_id)) # Should be dequeued, message delivered - else: - self.assertTrue(test_lcp.correct_map.is_queued(test_id)) # Should be queued, message undelivered + for j, test_id in enumerate(answer_ids): + if j == i: + self.assertFalse(self.problem.correct_map.is_queued(test_id)) # Should be dequeued, message delivered + else: + self.assertTrue(self.problem.correct_map.is_queued(test_id)) # Should be queued, message undelivered def test_recentmost_queuetime(self): ''' Test whether the LoncapaProblem knows about the time of queue requests ''' - problem_file = os.path.join(os.path.dirname(__file__), "test_files/coderesponse.xml") - with open(problem_file) as input_file: - test_lcp = lcp.LoncapaProblem(input_file.read(), '1', system=test_system) + answer_ids = sorted(self.problem.get_question_answers()) - answer_ids = sorted(test_lcp.get_question_answers()) + # CodeResponse requires internal CorrectMap state. Build it now in the unqueued state + cmap = CorrectMap() + for answer_id in answer_ids: + cmap.update(CorrectMap(answer_id=answer_id, queuestate=None)) + self.problem.correct_map.update(cmap) - # CodeResponse requires internal CorrectMap state. Build it now in the unqueued state - cmap = CorrectMap() - for answer_id in answer_ids: - cmap.update(CorrectMap(answer_id=answer_id, queuestate=None)) - test_lcp.correct_map.update(cmap) + self.assertEquals(self.problem.get_recentmost_queuetime(), None) - self.assertEquals(test_lcp.get_recentmost_queuetime(), None) + # CodeResponse requires internal CorrectMap state. Build it now in the queued state + cmap = CorrectMap() + for i, answer_id in enumerate(answer_ids): + queuekey = 1000 + i + latest_timestamp = datetime.now() + queuestate = CodeResponseTest.make_queuestate(1000 + i, latest_timestamp) + cmap.update(CorrectMap(answer_id=answer_id, queuestate=queuestate)) + self.problem.correct_map.update(cmap) - # CodeResponse requires internal CorrectMap state. Build it now in the queued state - cmap = CorrectMap() - for i, answer_id in enumerate(answer_ids): - queuekey = 1000 + i - latest_timestamp = datetime.now() - queuestate = CodeResponseTest.make_queuestate(1000+i, latest_timestamp) - cmap.update(CorrectMap(answer_id=answer_id, queuestate=queuestate)) - test_lcp.correct_map.update(cmap) + # Queue state only tracks up to second + latest_timestamp = datetime.strptime(datetime.strftime(latest_timestamp, dateformat), dateformat) - # Queue state only tracks up to second - latest_timestamp = datetime.strptime(datetime.strftime(latest_timestamp, dateformat), dateformat) + self.assertEquals(self.problem.get_recentmost_queuetime(), latest_timestamp) - self.assertEquals(test_lcp.get_recentmost_queuetime(), latest_timestamp) + def test_convert_files_to_filenames(self): + ''' + Test whether file objects are converted to filenames without altering other structures + ''' + problem_file = os.path.join(os.path.dirname(__file__), "test_files/filename_convert_test.txt") + with open(problem_file) as fp: + answers_with_file = {'1_2_1': 'String-based answer', + '1_3_1': ['answer1', 'answer2', 'answer3'], + '1_4_1': [fp, fp]} + answers_converted = convert_files_to_filenames(answers_with_file) + self.assertEquals(answers_converted['1_2_1'], 'String-based answer') + self.assertEquals(answers_converted['1_3_1'], ['answer1', 'answer2', 'answer3']) + self.assertEquals(answers_converted['1_4_1'], [fp.name, fp.name]) - def test_convert_files_to_filenames(self): - ''' - Test whether file objects are converted to filenames without altering other structures - ''' - problem_file = os.path.join(os.path.dirname(__file__), "test_files/coderesponse.xml") - with open(problem_file) as fp: - answers_with_file = {'1_2_1': 'String-based answer', - '1_3_1': ['answer1', 'answer2', 'answer3'], - '1_4_1': [fp, fp]} - answers_converted = convert_files_to_filenames(answers_with_file) - self.assertEquals(answers_converted['1_2_1'], 'String-based answer') - self.assertEquals(answers_converted['1_3_1'], ['answer1', 'answer2', 'answer3']) - self.assertEquals(answers_converted['1_4_1'], [fp.name, fp.name]) +class ChoiceResponseTest(ResponseTest): + from response_xml_factory import ChoiceResponseXMLFactory + xml_factory_class = ChoiceResponseXMLFactory + + def test_radio_group_grade(self): + problem = self.build_problem(choice_type='radio', + choices=[False, True, False]) + + # Check that we get the expected results + self.assert_grade(problem, 'choice_0', 'incorrect') + self.assert_grade(problem, 'choice_1', 'correct') + self.assert_grade(problem, 'choice_2', 'incorrect') + + # No choice 3 exists --> mark incorrect + self.assert_grade(problem, 'choice_3', 'incorrect') -class ChoiceResponseTest(unittest.TestCase): + def test_checkbox_group_grade(self): + problem = self.build_problem(choice_type='checkbox', + choices=[False, True, True]) - def test_cr_rb_grade(self): - problem_file = os.path.dirname(__file__) + "/test_files/choiceresponse_radio.xml" - test_lcp = lcp.LoncapaProblem(open(problem_file).read(), '1', system=test_system) - correct_answers = {'1_2_1': 'choice_2', - '1_3_1': ['choice_2', 'choice_3']} - test_answers = {'1_2_1': 'choice_2', - '1_3_1': 'choice_2', - } - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_1'), 'correct') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_3_1'), 'incorrect') + # Check that we get the expected results + # (correct if and only if BOTH correct choices chosen) + self.assert_grade(problem, ['choice_1', 'choice_2'], 'correct') + self.assert_grade(problem, 'choice_1', 'incorrect') + self.assert_grade(problem, 'choice_2', 'incorrect') + self.assert_grade(problem, ['choice_0', 'choice_1'], 'incorrect') + self.assert_grade(problem, ['choice_0', 'choice_2'], 'incorrect') - def test_cr_cb_grade(self): - problem_file = os.path.dirname(__file__) + "/test_files/choiceresponse_checkbox.xml" - test_lcp = lcp.LoncapaProblem(open(problem_file).read(), '1', system=test_system) - correct_answers = {'1_2_1': 'choice_2', - '1_3_1': ['choice_2', 'choice_3'], - '1_4_1': ['choice_2', 'choice_3']} - test_answers = {'1_2_1': 'choice_2', - '1_3_1': 'choice_2', - '1_4_1': ['choice_2', 'choice_3'], - } - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_2_1'), 'correct') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_3_1'), 'incorrect') - self.assertEquals(test_lcp.grade_answers(test_answers).get_correctness('1_4_1'), 'correct') + # No choice 3 exists --> mark incorrect + self.assert_grade(problem, 'choice_3', 'incorrect') -class JavascriptResponseTest(unittest.TestCase): - def test_jr_grade(self): - problem_file = os.path.dirname(__file__) + "/test_files/javascriptresponse.xml" +class JavascriptResponseTest(ResponseTest): + from response_xml_factory import JavascriptResponseXMLFactory + xml_factory_class = JavascriptResponseXMLFactory + + def test_grade(self): + # Compile coffee files into javascript used by the response coffee_file_path = os.path.dirname(__file__) + "/test_files/js/*.coffee" os.system("coffee -c %s" % (coffee_file_path)) - test_lcp = lcp.LoncapaProblem(open(problem_file).read(), '1', system=test_system) - correct_answers = {'1_2_1': json.dumps({0: 4})} - incorrect_answers = {'1_2_1': json.dumps({0: 5})} - self.assertEquals(test_lcp.grade_answers(incorrect_answers).get_correctness('1_2_1'), 'incorrect') - self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct') + problem = self.build_problem(generator_src="test_problem_generator.js", + grader_src="test_problem_grader.js", + display_class="TestProblemDisplay", + display_src="test_problem_display.js", + param_dict={'value': '4'}) + # Test that we get graded correctly + self.assert_grade(problem, json.dumps({0:4}), "correct") + self.assert_grade(problem, json.dumps({0:5}), "incorrect") + +class NumericalResponseTest(ResponseTest): + from response_xml_factory import NumericalResponseXMLFactory + xml_factory_class = NumericalResponseXMLFactory + + def test_grade_exact(self): + problem = self.build_problem(question_text="What is 2 + 2?", + explanation="The answer is 4", + answer=4) + correct_responses = ["4", "4.0", "4.00"] + incorrect_responses = ["", "3.9", "4.1", "0"] + self.assert_multiple_grade(problem, correct_responses, incorrect_responses) + + + def test_grade_decimal_tolerance(self): + problem = self.build_problem(question_text="What is 2 + 2 approximately?", + explanation="The answer is 4", + answer=4, + tolerance=0.1) + correct_responses = ["4.0", "4.00", "4.09", "3.91"] + incorrect_responses = ["", "4.11", "3.89", "0"] + self.assert_multiple_grade(problem, correct_responses, incorrect_responses) + + def test_grade_percent_tolerance(self): + problem = self.build_problem(question_text="What is 2 + 2 approximately?", + explanation="The answer is 4", + answer=4, + tolerance="10%") + correct_responses = ["4.0", "4.3", "3.7", "4.30", "3.70"] + incorrect_responses = ["", "4.5", "3.5", "0"] + self.assert_multiple_grade(problem, correct_responses, incorrect_responses) + + def test_grade_with_script(self): + script_text = "computed_response = math.sqrt(4)" + problem = self.build_problem(question_text="What is sqrt(4)?", + explanation="The answer is 2", + answer="$computed_response", + script=script_text) + correct_responses = ["2", "2.0"] + incorrect_responses = ["", "2.01", "1.99", "0"] + self.assert_multiple_grade(problem, correct_responses, incorrect_responses) + + def test_grade_with_script_and_tolerance(self): + script_text = "computed_response = math.sqrt(4)" + problem = self.build_problem(question_text="What is sqrt(4)?", + explanation="The answer is 2", + answer="$computed_response", + tolerance="0.1", + script=script_text) + correct_responses = ["2", "2.0", "2.05", "1.95"] + incorrect_responses = ["", "2.11", "1.89", "0"] + self.assert_multiple_grade(problem, correct_responses, incorrect_responses) + + +class CustomResponseTest(ResponseTest): + from response_xml_factory import CustomResponseXMLFactory + xml_factory_class = CustomResponseXMLFactory + + def test_inline_code(self): + + # For inline code, we directly modify global context variables + # 'answers' is a list of answers provided to us + # 'correct' is a list we fill in with True/False + # 'expect' is given to us (if provided in the XML) + inline_script = """correct[0] = 'correct' if (answers['1_2_1'] == expect) else 'incorrect'""" + problem = self.build_problem(answer=inline_script, expect="42") + + # Check results + self.assert_grade(problem, '42', 'correct') + self.assert_grade(problem, '0', 'incorrect') + + def test_inline_message(self): + + # Inline code can update the global messages list + # to pass messages to the CorrectMap for a particular input + # The code can also set the global overall_message (str) + # to pass a message that applies to the whole response + inline_script = textwrap.dedent(""" + messages[0] = "Test Message" + overall_message = "Overall message" + """) + problem = self.build_problem(answer=inline_script) + + input_dict = {'1_2_1': '0'} + correctmap = problem.grade_answers(input_dict) + + # Check that the message for the particular input was received + input_msg = correctmap.get_msg('1_2_1') + self.assertEqual(input_msg, "Test Message") + + # Check that the overall message (for the whole response) was received + overall_msg = correctmap.get_overall_message() + self.assertEqual(overall_msg, "Overall message") + + + def test_function_code_single_input(self): + + # For function code, we pass in these arguments: + # + # 'expect' is the expect attribute of the + # + # 'answer_given' is the answer the student gave (if there is just one input) + # or an ordered list of answers (if there are multiple inputs) + # + # + # The function should return a dict of the form + # { 'ok': BOOL, 'msg': STRING } + # + script = textwrap.dedent(""" + def check_func(expect, answer_given): + return {'ok': answer_given == expect, 'msg': 'Message text'} + """) + + problem = self.build_problem(script=script, cfn="check_func", expect="42") + + # Correct answer + input_dict = {'1_2_1': '42'} + correct_map = problem.grade_answers(input_dict) + + correctness = correct_map.get_correctness('1_2_1') + msg = correct_map.get_msg('1_2_1') + + self.assertEqual(correctness, 'correct') + self.assertEqual(msg, "Message text") + + # Incorrect answer + input_dict = {'1_2_1': '0'} + correct_map = problem.grade_answers(input_dict) + + correctness = correct_map.get_correctness('1_2_1') + msg = correct_map.get_msg('1_2_1') + + self.assertEqual(correctness, 'incorrect') + self.assertEqual(msg, "Message text") + + def test_function_code_multiple_input_no_msg(self): + + # Check functions also have the option of returning + # a single boolean value + # If true, mark all the inputs correct + # If false, mark all the inputs incorrect + script = textwrap.dedent(""" + def check_func(expect, answer_given): + return (answer_given[0] == expect and + answer_given[1] == expect) + """) + + problem = self.build_problem(script=script, cfn="check_func", + expect="42", num_inputs=2) + + # Correct answer -- expect both inputs marked correct + input_dict = {'1_2_1': '42', '1_2_2': '42'} + correct_map = problem.grade_answers(input_dict) + + correctness = correct_map.get_correctness('1_2_1') + self.assertEqual(correctness, 'correct') + + correctness = correct_map.get_correctness('1_2_2') + self.assertEqual(correctness, 'correct') + + # One answer incorrect -- expect both inputs marked incorrect + input_dict = {'1_2_1': '0', '1_2_2': '42'} + correct_map = problem.grade_answers(input_dict) + + correctness = correct_map.get_correctness('1_2_1') + self.assertEqual(correctness, 'incorrect') + + correctness = correct_map.get_correctness('1_2_2') + self.assertEqual(correctness, 'incorrect') + + + def test_function_code_multiple_inputs(self): + + # If the has multiple inputs associated with it, + # the check function can return a dict of the form: + # + # {'overall_message': STRING, + # 'input_list': [{'ok': BOOL, 'msg': STRING}, ...] } + # + # 'overall_message' is displayed at the end of the response + # + # 'input_list' contains dictionaries representing the correctness + # and message for each input. + script = textwrap.dedent(""" + def check_func(expect, answer_given): + check1 = (int(answer_given[0]) == 1) + check2 = (int(answer_given[1]) == 2) + check3 = (int(answer_given[2]) == 3) + return {'overall_message': 'Overall message', + 'input_list': [ + {'ok': check1, 'msg': 'Feedback 1'}, + {'ok': check2, 'msg': 'Feedback 2'}, + {'ok': check3, 'msg': 'Feedback 3'} ] } + """) + + problem = self.build_problem(script=script, + cfn="check_func", num_inputs=3) + + # Grade the inputs (one input incorrect) + input_dict = {'1_2_1': '-999', '1_2_2': '2', '1_2_3': '3' } + correct_map = problem.grade_answers(input_dict) + + # Expect that we receive the overall message (for the whole response) + self.assertEqual(correct_map.get_overall_message(), "Overall message") + + # Expect that the inputs were graded individually + self.assertEqual(correct_map.get_correctness('1_2_1'), 'incorrect') + self.assertEqual(correct_map.get_correctness('1_2_2'), 'correct') + self.assertEqual(correct_map.get_correctness('1_2_3'), 'correct') + + # Expect that we received messages for each individual input + self.assertEqual(correct_map.get_msg('1_2_1'), 'Feedback 1') + self.assertEqual(correct_map.get_msg('1_2_2'), 'Feedback 2') + self.assertEqual(correct_map.get_msg('1_2_3'), 'Feedback 3') + + + def test_multiple_inputs_return_one_status(self): + # When given multiple inputs, the 'answer_given' argument + # to the check_func() is a list of inputs + # + # The sample script below marks the problem as correct + # if and only if it receives answer_given=[1,2,3] + # (or string values ['1','2','3']) + # + # Since we return a dict describing the status of one input, + # we expect that the same 'ok' value is applied to each + # of the inputs. + script = textwrap.dedent(""" + def check_func(expect, answer_given): + check1 = (int(answer_given[0]) == 1) + check2 = (int(answer_given[1]) == 2) + check3 = (int(answer_given[2]) == 3) + return {'ok': (check1 and check2 and check3), + 'msg': 'Message text'} + """) + + problem = self.build_problem(script=script, + cfn="check_func", num_inputs=3) + + # Grade the inputs (one input incorrect) + input_dict = {'1_2_1': '-999', '1_2_2': '2', '1_2_3': '3' } + correct_map = problem.grade_answers(input_dict) + + # Everything marked incorrect + self.assertEqual(correct_map.get_correctness('1_2_1'), 'incorrect') + self.assertEqual(correct_map.get_correctness('1_2_2'), 'incorrect') + self.assertEqual(correct_map.get_correctness('1_2_3'), 'incorrect') + + # Grade the inputs (everything correct) + input_dict = {'1_2_1': '1', '1_2_2': '2', '1_2_3': '3' } + correct_map = problem.grade_answers(input_dict) + + # Everything marked incorrect + self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct') + self.assertEqual(correct_map.get_correctness('1_2_2'), 'correct') + self.assertEqual(correct_map.get_correctness('1_2_3'), 'correct') + + # Message is interpreted as an "overall message" + self.assertEqual(correct_map.get_overall_message(), 'Message text') + + def test_script_exception(self): + + # Construct a script that will raise an exception + script = textwrap.dedent(""" + def check_func(expect, answer_given): + raise Exception("Test") + """) + + problem = self.build_problem(script=script, cfn="check_func") + + # Expect that an exception gets raised when we check the answer + with self.assertRaises(Exception): + problem.grade_answers({'1_2_1': '42'}) + + def test_invalid_dict_exception(self): + + # Construct a script that passes back an invalid dict format + script = textwrap.dedent(""" + def check_func(expect, answer_given): + return {'invalid': 'test'} + """) + + problem = self.build_problem(script=script, cfn="check_func") + + # Expect that an exception gets raised when we check the answer + with self.assertRaises(Exception): + problem.grade_answers({'1_2_1': '42'}) + + +class SchematicResponseTest(ResponseTest): + from response_xml_factory import SchematicResponseXMLFactory + xml_factory_class = SchematicResponseXMLFactory + + def test_grade(self): + + # Most of the schematic-specific work is handled elsewhere + # (in client-side JavaScript) + # The is responsible only for executing the + # Python code in with *submission* (list) + # in the global context. + + # To test that the context is set up correctly, + # we create a script that sets *correct* to true + # if and only if we find the *submission* (list) + script="correct = ['correct' if 'test' in submission[0] else 'incorrect']" + problem = self.build_problem(answer=script) + + # The actual dictionary would contain schematic information + # sent from the JavaScript simulation + submission_dict = {'test': 'test'} + input_dict = { '1_2_1': json.dumps(submission_dict) } + correct_map = problem.grade_answers(input_dict) + + # Expect that the problem is graded as true + # (That is, our script verifies that the context + # is what we expect) + self.assertEqual(correct_map.get_correctness('1_2_1'), 'correct') diff --git a/common/lib/capa/capa/util.py b/common/lib/capa/capa/util.py index 0df58c216f..a0f25c4947 100644 --- a/common/lib/capa/capa/util.py +++ b/common/lib/capa/capa/util.py @@ -51,15 +51,17 @@ def convert_files_to_filenames(answers): new_answers = dict() for answer_id in answers.keys(): answer = answers[answer_id] - if is_list_of_files(answer): # Files are stored as a list, even if one file + if is_list_of_files(answer): # Files are stored as a list, even if one file new_answers[answer_id] = [f.name for f in answer] else: new_answers[answer_id] = answers[answer_id] return new_answers + def is_list_of_files(files): return isinstance(files, list) and all(is_file(f) for f in files) + def is_file(file_to_test): ''' Duck typing to check if 'file_to_test' is a File object @@ -79,11 +81,10 @@ def find_with_default(node, path, default): Returns: node.find(path).text if the find succeeds, default otherwise. - + """ v = node.find(path) if v is not None: return v.text else: return default - diff --git a/common/lib/capa/capa/verifiers/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py index eb91208923..239ff2b9a4 100644 --- a/common/lib/capa/capa/verifiers/draganddrop.py +++ b/common/lib/capa/capa/verifiers/draganddrop.py @@ -111,7 +111,7 @@ class DragAndDrop(object): Returns: bool. ''' for draggable in self.excess_draggables: - if not self.excess_draggables[draggable]: + if self.excess_draggables[draggable]: return False # user answer has more draggables than correct answer # Number of draggables in user_groups may be differ that in @@ -304,8 +304,13 @@ class DragAndDrop(object): user_answer = json.loads(user_answer) - # check if we have draggables that are not in correct answer: - self.excess_draggables = {} + # This dictionary will hold a key for each draggable the user placed on + # the image. The value is True if that draggable is not mentioned in any + # correct_answer entries. If the draggable is mentioned in at least one + # correct_answer entry, the value is False. + # default to consider every user answer excess until proven otherwise. + self.excess_draggables = dict((users_draggable.keys()[0],True) + for users_draggable in user_answer['draggables']) # create identical data structures from user answer and correct answer for i in xrange(0, len(correct_answer)): @@ -322,11 +327,8 @@ class DragAndDrop(object): self.user_groups[groupname].append(draggable_name) self.user_positions[groupname]['user'].append( draggable_dict[draggable_name]) - self.excess_draggables[draggable_name] = True - else: - self.excess_draggables[draggable_name] = \ - self.excess_draggables.get(draggable_name, False) - + # proved that this is not excess + self.excess_draggables[draggable_name] = False def grade(user_input, correct_answer): """ Creates DragAndDrop instance from user_input and correct_answer and diff --git a/common/lib/capa/capa/verifiers/tests_draganddrop.py b/common/lib/capa/capa/verifiers/tests_draganddrop.py index 9b1b15ce0c..bcd024fa89 100644 --- a/common/lib/capa/capa/verifiers/tests_draganddrop.py +++ b/common/lib/capa/capa/verifiers/tests_draganddrop.py @@ -46,6 +46,18 @@ class Test_DragAndDrop_Grade(unittest.TestCase): correct_answer = {'1': 't1', 'name_with_icon': 't2'} self.assertTrue(draganddrop.grade(user_input, correct_answer)) + def test_expect_no_actions_wrong(self): + user_input = '{"draggables": [{"1": "t1"}, \ + {"name_with_icon": "t2"}]}' + correct_answer = [] + self.assertFalse(draganddrop.grade(user_input, correct_answer)) + + def test_expect_no_actions_right(self): + user_input = '{"draggables": []}' + correct_answer = [] + self.assertTrue(draganddrop.grade(user_input, correct_answer)) + + def test_targets_false(self): user_input = '{"draggables": [{"1": "t1"}, \ {"name_with_icon": "t2"}]}' diff --git a/common/lib/capa/capa/xqueue_interface.py b/common/lib/capa/capa/xqueue_interface.py index 798867955b..8dbe2c84aa 100644 --- a/common/lib/capa/capa/xqueue_interface.py +++ b/common/lib/capa/capa/xqueue_interface.py @@ -10,6 +10,7 @@ import requests log = logging.getLogger('mitx.' + __name__) dateformat = '%Y%m%d%H%M%S' + def make_hashkey(seed): ''' Generate a string key by hashing @@ -29,9 +30,9 @@ def make_xheader(lms_callback_url, lms_key, queue_name): 'queue_name': designate a specific queue within xqueue server, e.g. 'MITx-6.00x' (string) } """ - return json.dumps({ 'lms_callback_url': lms_callback_url, + return json.dumps({'lms_callback_url': lms_callback_url, 'lms_key': lms_key, - 'queue_name': queue_name }) + 'queue_name': queue_name}) def parse_xreply(xreply): @@ -96,18 +97,18 @@ class XQueueInterface(object): def _login(self): - payload = { 'username': self.auth['username'], - 'password': self.auth['password'] } + payload = {'username': self.auth['username'], + 'password': self.auth['password']} return self._http_post(self.url + '/xqueue/login/', payload) def _send_to_queue(self, header, body, files_to_upload): payload = {'xqueue_header': header, - 'xqueue_body' : body} + 'xqueue_body': body} files = {} if files_to_upload is not None: for f in files_to_upload: - files.update({ f.name: f }) + files.update({f.name: f}) return self._http_post(self.url + '/xqueue/submit/', payload, files=files) diff --git a/common/lib/capa/setup.py b/common/lib/capa/setup.py index 15b3015930..9c724dec8b 100644 --- a/common/lib/capa/setup.py +++ b/common/lib/capa/setup.py @@ -4,5 +4,5 @@ setup( name="capa", version="0.1", packages=find_packages(exclude=["tests"]), - install_requires=['distribute', 'pyparsing'], + install_requires=['distribute==0.6.34', 'pyparsing==1.5.6'], ) diff --git a/common/lib/logsettings.py b/common/lib/logsettings.py index 2896496c3b..9af8b08fb1 100644 --- a/common/lib/logsettings.py +++ b/common/lib/logsettings.py @@ -5,6 +5,7 @@ from logging.handlers import SysLogHandler LOG_LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'] + def get_logger_config(log_dir, logging_env="no_env", tracking_filename="tracking.log", @@ -13,7 +14,8 @@ def get_logger_config(log_dir, syslog_addr=None, debug=False, local_loglevel='INFO', - console_loglevel=None): + console_loglevel=None, + service_variant=None): """ @@ -38,14 +40,21 @@ def get_logger_config(log_dir, if console_loglevel is None or console_loglevel not in LOG_LEVELS: console_loglevel = 'DEBUG' if debug else 'INFO' + if service_variant is None: + # default to a blank string so that if SERVICE_VARIANT is not + # set we will not log to a sub directory + service_variant = '' + hostname = platform.node().split(".")[0] - syslog_format = ("[%(name)s][env:{logging_env}] %(levelname)s " + syslog_format = ("[service_variant={service_variant}]" + "[%(name)s][env:{logging_env}] %(levelname)s " "[{hostname} %(process)d] [%(filename)s:%(lineno)d] " - "- %(message)s").format( - logging_env=logging_env, hostname=hostname) + "- %(message)s").format(service_variant=service_variant, + logging_env=logging_env, + hostname=hostname) handlers = ['console', 'local'] if debug else ['console', - 'syslogger-remote', 'local'] + 'syslogger-remote', 'local'] logger_config = { 'version': 1, @@ -78,11 +87,6 @@ def get_logger_config(log_dir, } }, 'loggers': { - 'django': { - 'handlers': handlers, - 'propagate': True, - 'level': 'INFO' - }, 'tracking': { 'handlers': ['tracking', 'http'], 'level': 'DEBUG', @@ -93,16 +97,6 @@ def get_logger_config(log_dir, 'level': 'DEBUG', 'propagate': False }, - 'mitx': { - 'handlers': handlers, - 'level': 'DEBUG', - 'propagate': False - }, - 'keyedcache': { - 'handlers': handlers, - 'level': 'DEBUG', - 'propagate': False - }, } } @@ -134,6 +128,9 @@ def get_logger_config(log_dir, } }) else: + # for production environments we will only + # log INFO and up + logger_config['loggers']['']['level'] = 'INFO' logger_config['handlers'].update({ 'local': { 'level': local_loglevel, diff --git a/common/lib/sample-post.py b/common/lib/sample-post.py new file mode 100644 index 0000000000..a4985689bf --- /dev/null +++ b/common/lib/sample-post.py @@ -0,0 +1,71 @@ +# A simple script demonstrating how to have an external program post problem +# responses to an edx server. +# +# ***** NOTE ***** +# This is not intended as a stable public API. In fact, it is almost certainly +# going to change. If you use this for some reason, be prepared to change your +# code. +# +# We will be working to define a stable public API for external programs. We +# don't have have one yet (Feb 2013). + + +import requests +import sys +import getpass + +def prompt(msg, default=None, safe=False): + d = ' [{0}]'.format(default) if default is not None else '' + prompt = 'Enter {msg}{default}: '.format(msg=msg, default=d) + if not safe: + print prompt + x = sys.stdin.readline().strip() + else: + x = getpass.getpass(prompt=prompt) + if x == '' and default is not None: + return default + return x + +server = 'https://www.edx.org' +course_id = 'HarvardX/PH207x/2012_Fall' +location = 'i4x://HarvardX/PH207x/problem/ex_practice_2' + +#server = prompt('Server (no trailing slash)', 'http://127.0.0.1:8000') +#course_id = prompt('Course id', 'MITx/7012x/2013_Spring') +#location = prompt('problem location', 'i4x://MITx/7012x/problem/example_upload_answer') +value = prompt('value to upload') + +username = prompt('username on server', 'victor@edx.org') +password = prompt('password', 'abc123', safe=True) + +print "get csrf cookie" +session = requests.session() +r = session.get(server + '/') +r.raise_for_status() + +# print session.cookies + +# for some reason, the server expects a header containing the csrf cookie, not just the +# cookie itself. +session.headers['X-CSRFToken'] = session.cookies['csrftoken'] +# for https, need a referer header +session.headers['Referer'] = server + '/' +login_url = '/'.join([server, 'login']) + +print "log in" +r = session.post(login_url, {'email': 'victor@edx.org', 'password': 'Secret!', 'remember': 'false'}) +#print "request headers: ", r.request.headers +#print "response headers: ", r.headers +r.raise_for_status() + +url = '/'.join([server, 'courses', course_id, 'modx', location, 'problem_check']) +data = {'input_{0}_2_1'.format(location.replace('/','-').replace(':','').replace('--','-')): value} +#data = {'input_i4x-MITx-7012x-problem-example_upload_answer_2_1': value} + +print "Posting to '{0}': {1}".format(url, data) + +r = session.post(url, data) +r.raise_for_status() + +print ("To see the uploaded answer, go to {server}/courses/{course_id}/jump_to/{location}" + .format(server=server, course_id=course_id, location=location)) diff --git a/common/lib/supertrace.py b/common/lib/supertrace.py index e17cd7a8ba..83dfa12031 100644 --- a/common/lib/supertrace.py +++ b/common/lib/supertrace.py @@ -3,7 +3,8 @@ A handy util to print a django-debug-screen-like stack trace with values of local variables. """ -import sys, traceback +import sys +import traceback from django.utils.encoding import smart_unicode @@ -48,5 +49,3 @@ def supertrace(max_len=160): print s except: print "" - - diff --git a/common/lib/tempdir.py b/common/lib/tempdir.py new file mode 100644 index 0000000000..0acd92ba33 --- /dev/null +++ b/common/lib/tempdir.py @@ -0,0 +1,17 @@ +"""Make temporary directories nicely.""" + +import atexit +import os.path +import shutil +import tempfile + +def mkdtemp_clean(suffix="", prefix="tmp", dir=None): + """Just like mkdtemp, but the directory will be deleted when the process ends.""" + the_dir = tempfile.mkdtemp(suffix=suffix, prefix=prefix, dir=dir) + atexit.register(cleanup_tempdir, the_dir) + return the_dir + +def cleanup_tempdir(the_dir): + """Called on process exit to remove a temp directory.""" + if os.path.exists(the_dir): + shutil.rmtree(the_dir) diff --git a/common/lib/xmodule/jasmine_test_runner.html.erb b/common/lib/xmodule/jasmine_test_runner.html.erb index 3327ab4aea..7b078daedd 100644 --- a/common/lib/xmodule/jasmine_test_runner.html.erb +++ b/common/lib/xmodule/jasmine_test_runner.html.erb @@ -14,9 +14,9 @@ - + \ No newline at end of file diff --git a/common/static/js/capa/jsme/08DE1A45E2ED1FE31E10B481F379463B.cache.html b/common/static/js/capa/jsme/08DE1A45E2ED1FE31E10B481F379463B.cache.html new file mode 100644 index 0000000000..69c1f49350 --- /dev/null +++ b/common/static/js/capa/jsme/08DE1A45E2ED1FE31E10B481F379463B.cache.html @@ -0,0 +1,572 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/22351D2E57E6D516BDAA63C8D92AF37E.cache.html b/common/static/js/capa/jsme/22351D2E57E6D516BDAA63C8D92AF37E.cache.html new file mode 100644 index 0000000000..84bbdb9b51 --- /dev/null +++ b/common/static/js/capa/jsme/22351D2E57E6D516BDAA63C8D92AF37E.cache.html @@ -0,0 +1,574 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/2EB7CEFA089AFE9532D26E6ED5265D36.cache.html b/common/static/js/capa/jsme/2EB7CEFA089AFE9532D26E6ED5265D36.cache.html new file mode 100644 index 0000000000..3244d8a9ec --- /dev/null +++ b/common/static/js/capa/jsme/2EB7CEFA089AFE9532D26E6ED5265D36.cache.html @@ -0,0 +1,592 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/396F806CD63ABD414BFBB9D57429F05B.cache.png b/common/static/js/capa/jsme/396F806CD63ABD414BFBB9D57429F05B.cache.png new file mode 100644 index 0000000000..009e987261 Binary files /dev/null and b/common/static/js/capa/jsme/396F806CD63ABD414BFBB9D57429F05B.cache.png differ diff --git a/common/static/js/capa/jsme/40BAF81124143A595056A9CCA0E9DBBA.cache.png b/common/static/js/capa/jsme/40BAF81124143A595056A9CCA0E9DBBA.cache.png new file mode 100644 index 0000000000..daa0fa3f47 Binary files /dev/null and b/common/static/js/capa/jsme/40BAF81124143A595056A9CCA0E9DBBA.cache.png differ diff --git a/common/static/js/capa/jsme/4841BDE9DC293BA35F7762B4D8EFD236.cache.png b/common/static/js/capa/jsme/4841BDE9DC293BA35F7762B4D8EFD236.cache.png new file mode 100644 index 0000000000..8a77f17dd4 Binary files /dev/null and b/common/static/js/capa/jsme/4841BDE9DC293BA35F7762B4D8EFD236.cache.png differ diff --git a/common/static/js/capa/jsme/5C122AB17CD2018C049114A7F6B474A9.cache.html b/common/static/js/capa/jsme/5C122AB17CD2018C049114A7F6B474A9.cache.html new file mode 100644 index 0000000000..9d09d5a590 --- /dev/null +++ b/common/static/js/capa/jsme/5C122AB17CD2018C049114A7F6B474A9.cache.html @@ -0,0 +1,590 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/71C3CF16262A8C60182173C9451037E5.cache.html b/common/static/js/capa/jsme/71C3CF16262A8C60182173C9451037E5.cache.html new file mode 100644 index 0000000000..2b39a0f8e1 --- /dev/null +++ b/common/static/js/capa/jsme/71C3CF16262A8C60182173C9451037E5.cache.html @@ -0,0 +1,592 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/9347E46F84EA436EF22DCE900B9102C6.cache.html b/common/static/js/capa/jsme/9347E46F84EA436EF22DCE900B9102C6.cache.html new file mode 100644 index 0000000000..13a3844725 --- /dev/null +++ b/common/static/js/capa/jsme/9347E46F84EA436EF22DCE900B9102C6.cache.html @@ -0,0 +1,580 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/9AFE4FAB17128C1405E8842B30CF63FB.cache.html b/common/static/js/capa/jsme/9AFE4FAB17128C1405E8842B30CF63FB.cache.html new file mode 100644 index 0000000000..d8659abd34 --- /dev/null +++ b/common/static/js/capa/jsme/9AFE4FAB17128C1405E8842B30CF63FB.cache.html @@ -0,0 +1,573 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/A6FD788C50529ED45CB7C2AB2F64541F.cache.html b/common/static/js/capa/jsme/A6FD788C50529ED45CB7C2AB2F64541F.cache.html new file mode 100644 index 0000000000..c3f0435f87 --- /dev/null +++ b/common/static/js/capa/jsme/A6FD788C50529ED45CB7C2AB2F64541F.cache.html @@ -0,0 +1,575 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/ABA5251AA57980BE29B5B1956A00CD62.cache.html b/common/static/js/capa/jsme/ABA5251AA57980BE29B5B1956A00CD62.cache.html new file mode 100644 index 0000000000..98d4ac45ae --- /dev/null +++ b/common/static/js/capa/jsme/ABA5251AA57980BE29B5B1956A00CD62.cache.html @@ -0,0 +1,592 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/CF83F215ABEBF1D672DBF6BADC3B04A8.cache.html b/common/static/js/capa/jsme/CF83F215ABEBF1D672DBF6BADC3B04A8.cache.html new file mode 100644 index 0000000000..84d2af283e --- /dev/null +++ b/common/static/js/capa/jsme/CF83F215ABEBF1D672DBF6BADC3B04A8.cache.html @@ -0,0 +1,588 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/DF7764EEC1903CD03C9545B354D8D8E4.cache.png b/common/static/js/capa/jsme/DF7764EEC1903CD03C9545B354D8D8E4.cache.png new file mode 100644 index 0000000000..fbae9473b1 Binary files /dev/null and b/common/static/js/capa/jsme/DF7764EEC1903CD03C9545B354D8D8E4.cache.png differ diff --git a/common/static/js/capa/jsme/F4FD0E34AFA9D7A91283D78040E0A050.cache.html b/common/static/js/capa/jsme/F4FD0E34AFA9D7A91283D78040E0A050.cache.html new file mode 100644 index 0000000000..1721d769f9 --- /dev/null +++ b/common/static/js/capa/jsme/F4FD0E34AFA9D7A91283D78040E0A050.cache.html @@ -0,0 +1,592 @@ + \ No newline at end of file diff --git a/common/static/js/capa/jsme/clear.cache.gif b/common/static/js/capa/jsme/clear.cache.gif new file mode 100644 index 0000000000..e565824aaf Binary files /dev/null and b/common/static/js/capa/jsme/clear.cache.gif differ diff --git a/common/static/js/capa/jsme/gwt/chrome/chrome.css b/common/static/js/capa/jsme/gwt/chrome/chrome.css new file mode 100644 index 0000000000..9c7bcd627d --- /dev/null +++ b/common/static/js/capa/jsme/gwt/chrome/chrome.css @@ -0,0 +1,1153 @@ +/** + * The file contains styles for GWT widgets in the chrome theme. + * + * In order to maintain cross-browser compatibility, the following syntax is + * used to create IE6 specific style rules: + * .gwt-Widget { + * property: rule applies to all browsers + * -property: rule applies only to IE6 (overrides previous rule) + * } + * * html .gwt-Widget { + * property: rule applies to all versions of IE + * } + */ + +body, table td, select { + font-family: Arial Unicode MS, Arial, sans-serif; + font-size: small; +} +pre { + font-family: "courier new", courier; + font-size: small; +} +body { + color: black; + margin: 0px; + border: 0px; + padding: 0px; + background: #fff; + direction: ltr; +} +a, a:visited, a:hover { + color: #0000AA; +} + +/** + * The reference theme can be used to determine when this style sheet has + * loaded. Create a hidden div element with absolute position, assign the style + * name below, and attach it to the DOM. Use a timer to detect when the + * element's height and width are set to 5px. + */ +.gwt-Reference-chrome { + height: 5px; + width: 5px; + zoom: 1; +} + +.gwt-Button { + margin: 0; + padding: 3px 5px; + text-decoration: none; + font-size: small; + cursor: pointer; + cursor: hand; + background: url("images/hborder.png") repeat-x 0px -27px; + border: 1px outset #ccc; +} +.gwt-Button:active { + border: 1px inset #ccc; +} +.gwt-Button:hover { + border-color: #9cf #69e #69e #7af; +} +.gwt-Button[disabled] { + cursor: default; + color: #888; +} +.gwt-Button[disabled]:hover { + border: 1px outset #ccc; +} + +.gwt-CheckBox { +} +.gwt-CheckBox-disabled { + color: #888; +} + +.gwt-DecoratorPanel { +} +.gwt-DecoratorPanel .topCenter, +.gwt-DecoratorPanel .bottomCenter { + background: url(images/hborder.png) repeat-x; +} +.gwt-DecoratorPanel .middleLeft, +.gwt-DecoratorPanel .middleRight { + background: url(images/vborder.png) repeat-y; +} +.gwt-DecoratorPanel .topLeftInner, +.gwt-DecoratorPanel .topRightInner, +.gwt-DecoratorPanel .bottomLeftInner, +.gwt-DecoratorPanel .bottomRightInner { + width: 5px; + height: 5px; + zoom: 1; +} +.gwt-DecoratorPanel .topLeft { + background: url(images/corner.png) no-repeat 0px 0px; + -background: url(images/corner_ie6.png) no-repeat 0px 0px; +} +.gwt-DecoratorPanel .topRight { + background: url(images/corner.png) no-repeat -5px 0px; + -background: url(images/corner_ie6.png) no-repeat -5px 0px; +} +.gwt-DecoratorPanel .bottomLeft { + background: url(images/corner.png) no-repeat 0px -5px; + -background: url(images/corner_ie6.png) no-repeat 0px -5px; +} +.gwt-DecoratorPanel .bottomRight { + background: url(images/corner.png) no-repeat -5px -5px; + -background: url(images/corner_ie6.png) no-repeat -5px -5px; +} +* html .gwt-DecoratorPanel .topLeftInner, +* html .gwt-DecoratorPanel .topRightInner, +* html .gwt-DecoratorPanel .bottomLeftInner, +* html .gwt-DecoratorPanel .bottomRightInner { + width: 5px; + height: 5px; + overflow: hidden; +} + +.gwt-DialogBox .Caption { + background: #ebebeb url(images/hborder.png) repeat-x 0px -2003px; + padding: 4px 4px 4px 8px; + cursor: default; + border-bottom: 1px solid #bbbbbb; + border-top: 5px solid #e3e3e3; +} +.gwt-DialogBox .dialogContent { +} +.gwt-DialogBox .dialogMiddleCenter { + padding: 3px; + background: white; +} +.gwt-DialogBox .dialogBottomCenter { + background: url(images/hborder.png) repeat-x 0px -4px; + -background: url(images/hborder_ie6.png) repeat-x 0px -4px; +} +.gwt-DialogBox .dialogMiddleLeft { + background: url(images/vborder.png) repeat-y; +} +.gwt-DialogBox .dialogMiddleRight { + background: url(images/vborder.png) repeat-y -4px 0px; + -background: url(images/vborder_ie6.png) repeat-y -4px 0px; +} +.gwt-DialogBox .dialogTopLeftInner { + width: 5px; + zoom: 1; +} +.gwt-DialogBox .dialogTopRightInner { + width: 8px; + zoom: 1; +} +.gwt-DialogBox .dialogBottomLeftInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-DialogBox .dialogBottomRightInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-DialogBox .dialogTopLeft { + background: url(images/corner.png) no-repeat -13px 0px; + -background: url(images/corner_ie6.png) no-repeat -13px 0px; +} +.gwt-DialogBox .dialogTopRight { + background: url(images/corner.png) no-repeat -18px 0px; + -background: url(images/corner_ie6.png) no-repeat -18px 0px; +} +.gwt-DialogBox .dialogBottomLeft { + background: url(images/corner.png) no-repeat 0px -15px; + -background: url(images/corner_ie6.png) no-repeat 0px -15px; +} +.gwt-DialogBox .dialogBottomRight { + background: url(images/corner.png) no-repeat -5px -15px; + -background: url(images/corner_ie6.png) no-repeat -5px -15px; +} +* html .gwt-DialogBox .dialogTopLeftInner { + width: 5px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogTopRightInner { + width: 8px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogBottomLeftInner { + width: 5px; + height: 8px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogBottomRightInner { + width: 8px; + height: 8px; + overflow: hidden; +} + +.gwt-DisclosurePanel { +} +.gwt-DisclosurePanel-open { +} +.gwt-DisclosurePanel-closed { +} +.gwt-DisclosurePanel .header, +.gwt-DisclosurePanel .header a, +.gwt-DisclosurePanel .header td { + text-decoration: none; /* Remove underline from header */ + color: black; + cursor: pointer; + cursor: hand; +} +.gwt-DisclosurePanel .content { + border-left: 3px solid #e3e3e3; + padding: 4px 0px 4px 8px; + margin-left: 6px; +} + +.gwt-FileUpload { +} + +.gwt-Frame { + border-top: 2px solid #666; + border-left: 2px solid #666; + border-right: 2px solid #bbb; + border-bottom: 2px solid #bbb; +} + +.gwt-HorizontalSplitPanel { +} +.gwt-HorizontalSplitPanel .hsplitter { + cursor: move; + border: 0px; + background: #91c0ef url(images/vborder.png) repeat-y; + line-height: 0px; +} +.gwt-VerticalSplitPanel { +} +.gwt-VerticalSplitPanel .vsplitter { + cursor: move; + border: 0px; + background: #91c0ef url(images/hborder.png) repeat-x; + line-height: 0px; +} + +.gwt-HTML { +} + +.gwt-Hyperlink { + cursor: pointer; +} + +.gwt-Image { +} + +.gwt-Label { +} + +.gwt-ListBox { +} + +.gwt-MenuBar { + cursor: default; +} +.gwt-MenuBar .gwt-MenuItem { + cursor: default; +} +.gwt-MenuBar .gwt-MenuItem-selected { + background: #cdcdcd; +} +.gwt-MenuBar .gwt-MenuItem-disabled { + color: #cdcdcd; +} +.gwt-MenuBar-horizontal { + background: #ebebeb url(images/hborder.png) repeat-x 0px -2003px; + border: 1px solid #BBBBBB; +} +.gwt-MenuBar-horizontal .gwt-MenuItem { + padding: 0px 10px; + vertical-align: bottom; + color: #666666; + font-weight: bold; +} +.gwt-MenuBar-horizontal .gwt-MenuItemSeparator { + width: 1px; + padding: 0px; + margin: 0px; + border: 0px; + border-left: 1px solid #888888; + background: white; +} +.gwt-MenuBar-horizontal .gwt-MenuItemSeparator .menuSeparatorInner { + width: 1px; + height: 1px; + background: white; +} +.gwt-MenuBar-vertical { + margin-top: 0px; + margin-left: 0px; + background: white; +} +.gwt-MenuBar-vertical table { + border-collapse: collapse; +} +.gwt-MenuBar-vertical .gwt-MenuItem { + padding: 4px 14px 4px 1px; +} +.gwt-MenuBar-vertical .gwt-MenuItemSeparator { + padding: 2px 0px; +} +.gwt-MenuBar-vertical .gwt-MenuItemSeparator .menuSeparatorInner { + height: 1px; + padding: 0px; + border: 0px; + border-top: 1px solid #777777; + background: #ddddee; + overflow: hidden; +} +.gwt-MenuBar-vertical .subMenuIcon { + padding-right: 4px; +} +.gwt-MenuBar-vertical .subMenuIcon-selected { + background: #cdcdcd; +} +.gwt-MenuBarPopup { + margin: 0px 0px 0px 3px; +} +.gwt-MenuBarPopup .menuPopupTopCenter { + background: url(images/hborder.png) 0px -12px repeat-x; +} +.gwt-MenuBarPopup .menuPopupBottomCenter { + background: url(images/hborder.png) 0px -13px repeat-x; + -background: url(images/hborder_ie6.png) 0px -13px repeat-x; +} +.gwt-MenuBarPopup .menuPopupMiddleLeft { + background: url(images/vborder.png) -12px 0px repeat-y; + -background: url(images/vborder_ie6.png) -12px 0px repeat-y; +} +.gwt-MenuBarPopup .menuPopupMiddleRight { + background: url(images/vborder.png) -13px 0px repeat-y; + -background: url(images/vborder_ie6.png) -13px 0px repeat-y; +} +.gwt-MenuBarPopup .menuPopupTopLeftInner { + width: 5px; + height: 5px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupTopRightInner { + width: 8px; + height: 5px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupBottomLeftInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupBottomRightInner { + width: 8px; + height: 8px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupTopLeft { + background: url(images/corner.png) no-repeat 0px -36px; + -background: url(images/corner_ie6.png) no-repeat 0px -36px; +} +.gwt-MenuBarPopup .menuPopupTopRight { + background: url(images/corner.png) no-repeat -5px -36px; + -background: url(images/corner_ie6.png) no-repeat -5px -36px; +} +.gwt-MenuBarPopup .menuPopupBottomLeft { + background: url(images/corner.png) no-repeat 0px -41px; + -background: url(images/corner_ie6.png) no-repeat 0px -41px; +} +.gwt-MenuBarPopup .menuPopupBottomRight { + background: url(images/corner.png) no-repeat -5px -41px; + -background: url(images/corner_ie6.png) no-repeat -5px -41px; +} +* html .gwt-MenuBarPopup .menuPopupTopLeftInner { + width: 5px; + height: 5px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupTopRightInner { + width: 8px; + height: 5px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupBottomLeftInner { + width: 5px; + height: 8px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupBottomRightInner { + width: 8px; + height: 8px; + overflow: hidden; +} + +.gwt-PasswordTextBox { + padding: 2px; +} +.gwt-PasswordTextBox-readonly { + color: #888; +} + +.gwt-PopupPanel { + border: 3px solid #e3e3e3; + padding: 3px; + background: white; +} + +.gwt-DecoratedPopupPanel .popupContent { +} +.gwt-DecoratedPopupPanel .popupMiddleCenter { + padding: 3px; + background: #e3e3e3; +} +.gwt-DecoratedPopupPanel .popupTopCenter { + background: url(images/hborder.png) repeat-x; +} +.gwt-DecoratedPopupPanel .popupBottomCenter { + background: url(images/hborder.png) repeat-x 0px -4px; + -background: url(images/hborder_ie6.png) repeat-x 0px -4px; +} +.gwt-DecoratedPopupPanel .popupMiddleLeft { + background: url(images/vborder.png) repeat-y; +} +.gwt-DecoratedPopupPanel .popupMiddleRight { + background: url(images/vborder.png) repeat-y -4px 0px; + -background: url(images/vborder_ie6.png) repeat-y -4px 0px; +} +.gwt-DecoratedPopupPanel .popupTopLeftInner { + width: 5px; + height: 5px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupTopRightInner { + width: 8px; + height: 5px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupBottomLeftInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupBottomRightInner { + width: 8px; + height: 8px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupTopLeft { + background: url(images/corner.png) no-repeat 0px -10px; + -background: url(images/corner_ie6.png) no-repeat 0px -10px; +} +.gwt-DecoratedPopupPanel .popupTopRight { + background: url(images/corner.png) no-repeat -5px -10px; + -background: url(images/corner_ie6.png) no-repeat -5px -10px; +} +.gwt-DecoratedPopupPanel .popupBottomLeft { + background: url(images/corner.png) no-repeat 0px -15px; + -background: url(images/corner_ie6.png) no-repeat 0px -15px; +} +.gwt-DecoratedPopupPanel .popupBottomRight { + background: url(images/corner.png) no-repeat -5px -15px; + -background: url(images/corner_ie6.png) no-repeat -5px -15px; +} +* html .gwt-DecoratedPopupPanel .popupTopLeftInner { + width: 5px; + height: 5px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupTopRightInner { + width: 8px; + height: 5px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupBottomLeftInner { + width: 5px; + height: 8px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupBottomRightInner { + width: 8px; + height: 8px; + overflow: hidden; +} + +.gwt-PopupPanelGlass { + background-color: #000; + opacity: 0.3; + filter: alpha(opacity=30); +} + +.gwt-PushButton-up, +.gwt-PushButton-up-hovering, +.gwt-PushButton-up-disabled, +.gwt-PushButton-down, +.gwt-PushButton-down-hovering, +.gwt-PushButton-down-disabled { + margin: 0; + text-decoration: none; + background: url("images/hborder.png") repeat-x 0px -27px; +} +.gwt-PushButton-up, +.gwt-PushButton-up-hovering, +.gwt-PushButton-up-disabled { + padding: 3px 5px 3px 5px; +} +.gwt-PushButton-up { + border: 1px outset #ccc; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-up-hovering { + border: 1px outset; + border-color: #9cf #69e #69e #7af; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-up-disabled { + border: 1px outset #ccc; + cursor: default; + opacity: .5; + filter: alpha(opacity=40); + zoom: 1; +} +.gwt-PushButton-down, +.gwt-PushButton-down-hovering, +.gwt-PushButton-down-disabled { + padding: 4px 4px 2px 6px; +} +.gwt-PushButton-down { + border: 1px inset #666; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-down-hovering { + border: 1px inset; + border-color: #9cf #69e #69e #7af; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-down-disabled { + border: 1px outset #ccc; + cursor: default; + opacity: 0.5; + filter: alpha(opacity=40); + zoom: 1; +} + +.gwt-RadioButton { +} +.gwt-RadioButton-disabled { + color: #888; +} + +.gwt-RichTextArea { +} +.hasRichTextToolbar { + border: 0px; +} +.gwt-RichTextToolbar { + background: #ebebeb url(images/hborder.png) repeat-x 0px -2003px; + border-bottom: 1px solid #BBBBBB; + padding: 3px; + margin: 0px; +} +.gwt-RichTextToolbar .gwt-PushButton-up { + padding: 0px 1px 0px 0px; + margin-right: 4px; + margin-bottom: 4px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-up-hovering { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-down { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-down-hovering { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-up { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-down { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} + +.gwt-StackPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-StackPanel .gwt-StackPanelItem { + cursor: pointer; + cursor: hand; + font-weight: bold; + font-size: 1.3em; + padding: 3px; + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.gwt-StackPanel .gwt-StackPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 2px 10px 5px; +} + +.gwt-DecoratedStackPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .gwt-StackPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 2px 10px 5px; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem { + cursor: pointer; + cursor: hand; +} +.gwt-DecoratedStackPanel .stackItemTopLeft, +.gwt-DecoratedStackPanel .stackItemTopRight { + height: 6px; + width: 6px; + zoom: 1; +} +.gwt-DecoratedStackPanel .stackItemTopLeft { + border-left: 1px solid #bbbbbb; + background: #e4e4e4 url(images/corner.png) no-repeat 0px -49px; + -background: #e4e4e4 url(images/corner_ie6.png) no-repeat 0px -49px; +} +.gwt-DecoratedStackPanel .stackItemTopRight { + border-right: 1px solid #bbbbbb; + background: #e4e4e4 url(images/corner.png) no-repeat -6px -49px; + -background: #e4e4e4 url(images/corner_ie6.png) no-repeat -6px -49px; +} +.gwt-DecoratedStackPanel .stackItemTopLeftInner, +.gwt-DecoratedStackPanel .stackItemTopRightInner { + width: 1px; + height: 1px; +} +* html .gwt-DecoratedStackPanel .stackItemTopLeftInner, +* html .gwt-DecoratedStackPanel .stackItemTopRightInner { + width: 6px; + height: 6px; + overflow: hidden; +} +.gwt-DecoratedStackPanel .stackItemTopCenter { + background: url(images/hborder.png) 0px -21px repeat-x; +} +.gwt-DecoratedStackPanel .stackItemMiddleLeft { + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; + border-left: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .stackItemMiddleLeftInner, +.gwt-DecoratedStackPanel .stackItemMiddleRightInner { + width: 1px; + height: 1px; +} +.gwt-DecoratedStackPanel .stackItemMiddleRight { + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; + border-right: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .stackItemMiddleCenter { + font-weight: bold; + font-size: 1.3em; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem-first .stackItemTopRight, +.gwt-DecoratedStackPanel .gwt-StackPanelItem-first .stackItemTopLeft { + border: 0px; + background-color: white; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem-below-selected .stackItemTopLeft, +.gwt-DecoratedStackPanel .gwt-StackPanelItem-below-selected .stackItemTopRight { + background-color: white; +} + +.gwt-SuggestBox { + padding: 2px; +} +.gwt-SuggestBoxPopup { + margin-left: 3px; +} +.gwt-SuggestBoxPopup .item { + padding: 2px 6px; + color: #424242; + cursor: default; +} +.gwt-SuggestBoxPopup .item-selected { + background: #cdcdcd; +} +.gwt-SuggestBoxPopup .suggestPopupContent { + background: white; +} +.gwt-SuggestBoxPopup .suggestPopupTopCenter { + background: url(images/hborder.png) repeat-x; +} +.gwt-SuggestBoxPopup .suggestPopupBottomCenter { + background: url(images/hborder.png) repeat-x 0px -4px; + -background: url(images/hborder_ie6.png) repeat-x 0px -4px; +} +.gwt-SuggestBoxPopup .suggestPopupMiddleLeft { + background: url(images/vborder.png) repeat-y; +} +.gwt-SuggestBoxPopup .suggestPopupMiddleRight { + background: url(images/vborder.png) repeat-y -4px 0px; + -background: url(images/vborder_ie6.png) repeat-y -4px 0px; +} +.gwt-SuggestBoxPopup .suggestPopupTopLeftInner { + width: 5px; + height: 5px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupTopRightInner { + width: 8px; + height: 5px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupBottomLeftInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupBottomRightInner { + width: 8px; + height: 8px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupTopLeft { + background: url(images/corner.png) no-repeat 0px -23px; + -background: url(images/corner_ie6.png) no-repeat 0px -23px; +} +.gwt-SuggestBoxPopup .suggestPopupTopRight { + background: url(images/corner.png) no-repeat -5px -23px; + -background: url(images/corner_ie6.png) no-repeat -5px -23px; +} +.gwt-SuggestBoxPopup .suggestPopupBottomLeft { + background: url(images/corner.png) no-repeat 0px -28px; + -background: url(images/corner_ie6.png) no-repeat 0px -28px; +} +.gwt-SuggestBoxPopup .suggestPopupBottomRight { + background: url(images/corner.png) no-repeat -5px -28px; + -background: url(images/corner_ie6.png) no-repeat -5px -28px; +} +* html .gwt-SuggestBoxPopup .suggestPopupTopLeftInner { + width: 5px; + height: 5px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupTopRightInner { + width: 8px; + height: 5px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupBottomLeftInner { + width: 5px; + height: 8px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupBottomRightInner { + width: 8px; + height: 8px; + overflow: hidden; +} + +.gwt-TabBar { +} +.gwt-TabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.gwt-TabBar .gwt-TabBarRest { +} +.gwt-TabBar .gwt-TabBarItem { + margin-left: 6px; + padding: 3px 6px 3px 6px; + cursor: pointer; + cursor: hand; + color: black; + font-weight: bold; + text-align: center; + background: #e3e3e3; +} +.gwt-TabBar .gwt-TabBarItem-selected { + cursor: default; + background: #bcbcbc; +} +.gwt-TabBar .gwt-TabBarItem-disabled { + cursor: default; + color: #999999; +} +.gwt-TabPanel { +} +.gwt-TabPanelBottom { + border-color: #bcbcbc; + border-style: solid; + border-width: 3px 2px 2px; + overflow: hidden; + padding: 6px; +} + +.gwt-DecoratedTabBar { +} +.gwt-DecoratedTabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.gwt-DecoratedTabBar .gwt-TabBarRest { +} +.gwt-DecoratedTabBar .gwt-TabBarItem { + border-collapse: collapse; + margin-left: 6px; +} +.gwt-DecoratedTabBar .tabTopCenter { + padding: 0px; + background: #e3e3e3; +} +.gwt-DecoratedTabBar .tabTopLeft, +.gwt-DecoratedTabBar .tabTopRight { + padding: 0px; + zoom: 1; +} +.gwt-DecoratedTabBar .tabTopLeftInner, +.gwt-DecoratedTabBar .tabTopRightInner { + width: 6px; + height: 6px; +} +.gwt-DecoratedTabBar .tabTopLeft { + background: url(images/corner.png) no-repeat 0px -55px; + -background: url(images/corner_ie6.png) no-repeat 0px -55px; +} +.gwt-DecoratedTabBar .tabTopRight { + background: url(images/corner.png) no-repeat -6px -55px; + -background: url(images/corner_ie6.png) no-repeat -6px -55px; +} +* html .gwt-DecoratedTabBar .tabTopLeftInner, +* html .gwt-DecoratedTabBar .tabTopRightInner { + width: 6px; + height: 6px; + overflow: hidden; +} +.gwt-DecoratedTabBar .tabMiddleLeft, +.gwt-DecoratedTabBar .tabMiddleRight { + width: 6px; + padding: 0px; + background: #e3e3e3 url(images/hborder.png) repeat-x 0px -1463px; +} +.gwt-DecoratedTabBar .tabMiddleLeftInner, +.gwt-DecoratedTabBar .tabMiddleRightInner { + width: 1px; + height: 1px; +} +.gwt-DecoratedTabBar .tabMiddleCenter { + padding: 0px 4px 2px 4px; + cursor: pointer; + cursor: hand; + color: black; + font-weight: bold; + text-align: center; + background: #e3e3e3 url(images/hborder.png) repeat-x 0px -1463px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopCenter { + background: #747474; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopLeft { + background-position: 0px -61px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopRight { + background-position: -6px -61px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleLeft, +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleRight { + background: #bcbcbc url(images/hborder.png) repeat-x 0px -2511px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleCenter { + cursor: default; + background: #bcbcbc url(images/hborder.png) repeat-x 0px -2511px; + color: white; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-disabled .tabMiddleCenter { + cursor: default; + color: #999999; +} + +.gwt-TextArea { + padding: 2px; +} +.gwt-TextArea-readonly { + color: #888; +} + +.gwt-TextBox { + padding: 2px; +} +.gwt-TextBox-readonly { + color: #888; +} + +.gwt-ToggleButton-up, +.gwt-ToggleButton-up-hovering, +.gwt-ToggleButton-up-disabled, +.gwt-ToggleButton-down, +.gwt-ToggleButton-down-hovering, +.gwt-ToggleButton-down-disabled { + margin: 0; + text-decoration: none; + background: url("images/hborder.png") repeat-x 0px -27px; +} +.gwt-ToggleButton-up, +.gwt-ToggleButton-up-hovering, +.gwt-ToggleButton-up-disabled { + padding: 3px 5px 3px 5px; +} +.gwt-ToggleButton-up { + border: 1px outset #ccc; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-up-hovering { + border: 1px outset; + border-color: #9cf #69e #69e #7af; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-up-disabled { + border: 1px outset #ccc; + cursor: default; + opacity: .5; + zoom: 1; + filter: alpha(opacity=40); +} +.gwt-ToggleButton-down, +.gwt-ToggleButton-down-hovering, +.gwt-ToggleButton-down-disabled { + padding: 4px 4px 2px 6px; +} +.gwt-ToggleButton-down { + background-position: 0 -513px; + border: 1px inset #ccc; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-down-hovering { + background-position: 0 -513px; + border: 1px inset; + border-color: #9cf #69e #69e #7af; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-down-disabled { + background-position: 0 -513px; + border: 1px inset #ccc; + cursor: default; + opacity: .5; + zoom: 1; + filter: alpha(opacity=40); +} + +.gwt-Tree .gwt-TreeItem { + padding: 1px 0px; + margin: 0px; + white-space: nowrap; + cursor: hand; + cursor: pointer; +} +.gwt-Tree .gwt-TreeItem-selected { + background: #93c2f1 url(images/hborder.png) repeat-x 0px -1463px; +} +.gwt-TreeItem .gwt-RadioButton input, +.gwt-TreeItem .gwt-CheckBox input { + margin-left: 0px; +} +* html .gwt-TreeItem .gwt-RadioButton input, +* html .gwt-TreeItem .gwt-CheckBox input { + margin-left: -4px; +} + +.gwt-DateBox input { + width: 8em; +} +.dateBoxFormatError { + background: #eed6d6; +} +.dateBoxPopup { +} + +.gwt-DatePicker { + border: 1px solid #888; + cursor: default; +} +.gwt-DatePicker td, +.datePickerMonthSelector td:focus { + outline: none +} +.datePickerDays { + width: 100%; + background: white; +} +.datePickerDay, +.datePickerWeekdayLabel, +.datePickerWeekendLabel { + font-size: 75%; + text-align: center; + padding: 4px; + outline: none; +} +.datePickerWeekdayLabel, +.datePickerWeekendLabel { + background: #c1c1c1; + padding: 0px 4px 2px; + cursor: default; +} +.datePickerDay { + padding: 4px; + cursor: hand; + cursor: pointer; +} +.datePickerDayIsToday { + border: 1px solid black; + padding: 3px; +} +.datePickerDayIsWeekend { + background: #EEEEEE; +} +.datePickerDayIsFiller { + color: #888888; +} +.datePickerDayIsValue { + background: #abf; +} +.datePickerDayIsDisabled { + color: #AAAAAA; + font-style: italic; +} +.datePickerDayIsHighlighted { + background: #dde; +} +.datePickerDayIsValueAndHighlighted { + background: #ccf; +} +.datePickerMonthSelector { + background: #c1c1c1; + width: 100%; +} +td.datePickerMonth { + text-align: center; + vertical-align: center; + white-space: nowrap; + font-size: 70%; + font-weight: bold; +} +.datePickerPreviousButton, +.datePickerNextButton { + font-size: 120%; + line-height: 1em; + cursor: hand; + cursor: pointer; + padding: 0px 4px; +} + +.gwt-StackLayoutPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelHeader { + cursor: pointer; + cursor: hand; + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; + + font-weight: bold; + font-size: 1.3em; + padding: 3px; + text-align: center; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelHeader-hovering { + background: #d3def6 url(images/hborder.png) repeat-x 0px -1464px; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 2px 10px 5px; +} + +.gwt-TabLayoutPanel { +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTabs { +} +.gwt-TabLayoutPanelContentContainer { + border-color: #bcbcbc; + border-style: solid; + border-width: 2px 1px 1px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelContent { + border-color: #bcbcbc; + border-style: solid; + border-width: 1px; + overflow: hidden; + padding: 6px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTab { + margin-left: 6px; + padding: 3px 6px 3px 6px; + cursor: pointer; + cursor: hand; + color: black; + font-weight: bold; + text-align: center; + background: #e3e3e3; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTab-selected { + cursor: default; + background: #bcbcbc; +} + +.gwt-SplitLayoutPanel-HDragger { + background: white url(images/splitPanelThumb.png) center center no-repeat; + cursor: col-resize; +} + +.gwt-SplitLayoutPanel-VDragger { + background: white url(images/splitPanelThumb.png) center center no-repeat; + cursor: row-resize; +} diff --git a/common/static/js/capa/jsme/gwt/chrome/chrome_rtl.css b/common/static/js/capa/jsme/gwt/chrome/chrome_rtl.css new file mode 100644 index 0000000000..9d316660b1 --- /dev/null +++ b/common/static/js/capa/jsme/gwt/chrome/chrome_rtl.css @@ -0,0 +1,1154 @@ +/** + * The file contains styles for GWT widgets in the chrome theme, in RTL mode. + * + * In order to maintain cross-browser compatibility, the following syntax is + * used to create IE6 specific style rules: + * .gwt-Widget { + * property: rule applies to all browsers + * -property: rule applies only to IE6 (overrides previous rule) + * } + * * html .gwt-Widget { + * property: rule applies to all versions of IE + * } + */ + +body, table td, select { + font-family: Arial Unicode MS, Arial, sans-serif; + font-size: small; +} +pre { + font-family: "courier new", courier; + font-size: small; +} +body { + color: black; + margin: 0px; + border: 0px; + padding: 0px; + background: #fff; + direction: rtl; +} +a, a:visited, a:hover { + color: #0000AA; +} + +/** + * The reference theme can be used to determine when this style sheet has + * loaded. Create a hidden div element with absolute position, assign the style + * name below, and attach it to the DOM. Use a timer to detect when the + * element's height and width are set to 5px. + */ +.gwt-Reference-chrome-rtl { + height: 5px; + width: 5px; + zoom: 1; +} + +.gwt-Button { + margin: 0; + padding: 3px 5px; + text-decoration: none; + font-size: small; + cursor: pointer; + cursor: hand; + background: url("images/hborder.png") repeat-x 0px -27px; + border: 1px outset #ccc; +} +.gwt-Button:active { + border: 1px inset #ccc; +} +.gwt-Button:hover { + border-color: #9cf #69e #69e #7af; +} +.gwt-Button[disabled] { + cursor: default; + color: #888; +} +.gwt-Button[disabled]:hover { + border: 1px outset #ccc; +} + +.gwt-CheckBox { +} +.gwt-CheckBox-disabled { + color: #888; +} + +.gwt-DecoratorPanel { +} +.gwt-DecoratorPanel .topCenter, +.gwt-DecoratorPanel .bottomCenter { + background: url(images/hborder.png) repeat-x; +} +.gwt-DecoratorPanel .middleLeft, +.gwt-DecoratorPanel .middleRight { + background: url(images/vborder.png) repeat-y; +} +.gwt-DecoratorPanel .topLeftInner, +.gwt-DecoratorPanel .topRightInner, +.gwt-DecoratorPanel .bottomLeftInner, +.gwt-DecoratorPanel .bottomRightInner { + width: 5px; + height: 5px; + zoom: 1; +} +.gwt-DecoratorPanel .topLeft { + background: url(images/corner.png) no-repeat 0px 0px; + -background: url(images/corner_ie6.png) no-repeat 0px 0px; +} +.gwt-DecoratorPanel .topRight { + background: url(images/corner.png) no-repeat -5px 0px; + -background: url(images/corner_ie6.png) no-repeat -5px 0px; +} +.gwt-DecoratorPanel .bottomLeft { + background: url(images/corner.png) no-repeat 0px -5px; + -background: url(images/corner_ie6.png) no-repeat 0px -5px; +} +.gwt-DecoratorPanel .bottomRight { + background: url(images/corner.png) no-repeat -5px -5px; + -background: url(images/corner_ie6.png) no-repeat -5px -5px; +} +* html .gwt-DecoratorPanel .topLeftInner, +* html .gwt-DecoratorPanel .topRightInner, +* html .gwt-DecoratorPanel .bottomLeftInner, +* html .gwt-DecoratorPanel .bottomRightInner { + width: 5px; + height: 5px; + overflow: hidden; +} + +.gwt-DialogBox .Caption { + background: #ebebeb url(images/hborder.png) repeat-x 0px -2003px; + padding: 4px 8px 4px 4px; + cursor: default; + border-bottom: 1px solid #bbbbbb; + border-top: 5px solid #e3e3e3; +} +.gwt-DialogBox .dialogContent { +} +.gwt-DialogBox .dialogMiddleCenter { + padding: 3px; + background: white; +} +.gwt-DialogBox .dialogBottomCenter { + background: url(images/hborder.png) repeat-x 0px -4px; + -background: url(images/hborder_ie6.png) repeat-x 0px -4px; +} +.gwt-DialogBox .dialogMiddleLeft { + background: url(images/vborder.png) repeat-y; +} +.gwt-DialogBox .dialogMiddleRight { + background: url(images/vborder.png) repeat-y -4px 0px; + -background: url(images/vborder_ie6.png) repeat-y -4px 0px; +} +.gwt-DialogBox .dialogTopLeftInner { + width: 5px; + zoom: 1; +} +.gwt-DialogBox .dialogTopRightInner { + width: 8px; + zoom: 1; +} +.gwt-DialogBox .dialogBottomLeftInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-DialogBox .dialogBottomRightInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-DialogBox .dialogTopLeft { + background: url(images/corner.png) no-repeat -13px 0px; + -background: url(images/corner_ie6.png) no-repeat -13px 0px; +} +.gwt-DialogBox .dialogTopRight { + background: url(images/corner.png) no-repeat -18px 0px; + -background: url(images/corner_ie6.png) no-repeat -18px 0px; +} +.gwt-DialogBox .dialogBottomLeft { + background: url(images/corner.png) no-repeat 0px -15px; + -background: url(images/corner_ie6.png) no-repeat 0px -15px; +} +.gwt-DialogBox .dialogBottomRight { + background: url(images/corner.png) no-repeat -5px -15px; + -background: url(images/corner_ie6.png) no-repeat -5px -15px; +} +* html .gwt-DialogBox .dialogTopLeftInner { + width: 5px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogTopRightInner { + width: 8px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogBottomLeftInner { + width: 5px; + height: 8px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogBottomRightInner { + width: 8px; + height: 8px; + overflow: hidden; +} + +.gwt-DisclosurePanel { +} +.gwt-DisclosurePanel-open { +} +.gwt-DisclosurePanel-closed { +} +.gwt-DisclosurePanel .header, +.gwt-DisclosurePanel .header a, +.gwt-DisclosurePanel .header td { + text-decoration: none; /* Remove underline from header */ + color: black; + cursor: pointer; + cursor: hand; +} +.gwt-DisclosurePanel .content { + border-right: 3px solid #e3e3e3; + padding: 4px 8px 4px 0px; + margin-right: 6px; +} + +.gwt-FileUpload { +} + +.gwt-Frame { + border-top: 2px solid #666; + border-left: 2px solid #666; + border-right: 2px solid #bbb; + border-bottom: 2px solid #bbb; +} + +.gwt-HorizontalSplitPanel { +} +.gwt-HorizontalSplitPanel .hsplitter { + cursor: move; + border: 0px; + background: #91c0ef url(images/vborder.png) repeat-y; + line-height: 0px; +} +.gwt-VerticalSplitPanel { +} +.gwt-VerticalSplitPanel .vsplitter { + cursor: move; + border: 0px; + background: #91c0ef url(images/hborder.png) repeat-x; + line-height: 0px; +} + +.gwt-HTML { +} + +.gwt-Hyperlink { + cursor: pointer; +} + +.gwt-Image { +} + +.gwt-Label { +} + +.gwt-ListBox { +} + +.gwt-MenuBar { + cursor: default; +} +.gwt-MenuBar .gwt-MenuItem { + cursor: default; +} +.gwt-MenuBar .gwt-MenuItem-selected { + background: #cdcdcd; +} +.gwt-MenuBar .gwt-MenuItem-disabled { + color: #cdcdcd; +} +.gwt-MenuBar-horizontal { + background: #ebebeb url(images/hborder.png) repeat-x 0px -2003px; + border: 1px solid #BBBBBB; +} +.gwt-MenuBar-horizontal .gwt-MenuItem { + padding: 0px 10px; + vertical-align: bottom; + color: #666666; + font-weight: bold; +} +.gwt-MenuBar-horizontal .gwt-MenuItemSeparator { + width: 1px; + padding: 0px; + margin: 0px; + border: 0px; + border-right: 1px solid #888888; + background: white; +} +.gwt-MenuBar-horizontal .gwt-MenuItemSeparator .menuSeparatorInner { + width: 1px; + height: 1px; + background: white; +} +.gwt-MenuBar-vertical { + margin-top: 0px; + margin-right: 0px; + background: white; +} +.gwt-MenuBar-vertical table { + border-collapse: collapse; +} +.gwt-MenuBar-vertical .gwt-MenuItem { + padding: 4px 1px 4px 14px; +} +.gwt-MenuBar-vertical .gwt-MenuItemSeparator { + padding: 2px 0px; +} +.gwt-MenuBar-vertical .gwt-MenuItemSeparator .menuSeparatorInner { + height: 1px; + padding: 0px; + border: 0px; + border-top: 1px solid #777777; + background: #ddddee; + overflow: hidden; +} +.gwt-MenuBar-vertical .subMenuIcon { + padding-left: 4px; +} +.gwt-MenuBar-vertical .subMenuIcon-selected { + background: #cdcdcd; +} +.gwt-MenuBarPopup { + margin: 0px 3px 0px 0px; +} +.gwt-MenuBarPopup .menuPopupTopCenter { + background: url(images/hborder.png) 0px -12px repeat-x; +} +.gwt-MenuBarPopup .menuPopupBottomCenter { + background: url(images/hborder.png) 0px -13px repeat-x; + -background: url(images/hborder_ie6.png) 0px -13px repeat-x; +} +.gwt-MenuBarPopup .menuPopupMiddleLeft { + background: url(images/vborder.png) -12px 0px repeat-y; + -background: url(images/vborder_ie6.png) -12px 0px repeat-y; +} +.gwt-MenuBarPopup .menuPopupMiddleRight { + background: url(images/vborder.png) -13px 0px repeat-y; + -background: url(images/vborder_ie6.png) -13px 0px repeat-y; +} +.gwt-MenuBarPopup .menuPopupTopLeftInner { + width: 5px; + height: 5px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupTopRightInner { + width: 8px; + height: 5px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupBottomLeftInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupBottomRightInner { + width: 8px; + height: 8px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupTopLeft { + background: url(images/corner.png) no-repeat 0px -36px; + -background: url(images/corner_ie6.png) no-repeat 0px -36px; +} +.gwt-MenuBarPopup .menuPopupTopRight { + background: url(images/corner.png) no-repeat -5px -36px; + -background: url(images/corner_ie6.png) no-repeat -5px -36px; +} +.gwt-MenuBarPopup .menuPopupBottomLeft { + background: url(images/corner.png) no-repeat 0px -41px; + -background: url(images/corner_ie6.png) no-repeat 0px -41px; +} +.gwt-MenuBarPopup .menuPopupBottomRight { + background: url(images/corner.png) no-repeat -5px -41px; + -background: url(images/corner_ie6.png) no-repeat -5px -41px; +} +* html .gwt-MenuBarPopup .menuPopupTopLeftInner { + width: 5px; + height: 5px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupTopRightInner { + width: 8px; + height: 5px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupBottomLeftInner { + width: 5px; + height: 8px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupBottomRightInner { + width: 8px; + height: 8px; + overflow: hidden; +} + +.gwt-PasswordTextBox { + padding: 2px; +} +.gwt-PasswordTextBox-readonly { + color: #888; +} + +.gwt-PopupPanel { + border: 3px solid #e3e3e3; + padding: 3px; + background: white; +} + +.gwt-DecoratedPopupPanel .popupContent { +} +.gwt-DecoratedPopupPanel .popupMiddleCenter { + padding: 3px; + background: #e3e3e3; +} +.gwt-DecoratedPopupPanel .popupTopCenter { + background: url(images/hborder.png) repeat-x; +} +.gwt-DecoratedPopupPanel .popupBottomCenter { + background: url(images/hborder.png) repeat-x 0px -4px; + -background: url(images/hborder_ie6.png) repeat-x 0px -4px; +} +.gwt-DecoratedPopupPanel .popupMiddleLeft { + background: url(images/vborder.png) repeat-y; +} +.gwt-DecoratedPopupPanel .popupMiddleRight { + background: url(images/vborder.png) repeat-y -4px 0px; + -background: url(images/vborder_ie6.png) repeat-y -4px 0px; +} +.gwt-DecoratedPopupPanel .popupTopLeftInner { + width: 5px; + height: 5px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupTopRightInner { + width: 8px; + height: 5px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupBottomLeftInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupBottomRightInner { + width: 8px; + height: 8px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupTopLeft { + background: url(images/corner.png) no-repeat 0px -10px; + -background: url(images/corner_ie6.png) no-repeat 0px -10px; +} +.gwt-DecoratedPopupPanel .popupTopRight { + background: url(images/corner.png) no-repeat -5px -10px; + -background: url(images/corner_ie6.png) no-repeat -5px -10px; +} +.gwt-DecoratedPopupPanel .popupBottomLeft { + background: url(images/corner.png) no-repeat 0px -15px; + -background: url(images/corner_ie6.png) no-repeat 0px -15px; +} +.gwt-DecoratedPopupPanel .popupBottomRight { + background: url(images/corner.png) no-repeat -5px -15px; + -background: url(images/corner_ie6.png) no-repeat -5px -15px; +} +* html .gwt-DecoratedPopupPanel .popupTopLeftInner { + width: 5px; + height: 5px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupTopRightInner { + width: 8px; + height: 5px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupBottomLeftInner { + width: 5px; + height: 8px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupBottomRightInner { + width: 8px; + height: 8px; + overflow: hidden; +} + +.gwt-PopupPanelGlass { + background-color: #000; + opacity: 0.3; + filter: alpha(opacity=30); +} + +.gwt-PushButton-up, +.gwt-PushButton-up-hovering, +.gwt-PushButton-up-disabled, +.gwt-PushButton-down, +.gwt-PushButton-down-hovering, +.gwt-PushButton-down-disabled { + margin: 0; + text-decoration: none; + background: url("images/hborder.png") repeat-x 0px -27px; +} +.gwt-PushButton-up, +.gwt-PushButton-up-hovering, +.gwt-PushButton-up-disabled { + padding: 3px 5px 3px 5px; +} +.gwt-PushButton-up { + border: 1px outset #ccc; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-up-hovering { + border: 1px outset; + border-color: #9cf #69e #69e #7af; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-up-disabled { + border: 1px outset #ccc; + cursor: default; + opacity: .5; + filter: alpha(opacity=40); + zoom: 1; +} +.gwt-PushButton-down, +.gwt-PushButton-down-hovering, +.gwt-PushButton-down-disabled { + padding: 4px 4px 2px 6px; +} +.gwt-PushButton-down { + border: 1px inset #666; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-down-hovering { + border: 1px inset; + border-color: #9cf #69e #69e #7af; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-down-disabled { + border: 1px outset #ccc; + cursor: default; + opacity: 0.5; + filter: alpha(opacity=40); + zoom: 1; +} + +.gwt-RadioButton { +} +.gwt-RadioButton-disabled { + color: #888; +} + +.gwt-RichTextArea { +} +.hasRichTextToolbar { + border: 0px; +} +.gwt-RichTextToolbar { + background: #ebebeb url(images/hborder.png) repeat-x 0px -2003px; + border-bottom: 1px solid #BBBBBB; + padding: 3px; + margin: 0px; +} +.gwt-RichTextToolbar .gwt-PushButton-up { + padding: 0px 0px 0px 1px; + margin-left: 4px; + margin-bottom: 4px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-up-hovering { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-down { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-down-hovering { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-up { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-down { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} + +.gwt-StackPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-StackPanel .gwt-StackPanelItem { + cursor: pointer; + cursor: hand; + font-weight: bold; + font-size: 1.3em; + padding: 3px; + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.gwt-StackPanel .gwt-StackPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 2px 10px 5px; +} + +.gwt-DecoratedStackPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .gwt-StackPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 5px 10px 2px; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem { + cursor: pointer; + cursor: hand; +} +.gwt-DecoratedStackPanel .stackItemTopLeft, +.gwt-DecoratedStackPanel .stackItemTopRight { + height: 6px; + width: 6px; + zoom: 1; +} +.gwt-DecoratedStackPanel .stackItemTopLeft { + border-left: 1px solid #bbbbbb; + background: #e4e4e4 url(images/corner.png) no-repeat 0px -49px; + -background: #e4e4e4 url(images/corner_ie6.png) no-repeat 0px -49px; +} +.gwt-DecoratedStackPanel .stackItemTopRight { + border-right: 1px solid #bbbbbb; + background: #e4e4e4 url(images/corner.png) no-repeat -6px -49px; + -background: #e4e4e4 url(images/corner_ie6.png) no-repeat -6px -49px; +} +.gwt-DecoratedStackPanel .stackItemTopLeftInner, +.gwt-DecoratedStackPanel .stackItemTopRightInner { + width: 1px; + height: 1px; +} +* html .gwt-DecoratedStackPanel .stackItemTopLeftInner, +* html .gwt-DecoratedStackPanel .stackItemTopRightInner { + width: 6px; + height: 6px; + overflow: hidden; +} +.gwt-DecoratedStackPanel .stackItemTopCenter { + background: url(images/hborder.png) 0px -21px repeat-x; +} +.gwt-DecoratedStackPanel .stackItemMiddleLeft { + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; + border-left: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .stackItemMiddleLeftInner, +.gwt-DecoratedStackPanel .stackItemMiddleRightInner { + width: 1px; + height: 1px; +} +.gwt-DecoratedStackPanel .stackItemMiddleRight { + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; + border-right: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .stackItemMiddleCenter { + font-weight: bold; + font-size: 1.3em; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem-first .stackItemTopRight, +.gwt-DecoratedStackPanel .gwt-StackPanelItem-first .stackItemTopLeft { + border: 0px; + background-color: white; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem-below-selected .stackItemTopLeft, +.gwt-DecoratedStackPanel .gwt-StackPanelItem-below-selected .stackItemTopRight { + background-color: white; +} + +.gwt-SuggestBox { + padding: 2px; +} +.gwt-SuggestBoxPopup { + margin-right: 3px; +} +.gwt-SuggestBoxPopup .item { + padding: 2px 6px; + color: #424242; + cursor: default; +} +.gwt-SuggestBoxPopup .item-selected { + background: #cdcdcd; +} +.gwt-SuggestBoxPopup .suggestPopupContent { + background: white; +} +.gwt-SuggestBoxPopup .suggestPopupTopCenter { + background: url(images/hborder.png) repeat-x; +} +.gwt-SuggestBoxPopup .suggestPopupBottomCenter { + background: url(images/hborder.png) repeat-x 0px -4px; + -background: url(images/hborder_ie6.png) repeat-x 0px -4px; +} +.gwt-SuggestBoxPopup .suggestPopupMiddleLeft { + background: url(images/vborder.png) repeat-y; +} +.gwt-SuggestBoxPopup .suggestPopupMiddleRight { + background: url(images/vborder.png) repeat-y -4px 0px; + -background: url(images/vborder_ie6.png) repeat-y -4px 0px; +} +.gwt-SuggestBoxPopup .suggestPopupTopLeftInner { + width: 5px; + height: 5px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupTopRightInner { + width: 8px; + height: 5px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupBottomLeftInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupBottomRightInner { + width: 8px; + height: 8px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupTopLeft { + background: url(images/corner.png) no-repeat 0px -23px; + -background: url(images/corner_ie6.png) no-repeat 0px -23px; +} +.gwt-SuggestBoxPopup .suggestPopupTopRight { + background: url(images/corner.png) no-repeat -5px -23px; + -background: url(images/corner_ie6.png) no-repeat -5px -23px; +} +.gwt-SuggestBoxPopup .suggestPopupBottomLeft { + background: url(images/corner.png) no-repeat 0px -28px; + -background: url(images/corner_ie6.png) no-repeat 0px -28px; +} +.gwt-SuggestBoxPopup .suggestPopupBottomRight { + background: url(images/corner.png) no-repeat -5px -28px; + -background: url(images/corner_ie6.png) no-repeat -5px -28px; +} +* html .gwt-SuggestBoxPopup .suggestPopupTopLeftInner { + width: 5px; + height: 5px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupTopRightInner { + width: 8px; + height: 5px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupBottomLeftInner { + width: 5px; + height: 8px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupBottomRightInner { + width: 8px; + height: 8px; + overflow: hidden; +} + +.gwt-TabBar { +} +.gwt-TabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.gwt-TabBar .gwt-TabBarRest { +} +.gwt-TabBar .gwt-TabBarItem { + margin-left: 6px; + padding: 3px 6px 3px 6px; + cursor: pointer; + cursor: hand; + color: black; + font-weight: bold; + text-align: center; + background: #e3e3e3; +} +.gwt-TabBar .gwt-TabBarItem-selected { + cursor: default; + background: #bcbcbc; +} +.gwt-TabBar .gwt-TabBarItem-disabled { + cursor: default; + color: #999999; +} +.gwt-TabPanel { +} +.gwt-TabPanelBottom { + border-color: #bcbcbc; + border-style: solid; + border-width: 3px 2px 2px; + overflow: hidden; + padding: 6px; +} + +.gwt-DecoratedTabBar { +} +.gwt-DecoratedTabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.gwt-DecoratedTabBar .gwt-TabBarRest { +} +.gwt-DecoratedTabBar .gwt-TabBarItem { + border-collapse: collapse; + margin-right: 6px; +} +.gwt-DecoratedTabBar .tabTopCenter { + padding: 0px; + background: #e3e3e3; +} +.gwt-DecoratedTabBar .tabTopLeft, +.gwt-DecoratedTabBar .tabTopRight { + padding: 0px; + zoom: 1; +} +.gwt-DecoratedTabBar .tabTopLeftInner, +.gwt-DecoratedTabBar .tabTopRightInner { + width: 6px; + height: 6px; +} +.gwt-DecoratedTabBar .tabTopLeft { + background: url(images/corner.png) no-repeat 0px -55px; + -background: url(images/corner_ie6.png) no-repeat 0px -55px; +} +.gwt-DecoratedTabBar .tabTopRight { + background: url(images/corner.png) no-repeat -6px -55px; + -background: url(images/corner_ie6.png) no-repeat -6px -55px; +} +* html .gwt-DecoratedTabBar .tabTopLeftInner, +* html .gwt-DecoratedTabBar .tabTopRightInner { + width: 6px; + height: 6px; + overflow: hidden; +} +.gwt-DecoratedTabBar .tabMiddleLeft, +.gwt-DecoratedTabBar .tabMiddleRight { + width: 6px; + padding: 0px; + background: #e3e3e3 url(images/hborder.png) repeat-x 0px -1463px; +} +.gwt-DecoratedTabBar .tabMiddleLeftInner, +.gwt-DecoratedTabBar .tabMiddleRightInner { + width: 1px; + height: 1px; +} +.gwt-DecoratedTabBar .tabMiddleCenter { + padding: 0px 4px 2px 4px; + cursor: pointer; + cursor: hand; + color: black; + font-weight: bold; + text-align: center; + background: #e3e3e3 url(images/hborder.png) repeat-x 0px -1463px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopCenter { + background: #747474; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopLeft { + background-position: 0px -61px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopRight { + background-position: -6px -61px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleLeft, +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleRight { + background: #bcbcbc url(images/hborder.png) repeat-x 0px -2511px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleCenter { + cursor: default; + background: #bcbcbc url(images/hborder.png) repeat-x 0px -2511px; + color: white; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-disabled .tabMiddleCenter { + cursor: default; + color: #999999; +} + +.gwt-TextArea { + padding: 2px; +} +.gwt-TextArea-readonly { + color: #888; +} + +.gwt-TextBox { + padding: 2px; +} +.gwt-TextBox-readonly { + color: #888; +} + +.gwt-ToggleButton-up, +.gwt-ToggleButton-up-hovering, +.gwt-ToggleButton-up-disabled, +.gwt-ToggleButton-down, +.gwt-ToggleButton-down-hovering, +.gwt-ToggleButton-down-disabled { + margin: 0; + text-decoration: none; + background: url("images/hborder.png") repeat-x 0px -27px; +} +.gwt-ToggleButton-up, +.gwt-ToggleButton-up-hovering, +.gwt-ToggleButton-up-disabled { + padding: 3px 5px 3px 5px; +} +.gwt-ToggleButton-up { + border: 1px outset #ccc; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-up-hovering { + border: 1px outset; + border-color: #9cf #69e #69e #7af; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-up-disabled { + border: 1px outset #ccc; + cursor: default; + opacity: .5; + zoom: 1; + filter: alpha(opacity=40); +} +.gwt-ToggleButton-down, +.gwt-ToggleButton-down-hovering, +.gwt-ToggleButton-down-disabled { + padding: 4px 4px 2px 6px; +} +.gwt-ToggleButton-down { + background-position: 0 -513px; + border: 1px inset #ccc; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-down-hovering { + background-position: 0 -513px; + border: 1px inset; + border-color: #9cf #69e #69e #7af; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-down-disabled { + background-position: 0 -513px; + border: 1px inset #ccc; + cursor: default; + opacity: .5; + zoom: 1; + filter: alpha(opacity=40); +} + +.gwt-Tree .gwt-TreeItem { + padding: 1px 0px; + margin: 0px; + white-space: nowrap; + cursor: hand; + cursor: pointer; + zoom: 1; +} +.gwt-Tree .gwt-TreeItem-selected { + background: #93c2f1 url(images/hborder.png) repeat-x 0px -1463px; +} +.gwt-TreeItem .gwt-RadioButton input, +.gwt-TreeItem .gwt-CheckBox input { + margin-right: 0px; +} +* html .gwt-TreeItem .gwt-RadioButton input, +* html .gwt-TreeItem .gwt-CheckBox input { + margin-right: -4px; +} + +.gwt-DateBox input { + width: 8em; +} +.dateBoxFormatError { + background: #eed6d6; +} +.dateBoxPopup { +} + +.gwt-DatePicker { + border: 1px solid #888; + cursor: default; +} +.gwt-DatePicker td, +.datePickerMonthSelector td:focus { + outline: none +} +.datePickerDays { + width: 100%; + background: white; +} +.datePickerDay, +.datePickerWeekdayLabel, +.datePickerWeekendLabel { + font-size: 75%; + text-align: center; + padding: 4px; + outline: none; +} +.datePickerWeekdayLabel, +.datePickerWeekendLabel { + background: #c1c1c1; + padding: 0px 4px 2px; + cursor: default; +} +.datePickerDay { + padding: 4px; + cursor: hand; + cursor: pointer; +} +.datePickerDayIsToday { + border: 1px solid black; + padding: 3px; +} +.datePickerDayIsWeekend { + background: #EEEEEE; +} +.datePickerDayIsFiller { + color: #888888; +} +.datePickerDayIsValue { + background: #abf; +} +.datePickerDayIsDisabled { + color: #AAAAAA; + font-style: italic; +} +.datePickerDayIsHighlighted { + background: #dde; +} +.datePickerDayIsValueAndHighlighted { + background: #ccf; +} +.datePickerMonthSelector { + background: #c1c1c1; + width: 100%; +} +td.datePickerMonth { + text-align: center; + vertical-align: center; + white-space: nowrap; + font-size: 70%; + font-weight: bold; +} +.datePickerPreviousButton, +.datePickerNextButton { + font-size: 120%; + line-height: 1em; + cursor: hand; + cursor: pointer; + padding: 0px 4px; +} + +.gwt-StackLayoutPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelHeader { + cursor: pointer; + cursor: hand; + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; + + font-weight: bold; + font-size: 1.3em; + padding: 3px; + text-align: center; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelHeader-hovering { + background: #d3def6 url(images/hborder.png) repeat-x 0px -1464px; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 5px 10px 2px; +} + +.gwt-TabLayoutPanel { +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTabs { +} +.gwt-TabLayoutPanelContentContainer { + border-color: #bcbcbc; + border-style: solid; + border-width: 2px 1px 1px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelContent { + border-color: #bcbcbc; + border-style: solid; + border-width: 1px; + overflow: hidden; + padding: 6px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTab { + margin-left: 6px; + padding: 3px 6px 3px 6px; + cursor: pointer; + cursor: hand; + color: black; + font-weight: bold; + text-align: center; + background: #e3e3e3; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTab-selected { + cursor: default; + background: #bcbcbc; +} + +.gwt-SplitLayoutPanel-HDragger { + background: white url(images/splitPanelThumb.png) center center no-repeat; + cursor: col-resize; +} + +.gwt-SplitLayoutPanel-VDragger { + background: white url(images/splitPanelThumb.png) center center no-repeat; + cursor: row-resize; +} diff --git a/common/static/js/capa/jsme/gwt/chrome/images/button/menu-button-arrow-disabled.png b/common/static/js/capa/jsme/gwt/chrome/images/button/menu-button-arrow-disabled.png new file mode 100644 index 0000000000..8cef2abb31 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/button/menu-button-arrow-disabled.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/button/menu-button-arrow.png b/common/static/js/capa/jsme/gwt/chrome/images/button/menu-button-arrow.png new file mode 100644 index 0000000000..f03dfee4e4 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/button/menu-button-arrow.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-active.png b/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-active.png new file mode 100644 index 0000000000..fa58c5030e Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-active.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-disabled.png b/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-disabled.png new file mode 100644 index 0000000000..0a6a82c640 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-disabled.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-focus.png b/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-focus.png new file mode 100644 index 0000000000..167d71eb72 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-focus.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-hover.png b/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-hover.png new file mode 100644 index 0000000000..167d71eb72 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow-hover.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow.png b/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow.png new file mode 100644 index 0000000000..b33a93ff2d Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/button/split-button-arrow.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/combobox/arrow-down-disabled.png b/common/static/js/capa/jsme/gwt/chrome/images/combobox/arrow-down-disabled.png new file mode 100644 index 0000000000..3c5f5ecd55 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/combobox/arrow-down-disabled.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/combobox/arrow-down.png b/common/static/js/capa/jsme/gwt/chrome/images/combobox/arrow-down.png new file mode 100644 index 0000000000..b298d6e77b Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/combobox/arrow-down.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/combobox/ellipsis-disabled.png b/common/static/js/capa/jsme/gwt/chrome/images/combobox/ellipsis-disabled.png new file mode 100644 index 0000000000..a9a225dfdc Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/combobox/ellipsis-disabled.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/combobox/ellipsis.png b/common/static/js/capa/jsme/gwt/chrome/images/combobox/ellipsis.png new file mode 100644 index 0000000000..aca78e7837 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/combobox/ellipsis.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/corner.png b/common/static/js/capa/jsme/gwt/chrome/images/corner.png new file mode 100644 index 0000000000..f57b153fb3 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/corner.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/corner_ie6.png b/common/static/js/capa/jsme/gwt/chrome/images/corner_ie6.png new file mode 100644 index 0000000000..fd1ccf0a0e Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/corner_ie6.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/fasttree/selectionBar.gif b/common/static/js/capa/jsme/gwt/chrome/images/fasttree/selectionBar.gif new file mode 100644 index 0000000000..11e3caf896 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/fasttree/selectionBar.gif differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/fasttree/treeClosed.gif b/common/static/js/capa/jsme/gwt/chrome/images/fasttree/treeClosed.gif new file mode 100644 index 0000000000..7bda586151 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/fasttree/treeClosed.gif differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/fasttree/treeLoading.gif b/common/static/js/capa/jsme/gwt/chrome/images/fasttree/treeLoading.gif new file mode 100644 index 0000000000..371963f67c Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/fasttree/treeLoading.gif differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/fasttree/treeOpen.gif b/common/static/js/capa/jsme/gwt/chrome/images/fasttree/treeOpen.gif new file mode 100644 index 0000000000..0fcf791e00 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/fasttree/treeOpen.gif differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/glasspanel/blue_ridge.png b/common/static/js/capa/jsme/gwt/chrome/images/glasspanel/blue_ridge.png new file mode 100644 index 0000000000..cb96282a6c Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/glasspanel/blue_ridge.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/hborder.png b/common/static/js/capa/jsme/gwt/chrome/images/hborder.png new file mode 100644 index 0000000000..f11658cceb Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/hborder.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/hborder_ie6.png b/common/static/js/capa/jsme/gwt/chrome/images/hborder_ie6.png new file mode 100644 index 0000000000..4f4dea1d24 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/hborder_ie6.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/ie6/corner_dialog_topleft.png b/common/static/js/capa/jsme/gwt/chrome/images/ie6/corner_dialog_topleft.png new file mode 100644 index 0000000000..a0b04f0263 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/ie6/corner_dialog_topleft.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/ie6/corner_dialog_topright.png b/common/static/js/capa/jsme/gwt/chrome/images/ie6/corner_dialog_topright.png new file mode 100644 index 0000000000..16f3d0e65f Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/ie6/corner_dialog_topright.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/ie6/hborder_blue_shadow.png b/common/static/js/capa/jsme/gwt/chrome/images/ie6/hborder_blue_shadow.png new file mode 100644 index 0000000000..d8c41d38f0 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/ie6/hborder_blue_shadow.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/ie6/hborder_gray_shadow.png b/common/static/js/capa/jsme/gwt/chrome/images/ie6/hborder_gray_shadow.png new file mode 100644 index 0000000000..f4d1844f6a Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/ie6/hborder_gray_shadow.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/ie6/vborder_blue_shadow.png b/common/static/js/capa/jsme/gwt/chrome/images/ie6/vborder_blue_shadow.png new file mode 100644 index 0000000000..bd154aee49 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/ie6/vborder_blue_shadow.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/ie6/vborder_gray_shadow.png b/common/static/js/capa/jsme/gwt/chrome/images/ie6/vborder_gray_shadow.png new file mode 100644 index 0000000000..fccce493ec Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/ie6/vborder_gray_shadow.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/scrolltable/bg_header_gradient.gif b/common/static/js/capa/jsme/gwt/chrome/images/scrolltable/bg_header_gradient.gif new file mode 100644 index 0000000000..48e5c32636 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/scrolltable/bg_header_gradient.gif differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/splitPanelThumb.png b/common/static/js/capa/jsme/gwt/chrome/images/splitPanelThumb.png new file mode 100644 index 0000000000..d2ef0255d8 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/splitPanelThumb.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/valuespinner/bg_textbox.png b/common/static/js/capa/jsme/gwt/chrome/images/valuespinner/bg_textbox.png new file mode 100644 index 0000000000..8f66df8dfc Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/valuespinner/bg_textbox.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/vborder.png b/common/static/js/capa/jsme/gwt/chrome/images/vborder.png new file mode 100644 index 0000000000..b9f7ddc345 Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/vborder.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/images/vborder_ie6.png b/common/static/js/capa/jsme/gwt/chrome/images/vborder_ie6.png new file mode 100644 index 0000000000..c5596d3def Binary files /dev/null and b/common/static/js/capa/jsme/gwt/chrome/images/vborder_ie6.png differ diff --git a/common/static/js/capa/jsme/gwt/chrome/mosaic.css b/common/static/js/capa/jsme/gwt/chrome/mosaic.css new file mode 100644 index 0000000000..9b6a242ea3 --- /dev/null +++ b/common/static/js/capa/jsme/gwt/chrome/mosaic.css @@ -0,0 +1,1161 @@ +/** + * The file contains styles for GWT widgets in the standard theme. + * + * In order to maintain cross-browser compatibility, the following syntax is + * used to create IE6 specific style rules: + * html>body .gwt-Widget { + * Rule applies to all browsers (including IE7), except IE6 + * } + * * html .gwt-Widget { + * Rule applied to IE6 only (not to IE7) + * } + * + * Specifically, IE6 does not support images with multiple transparent colors, + * so we need to use the AlphaImageLoader in IE6 only. + */ + +/** + * The reference theme can be used to determine when this style sheet has + * loaded. Create a hidden div element with absolute position, assign the style + * name below, and attach it to the DOM. Use a timer to detect when the + * element's height and width are set to 5px. + */ +.mosaic-Reference-chrome { + height: 5px; + width: 5px; + zoom: 1; +} + +body { + font-family: arial,sans-serif; +} + +div,td { + color: #000000; +} + +a:link { + color:#0000cc; +} + +a:visited { + color:#551a8b; +} + +a:active { + color:#ff0000; +} + +/*** Button ***/ + +.gwt-Button { + /* IE hack */ + overflow: visible; +} + +/*** TextBox & TextArea */ + +.gwt-TextBox, +.gwt-PasswordTextBox, +.gwt-TextArea { + margin: 0px; + padding: 0px; + text-decoration: none; + font-size: 10pt; + border: 1px inset #ccc; +} + +/*** DecoratedButton ***/ + +.mosaic-DecoratedButton { + margin: 0px; + text-decoration: none; + font-size: small; + cursor: pointer; + cursor: hand; + background: url("images/hborder.png") repeat-x 0px -27px; + border: none; + border-collapse: collapse; + table-layout: fixed; +} +.mosaic-DecoratedButton .buttonTopCenter, +.mosaic-DecoratedButton .buttonBottomCenter { + height: 1px !important; + background: #444; +} +.mosaic-DecoratedButton .buttonTopCenterInner, +.mosaic-DecoratedButton .buttonBottomCenterInner { + height: 1px !important; + background: #f00; +} +.mosaic-DecoratedButton .buttonMiddleLeft, +.mosaic-DecoratedButton .buttonMiddleRight { + width: 1px; + background: #444; +} +.mosaic-DecoratedButton .buttonTopLeftInner, +.mosaic-DecoratedButton .buttonTopRightInner, +.mosaic-DecoratedButton .buttonBottomLeftInner, +.mosaic-DecoratedButton .buttonBottomRightInner { + width: 1px; + height: 1px; +} +.mosaic-DecoratedButton .buttonMiddleCenterInner { + width: 100%; + height: 100%; + background: #0ff; +} + +/*** ComboBox ***/ + +.mosaic-ComboBox { + border: 1px inset #ccc; + background: url("images/hborder.png") repeat-x 0px -27px; +} + +.mosaic-ComboBox input { + border: 0px; + text-align: middle; +} +.mosaic-ComboBox button { + width: 17px !important; + border: 0px; + border-left: 1px solid #ccc; + padding: 0px; + background-position: center center; + background-repeat: no-repeat; + background-image: url(images/combobox/arrow-down.png); +} + +/*** ToolButton ***/ + +.mosaic-ToolButton { + margin: 0px; + padding: 0px; + border: 0px; + background: url("images/hborder.png") repeat-x 0px -27px; +} +.mosaic-ToolButton .mosaic-Button { + margin: 0; + padding: 3px 5px; + text-decoration: none; + font-size: small; + cursor: pointer; + cursor: hand; + background: url("images/hborder.png") repeat-x 0px -27px; + border: 1px outset #ccc; +} +.mosaic-ToolButton .mosaic-Button:active { + border: 1px inset #ccc; +} +.mosaic-ToolButton .mosaic-Button:hover { + border-color: #9cf #69e #69e #7af; +} +.mosaic-ToolButton .mosaic-Button[disabled] { + cursor: default; + color: #888; +} +.mosaic-ToolButton .mosaic-Button[disabled]:hover { + border: 1px outset #ccc; +} +.mosaic-ToolButton .mosaic-Button { + background: none; +} +.mosaic-ToolButton .mosaic-Menu-Button, +.mosaic-ToolButton .mosaic-Split-Button { + padding-right: 20px; + background-position: right center; + background-repeat: no-repeat; +} +.mosaic-ToolButton .mosaic-Menu-Button { + background-image: url(images/button/menu-button-arrow.png); +} +.mosaic-ToolButton .mosaic-Split-Button { + background-image: url(images/button/split-button-arrow.png); +} +.mosaic-ToolButton .mosaic-Split-Button-focus { + background-image: url(images/button/split-button-arrow-focus.png); +} +.mosaic-ToolButton .mosaic-Split-Button-hover { + background-image: url(images/button/split-button-arrow-hover.png); +} +.mosaic-ToolButton .mosaic-Split-Button-activeoption { + background-image: url(images/button/split-button-arrow-active.png); +} + +/* Checked state */ + +.mosaic-ToolButton .mosaic-Checkbox-Button-checked { + border: 1px inset #ccc; + background-color: #ccc; +} + +/* Disabled state */ + +.mosaic-ToolButton .mosaic-Menu-Button-disabled { + background-image: url(images/button/menu-button-arrow-disabled.png); +} + +.mosaic-ToolButton .mosaic-Split-Button-disabled { + background-image: url(images/button/split-button-arrow-disabled.png); +} + +.mosaic-ToolButton .mosaic-Checkbox-Button-checked[disabled] { + border: 1px inset #ccc; +} + +/*** Caption ***/ + +.mosaic-Caption { + background: #e3e8f3 url(images/hborder.png) repeat-x 0px -2003px; + border-bottom: 1px solid #bbbbbb; +} +.mosaic-Caption-iconBoxLeft { + padding: 0px 0px 0px 2px; +} +.mosaic-Caption-iconBoxRight { + padding: 0px 2px 0px 0px; +} +.mosaic-Caption-text { + padding: 4px 4px 4px 4px; + text-align: left !important; + font-weight: bold; + white-space: nowrap; + overflow: hidden; +} + +/*** DropDownPanel ***/ + +.mosaic-DropDownPanel { + +} + +.mosaic-DropDownPanel .mosaic-ComboBoxList { + background: white; + border: none; + margin: 0px; + padding: 0px; +} + +.mosaic-DropDownPanel .gwt-ScrollTable, +.mosaic-DropDownPanel .mosaic-ColumnWidget, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable { + border-color: #aaa; + border-style: solid; + border-width: 1px 0px 1px 1px; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .headerWrapper, +.mosaic-DropDownPanel .mosaic-ColumnWidget .headerWrapper, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .headerWrapper { + background: #8bd url(images/scrolltable/bg_header_gradient.gif) repeat-x bottom left; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .footerWrapper, +.mosaic-DropDownPanel .mosaic-ColumnWidget .footerWrapper, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .footerWrapper { + border-top: 1px solid #aaa; + background: #8bd url(images/scrolltable/bg_header_gradient.gif) repeat-x bottom left; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable td, +.mosaic-DropDownPanel .gwt-ScrollTable .headerTable td, +.mosaic-DropDownPanel .gwt-ScrollTable .footerTable td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .headerTable td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .footerTable td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .headerTable td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .footerTable td { + border-color: #aaa; + border-style: solid; + border-width: 0px 0px 0px 0px; + white-space: nowrap; + overflow: hidden; + padding: 1px 3px; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .headerTable td, +.mosaic-DropDownPanel .gwt-ScrollTable .footerTable td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .headerTable td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .footerTable td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .headerTable td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .footerTable td { + color: #fff; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.hovering, +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.highlighted, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.hovering, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.highlighted, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.hovering, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.highlighted { + background: #C3D9FF; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.hovering, +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.highlighted, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.hovering, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.highlighted, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.hovering, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.highlighted { + /*background: #FFFFAA;*/ + cursor: hand; + cursor: pointer; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.selected td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.selected td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.selected td { + background: #7AA5D6; +} + +/*** WindowPanel ***/ + +.mosaic-WindowPanel { +} +.mosaic-WindowPanel .mosaic-CaptionLayoutPanel .dragdrop-handle { + cursor: move; + user-select: none; + -khtml-user-select: none; + -moz-user-select: none; +} +.mosaic-WindowPanel .mosaic-CaptionLayoutPanel { + padding: 0px; + margin: 0px; + + /* debug */ + /*border: 1px solid #00f;*/ +} +.mosaic-WindowPanel .Body { + background: white; +} +.mosaic-MessageBox .Body { + background: none; +} +.mosaic-WindowPanel .Footer { +} +.mosaic-WindowPanel .popupMiddleCenter { + padding: 0px; + margin: 0px; +} +.mosaic-WindowPanel .Resize-nw { + cursor: nw-resize; +} +.mosaic-WindowPanel .Resize-n { + cursor: n-resize; +} +.mosaic-WindowPanel .Resize-ne { + cursor: ne-resize; +} +.mosaic-WindowPanel .Resize-e { + cursor: e-resize; +} +.mosaic-WindowPanel .Resize-se { + cursor: se-resize; +} +.mosaic-WindowPanel .Resize-s { + cursor: s-resize; +} +.mosaic-WindowPanel .Resize-sw { + cursor: sw-resize; +} +.mosaic-WindowPanel .Resize-w { + cursor: w-resize; +} + +/*** GlassPanel ***/ + +.mosaic-GlassPanel-loading, +.gwt-GlassPanel { + /* Override glass panel color to be `green` */ + background-color: #000 !important; + background-repeat: repeat; + + /* Override glass panel to 10% opacity (= 90% transparency) */ + filter: alpha(opacity = 10) !important; /* IE */ + opacity: 0.1 !important; /* non-IE */ + + /* + NOTE: Please do NOT use either CSS 'width' or 'height' here, as + this would defeat much of the effort that went into GlassPanel + in order to get it to work consistently in a variety of + circumstances. Specifically, please resist the urge to use + 'width/height: 100%' or similar constructs. + */ +} +.mosaic-GlassPanel-invisible { + /* Override glass panel color to be `green` */ + background-color: #000 !important; + background-repeat: repeat; + + /* Override glass panel to 0% opacity (= 100% transparency) */ + filter: alpha(opacity = 0) !important; /* IE */ + opacity: 0.0 !important; /* non-IE */ +} +.mosaic-GlassPanel-default, +.mosaic-GlassPanel-blue_ridge { + background-image: url("images/glasspanel/blue_ridge.png"); + background-repeat: repeat; + + filter: alpha(opacity = 33) !important; /* IE */ + opacity: 0.3 !important; /* non-IE */ +} +/*** ImageButton ***/ + +.mosaic-ImageButton { + cursor: pointer; +} + +.mosaic-ImageButton img { + display: block; + + /* + * Unfortunately, in IE, border-color: transparent is rendered as black. + * We get around the border on hover displacement of content by adjusting + * the margin/padding at the same time. + */ + border: 0px solid transparent; + margin: 1px; +} +.mosaic-ImageButton img:hover { + /* + * Unfortunately, in IE, border-color: transparent is rendered as black. + * We get around the border on hover displacement of content by adjusting + * the margin/padding at the same time. + */ + border: 1px solid #4d4d4d; + margin: 0px; + + background-color: #ccc; +} +.mosaic-ImageButton img:active { + background-color: #dcc; +} + +/*** InfoPanel ***/ + +.mosaic-InfoPanel { +} +.mosaic-InfoPanel-panel { +} +.mosaic-InfoPanel-caption { + font-weight: bold; + display: block; +} +.mosaic-InfoPanel-description { +} + +/*** TabLayoutPanel ***/ + +.mosaic-TabLayoutPanel { +} + +.mosaic-TabLayoutPanelBottom { +/* + border-color: #92c1f0; + border-style: solid; + border-width: 3px 2px 2px 2px; +*/ +} + +/*** ScrollTabBar ***/ + +.mosaic-ScrollTabBar { +} + +.mosaic-ScrollTabBar .mosaic-ScrollTabBar-NavBar { + margin: 0px 2px !important; +} + +.mosaic-ScrollTabBar button { + padding: 0px !important; + margin: 0px 0px 2px 0px !important; + border: 1px solid #ccc; +} + +/*** ScrollTable ***/ + +.gwt-ScrollTable, +.mosaic-ColumnWidget, +.mosaic-ScrollTreeTable { + border-color: #aaa; + border-style: solid; + border-width: 1px 0px 1px 1px; +} + +.gwt-ScrollTable .headerWrapper, +.mosaic-ColumnWidget .headerWrapper, +.mosaic-ScrollTreeTable .headerWrapper { + background: #8bd url(images/scrolltable/bg_header_gradient.gif) repeat-x bottom left; +} + +.gwt-ScrollTable .footerWrapper, +.mosaic-ColumnWidget .footerWrapper, +.mosaic-ScrollTreeTable .footerWrapper { + border-top: 1px solid #aaa; + background: #8bd url(images/scrolltable/bg_header_gradient.gif) repeat-x bottom left; +} + +.gwt-ScrollTable .dataTable td, +.gwt-ScrollTable .headerTable td, +.gwt-ScrollTable .footerTable td, +.mosaic-ColumnWidget .dataTable td, +.mosaic-ColumnWidget .headerTable td, +.mosaic-ColumnWidget .footerTable td, +.mosaic-ScrollTreeTable .dataTable td, +.mosaic-ScrollTreeTable .headerTable td, +.mosaic-ScrollTreeTable .footerTable td { + border-color: #aaa; + border-style: solid; + border-width: 0px 1px 1px 0px; + white-space: nowrap; + overflow: hidden; +} + +.gwt-ScrollTable .headerTable td, +.gwt-ScrollTable .footerTable td, +.mosaic-ColumnWidget .headerTable td, +.mosaic-ColumnWidget .footerTable td, +.mosaic-ScrollTreeTable .headerTable td, +.mosaic-ScrollTreeTable .footerTable td { + color: #fff; +} + +.gwt-ScrollTable .dataTable tr.highlighted, /* gen2 */ +.gwt-ScrollTable .dataTable tr.hovering, +.mosaic-ColumnWidget .dataTable tr.hovering, +.mosaic-ScrollTreeTable .dataTable tr.hovering { + background: #C3D9FF; +} + +.gwt-ScrollTable .dataTable td.highlighted, /* gen2 */ +.gwt-ScrollTable .dataTable td.hovering, +.mosaic-ColumnWidget .dataTable td.hovering, +.mosaic-ScrollTreeTable .dataTable td.hovering { + background: #FFFFAA; + cursor: hand; + cursor: pointer; +} + +.gwt-ScrollTable .dataTable tr.selected, +.mosaic-ColumnWidget .dataTable tr.selected, +.mosaic-ScrollTreeTable .dataTable tr.selected { + background: #7AA5D6; +} + +.gwt-ScrollTable .pagingOptions { + background: #e8eef7; + border-top: 1px solid #aaa; + border-right: 1px solid #aaa; + padding: 1px 0px; +} + +.gwt-ScrollTable .pagingOptions .errorMessage { + color: red; +} + +.gwt-PagingOptions .gwt-Image { + cursor: hand; + cursor: pointer; +} + +.gwt-InlineCellEditor { + border: 3px solid #7AA5D6; + padding: 4px; + background: white; + overflow: auto; +} +.gwt-InlineCellEditor .accept { + cursor: pointer; + cursor: hand; +} +.gwt-InlineCellEditor .cancel { + cursor: pointer; + cursor: hand; +} + +/*** CaptionLayoutPanel ***/ + +.mosaic-CaptionLayoutPanel { + padding: 0px; + margin: 0px; + + /* debug */ + /*border: 1px dotted #00f;*/ +} +.mosaic-CaptionLayoutPanel .Body { + + /* debug */ + /*border: 1px dotted #0f0;*/ +} + +/** DisclosureLayoutPanel */ + +.mosaic-DisclosureLayoutPanel { +} +.mosaic-DisclosureLayoutPanel-open { +} +.mosaic-DisclosureLayoutPanel-close { +} +.mosaic-DisclosureLayoutPanel .mosaic-Caption { + background: none; + border: none; +} +.mosaic-DisclosureLayoutPanel .mosaic-Caption-text a { + text-decoration: none; /* Remove underline from header */ + color: black; + cursor: pointer; + cursor: hand; + padding: 1px; +} +.mosaic-DisclosureLayoutPanel .Body { + border-left: 3px solid #e3e3e3; + padding: 4px 0px 4px 8px; + margin-left: 6px; +} + +/*** LayoutPanel ***/ + +.mosaic-LayoutPanel { + padding: 5px; + margin: 0px; + + /* debug */ + /* + margin: 1px; + border: 1px dotted #f00; + */ +} +.mosaic-LayoutPanel-FormLayout .mosaic-LayoutPanel { + /* required by Safari to handle the 'width' attribute */ + position: absolute !important; +} +.mosaic-LayoutPanel-FillLayout { + padding: 0px; +} +.mosaic-LayoutPanel-BoxLayout { +} +.mosaic-LayoutPanel-BorderLayout { +} +.mosaic-LayoutPanel-BorderLayout .NorthCollapsedImageButton { + border: 1px solid #d0e4f6; + border-top: none; + height: 18px !important; + padding: 0px 1px 1px 1px; + overflow: hidden; +} +.mosaic-LayoutPanel-BorderLayout .SouthCollapsedImageButton { + border: 1px solid #d0e4f6; + border-bottom: none; + height: 18px !important; + padding: 1px 1px 0px 1px; + overflow: hidden; +} +/* TODO +html>body .mosaic-LayoutPanel-BorderLayout .NorthCollapsedImageButton img, +html>body .mosaic-LayoutPanel-BorderLayout .SouthCollapsedImageButton img { + position: absolute; + top: 0px; + right: 0px; +} +*/ +.mosaic-LayoutPanel-BorderLayout .WestCollapsedImageButton { + border: 1px solid #d0e4f6; + border-left: none; + + /* required by Safari to handle the 'width' attribute */ + position: absolute !important; + width: 18px !important; + + padding: 1px 1px 1px 0px; + overflow: hidden; +} +.mosaic-LayoutPanel-BorderLayout .EastCollapsedImageButton { + border: 1px solid #d0e4f6; + border-right: none; + + /* required by Safari to handle the 'width' attribute */ + position: absolute !important; + width: 18px !important; + + padding: 1px 0px 1px 1px; + overflow: hidden; +} +.mosaic-LayoutPanel-BorderLayout .NorthSplitBar { + overflow: hidden; /* required by IE6 */ + background: #fff; + cursor: n-resize; +} +.mosaic-LayoutPanel-BorderLayout .NorthSplitBar:hover { + border-top: 1px dashed #888; +} +.mosaic-LayoutPanel-BorderLayout .NorthSplitBar-Movable { + background: #000; + cursor: n-resize; +} +.mosaic-LayoutPanel-BorderLayout .SouthSplitBar { + overflow: hidden; /* required by IE6 */ + background: #fff; + cursor: s-resize; +} +.mosaic-LayoutPanel-BorderLayout .SouthSplitBar:hover { + border-bottom: 1px dashed #888; +} +.mosaic-LayoutPanel-BorderLayout .SouthSplitBar-Movable { + background: #000; + cursor: s-resize; +} +.mosaic-LayoutPanel-BorderLayout .WestSplitBar { + overflow: hidden; /* required by IE6 */ + background: #fff; + cursor: w-resize; +} +.mosaic-LayoutPanel-BorderLayout .WestSplitBar:hover { + border-left: 1px dashed #888; +} +.mosaic-LayoutPanel-BorderLayout .WestSplitBar-Movable { + background: #000; + cursor: w-resize; +} +.mosaic-LayoutPanel-BorderLayout .EastSplitBar { + overflow: hidden; /* required by IE6 */ + background: #fff; + cursor: w-resize; +} +.mosaic-LayoutPanel-BorderLayout .EastSplitBar:hover { + border-right: 1px dashed #888; +} +.mosaic-LayoutPanel-BorderLayout .EastSplitBar-Movable { + background: #000; +} + +/*** ToolBar ***/ + +.mosaic-ToolBar { + cursor: default; + padding: 3px; + background: url("images/hborder.png") repeat-x 0px -27px; +} +.mosaic-ToolBar .mosaic-ToolButton { + background: none; + white-space: nowrap; +} +.mosaic-ToolBar .mosaic-ToolBarSeparator { + border-left: 1px solid #ccc; + background: white; + + /* required by Safari to handle the 'width' attribute */ + position: absolute !important; + width: 1px; + + padding: 0px; + margin: 5px 3px; +} + +/*** WidgetWrapper ***/ + +.mosaic-WidgetWrapper { + /* debug */ + /*border: 1px solid;*/ +} + +/*** DateTimePicker ***/ + +.mosaic-DateTimePicker { + border: none; + padding: 0px; + margin: 0px; + cursor: default; + background: #dbe6de; +} + +/*** mosaic-DecoratedBottomTabBar ***/ + +.mosaic-DecoratedBottomTabBar { +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarRest { +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarItem { + border-collapse: collapse; + margin-left: 6px; +} +.mosaic-DecoratedBottomTabBar .tabBottomCenter { + padding: 0px; + background: #d0e4f6; +} +.mosaic-DecoratedBottomTabBar .tabBottomLeft, +.mosaic-DecoratedBottomTabBar .tabBottomRight { + padding: 0px; + zoom: 1; +} +.mosaic-DecoratedBottomTabBar .tabBottomLeftInner, +.mosaic-DecoratedBottomTabBar .tabBottomRightInner { + width: 6px; + height: 6px; +} +.mosaic-DecoratedBottomTabBar .tabMiddleLeft, +.mosaic-DecoratedBottomTabBar .tabMiddleRight { + width: 6px; + padding: 0px; + background: #d0e4f6; +} +.mosaic-DecoratedBottomTabBar .tabMiddleLeftInner, +.mosaic-DecoratedBottomTabBar .tabMiddleRightInner { + width: 1px; + height: 1px; +} +.mosaic-DecoratedBottomTabBar .tabMiddleCenter { + padding: 0px 4px 2px 4px; + cursor: pointer; + cursor: hand; + color: black; + font-weight: bold; + text-align: center; + background: #d0e4f6; +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabBottomCenter { + background: #92c1f0; +} +html>body .mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabBottomLeft { + background-position: 0px 0px; +} +html>body .mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabBottomRight { + background-position: -6px 0px; +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabMiddleLeft, +.mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabMiddleRight { + background: #92c1f0; +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabMiddleCenter { + cursor: default; + background: #92c1f0; +} + +/*** StackLayoutPanel ***/ + +.mosaic-StackLayoutPanel { + /*border: 1px solid #bbbbbb;*/ +} +.mosaic-StackLayoutPanel .mosaic-StackLayoutPanelItem { + cursor: pointer; + cursor: hand; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.mosaic-StackLayoutPanel .mosaic-StackLayoutPanelItem-selected { + cursor: pointer; + cursor: hand; +} +.mosaic-StackLayoutPanel .mosaic-StackLayoutPanelContent { + /*border: 1px solid #bbbbbb;*/ + /*border-bottom: 0px;*/ +} + +/*** FastTree ***/ + +/* --- Structural CSS --- */ + +.gwt-FastTree { + -moz-user-select: none; + position: relative; +} +.gwt-FastTreeItem { + min-width: 18px; +} +.gwt-FastTreeItem .open,.gwt-FastTreeItem .closed { + width: 100%; +} +.gwt-FastTree .selection-bar { + font-size: 0; + position: absolute; + left: 0; + width: 1px; + z-index: -1; + outline: none; + -moz-outline: none; +} +.gwt-FastTree .selection-bar :focus { + outline: none +} + +/* --- Visual styling --- */ + +.gwt-FastTree .open .treeItemContent,.gwt-FastTree .closed .treeItemContent { + margin-left: 18px; +} +.gwt-FastTreeItem-leaf { + display: block; + padding: 2px; + padding-left: 18px; +} +.gwt-FastTreeItem .children { + margin-left: 10px; +} +.gwt-FastTreeItem .open,.gwt-FastTreeItem .closed,.gwt-FastTreeItem-leaf { + color: black; +} +.gwt-FastTreeItem .open { + background: url('images/fasttree/treeOpen.gif') no-repeat center left; +} +.gwt-FastTreeItem .closed { + background: url('images/fasttree/treeClosed.gif') no-repeat center left; +} +.gwt-FastTreeItem-loading .open { + background: url('images/fasttree/treeLoading.gif') no-repeat center left; +} +.gwt-FastTreeItem-leaf { +} +.gwt-FastTree .treeItemContent { + padding: 2px; +} +.gwt-FastTree .selected .treeItemContent { + background: #e3e8f3 url('images/fasttree/selectionBar.gif') repeat-x; +} + +/*** FastTreeTable ***/ + +/* --- Structural CSS --- */ + +.gwt-FastTreeTable { + -moz-user-select: none; + position: relative; +} +.gwt-FastTreeTable td { + white-space: nowrap; +} +.gwt-FastTreeTableItem { + min-width: 18px; +} +.gwt-FastTreeTableItem .open,.gwt-FastTreeTableItem .closed { + width: 100%; +} +.gwt-FastTreeTable .selection-bar { + font-size: 0; + position: absolute; + left: 0; + width: 1px; + z-index: -1; + outline: none; + -moz-outline: none; +} +.gwt-FastTreeTable .selection-bar :focus { + outline: none +} + +/* --- Visual styling --- */ + +.gwt-FastTreeTable .open .treeItemContent,.gwt-FastTreeTable .closed .treeItemContent { + margin-left: 18px; +} +.gwt-FastTreeTableItem-leaf { + display: block; + padding: 2px; + padding-left: 18px; +} +.gwt-FastTreeTableItem-children { + margin-left: 10px; +} +.gwt-FastTreeTableItem .open,.gwt-FastTreeTableItem .closed,.gwt-FastTreeTableItem-leaf { + color: black; +} +.gwt-FastTreeTableItem .open { + background: url('images/fasttree/treeOpen.gif') no-repeat center left; +} +.gwt-FastTreeTableItem .closed { + background: url('images/fasttree/treeClosed.gif') no-repeat center left; +} +.gwt-FastTreeTableItem-loading .open { + background: url('images/fasttree/treeLoading.gif') no-repeat center left; +} +.gwt-FastTreeTableItem-leaf { +} +.gwt-FastTreeTable .treeItemContent { + padding: 2px; +} +/* +.gwt-FastTreeTable .selected .treeItemContent { + background: #e3e8f3 url('images/fasttree/selectionBar.gif') repeat-x; +} +*/ + +/*** gwt-MenuItem ***/ + +.gwt-MenuBar .gwt-MenuItem-disabled { + cursor: default; + background: none; + opacity: .5; + zoom: 1; + filter: alpha(opacity=40); +} + +/*** gwt-MenuBarPopup ***/ + +.gwt-MenuBarPopup { + z-index: 2147483647; /* Integer.MAX_VALUE */ +} + +/*** gwt-InlineCellEditor **/ + +.gwt-InlineCellEditor { + z-index: 2147483647; /* Integer.MAX_VALUE */ +} + +/*** gwt-PopupPanel **/ +.gwt-PopupPanel, +.gwt-DecoratedPopupPanel { + z-index: 2147483647; /* Integer.MAX_VALUE */ +} + +/*** mosaic-FormSeparator **/ + +.mosaic-FormSeparator { + font-weight: bold; +} + +.mosaic-FormSeparator div { + border: 1px solid #4d4d4d; +} + +/*** Basic Button with Images ***/ + +.gwt-Button[disabled] table, +.gwt-Button[disabled] img { + opacity: .5; + zoom: 1; + filter: alpha(opacity=40); +} + +.gwt-Button { + white-space: nowrap; +} + +/*** GWT Incubator SliderBar ***/ + +.gwt-SliderBar-shell { + height: 34pt; + width: 256px; +} + +.gwt-SliderBar-shell .gwt-SliderBar-line { + border: 1px solid #4d4d4d; + background-color: #cdcdcd; + height: 4px; + width: 95%; + top: 22pt; + overflow: hidden; +} + +.gwt-SliderBar-shell .gwt-SliderBar-line-disabled { + border: 1px solid #8d8d8d; +} + +.gwt-SliderBar-shell .gwt-SliderBar-knob { + top: 14pt; + z-index: 1; + cursor: pointer; +} + +.gwt-SliderBar-shell .gwt-SliderBar-tick { + top: 16pt; + width: 1px; + height: 6pt; + background: #4d4d4d; + overflow: hidden; +} + +.gwt-SliderBar-shell .gwt-SliderBar-tick-disabled { + background: #8d8d8d; +} + +.gwt-SliderBar-shell .gwt-SliderBar-label { + top: 2pt; + font-size: 8pt; + cursor: default; +} + +.gwt-SliderBar-shell-focused { + +} + +.gwt-SliderBar-shell .gwt-SliderBar-line-sliding { + cursor: pointer; +} + +/*** GWT Incubator ProgressBar ***/ + +.gwt-ProgressBar-shell { + border: 1px solid #4d4d4d; + background-color: #AAAAAA; + height: 1em; + width: 256px; +} +.gwt-ProgressBar-shell .gwt-ProgressBar-bar { + background-color: #67A7E3; +} +.gwt-ProgressBar-shell .gwt-ProgressBar-text { + padding: 0px; + margin: 0px; + color: white; +} + +/*** GWT Incubator Value Spinner ***/ + +.gwt-ValueSpinner .arrows { + width: 17px; + height: 18px; + margin-left: 1px; +} + +.gwt-ValueSpinner .textBox { + border: 0px; + text-align: right; + font-family: sans-serif; + font-weight: bold; + border: 1px solid #7F9DB9; +} + +.gwt-TimePicker { + padding: 1px; +} + +.gwt-TimePicker .textBox { + border: 0px; + width: 22px; + text-align: center; + font-family: sans-serif; + font-weight: bold; + font-size: 11px; + color: #506374; + border: 1px solid #7F9DB9; + background: url('images/valuespinner/bg_textbox.png') repeat-x; +} + +.gwt-VolumeSlider .gwt-ProgressBar-shell { + border: 1px solid #faf9f7; + border-right: 1px solid #848280; + border-bottom: 1px solid #848280; + background-color: #AAAAAA; + width: 50%; + height: 12pt; +} + +.gwt-VolumeSlider .gwt-ProgressBar-shell .gwt-ProgressBar-bar { + background-color: #67A7E3; +} + +.gwt-VolumeSlider .gwt-ProgressBar-shell .gwt-ProgressBar-text { + padding: 0px; + margin: 0px; + color: white; +} + +.gwt-VolumeSlider .decreaseArrow { + margin: 4px; +} + +.gwt-VolumeSlider .increaseArrow { + margin: 4px; +} diff --git a/common/static/js/capa/jsme/gwt/chrome/mosaic_rtl.css b/common/static/js/capa/jsme/gwt/chrome/mosaic_rtl.css new file mode 100644 index 0000000000..dda9c913e9 --- /dev/null +++ b/common/static/js/capa/jsme/gwt/chrome/mosaic_rtl.css @@ -0,0 +1,1162 @@ +/** + * The file contains styles for GWT widgets in the standard theme. + * + * In order to maintain cross-browser compatibility, the following syntax is + * used to create IE6 specific style rules: + * html>body .gwt-Widget { + * Rule applies to all browsers (including IE7), except IE6 + * } + * * html .gwt-Widget { + * Rule applied to IE6 only (not to IE7) + * } + * + * Specifically, IE6 does not support images with multiple transparent colors, + * so we need to use the AlphaImageLoader in IE6 only. + */ + +/** + * The reference theme can be used to determine when this style sheet has + * loaded. Create a hidden div element with absolute position, assign the style + * name below, and attach it to the DOM. Use a timer to detect when the + * element's height and width are set to 5px. + */ +.mosaic-Reference-chrome-rtl { + height: 5px; + width: 5px; + zoom: 1; +} + +body { + font-family: arial,sans-serif; +} + +div,td { + color: #000000; +} + +a:link { + color:#0000cc; +} + +a:visited { + color:#551a8b; +} + +a:active { + color:#ff0000; +} + +/*** Button ***/ + +.gwt-Button { + /* IE hack */ + overflow: visible; +} + +/*** TextBox & TextArea */ + +.gwt-TextBox, +.gwt-PasswordTextBox, +.gwt-TextArea { + margin: 0px; + padding: 0px; + text-decoration: none; + font-size: 10pt; + border: 1px inset #ccc; +} + +/*** DecoratedButton ***/ + +.mosaic-DecoratedButton { + margin: 0px; + text-decoration: none; + font-size: small; + cursor: pointer; + cursor: hand; + background: url("images/hborder.png") repeat-x 0px -27px; + border: none; + border-collapse: collapse; + table-layout: fixed; +} +.mosaic-DecoratedButton .buttonTopCenter, +.mosaic-DecoratedButton .buttonBottomCenter { + height: 1px !important; + background: #444; +} +.mosaic-DecoratedButton .buttonTopCenterInner, +.mosaic-DecoratedButton .buttonBottomCenterInner { + height: 1px !important; + background: #f00; +} +.mosaic-DecoratedButton .buttonMiddleLeft, +.mosaic-DecoratedButton .buttonMiddleRight { + width: 1px; + background: #444; +} +.mosaic-DecoratedButton .buttonTopLeftInner, +.mosaic-DecoratedButton .buttonTopRightInner, +.mosaic-DecoratedButton .buttonBottomLeftInner, +.mosaic-DecoratedButton .buttonBottomRightInner { + width: 1px; + height: 1px; +} +.mosaic-DecoratedButton .buttonMiddleCenterInner { + width: 100%; + height: 100%; + background: #0ff; +} + +/*** ComboBox ***/ + +.mosaic-ComboBox { + border: 1px inset #ccc; + background: url("images/hborder.png") repeat-x 0px -27px; +} + +.mosaic-ComboBox input { + border: 0px; + text-align: middle; +} +.mosaic-ComboBox button { + width: 17px !important; + border: 0px; + border-left: 1px solid #ccc; + padding: 0px; + background-position: center center; + background-repeat: no-repeat; + background-image: url(images/combobox/arrow-down.png); +} + +/*** ToolButton ***/ + +.mosaic-ToolButton { + margin: 0px; + padding: 0px; + border: 0px; + background: url("images/hborder.png") repeat-x 0px -27px; +} +.mosaic-ToolButton .mosaic-Button { + margin: 0; + padding: 3px 5px; + text-decoration: none; + font-size: small; + cursor: pointer; + cursor: hand; + background: url("images/hborder.png") repeat-x 0px -27px; + border: 1px outset #ccc; +} +.mosaic-ToolButton .mosaic-Button:active { + border: 1px inset #ccc; +} +.mosaic-ToolButton .mosaic-Button:hover { + border-color: #9cf #69e #69e #7af; +} +.mosaic-ToolButton .mosaic-Button[disabled] { + cursor: default; + color: #888; +} +.mosaic-ToolButton .mosaic-Button[disabled]:hover { + border: 1px outset #ccc; +} +.mosaic-ToolButton .mosaic-Button { + background: none; +} +.mosaic-ToolButton .mosaic-Menu-Button, +.mosaic-ToolButton .mosaic-Split-Button { + padding-right: 20px; + background-position: right center; + background-repeat: no-repeat; +} +.mosaic-ToolButton .mosaic-Menu-Button { + background-image: url(images/button/menu-button-arrow.png); +} +.mosaic-ToolButton .mosaic-Split-Button { + background-image: url(images/button/split-button-arrow.png); +} +.mosaic-ToolButton .mosaic-Split-Button-focus { + background-image: url(images/button/split-button-arrow-focus.png); +} +.mosaic-ToolButton .mosaic-Split-Button-hover { + background-image: url(images/button/split-button-arrow-hover.png); +} +.mosaic-ToolButton .mosaic-Split-Button-activeoption { + background-image: url(images/button/split-button-arrow-active.png); +} + +/* Checked state */ + +.mosaic-ToolButton .mosaic-Checkbox-Button-checked { + border: 1px inset #ccc; + background-color: #ccc; +} + +/* Disabled state */ + +.mosaic-ToolButton .mosaic-Menu-Button-disabled { + background-image: url(images/button/menu-button-arrow-disabled.png); +} + +.mosaic-ToolButton .mosaic-Split-Button-disabled { + background-image: url(images/button/split-button-arrow-disabled.png); +} + +.mosaic-ToolButton .mosaic-Checkbox-Button-checked[disabled] { + border: 1px inset #ccc; +} + +/*** Caption ***/ + +.mosaic-Caption { + background: #e3e8f3 url(images/hborder.png) repeat-x 0px -2003px; + border-bottom: 1px solid #bbbbbb; +} +.mosaic-Caption-iconBoxLeft { + padding: 0px 0px 0px 2px; +} +.mosaic-Caption-iconBoxRight { + padding: 0px 2px 0px 0px; +} +.mosaic-Caption-text { + padding: 4px 4px 4px 4px; + text-align: left !important; + font-weight: bold; + white-space: nowrap; + overflow: hidden; +} + +/*** DropDownPanel ***/ + +.mosaic-DropDownPanel { + +} + +.mosaic-DropDownPanel .mosaic-ComboBoxList { + background: white; + border: none; + margin: 0px; + padding: 0px; +} + +.mosaic-DropDownPanel .gwt-ScrollTable, +.mosaic-DropDownPanel .mosaic-ColumnWidget, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable { + border-color: #aaa; + border-style: solid; + border-width: 1px 0px 1px 1px; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .headerWrapper, +.mosaic-DropDownPanel .mosaic-ColumnWidget .headerWrapper, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .headerWrapper { + background: #8bd url(images/scrolltable/bg_header_gradient.gif) repeat-x bottom left; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .footerWrapper, +.mosaic-DropDownPanel .mosaic-ColumnWidget .footerWrapper, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .footerWrapper { + border-top: 1px solid #aaa; + background: #8bd url(images/scrolltable/bg_header_gradient.gif) repeat-x bottom left; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable td, +.mosaic-DropDownPanel .gwt-ScrollTable .headerTable td, +.mosaic-DropDownPanel .gwt-ScrollTable .footerTable td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .headerTable td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .footerTable td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .headerTable td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .footerTable td { + border-color: #aaa; + border-style: solid; + border-width: 0px 0px 0px 0px; + white-space: nowrap; + overflow: hidden; + padding: 1px 3px; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .headerTable td, +.mosaic-DropDownPanel .gwt-ScrollTable .footerTable td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .headerTable td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .footerTable td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .headerTable td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .footerTable td { + color: #fff; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.hovering, +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.highlighted, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.hovering, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.highlighted, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.hovering, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.highlighted { + background: #C3D9FF; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.hovering, +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.highlighted, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.hovering, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.highlighted, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.hovering, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.highlighted { + /*background: #FFFFAA;*/ + cursor: hand; + cursor: pointer; +} + +.mosaic-DropDownPanel .gwt-ScrollTable .dataTable tr.selected td, +.mosaic-DropDownPanel .mosaic-ColumnWidget .dataTable tr.selected td, +.mosaic-DropDownPanel .mosaic-ScrollTreeTable .dataTable tr.selected td { + background: #7AA5D6; +} + +/*** WindowPanel ***/ + +.mosaic-WindowPanel { +} +.mosaic-WindowPanel .mosaic-CaptionLayoutPanel .dragdrop-handle { + cursor: move; + user-select: none; + -khtml-user-select: none; + -moz-user-select: none; +} +.mosaic-WindowPanel .mosaic-CaptionLayoutPanel { + padding: 0px; + margin: 0px; + + /* debug */ + /*border: 1px solid #00f;*/ +} +.mosaic-WindowPanel .Body { + background: white; +} +.mosaic-MessageBox .Body { + background: none; +} +.mosaic-WindowPanel .Footer { +} +.mosaic-WindowPanel .popupMiddleCenter { + padding: 0px; + margin: 0px; +} +.mosaic-WindowPanel .Resize-nw { + cursor: nw-resize; +} +.mosaic-WindowPanel .Resize-n { + cursor: n-resize; +} +.mosaic-WindowPanel .Resize-ne { + cursor: ne-resize; +} +.mosaic-WindowPanel .Resize-e { + cursor: e-resize; +} +.mosaic-WindowPanel .Resize-se { + cursor: se-resize; +} +.mosaic-WindowPanel .Resize-s { + cursor: s-resize; +} +.mosaic-WindowPanel .Resize-sw { + cursor: sw-resize; +} +.mosaic-WindowPanel .Resize-w { + cursor: w-resize; +} + +/*** GlassPanel ***/ + +.mosaic-GlassPanel-loading, +.gwt-GlassPanel { + /* Override glass panel color to be `green` */ + background-color: #000 !important; + background-repeat: repeat; + + /* Override glass panel to 10% opacity (= 90% transparency) */ + filter: alpha(opacity = 10) !important; /* IE */ + opacity: 0.1 !important; /* non-IE */ + + /* + NOTE: Please do NOT use either CSS 'width' or 'height' here, as + this would defeat much of the effort that went into GlassPanel + in order to get it to work consistently in a variety of + circumstances. Specifically, please resist the urge to use + 'width/height: 100%' or similar constructs. + */ +} +.mosaic-GlassPanel-invisible { + /* Override glass panel color to be `green` */ + background-color: #000 !important; + background-repeat: repeat; + + /* Override glass panel to 0% opacity (= 100% transparency) */ + filter: alpha(opacity = 0) !important; /* IE */ + opacity: 0.0 !important; /* non-IE */ +} +.mosaic-GlassPanel-default, +.mosaic-GlassPanel-blue_ridge { + background-image: url("images/glasspanel/blue_ridge.png"); + background-repeat: repeat; + + filter: alpha(opacity = 33) !important; /* IE */ + opacity: 0.3 !important; /* non-IE */ +} + +/*** ImageButton ***/ + +.mosaic-ImageButton { + cursor: pointer; +} + +.mosaic-ImageButton img { + display: block; + + /* + * Unfortunately, in IE, border-color: transparent is rendered as black. + * We get around the border on hover displacement of content by adjusting + * the margin/padding at the same time. + */ + border: 0px solid transparent; + margin: 1px; +} +.mosaic-ImageButton img:hover { + /* + * Unfortunately, in IE, border-color: transparent is rendered as black. + * We get around the border on hover displacement of content by adjusting + * the margin/padding at the same time. + */ + border: 1px solid #4d4d4d; + margin: 0px; + + background-color: #ccc; +} +.mosaic-ImageButton img:active { + background-color: #dcc; +} + +/*** InfoPanel ***/ + +.mosaic-InfoPanel { +} +.mosaic-InfoPanel-panel { +} +.mosaic-InfoPanel-caption { + font-weight: bold; + display: block; +} +.mosaic-InfoPanel-description { +} + +/*** TabLayoutPanel ***/ + +.mosaic-TabLayoutPanel { +} + +.mosaic-TabLayoutPanelBottom { +/* + border-color: #92c1f0; + border-style: solid; + border-width: 3px 2px 2px 2px; +*/ +} + +/*** ScrollTabBar ***/ + +.mosaic-ScrollTabBar { +} + +.mosaic-ScrollTabBar .mosaic-ScrollTabBar-NavBar { + margin: 0px 2px !important; +} + +.mosaic-ScrollTabBar button { + padding: 0px !important; + margin: 0px 0px 2px 0px !important; + border: 1px solid #ccc; +} + +/*** ScrollTable ***/ + +.gwt-ScrollTable, +.mosaic-ColumnWidget, +.mosaic-ScrollTreeTable { + border-color: #aaa; + border-style: solid; + border-width: 1px 0px 1px 1px; +} + +.gwt-ScrollTable .headerWrapper, +.mosaic-ColumnWidget .headerWrapper, +.mosaic-ScrollTreeTable .headerWrapper { + background: #8bd url(images/scrolltable/bg_header_gradient.gif) repeat-x bottom left; +} + +.gwt-ScrollTable .footerWrapper, +.mosaic-ColumnWidget .footerWrapper, +.mosaic-ScrollTreeTable .footerWrapper { + border-top: 1px solid #aaa; + background: #8bd url(images/scrolltable/bg_header_gradient.gif) repeat-x bottom left; +} + +.gwt-ScrollTable .dataTable td, +.gwt-ScrollTable .headerTable td, +.gwt-ScrollTable .footerTable td, +.mosaic-ColumnWidget .dataTable td, +.mosaic-ColumnWidget .headerTable td, +.mosaic-ColumnWidget .footerTable td, +.mosaic-ScrollTreeTable .dataTable td, +.mosaic-ScrollTreeTable .headerTable td, +.mosaic-ScrollTreeTable .footerTable td { + border-color: #aaa; + border-style: solid; + border-width: 0px 1px 1px 0px; + white-space: nowrap; + overflow: hidden; +} + +.gwt-ScrollTable .headerTable td, +.gwt-ScrollTable .footerTable td, +.mosaic-ColumnWidget .headerTable td, +.mosaic-ColumnWidget .footerTable td, +.mosaic-ScrollTreeTable .headerTable td, +.mosaic-ScrollTreeTable .footerTable td { + color: #fff; +} + +.gwt-ScrollTable .dataTable tr.highlighted, /* gen2 */ +.gwt-ScrollTable .dataTable tr.hovering, +.mosaic-ColumnWidget .dataTable tr.hovering, +.mosaic-ScrollTreeTable .dataTable tr.hovering { + background: #C3D9FF; +} + +.gwt-ScrollTable .dataTable td.highlighted, /* gen2 */ +.gwt-ScrollTable .dataTable td.hovering, +.mosaic-ColumnWidget .dataTable td.hovering, +.mosaic-ScrollTreeTable .dataTable td.hovering { + background: #FFFFAA; + cursor: hand; + cursor: pointer; +} + +.gwt-ScrollTable .dataTable tr.selected, +.mosaic-ColumnWidget .dataTable tr.selected, +.mosaic-ScrollTreeTable .dataTable tr.selected { + background: #7AA5D6; +} + +.gwt-ScrollTable .pagingOptions { + background: #e8eef7; + border-top: 1px solid #aaa; + border-right: 1px solid #aaa; + padding: 1px 0px; +} + +.gwt-ScrollTable .pagingOptions .errorMessage { + color: red; +} + +.gwt-PagingOptions .gwt-Image { + cursor: hand; + cursor: pointer; +} + +.gwt-InlineCellEditor { + border: 3px solid #7AA5D6; + padding: 4px; + background: white; + overflow: auto; +} +.gwt-InlineCellEditor .accept { + cursor: pointer; + cursor: hand; +} +.gwt-InlineCellEditor .cancel { + cursor: pointer; + cursor: hand; +} + +/*** CaptionLayoutPanel ***/ + +.mosaic-CaptionLayoutPanel { + padding: 0px; + margin: 0px; + + /* debug */ + /*border: 1px dotted #00f;*/ +} +.mosaic-CaptionLayoutPanel .Body { + + /* debug */ + /*border: 1px dotted #0f0;*/ +} + +/** DisclosureLayoutPanel */ + +.mosaic-DisclosureLayoutPanel { +} +.mosaic-DisclosureLayoutPanel-open { +} +.mosaic-DisclosureLayoutPanel-close { +} +.mosaic-DisclosureLayoutPanel .mosaic-Caption { + background: none; + border: none; +} +.mosaic-DisclosureLayoutPanel .mosaic-Caption-text a { + text-decoration: none; /* Remove underline from header */ + color: black; + cursor: pointer; + cursor: hand; + padding: 1px; +} +.mosaic-DisclosureLayoutPanel .Body { + border-left: 3px solid #e3e3e3; + padding: 4px 0px 4px 8px; + margin-left: 6px; +} + +/*** LayoutPanel ***/ + +.mosaic-LayoutPanel { + padding: 5px; + margin: 0px; + + /* debug */ + /* + margin: 1px; + border: 1px dotted #f00; + */ +} +.mosaic-LayoutPanel-FormLayout .mosaic-LayoutPanel { + /* required by Safari to handle the 'width' attribute */ + position: absolute !important; +} +.mosaic-LayoutPanel-FillLayout { + padding: 0px; +} +.mosaic-LayoutPanel-BoxLayout { +} +.mosaic-LayoutPanel-BorderLayout { +} +.mosaic-LayoutPanel-BorderLayout .NorthCollapsedImageButton { + border: 1px solid #d0e4f6; + border-top: none; + height: 18px !important; + padding: 0px 1px 1px 1px; + overflow: hidden; +} +.mosaic-LayoutPanel-BorderLayout .SouthCollapsedImageButton { + border: 1px solid #d0e4f6; + border-bottom: none; + height: 18px !important; + padding: 1px 1px 0px 1px; + overflow: hidden; +} +/* TODO +html>body .mosaic-LayoutPanel-BorderLayout .NorthCollapsedImageButton img, +html>body .mosaic-LayoutPanel-BorderLayout .SouthCollapsedImageButton img { + position: absolute; + top: 0px; + right: 0px; +} +*/ +.mosaic-LayoutPanel-BorderLayout .WestCollapsedImageButton { + border: 1px solid #d0e4f6; + border-left: none; + + /* required by Safari to handle the 'width' attribute */ + position: absolute !important; + width: 18px !important; + + padding: 1px 1px 1px 0px; + overflow: hidden; +} +.mosaic-LayoutPanel-BorderLayout .EastCollapsedImageButton { + border: 1px solid #d0e4f6; + border-right: none; + + /* required by Safari to handle the 'width' attribute */ + position: absolute !important; + width: 18px !important; + + padding: 1px 0px 1px 1px; + overflow: hidden; +} +.mosaic-LayoutPanel-BorderLayout .NorthSplitBar { + overflow: hidden; /* required by IE6 */ + background: #fff; + cursor: n-resize; +} +.mosaic-LayoutPanel-BorderLayout .NorthSplitBar:hover { + border-top: 1px dashed #888; +} +.mosaic-LayoutPanel-BorderLayout .NorthSplitBar-Movable { + background: #000; + cursor: n-resize; +} +.mosaic-LayoutPanel-BorderLayout .SouthSplitBar { + overflow: hidden; /* required by IE6 */ + background: #fff; + cursor: s-resize; +} +.mosaic-LayoutPanel-BorderLayout .SouthSplitBar:hover { + border-bottom: 1px dashed #888; +} +.mosaic-LayoutPanel-BorderLayout .SouthSplitBar-Movable { + background: #000; + cursor: s-resize; +} +.mosaic-LayoutPanel-BorderLayout .WestSplitBar { + overflow: hidden; /* required by IE6 */ + background: #fff; + cursor: w-resize; +} +.mosaic-LayoutPanel-BorderLayout .WestSplitBar:hover { + border-left: 1px dashed #888; +} +.mosaic-LayoutPanel-BorderLayout .WestSplitBar-Movable { + background: #000; + cursor: w-resize; +} +.mosaic-LayoutPanel-BorderLayout .EastSplitBar { + overflow: hidden; /* required by IE6 */ + background: #fff; + cursor: w-resize; +} +.mosaic-LayoutPanel-BorderLayout .EastSplitBar:hover { + border-right: 1px dashed #888; +} +.mosaic-LayoutPanel-BorderLayout .EastSplitBar-Movable { + background: #000; +} + +/*** ToolBar ***/ + +.mosaic-ToolBar { + cursor: default; + padding: 3px; + background: url("images/hborder.png") repeat-x 0px -27px; +} +.mosaic-ToolBar .mosaic-ToolButton { + background: none; + white-space: nowrap; +} +.mosaic-ToolBar .mosaic-ToolBarSeparator { + border-left: 1px solid #ccc; + background: white; + + /* required by Safari to handle the 'width' attribute */ + position: absolute !important; + width: 1px; + + padding: 0px; + margin: 5px 3px; +} + +/*** WidgetWrapper ***/ + +.mosaic-WidgetWrapper { + /* debug */ + /*border: 1px solid;*/ +} + +/*** DateTimePicker ***/ + +.mosaic-DateTimePicker { + border: none; + padding: 0px; + margin: 0px; + cursor: default; + background: #dbe6de; +} + +/*** mosaic-DecoratedBottomTabBar ***/ + +.mosaic-DecoratedBottomTabBar { +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarRest { +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarItem { + border-collapse: collapse; + margin-left: 6px; +} +.mosaic-DecoratedBottomTabBar .tabBottomCenter { + padding: 0px; + background: #d0e4f6; +} +.mosaic-DecoratedBottomTabBar .tabBottomLeft, +.mosaic-DecoratedBottomTabBar .tabBottomRight { + padding: 0px; + zoom: 1; +} +.mosaic-DecoratedBottomTabBar .tabBottomLeftInner, +.mosaic-DecoratedBottomTabBar .tabBottomRightInner { + width: 6px; + height: 6px; +} +.mosaic-DecoratedBottomTabBar .tabMiddleLeft, +.mosaic-DecoratedBottomTabBar .tabMiddleRight { + width: 6px; + padding: 0px; + background: #d0e4f6; +} +.mosaic-DecoratedBottomTabBar .tabMiddleLeftInner, +.mosaic-DecoratedBottomTabBar .tabMiddleRightInner { + width: 1px; + height: 1px; +} +.mosaic-DecoratedBottomTabBar .tabMiddleCenter { + padding: 0px 4px 2px 4px; + cursor: pointer; + cursor: hand; + color: black; + font-weight: bold; + text-align: center; + background: #d0e4f6; +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabBottomCenter { + background: #92c1f0; +} +html>body .mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabBottomLeft { + background-position: 0px 0px; +} +html>body .mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabBottomRight { + background-position: -6px 0px; +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabMiddleLeft, +.mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabMiddleRight { + background: #92c1f0; +} +.mosaic-DecoratedBottomTabBar .gwt-TabBarItem-selected .tabMiddleCenter { + cursor: default; + background: #92c1f0; +} + +/*** StackLayoutPanel ***/ + +.mosaic-StackLayoutPanel { + /*border: 1px solid #bbbbbb;*/ +} +.mosaic-StackLayoutPanel .mosaic-StackLayoutPanelItem { + cursor: pointer; + cursor: hand; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.mosaic-StackLayoutPanel .mosaic-StackLayoutPanelItem-selected { + cursor: pointer; + cursor: hand; +} +.mosaic-StackLayoutPanel .mosaic-StackLayoutPanelContent { + /*border: 1px solid #bbbbbb;*/ + /*border-bottom: 0px;*/ +} + +/*** FastTree ***/ + +/* --- Structural CSS --- */ + +.gwt-FastTree { + -moz-user-select: none; + position: relative; +} +.gwt-FastTreeItem { + min-width: 18px; +} +.gwt-FastTreeItem .open,.gwt-FastTreeItem .closed { + width: 100%; +} +.gwt-FastTree .selection-bar { + font-size: 0; + position: absolute; + left: 0; + width: 1px; + z-index: -1; + outline: none; + -moz-outline: none; +} +.gwt-FastTree .selection-bar :focus { + outline: none +} + +/* --- Visual styling --- */ + +.gwt-FastTree .open .treeItemContent,.gwt-FastTree .closed .treeItemContent { + margin-left: 18px; +} +.gwt-FastTreeItem-leaf { + display: block; + padding: 2px; + padding-left: 18px; +} +.gwt-FastTreeItem .children { + margin-left: 10px; +} +.gwt-FastTreeItem .open,.gwt-FastTreeItem .closed,.gwt-FastTreeItem-leaf { + color: black; +} +.gwt-FastTreeItem .open { + background: url('images/fasttree/treeOpen.gif') no-repeat center left; +} +.gwt-FastTreeItem .closed { + background: url('images/fasttree/treeClosed.gif') no-repeat center left; +} +.gwt-FastTreeItem-loading .open { + background: url('images/fasttree/treeLoading.gif') no-repeat center left; +} +.gwt-FastTreeItem-leaf { +} +.gwt-FastTree .treeItemContent { + padding: 2px; +} +.gwt-FastTree .selected .treeItemContent { + background: #e3e8f3 url('images/fasttree/selectionBar.gif') repeat-x; +} + +/*** FastTreeTable ***/ + +/* --- Structural CSS --- */ + +.gwt-FastTreeTable { + -moz-user-select: none; + position: relative; +} +.gwt-FastTreeTable td { + white-space: nowrap; +} +.gwt-FastTreeTableItem { + min-width: 18px; +} +.gwt-FastTreeTableItem .open,.gwt-FastTreeTableItem .closed { + width: 100%; +} +.gwt-FastTreeTable .selection-bar { + font-size: 0; + position: absolute; + left: 0; + width: 1px; + z-index: -1; + outline: none; + -moz-outline: none; +} +.gwt-FastTreeTable .selection-bar :focus { + outline: none +} + +/* --- Visual styling --- */ + +.gwt-FastTreeTable .open .treeItemContent,.gwt-FastTreeTable .closed .treeItemContent { + margin-left: 18px; +} +.gwt-FastTreeTableItem-leaf { + display: block; + padding: 2px; + padding-left: 18px; +} +.gwt-FastTreeTableItem-children { + margin-left: 10px; +} +.gwt-FastTreeTableItem .open,.gwt-FastTreeTableItem .closed,.gwt-FastTreeTableItem-leaf { + color: black; +} +.gwt-FastTreeTableItem .open { + background: url('images/fasttree/treeOpen.gif') no-repeat center left; +} +.gwt-FastTreeTableItem .closed { + background: url('images/fasttree/treeClosed.gif') no-repeat center left; +} +.gwt-FastTreeTableItem-loading .open { + background: url('images/fasttree/treeLoading.gif') no-repeat center left; +} +.gwt-FastTreeTableItem-leaf { +} +.gwt-FastTreeTable .treeItemContent { + padding: 2px; +} +/* +.gwt-FastTreeTable .selected .treeItemContent { + background: #e3e8f3 url('images/fasttree/selectionBar.gif') repeat-x; +} +*/ + +/*** gwt-MenuItem ***/ + +.gwt-MenuBar .gwt-MenuItem-disabled { + cursor: default; + background: none; + opacity: .5; + zoom: 1; + filter: alpha(opacity=40); +} + +/*** gwt-MenuBarPopup ***/ + +.gwt-MenuBarPopup { + z-index: 2147483647; /* Integer.MAX_VALUE */ +} + +/*** gwt-InlineCellEditor **/ + +.gwt-InlineCellEditor { + z-index: 2147483647; /* Integer.MAX_VALUE */ +} + +/*** gwt-PopupPanel **/ +.gwt-PopupPanel, +.gwt-DecoratedPopupPanel { + z-index: 2147483647; /* Integer.MAX_VALUE */ +} + +/*** mosaic-FormSeparator **/ + +.mosaic-FormSeparator { + font-weight: bold; +} + +.mosaic-FormSeparator div { + border: 1px solid #4d4d4d; +} + +/*** Basic Button with Images ***/ + +.gwt-Button[disabled] table, +.gwt-Button[disabled] img { + opacity: .5; + zoom: 1; + filter: alpha(opacity=40); +} + +.gwt-Button { + white-space: nowrap; +} + +/*** GWT Incubator SliderBar ***/ + +.gwt-SliderBar-shell { + height: 34pt; + width: 256px; +} + +.gwt-SliderBar-shell .gwt-SliderBar-line { + border: 1px solid #4d4d4d; + background-color: #cdcdcd; + height: 4px; + width: 95%; + top: 22pt; + overflow: hidden; +} + +.gwt-SliderBar-shell .gwt-SliderBar-line-disabled { + border: 1px solid #8d8d8d; +} + +.gwt-SliderBar-shell .gwt-SliderBar-knob { + top: 14pt; + z-index: 1; + cursor: pointer; +} + +.gwt-SliderBar-shell .gwt-SliderBar-tick { + top: 16pt; + width: 1px; + height: 6pt; + background: #4d4d4d; + overflow: hidden; +} + +.gwt-SliderBar-shell .gwt-SliderBar-tick-disabled { + background: #8d8d8d; +} + +.gwt-SliderBar-shell .gwt-SliderBar-label { + top: 2pt; + font-size: 8pt; + cursor: default; +} + +.gwt-SliderBar-shell-focused { + +} + +.gwt-SliderBar-shell .gwt-SliderBar-line-sliding { + cursor: pointer; +} + +/*** GWT Incubator ProgressBar ***/ + +.gwt-ProgressBar-shell { + border: 1px solid #4d4d4d; + background-color: #AAAAAA; + height: 1em; + width: 256px; +} +.gwt-ProgressBar-shell .gwt-ProgressBar-bar { + background-color: #67A7E3; +} +.gwt-ProgressBar-shell .gwt-ProgressBar-text { + padding: 0px; + margin: 0px; + color: white; +} + +/*** GWT Incubator Value Spinner ***/ + +.gwt-ValueSpinner .arrows { + width: 17px; + height: 18px; + margin-left: 1px; +} + +.gwt-ValueSpinner .textBox { + border: 0px; + text-align: right; + font-family: sans-serif; + font-weight: bold; + border: 1px solid #7F9DB9; +} + +.gwt-TimePicker { + padding: 1px; +} + +.gwt-TimePicker .textBox { + border: 0px; + width: 22px; + text-align: center; + font-family: sans-serif; + font-weight: bold; + font-size: 11px; + color: #506374; + border: 1px solid #7F9DB9; + background: url('images/valuespinner/bg_textbox.png') repeat-x; +} + +.gwt-VolumeSlider .gwt-ProgressBar-shell { + border: 1px solid #faf9f7; + border-right: 1px solid #848280; + border-bottom: 1px solid #848280; + background-color: #AAAAAA; + width: 50%; + height: 12pt; +} + +.gwt-VolumeSlider .gwt-ProgressBar-shell .gwt-ProgressBar-bar { + background-color: #67A7E3; +} + +.gwt-VolumeSlider .gwt-ProgressBar-shell .gwt-ProgressBar-text { + padding: 0px; + margin: 0px; + color: white; +} + +.gwt-VolumeSlider .decreaseArrow { + margin: 4px; +} + +.gwt-VolumeSlider .increaseArrow { + margin: 4px; +} diff --git a/common/static/js/capa/jsme/hosted.html b/common/static/js/capa/jsme/hosted.html new file mode 100644 index 0000000000..48b87f39b5 --- /dev/null +++ b/common/static/js/capa/jsme/hosted.html @@ -0,0 +1,365 @@ + + + +This html file is for Development Mode support. + diff --git a/common/static/js/capa/jsme/jsme.nocache.js b/common/static/js/capa/jsme/jsme.nocache.js new file mode 100644 index 0000000000..6b8b1af30f --- /dev/null +++ b/common/static/js/capa/jsme/jsme.nocache.js @@ -0,0 +1,18 @@ +function jsme(){var P='',xb='" for "gwt:onLoadErrorFn"',vb='" for "gwt:onPropertyErrorFn"',ib='"><\/script>',Z='#',ec='.cache.html',_='/',lb='//',Tb='07F2F052178EB8ACC679F41AB589BB42',Ub='08DE1A45E2ED1FE31E10B481F379463B',Vb='22351D2E57E6D516BDAA63C8D92AF37E',Wb='2EB7CEFA089AFE9532D26E6ED5265D36',Xb='5C122AB17CD2018C049114A7F6B474A9',Yb='71C3CF16262A8C60182173C9451037E5',Zb='9347E46F84EA436EF22DCE900B9102C6',$b='9AFE4FAB17128C1405E8842B30CF63FB',dc=':',pb='::',nc=' + + + + + diff --git a/common/static/js/capa/jsmolcalc/468C0B0171166372F064D287492CBD1E.cache.html b/common/static/js/capa/jsmolcalc/468C0B0171166372F064D287492CBD1E.cache.html new file mode 100644 index 0000000000..7c2b151277 --- /dev/null +++ b/common/static/js/capa/jsmolcalc/468C0B0171166372F064D287492CBD1E.cache.html @@ -0,0 +1,2659 @@ + + + + + + + diff --git a/common/static/js/capa/jsmolcalc/C43483CC355E7BFB7BE2F45092922897.cache.html b/common/static/js/capa/jsmolcalc/C43483CC355E7BFB7BE2F45092922897.cache.html new file mode 100644 index 0000000000..dbd7f2dd35 --- /dev/null +++ b/common/static/js/capa/jsmolcalc/C43483CC355E7BFB7BE2F45092922897.cache.html @@ -0,0 +1,2638 @@ + + + + + + + diff --git a/common/static/js/capa/jsmolcalc/E38BF09B489084CBFD0BF2CB8A77BFAC.cache.html b/common/static/js/capa/jsmolcalc/E38BF09B489084CBFD0BF2CB8A77BFAC.cache.html new file mode 100644 index 0000000000..b8cf726023 --- /dev/null +++ b/common/static/js/capa/jsmolcalc/E38BF09B489084CBFD0BF2CB8A77BFAC.cache.html @@ -0,0 +1,2788 @@ + + + + + + + diff --git a/common/static/js/capa/jsmolcalc/E8EDF03FE9C26D69E2C7DB17E15CF0ED.cache.html b/common/static/js/capa/jsmolcalc/E8EDF03FE9C26D69E2C7DB17E15CF0ED.cache.html new file mode 100644 index 0000000000..5255e0e552 --- /dev/null +++ b/common/static/js/capa/jsmolcalc/E8EDF03FE9C26D69E2C7DB17E15CF0ED.cache.html @@ -0,0 +1,2631 @@ + + + + + + + diff --git a/common/static/js/capa/jsmolcalc/F8283183F9546F019176F75A8E25B0F0.cache.html b/common/static/js/capa/jsmolcalc/F8283183F9546F019176F75A8E25B0F0.cache.html new file mode 100644 index 0000000000..b4b1d177df --- /dev/null +++ b/common/static/js/capa/jsmolcalc/F8283183F9546F019176F75A8E25B0F0.cache.html @@ -0,0 +1,2659 @@ + + + + + + + diff --git a/common/static/js/capa/jsmolcalc/clear.cache.gif b/common/static/js/capa/jsmolcalc/clear.cache.gif new file mode 100644 index 0000000000..e565824aaf Binary files /dev/null and b/common/static/js/capa/jsmolcalc/clear.cache.gif differ diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/clean.css b/common/static/js/capa/jsmolcalc/gwt/clean/clean.css new file mode 100644 index 0000000000..aa02d5385d --- /dev/null +++ b/common/static/js/capa/jsmolcalc/gwt/clean/clean.css @@ -0,0 +1,1264 @@ +/** + * The file contains styles for GWT widgets in the Clean theme. + * + * In order to maintain cross-browser compatibility, the following syntax is + * used to create IE6 specific style rules: + * .gwt-Widget { + * property: rule applies to all browsers + * -property: rule applies only to IE6 (overrides previous rule) + * } + * * html .gwt-Widget { + * property: rule applies to all versions of IE + * } + */ + +body, table td, select, button { + font-family: Arial Unicode MS, Arial, sans-serif; + font-size: small; +} +pre { + font-family: "courier new", courier; + font-size: small; +} +body { + color: black; + margin: 10px; + border: 0px; + padding: 0px; + background: #fff; + direction: ltr; +} +a, a:visited { + color: #0066cc; + text-decoration:none; +} + +a:hover { + color: #0066cc; + text-decoration:underline; +} + +select { + background: white; +} + +/** + * The reference theme can be used to determine when this style sheet has + * loaded. Create a hidden div element with absolute position, assign the style + * name below, and attach it to the DOM. Use a timer to detect when the + * element's height and width are set to 5px. + */ +.gwt-Reference-clean { + height: 5px; + width: 5px; + zoom: 1; +} + +.gwt-Button { + margin: 0; + padding: 5px 7px; + text-decoration: none; + cursor: pointer; + cursor: hand; + font-size:small; + background: url("images/hborder.png") repeat-x 0px -2077px; + border:1px solid #bbb; + border-bottom: 1px solid #a0a0a0; + border-radius: 3px; + -moz-border-radius: 3px; +} +.gwt-Button:active { + border: 1px inset #ccc; +} +.gwt-Button:hover { + border-color: #939393; +} +.gwt-Button[disabled] { + cursor: default; + color: #888; +} +.gwt-Button[disabled]:hover { + border: 1px outset #ccc; +} + +.gwt-CheckBox { +} +.gwt-CheckBox-disabled { + color: #888; +} + +.gwt-DecoratorPanel { +} +.gwt-DecoratorPanel .topCenter { + border-top: 1px solid #bbb; + line-height: 0px; +} +.gwt-DecoratorPanel .bottomCenter { + border-bottom: 1px solid #bbb; + line-height: 0px; +} +.gwt-DecoratorPanel .topCenterInner, +.gwt-DecoratorPanel .bottomCenterInner { + height: 1px; + line-height: 0px; + font-size: 1px; +} +.gwt-DecoratorPanel .middleLeft { + border-left: 1px solid #bbb; +} +.gwt-DecoratorPanel .middleRight { + border-right: 1px solid #bbb; +} +.gwt-DecoratorPanel .middleLeftInner, +.gwt-DecoratorPanel .middleRightInner { + width: 1px; + line-height: 1px; +} +.gwt-DecoratorPanel .topLeftInner, +.gwt-DecoratorPanel .topRightInner, +.gwt-DecoratorPanel .bottomLeftInner, +.gwt-DecoratorPanel .bottomRightInner { + width: 5px; + height: 5px; + zoom: 1; + font-size: 1px; + overflow: hidden; +} +.gwt-DecoratorPanel .topLeft { + line-height: 0px; + background: url(images/circles.png) no-repeat 0px -6px; + -background: url(images/circles_ie6.png) no-repeat 0px -6px; +} +.gwt-DecoratorPanel .topRight { + line-height: 0px; + background: url(images/circles.png) no-repeat -5px -6px; + -background: url(images/circles_ie6.png) no-repeat -5px -6px; +} +.gwt-DecoratorPanel .bottomLeft { + line-height: 0px; + background: url(images/circles.png) no-repeat 0px -11px; + -background: url(images/circles_ie6.png) no-repeat 0px -11px; +} +.gwt-DecoratorPanel .bottomRight { + line-height: 0px; + background: url(images/circles.png) no-repeat -5px -11px; + -background: url(images/circles_ie6.png) no-repeat -5px -11px; +} +* html .gwt-DecoratorPanel .topLeftInner, +* html .gwt-DecoratorPanel .topRightInner, +* html .gwt-DecoratorPanel .bottomLeftInner, +* html .gwt-DecoratorPanel .bottomRightInner { + width: 5px; + height: 5px; + overflow: hidden; +} + +.gwt-DialogBox .Caption { + background: #F1F1F1; + padding: 4px 8px 4px 4px; + cursor: default; + font-family: Arial Unicode MS, Arial, sans-serif; + font-weight: bold; + border-bottom: 1px solid #bbbbbb; + border-top: 1px solid #D2D2D2; +} +.gwt-DialogBox .dialogContent { +} +.gwt-DialogBox .dialogMiddleCenter { + padding: 3px; + background: white; +} +.gwt-DialogBox .dialogBottomCenter { + background: url(images/hborder.png) repeat-x 0px -2945px; + -background: url(images/hborder_ie6.png) repeat-x 0px -2144px; +} +.gwt-DialogBox .dialogMiddleLeft { + background: url(images/vborder.png) repeat-y -31px 0px; +} +.gwt-DialogBox .dialogMiddleRight { + background: url(images/vborder.png) repeat-y -32px 0px; + -background: url(images/vborder_ie6.png) repeat-y -32px 0px; +} +.gwt-DialogBox .dialogTopLeftInner { + width: 10px; + height: 8px; + zoom: 1; +} +.gwt-DialogBox .dialogTopRightInner { + width: 12px; + zoom: 1; +} +.gwt-DialogBox .dialogBottomLeftInner { + width: 10px; + height: 12px; + zoom: 1; +} +.gwt-DialogBox .dialogBottomRightInner { + width: 12px; + height: 12px; + zoom: 1; +} +.gwt-DialogBox .dialogTopLeft { + background: url(images/circles.png) no-repeat -20px 0px; + -background: url(images/circles_ie6.png) no-repeat -20px 0px; +} +.gwt-DialogBox .dialogTopRight { + background: url(images/circles.png) no-repeat -28px 0px; + -background: url(images/circles_ie6.png) no-repeat -28px 0px; +} +.gwt-DialogBox .dialogBottomLeft { + background: url(images/circles.png) no-repeat 0px -36px; + -background: url(images/circles_ie6.png) no-repeat 0px -36px; +} +.gwt-DialogBox .dialogBottomRight { + background: url(images/circles.png) no-repeat -8px -36px; + -background: url(images/circles_ie6.png) no-repeat -8px -36px; +} +* html .gwt-DialogBox .dialogTopLeftInner { + width: 10px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogTopRightInner { + width: 12px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogBottomLeftInner { + width: 10px; + height: 12px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogBottomRightInner { + width: 12px; + height: 12px; + overflow: hidden; +} + +.gwt-DisclosurePanel { +} +.gwt-DisclosurePanel-open { +} +.gwt-DisclosurePanel-closed { +} +.gwt-DisclosurePanel .header, +.gwt-DisclosurePanel .header a, +.gwt-DisclosurePanel .header td { + text-decoration: none; /* Remove underline from header */ + color: black; + cursor: pointer; + cursor: hand; +} +.gwt-DisclosurePanel .content { + border-left: 3px solid #e7e7e7; + padding: 4px 0px 4px 8px; + margin-left: 6px; +} + +.gwt-FileUpload { +} + +.gwt-Frame { + border-top: 2px solid #666; + border-left: 2px solid #666; + border-right: 2px solid #bbb; + border-bottom: 2px solid #bbb; +} + +.gwt-HorizontalSplitPanel { +} +.gwt-HorizontalSplitPanel .hsplitter { + cursor: move; + border: 0px; + background: #e7e7e7; + line-height: 0px; +} +.gwt-VerticalSplitPanel { +} +.gwt-VerticalSplitPanel .vsplitter { + cursor: move; + border: 0px; + background: #e7e7e7; + line-height: 0px; +} + +.gwt-HTML { + padding: 0 0px; +} + +.gwt-Hyperlink { + cursor: pointer; +} + +.gwt-Image { +} + +.gwt-Label { +} + +.gwt-ListBox { +} + +.gwt-MenuBar { + cursor: default; +} +.gwt-MenuBar .gwt-MenuItem { + cursor: default; + font-family: Arial Unicode MS, Arial, sans-serif; +} +.gwt-MenuBar .gwt-MenuItem-selected { + background: #E3E8F3; +} +.gwt-MenuBar-horizontal { + background: #e3e8f3 url(images/hborder.png) repeat-x 0px -2003px; + border: 1px solid #e0e0e0; +} +.gwt-MenuBar-horizontal .gwt-MenuItem { + padding: 5px 10px; + vertical-align: bottom; + color: #000; + font-weight: bold; +} +.gwt-MenuBar-horizontal .gwt-MenuItemSeparator { + width: 1px; + padding: 0px; + margin: 0px; + border: 0px; + border-left: 1px solid #ccc; + background: white; +} +.gwt-MenuBar-horizontal .gwt-MenuItemSeparator .menuSeparatorInner { + width: 1px; + height: 1px; + background: white; +} +.gwt-MenuBar-vertical { + margin-top: 0px; + margin-left: 0px; + background: white; +} +.gwt-MenuBar-vertical table { + border-collapse: collapse; +} +.gwt-MenuBar-vertical .gwt-MenuItem { + padding: 2px 40px 2px 1px; +} +.gwt-MenuBar-vertical .gwt-MenuItemSeparator { + padding: 2px 0px; +} +.gwt-MenuBar-vertical .gwt-MenuItemSeparator .menuSeparatorInner { + height: 1px; + padding: 0px; + border: 0px; + border-top: 1px solid #ccc; + overflow: hidden; +} +.gwt-MenuBar-vertical .subMenuIcon { + padding-right: 4px; +} +.gwt-MenuBar-vertical .subMenuIcon-selected { + background: #E3E8F3; +} +.gwt-MenuBarPopup { + margin: 0px 0px 0px 3px; +} +.gwt-MenuBarPopup .menuPopupTopCenter { + background: url(images/hborder.png) 0px -12px repeat-x; +} +.gwt-MenuBarPopup .menuPopupBottomCenter { + background: url(images/hborder.png) 0px -13px repeat-x; + -background: url(images/hborder_ie6.png) 0px -13px repeat-x; +} +.gwt-MenuBarPopup .menuPopupMiddleLeft { + background: url(images/vborder.png) -12px 0px repeat-y; + -background: url(images/vborder_ie6.png) -12px 0px repeat-y; +} +.gwt-MenuBarPopup .menuPopupMiddleRight { + background: url(images/vborder.png) -13px 0px repeat-y; + -background: url(images/vborder_ie6.png) -13px 0px repeat-y; +} +.gwt-MenuBarPopup .menuPopupTopLeftInner { + width: 5px; + height: 5px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupTopRightInner { + width: 8px; + height: 5px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupBottomLeftInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupBottomRightInner { + width: 8px; + height: 8px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupTopLeft { + background: url(images/corner.png) no-repeat 0px -36px; + -background: url(images/corner_ie6.png) no-repeat 0px -36px; +} +.gwt-MenuBarPopup .menuPopupTopRight { + background: url(images/corner.png) no-repeat -5px -36px; + -background: url(images/corner_ie6.png) no-repeat -5px -36px; +} +.gwt-MenuBarPopup .menuPopupBottomLeft { + background: url(images/corner.png) no-repeat 0px -41px; + -background: url(images/corner_ie6.png) no-repeat 0px -41px; +} +.gwt-MenuBarPopup .menuPopupBottomRight { + background: url(images/corner.png) no-repeat -5px -41px; + -background: url(images/corner_ie6.png) no-repeat -5px -41px; +} +* html .gwt-MenuBarPopup .menuPopupTopLeftInner { + width: 5px; + height: 5px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupTopRightInner { + width: 8px; + height: 5px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupBottomLeftInner { + width: 5px; + height: 8px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupBottomRightInner { + width: 8px; + height: 8px; + overflow: hidden; +} + +.gwt-PasswordTextBox { + padding: 5px 4px; + border: 1px solid #ccc; + border-top: 1px solid #999; + font-size: 100%; +} +.gwt-PasswordTextBox-readonly { + color: #888; +} + +.gwt-PopupPanel { + border: 3px solid #e7e7e7; + padding: 3px; + background: white; +} + +.gwt-DecoratedPopupPanel .popupContent { +} +.gwt-DecoratedPopupPanel .popupMiddleCenter { + padding: 3px; + background: #f1f1f1; +} +.gwt-DecoratedPopupPanel .popupTopCenter { + background: url(images/hborder.png) 0px -2937px repeat-x; +} +.gwt-DecoratedPopupPanel .popupBottomCenter { + background: url(images/hborder.png) repeat-x 0px -2938px; + -background: url(images/hborder_ie6.png) repeat-x 0px -2138px; +} +.gwt-DecoratedPopupPanel .popupMiddleLeft { + background: url(images/vborder.png) -21px 0px repeat-y; +} +.gwt-DecoratedPopupPanel .popupMiddleRight { + background: url(images/vborder.png) repeat-y -24px 0px; + -background: url(images/vborder_ie6.png) repeat-y -24px 0px; +} +.gwt-DecoratedPopupPanel .popupTopLeftInner { + width: 6px; + height: 5px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupTopRightInner { + width: 6px; + height: 5px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupBottomLeftInner { + width: 6px; + height: 6px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupBottomRightInner { + width: 6px; + height: 6px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupTopLeft { + background: url(images/circles.png) no-repeat 0px -16px; + -background: url(images/circles_ie6.png) no-repeat 0px -16px; +} +.gwt-DecoratedPopupPanel .popupTopRight { + background: url(images/circles.png) no-repeat -6px -16px; + -background: url(images/circles_ie6.png) no-repeat -6px -16px; +} +.gwt-DecoratedPopupPanel .popupBottomLeft { + background: url(images/circles.png) no-repeat 0px -21px; + -background: url(images/circles_ie6.png) no-repeat 0px -21px; +} +.gwt-DecoratedPopupPanel .popupBottomRight { + background: url(images/circles.png) no-repeat -6px -21px; + -background: url(images/circles_ie6.png) no-repeat -6px -21px; +} +* html .gwt-DecoratedPopupPanel .popupTopLeftInner { + width: 6px; + height: 5px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupTopRightInner { + width: 6px; + height: 5px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupBottomLeftInner { + width: 6px; + height: 6px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupBottomRightInner { + width: 6px; + height: 6px; + overflow: hidden; +} + +.gwt-PopupPanelGlass { + background-color: #000; + opacity: 0.3; + filter: alpha(opacity=30); +} + +.gwt-PushButton-up, +.gwt-PushButton-up-hovering, +.gwt-PushButton-up-disabled, +.gwt-PushButton-down, +.gwt-PushButton-down-hovering, +.gwt-PushButton-down-disabled { + margin: 0; + text-decoration: none; + background: url("images/hborder.png") repeat-x 0px -27px; + border-radius: 2px; + -moz-border-radius: 2px; +} +.gwt-PushButton-up, +.gwt-PushButton-up-hovering, +.gwt-PushButton-up-disabled { + padding: 3px 5px 3px 5px; +} +.gwt-PushButton-up { + border:1px solid #bbb; + border-bottom: 1px solid #a0a0a0; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-up-hovering { + border: 1px solid; + border-color: #939393; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-up-disabled { + border: 1px solid #bbb; + cursor: default; + opacity: .5; + filter: alpha(opacity=45); + zoom: 1; +} +.gwt-PushButton-down, +.gwt-PushButton-down-hovering, +.gwt-PushButton-down-disabled { + padding: 4px 4px 2px 6px; + outline:none; +} +.gwt-PushButton-down { + border: 1px inset #666; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-down-hovering { + border: 1px solid #939393; + border-top: 1px solid #333333; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-down-disabled { + border: 1px outset #ccc; + cursor: default; + opacity: 0.5; + filter: alpha(opacity=45); + zoom: 1; +} + +.gwt-RadioButton { +} +.gwt-RadioButton-disabled { + color: #888; +} + +.gwt-RichTextArea { +} +.hasRichTextToolbar { + border: 0px; +} +.gwt-RichTextToolbar { + background: #e3e8f3 url(images/hborder.png) repeat-x 0px -2003px; + border-bottom: 1px solid #BBBBBB; + padding: 3px; + margin: 0px; +} +.gwt-RichTextToolbar .gwt-PushButton-up { + padding: 0px 1px 0px 0px; + margin-right: 4px; + margin-bottom: 4px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-up-hovering { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-down { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-down-hovering { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-up { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border:1px solid #bbb; + border-bottom: 1px solid #a0a0a0; +} +.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-down { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { + margin-right: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} + +.gwt-StackPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-StackPanel .gwt-StackPanelItem { + cursor: pointer; + cursor: hand; + font-weight: bold; + font-size: 1.3em; + padding: 3px; + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.gwt-StackPanel .gwt-StackPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 2px 10px 5px; +} + +.gwt-DecoratedStackPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .gwt-StackPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 2px 10px 5px; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem { + cursor: pointer; + cursor: hand; +} +.gwt-DecoratedStackPanel .stackItemTopLeft, +.gwt-DecoratedStackPanel .stackItemTopRight { + height: 6px; + width: 6px; + zoom: 1; +} +.gwt-DecoratedStackPanel .stackItemTopLeft { + border-left: 1px solid #bbbbbb; + background: #d3def6 url(images/corner.png) no-repeat 0px -49px; + -background: #d3def6 url(images/corner_ie6.png) no-repeat 0px -49px; +} +.gwt-DecoratedStackPanel .stackItemTopRight { + border-right: 1px solid #bbbbbb; + background: #d3def6 url(images/corner.png) no-repeat -6px -49px; + -background: #d3def6 url(images/corner_ie6.png) no-repeat -6px -49px; +} +.gwt-DecoratedStackPanel .stackItemTopLeftInner, +.gwt-DecoratedStackPanel .stackItemTopRightInner { + width: 1px; + height: 1px; +} +* html .gwt-DecoratedStackPanel .stackItemTopLeftInner, +* html .gwt-DecoratedStackPanel .stackItemTopRightInner { + width: 6px; + height: 6px; + overflow: hidden; +} +.gwt-DecoratedStackPanel .stackItemTopCenter { + background: url(images/hborder.png) 0px -21px repeat-x; +} +.gwt-DecoratedStackPanel .stackItemMiddleLeft { + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; + border-left: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .stackItemMiddleLeftInner, +.gwt-DecoratedStackPanel .stackItemMiddleRightInner { + width: 1px; + height: 1px; +} +.gwt-DecoratedStackPanel .stackItemMiddleRight { + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; + border-right: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .stackItemMiddleCenter { + font-weight: bold; + font-size: 1.3em; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem-first .stackItemTopRight, +.gwt-DecoratedStackPanel .gwt-StackPanelItem-first .stackItemTopLeft { + border: 0px; + background-color: white; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem-below-selected .stackItemTopLeft, +.gwt-DecoratedStackPanel .gwt-StackPanelItem-below-selected .stackItemTopRight { + background-color: white; +} + +.gwt-SuggestBox { + padding: 5px 4px; + border: 1px solid #ccc; + border-top: 1px solid #999; + font-size: 100%; + font-family: Arial Unicode MS, Arial, sans-serif; +} + +.gwt-SuggestBoxPopup { +} + +.gwt-SuggestBoxPopup .item { + padding: 2px 6px; + color: #000; + cursor: default; + font-size: 110%; +} +.gwt-SuggestBoxPopup .item-selected { + background: #D5E2FF; +} +.gwt-SuggestBoxPopup .suggestPopupContent { + background: white; +} +.gwt-SuggestBoxPopup .suggestPopupTopCenter { + border-top: 1px solid #bbb; +} +.gwt-SuggestBoxPopup .suggestPopupBottomCenter { + border-bottom: 1px solid #bbb; +} +.gwt-SuggestBoxPopup .suggestPopupTopCenterInner, +.gwt-SuggestBoxPopup .suggestPopupBottomCenterInner { + height: 1px; + line-height: 1px; +} +.gwt-SuggestBoxPopup .suggestPopupMiddleLeft { + border-left: 1px solid #bbb; +} +.gwt-SuggestBoxPopup .suggestPopupMiddleRight { + border-right: 1px solid #bbb; +} +.gwt-SuggestBoxPopup .suggestPopupMiddleLeftInner, +.gwt-SuggestBoxPopup .suggestPopupMiddleRightInner { + width: 1px; + line-height: 1px; +} +.gwt-SuggestBoxPopup .suggestPopupTopLeftInner { + width: 0px; + height: 0px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupTopRightInner { + width: 0px; + height: 0px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupBottomLeftInner { + width: 0px; + height: 0px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupBottomRightInner { + width: 0px; + height: 0px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupTopLeft { + background: url(images/circles.png) no-repeat 0px -6px; + -background: url(images/circles_ie6.png) no-repeat 0px -6px; + width:5px; + height:5px; +} +.gwt-SuggestBoxPopup .suggestPopupTopRight { + background: url(images/circles.png) no-repeat -5px -6px; + -background: url(images/circles_ie6.png) no-repeat -5px -6px; + width:5px; + height:5px; +} +.gwt-SuggestBoxPopup .suggestPopupBottomLeft { + background: url(images/circles.png) no-repeat 0px -11px; + -background: url(images/circles_ie6.png) no-repeat 0px -11px; + width:5px; + height:5px; +} +.gwt-SuggestBoxPopup .suggestPopupBottomRight { + background: url(images/circles.png) no-repeat -5px -11px; + -background: url(images/circles_ie6.png) no-repeat -5px -11px; + width:5px; + height:5px; +} +* html .gwt-SuggestBoxPopup .suggestPopupTopLeftInner { + width: 0px; + height: 0px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupTopRightInner { + width: 0px; + height: 0px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupBottomLeftInner { + width: 0px; + height: 0px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupBottomRightInner { + width: 0px; + height: 0px; + overflow: hidden; +} + +.gwt-TabBar { + background: #ccc; + padding-top: 6px; +} +.gwt-TabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.gwt-TabBar .gwt-TabBarRest { +} +.gwt-TabBar .gwt-TabBarItem { + margin-left: 4px; + padding: 4px 8px 4px 8px; + cursor: pointer; + cursor: hand; + color: white; + font-weight: normal; + text-align: center; + background: #8E8E8E; + -moz-border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; +} +.gwt-TabBar .gwt-TabBarItem-selected { + cursor: default; + background: white; + color: #333; + font-weight: bold; +} +.gwt-TabBar .gwt-TabBarItem-disabled { + cursor: default; + color: #999999; +} +.gwt-TabPanel { +} +.gwt-TabPanelBottom { + border-color: #ccc; + border-style: solid; + border-width: 0px 1px 1px; + overflow: hidden; + padding: 6px; +} +.gwt-DecoratedTabBar { + background: #ccc; + padding-top: 6px; +} +.gwt-DecoratedTabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.gwt-DecoratedTabBar .gwt-TabBarRest { +} +.gwt-DecoratedTabBar .gwt-TabBarItem { + border-collapse: collapse; + margin-left: 4px; +} +.gwt-DecoratedTabBar .tabTopCenter { + padding: 0px; + background: #8E8E8E; +} +.gwt-DecoratedTabBar .tabTopLeft, +.gwt-DecoratedTabBar .tabTopRight { + padding: 0px; + zoom: 1; +} +.gwt-DecoratedTabBar .tabTopLeftInner, +.gwt-DecoratedTabBar .tabTopRightInner { + width: 3px; + height: 3px; +} +.gwt-DecoratedTabBar .tabTopLeft { + background: url(images/circles.png) no-repeat 0px 0px; + -background: url(images/circles_ie6.png) no-repeat 0px 0px; +} +.gwt-DecoratedTabBar .tabTopRight { + background: url(images/circles.png) no-repeat -3px 0px; + -background: url(images/circles_ie6.png) no-repeat -3px 0px; +} +* html .gwt-DecoratedTabBar .tabTopLeftInner, +* html .gwt-DecoratedTabBar .tabTopRightInner { + width: 3px; + height: 3px; + overflow: hidden; +} +.gwt-DecoratedTabBar .tabMiddleLeft, +.gwt-DecoratedTabBar .tabMiddleRight { + width: 3px; + padding: 0px; + background: #8E8E8E; +} +.gwt-DecoratedTabBar .tabMiddleLeftInner, +.gwt-DecoratedTabBar .tabMiddleRightInner { + width: 1px; + height: 1px; +} +.gwt-DecoratedTabBar .tabMiddleCenter { + padding: 0px 5px 4px 5px; + cursor: pointer; + cursor: hand; + color: #fff; + font-weight: normal; + text-align: center; + background: #8E8E8E; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopCenter { + background:#fff; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopLeft { + background: url(images/circles.png) no-repeat -6px 0px; + -background: url(images/circles_ie6.png) no-repeat -6px 0px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopRight { + background: url(images/circles.png) no-repeat -9px 0px; + -background: url(images/circles_ie6.png) no-repeat -9px 0px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleLeft, +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleRight { + background: #fff; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleCenter { + cursor: default; + background: #fff; + color:#333; + font-weight:bold; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-disabled .tabMiddleCenter { + cursor: default; + color: #999999; +} + +.gwt-TextArea { + padding: 4px; + border: 1px solid #ccc; + border-top: 1px solid #666; + font-size: 100%; + font-family: Arial Unicode MS, Arial, sans-serif; +} +.gwt-TextArea-readonly { + color: #888; +} + +.gwt-TextBox { + padding: 5px 4px; + border: 1px solid #ccc; + border-top: 1px solid #999; + font-size: small; + font-family: Arial Unicode MS, Arial, sans-serif; +} +.gwt-TextBox-readonly { + color: #888; +} +.gwt-ToggleButton-up, +.gwt-ToggleButton-up-hovering, +.gwt-ToggleButton-up-disabled, +.gwt-ToggleButton-down, +.gwt-ToggleButton-down-hovering, +.gwt-ToggleButton-down-disabled { + margin: 0; + text-decoration: none; + background: url("images/hborder.png") repeat-x 0px -27px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.gwt-ToggleButton-up, +.gwt-ToggleButton-up-hovering, +.gwt-ToggleButton-up-disabled { + padding: 3px 5px 3px 5px; +} +.gwt-ToggleButton-up { + border:1px solid #bbb; + border-bottom: 1px solid #a0a0a0; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-up-hovering { + border: 1px solid; + border-color: #939393; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-up-disabled { + border: 1px solid #bbb; + cursor: default; + opacity: .5; + zoom: 1; + filter: alpha(opacity=45); +} +.gwt-ToggleButton-down, +.gwt-ToggleButton-down-hovering, +.gwt-ToggleButton-down-disabled { + padding: 4px 4px 2px 6px; +} +.gwt-ToggleButton-down { + background-position: 0 -513px; + border: 1px inset #666; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-down-hovering { + background-position: 0 -513px; + border: 1px inset; + border-color: #9cf #69e #69e #7af; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-down-disabled { + background-position: 0 -513px; + border: 1px inset #ccc; + cursor: default; + opacity: .5; + zoom: 1; + filter: alpha(opacity=45); +} + +.gwt-Tree .gwt-TreeItem { + padding: 1px 0px; + margin: 0px; + white-space: nowrap; + cursor: hand; + cursor: pointer; +} +.gwt-Tree .gwt-TreeItem-selected { + background: #ebeff9; +} +.gwt-TreeItem .gwt-RadioButton input, +.gwt-TreeItem .gwt-CheckBox input { + margin-left: 0px; +} +* html .gwt-TreeItem .gwt-RadioButton input, +* html .gwt-TreeItem .gwt-CheckBox input { + margin-left: -4px; +} + +.gwt-DateBox { + padding: 5px 4px; + border: 1px solid #ccc; + border-top: 1px solid #999; + font-size: 100%; +} +.gwt-DateBox input { + width: 8em; +} +.dateBoxFormatError { + background: #ffcccc; +} +.dateBoxPopup { +} + +.gwt-DatePicker { + border: 1px solid #ccc; + border-top:1px solid #999; + cursor: default; +} +.gwt-DatePicker td, +.datePickerMonthSelector td:focus { + outline: none; +} +.datePickerDays { + width: 100%; + background: white; +} +.datePickerDay, +.datePickerWeekdayLabel, +.datePickerWeekendLabel { + font-size: 85%; + text-align: center; + padding: 4px; + outline: none; + font-weight:bold; + color:#333; + border-right: 1px solid #EDEDED; + border-bottom: 1px solid #EDEDED; +} +.datePickerWeekdayLabel, +.datePickerWeekendLabel { + background: #fff; + padding: 0px 4px 2px; + cursor: default; + color:#666; + font-size:70%; + font-weight:normal; +} +.datePickerDay { + padding: 4px 7px; + cursor: hand; + cursor: pointer; +} +.datePickerDayIsWeekend { + background: #f7f7f7; +} +.datePickerDayIsFiller { + color: #999; + font-weight:normal; +} +.datePickerDayIsValue { + background: #d7dfe8; +} +.datePickerDayIsDisabled { + color: #AAAAAA; + font-style: italic; +} +.datePickerDayIsHighlighted { + background: #F0E68C; +} +.datePickerDayIsValueAndHighlighted { + background: #d7dfe8; +} +.datePickerDayIsToday { + padding: 3px; + color: #fff; + background: url(images/hborder.png) repeat-x 0px -2607px; +} + +.datePickerMonthSelector { + width: 100%; + padding: 1px 0 5px 0; + background: #fff; +} +td.datePickerMonth { + text-align: center; + vertical-align: middle; + white-space: nowrap; + font-size: 100%; + font-weight: bold; + color: #333; +} +.datePickerPreviousButton, +.datePickerNextButton { + font-size: 120%; + line-height: 1em; + color: #3a6aad; + cursor: hand; + cursor: pointer; + font-weight: bold; + padding: 0px 4px; + outline: none; +} + +.gwt-StackLayoutPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelHeader { + cursor: pointer; + cursor: hand; + font-weight: bold; + font-size: 1.3em; + padding: 3px; + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelHeader-hovering { + background: #d3def6; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 2px 10px 5px; +} + +.gwt-TabLayoutPanel { +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTabs { + background: #ccc; + padding-top: 6px; + padding-left: 5px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelContentContainer { + border-color: #ccc; + border-style: solid; + border-width: 0px 1px 1px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelContent { + overflow: hidden; + padding: 6px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTab { + margin-left: 4px; + padding: 4px 8px 4px 8px; + cursor: pointer; + cursor: hand; + color: white; + font-weight: normal; + text-align: center; + background: #8E8E8E; + -moz-border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTab-selected { + cursor: default; + background: white; + color: #333; + font-weight: bold; +} + +.gwt-SplitLayoutPanel-HDragger { + background: #e7e7e7 url(images/thumb_vertical.png) center center no-repeat; + cursor: col-resize; +} + +.gwt-SplitLayoutPanel-VDragger { + background: #e7e7e7 url(images/thumb_horz.png) center center no-repeat; + cursor: row-resize; +} \ No newline at end of file diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/clean_rtl.css b/common/static/js/capa/jsmolcalc/gwt/clean/clean_rtl.css new file mode 100644 index 0000000000..7e2c695ccf --- /dev/null +++ b/common/static/js/capa/jsmolcalc/gwt/clean/clean_rtl.css @@ -0,0 +1,1265 @@ +/** + * The file contains styles for GWT widgets in the Clean theme, in RTL mode. + * + * In order to maintain cross-browser compatibility, the following syntax is + * used to create IE6 specific style rules: + * .gwt-Widget { + * property: rule applies to all browsers + * -property: rule applies only to IE6 (overrides previous rule) + * } + * * html .gwt-Widget { + * property: rule applies to all versions of IE + * } + */ + +body, table td, select, button { + font-family: Arial Unicode MS, Arial, sans-serif; + font-size: small; +} +pre { + font-family: "courier new", courier; + font-size: small; +} +body { + color: black; + margin: 10px; + border: 0px; + padding: 0px; + background: #fff; + direction: rtl; +} +a, a:visited { + color: #0066cc; + text-decoration:none; +} + +a:hover { + color: #0066cc; + text-decoration:underline; +} + +select { + background: white; +} + +/** + * The reference theme can be used to determine when this style sheet has + * loaded. Create a hidden div element with absolute position, assign the style + * name below, and attach it to the DOM. Use a timer to detect when the + * element's height and width are set to 5px. + */ +.gwt-Reference-clean-rtl { + height: 5px; + width: 5px; + zoom: 1; +} + +.gwt-Button { + margin: 0; + padding: 5px 7px; + text-decoration: none; + cursor: pointer; + cursor: hand; + font-size:small; + background: url("images/hborder.png") repeat-x 0px -2077px; + border:1px solid #bbb; + border-bottom: 1px solid #a0a0a0; + border-radius: 3px; + -moz-border-radius: 3px; +} +.gwt-Button:active { + border: 1px inset #ccc; +} +.gwt-Button:hover { + border-color: #939393; +} +.gwt-Button[disabled] { + cursor: default; + color: #888; +} +.gwt-Button[disabled]:hover { + border: 1px outset #ccc; +} + +.gwt-CheckBox { +} +.gwt-CheckBox-disabled { + color: #888; +} + +.gwt-DecoratorPanel { +} +.gwt-DecoratorPanel .topCenter { + border-top: 1px solid #bbb; + line-height: 0px; +} +.gwt-DecoratorPanel .bottomCenter { + border-bottom: 1px solid #bbb; + line-height: 0px; +} +.gwt-DecoratorPanel .topCenterInner, +.gwt-DecoratorPanel .bottomCenterInner { + height: 1px; + line-height: 0px; + font-size: 1px; +} +.gwt-DecoratorPanel .middleLeft { + border-left: 1px solid #bbb; +} +.gwt-DecoratorPanel .middleRight { + border-right: 1px solid #bbb; +} +.gwt-DecoratorPanel .middleLeftInner, +.gwt-DecoratorPanel .middleRightInner { + width: 1px; + line-height: 1px; +} +.gwt-DecoratorPanel .topLeftInner, +.gwt-DecoratorPanel .topRightInner, +.gwt-DecoratorPanel .bottomLeftInner, +.gwt-DecoratorPanel .bottomRightInner { + width: 5px; + height: 5px; + zoom: 1; + font-size: 1px; + overflow: hidden; +} +.gwt-DecoratorPanel .topLeft { + line-height: 0px; + background: url(images/circles.png) no-repeat 0px -6px; + -background: url(images/circles_ie6.png) no-repeat 0px -6px; +} +.gwt-DecoratorPanel .topRight { + line-height: 0px; + background: url(images/circles.png) no-repeat -5px -6px; + -background: url(images/circles_ie6.png) no-repeat -5px -6px; +} +.gwt-DecoratorPanel .bottomLeft { + line-height: 0px; + background: url(images/circles.png) no-repeat 0px -11px; + -background: url(images/circles_ie6.png) no-repeat 0px -11px; +} +.gwt-DecoratorPanel .bottomRight { + line-height: 0px; + background: url(images/circles.png) no-repeat -5px -11px; + -background: url(images/circles_ie6.png) no-repeat -5px -11px; +} +* html .gwt-DecoratorPanel .topLeftInner, +* html .gwt-DecoratorPanel .topRightInner, +* html .gwt-DecoratorPanel .bottomLeftInner, +* html .gwt-DecoratorPanel .bottomRightInner { + width: 5px; + height: 5px; + overflow: hidden; +} + +.gwt-DialogBox .Caption { + background: #F1F1F1; + padding: 4px 4px 4px 8px; + cursor: default; + font-family: Arial Unicode MS, Arial, sans-serif; + font-weight: bold; + border-bottom: 1px solid #bbbbbb; + border-top: 1px solid #D2D2D2; +} +.gwt-DialogBox .dialogContent { +} +.gwt-DialogBox .dialogMiddleCenter { + padding: 3px; + background: white; +} +.gwt-DialogBox .dialogBottomCenter { + background: url(images/hborder.png) repeat-x 0px -2945px; + -background: url(images/hborder_ie6.png) repeat-x 0px -2144px; +} +.gwt-DialogBox .dialogMiddleLeft { + background: url(images/vborder.png) repeat-y -31px 0px; +} +.gwt-DialogBox .dialogMiddleRight { + background: url(images/vborder.png) repeat-y -32px 0px; + -background: url(images/vborder_ie6.png) repeat-y -32px 0px; +} +.gwt-DialogBox .dialogTopLeftInner { + width: 10px; + height: 8px; + zoom: 1; +} +.gwt-DialogBox .dialogTopRightInner { + width: 12px; + zoom: 1; +} +.gwt-DialogBox .dialogBottomLeftInner { + width: 10px; + height: 12px; + zoom: 1; +} +.gwt-DialogBox .dialogBottomRightInner { + width: 12px; + height: 12px; + zoom: 1; +} +.gwt-DialogBox .dialogTopLeft { + background: url(images/circles.png) no-repeat -20px 0px; + -background: url(images/circles_ie6.png) no-repeat -20px 0px; +} +.gwt-DialogBox .dialogTopRight { + background: url(images/circles.png) no-repeat -28px 0px; + -background: url(images/circles_ie6.png) no-repeat -28px 0px; +} +.gwt-DialogBox .dialogBottomLeft { + background: url(images/circles.png) no-repeat 0px -36px; + -background: url(images/circles_ie6.png) no-repeat 0px -36px; +} +.gwt-DialogBox .dialogBottomRight { + background: url(images/circles.png) no-repeat -8px -36px; + -background: url(images/circles_ie6.png) no-repeat -8px -36px; +} +* html .gwt-DialogBox .dialogTopLeftInner { + width: 10px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogTopRightInner { + width: 12px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogBottomLeftInner { + width: 10px; + height: 12px; + overflow: hidden; +} +* html .gwt-DialogBox .dialogBottomRightInner { + width: 12px; + height: 12px; + overflow: hidden; +} + +.gwt-DisclosurePanel { +} +.gwt-DisclosurePanel-open { +} +.gwt-DisclosurePanel-closed { +} +.gwt-DisclosurePanel .header, +.gwt-DisclosurePanel .header a, +.gwt-DisclosurePanel .header td { + text-decoration: none; /* Remove underline from header */ + color: black; + cursor: pointer; + cursor: hand; +} +.gwt-DisclosurePanel .content { + border-right: 3px solid #e7e7e7; + padding: 4px 8px 4px 0px; + margin-right: 6px; +} + +.gwt-FileUpload { +} + +.gwt-Frame { + border-top: 2px solid #666; + border-left: 2px solid #666; + border-right: 2px solid #bbb; + border-bottom: 2px solid #bbb; +} + +.gwt-HorizontalSplitPanel { +} +.gwt-HorizontalSplitPanel .hsplitter { + cursor: move; + border: 0px; + background: #e7e7e7; + line-height: 0px; +} +.gwt-VerticalSplitPanel { +} +.gwt-VerticalSplitPanel .vsplitter { + cursor: move; + border: 0px; + background: #e7e7e7; + line-height: 0px; +} + +.gwt-HTML { + padding: 0 0px; +} + +.gwt-Hyperlink { + cursor: pointer; +} + +.gwt-Image { +} + +.gwt-Label { +} + +.gwt-ListBox { +} + +.gwt-MenuBar { + cursor: default; +} +.gwt-MenuBar .gwt-MenuItem { + cursor: default; + font-family: Arial Unicode MS, Arial, sans-serif; +} +.gwt-MenuBar .gwt-MenuItem-selected { + background: #E3E8F3; +} +.gwt-MenuBar-horizontal { + background: #e3e8f3 url(images/hborder.png) repeat-x 0px -2003px; + border: 1px solid #e0e0e0; +} +.gwt-MenuBar-horizontal .gwt-MenuItem { + padding: 5px 10px; + vertical-align: bottom; + color: #000; + font-weight: bold; +} +.gwt-MenuBar-horizontal .gwt-MenuItemSeparator { + width: 1px; + padding: 0px; + margin: 0px; + border: 0px; + border-right: 1px solid #ccc; + background: white; +} +.gwt-MenuBar-horizontal .gwt-MenuItemSeparator .menuSeparatorInner { + width: 1px; + height: 1px; + background: white; +} +.gwt-MenuBar-vertical { + margin-top: 0px; + margin-right: 0px; + background: white; +} +.gwt-MenuBar-vertical table { + border-collapse: collapse; +} +.gwt-MenuBar-vertical .gwt-MenuItem { + padding: 2px 1px 2px 40px; +} +.gwt-MenuBar-vertical .gwt-MenuItemSeparator { + padding: 2px 0px; +} +.gwt-MenuBar-vertical .gwt-MenuItemSeparator .menuSeparatorInner { + height: 1px; + padding: 0px; + border: 0px; + border-top: 1px solid #ccc; + overflow: hidden; +} +.gwt-MenuBar-vertical .subMenuIcon { + padding-left: 4px; +} +.gwt-MenuBar-vertical .subMenuIcon-selected { + background: #E3E8F3; +} +.gwt-MenuBarPopup { + margin: 0px 3px 0px 0px; +} +.gwt-MenuBarPopup .menuPopupTopCenter { + background: url(images/hborder.png) 0px -12px repeat-x; +} +.gwt-MenuBarPopup .menuPopupBottomCenter { + background: url(images/hborder.png) 0px -13px repeat-x; + -background: url(images/hborder_ie6.png) 0px -13px repeat-x; +} +.gwt-MenuBarPopup .menuPopupMiddleLeft { + background: url(images/vborder.png) -12px 0px repeat-y; + -background: url(images/vborder_ie6.png) -12px 0px repeat-y; +} +.gwt-MenuBarPopup .menuPopupMiddleRight { + background: url(images/vborder.png) -13px 0px repeat-y; + -background: url(images/vborder_ie6.png) -13px 0px repeat-y; +} +.gwt-MenuBarPopup .menuPopupTopLeftInner { + width: 5px; + height: 5px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupTopRightInner { + width: 8px; + height: 5px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupBottomLeftInner { + width: 5px; + height: 8px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupBottomRightInner { + width: 8px; + height: 8px; + zoom: 1; +} +.gwt-MenuBarPopup .menuPopupTopLeft { + background: url(images/corner.png) no-repeat 0px -36px; + -background: url(images/corner_ie6.png) no-repeat 0px -36px; +} +.gwt-MenuBarPopup .menuPopupTopRight { + background: url(images/corner.png) no-repeat -5px -36px; + -background: url(images/corner_ie6.png) no-repeat -5px -36px; +} +.gwt-MenuBarPopup .menuPopupBottomLeft { + background: url(images/corner.png) no-repeat 0px -41px; + -background: url(images/corner_ie6.png) no-repeat 0px -41px; +} +.gwt-MenuBarPopup .menuPopupBottomRight { + background: url(images/corner.png) no-repeat -5px -41px; + -background: url(images/corner_ie6.png) no-repeat -5px -41px; +} +* html .gwt-MenuBarPopup .menuPopupTopLeftInner { + width: 5px; + height: 5px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupTopRightInner { + width: 8px; + height: 5px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupBottomLeftInner { + width: 5px; + height: 8px; + overflow: hidden; +} +* html .gwt-MenuBarPopup .menuPopupBottomRightInner { + width: 8px; + height: 8px; + overflow: hidden; +} + +.gwt-PasswordTextBox { + padding: 5px 4px; + border: 1px solid #ccc; + border-top: 1px solid #999; + font-size: 100%; +} +.gwt-PasswordTextBox-readonly { + color: #888; +} + +.gwt-PopupPanel { + border: 3px solid #e7e7e7; + padding: 3px; + background: white; +} + +.gwt-DecoratedPopupPanel .popupContent { +} +.gwt-DecoratedPopupPanel .popupMiddleCenter { + padding: 3px; + background: #f1f1f1; +} +.gwt-DecoratedPopupPanel .popupTopCenter { + background: url(images/hborder.png) 0px -2937px repeat-x; +} +.gwt-DecoratedPopupPanel .popupBottomCenter { + background: url(images/hborder.png) repeat-x 0px -2938px; + -background: url(images/hborder_ie6.png) repeat-x 0px -2138px; +} +.gwt-DecoratedPopupPanel .popupMiddleLeft { + background: url(images/vborder.png) -21px 0px repeat-y; +} +.gwt-DecoratedPopupPanel .popupMiddleRight { + background: url(images/vborder.png) repeat-y -24px 0px; + -background: url(images/vborder_ie6.png) repeat-y -24px 0px; +} +.gwt-DecoratedPopupPanel .popupTopLeftInner { + width: 6px; + height: 5px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupTopRightInner { + width: 6px; + height: 5px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupBottomLeftInner { + width: 6px; + height: 6px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupBottomRightInner { + width: 6px; + height: 6px; + zoom: 1; +} +.gwt-DecoratedPopupPanel .popupTopLeft { + background: url(images/circles.png) no-repeat 0px -16px; + -background: url(images/circles_ie6.png) no-repeat 0px -16px; +} +.gwt-DecoratedPopupPanel .popupTopRight { + background: url(images/circles.png) no-repeat -6px -16px; + -background: url(images/circles_ie6.png) no-repeat -6px -16px; +} +.gwt-DecoratedPopupPanel .popupBottomLeft { + background: url(images/circles.png) no-repeat 0px -21px; + -background: url(images/circles_ie6.png) no-repeat 0px -21px; +} +.gwt-DecoratedPopupPanel .popupBottomRight { + background: url(images/circles.png) no-repeat -6px -21px; + -background: url(images/circles_ie6.png) no-repeat -6px -21px; +} +* html .gwt-DecoratedPopupPanel .popupTopLeftInner { + width: 6px; + height: 5px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupTopRightInner { + width: 6px; + height: 5px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupBottomLeftInner { + width: 6px; + height: 6px; + overflow: hidden; +} +* html .gwt-DecoratedPopupPanel .popupBottomRightInner { + width: 6px; + height: 6px; + overflow: hidden; +} + +.gwt-PopupPanelGlass { + background-color: #000; + opacity: 0.3; + filter: alpha(opacity=30); +} + +.gwt-PushButton-up, +.gwt-PushButton-up-hovering, +.gwt-PushButton-up-disabled, +.gwt-PushButton-down, +.gwt-PushButton-down-hovering, +.gwt-PushButton-down-disabled { + margin: 0; + text-decoration: none; + background: url("images/hborder.png") repeat-x 0px -27px; + border-radius: 2px; + -moz-border-radius: 2px; +} +.gwt-PushButton-up, +.gwt-PushButton-up-hovering, +.gwt-PushButton-up-disabled { + padding: 3px 5px 3px 5px; +} +.gwt-PushButton-up { + border:1px solid #bbb; + border-bottom: 1px solid #a0a0a0; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-up-hovering { + border: 1px solid; + border-color: #939393; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-up-disabled { + border: 1px solid #bbb; + cursor: default; + opacity: .5; + filter: alpha(opacity=45); + zoom: 1; +} +.gwt-PushButton-down, +.gwt-PushButton-down-hovering, +.gwt-PushButton-down-disabled { + padding: 4px 6px 2px 4px; + outline:none; +} +.gwt-PushButton-down { + border: 1px inset #666; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-down-hovering { + border: 1px solid #939393; + border-top: 1px solid #333333; + cursor: pointer; + cursor: hand; +} +.gwt-PushButton-down-disabled { + border: 1px outset #ccc; + cursor: default; + opacity: 0.5; + filter: alpha(opacity=45); + zoom: 1; +} + +.gwt-RadioButton { +} +.gwt-RadioButton-disabled { + color: #888; +} + +.gwt-RichTextArea { +} +.hasRichTextToolbar { + border: 0px; +} +.gwt-RichTextToolbar { + background: #e3e8f3 url(images/hborder.png) repeat-x 0px -2003px; + border-bottom: 1px solid #BBBBBB; + padding: 3px; + margin: 0px; +} +.gwt-RichTextToolbar .gwt-PushButton-up { + padding: 0px 0px 0px 1px; + margin-left: 4px; + margin-bottom: 4px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-up-hovering { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-down { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-PushButton-down-hovering { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-up { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border:1px solid #bbb; + border-bottom: 1px solid #a0a0a0; +} +.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 0px 0px 1px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-down { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} +.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { + margin-left: 4px; + margin-bottom: 4px; + padding: 0px 1px 0px 0px; + border-width: 1px; +} + +.gwt-StackPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-StackPanel .gwt-StackPanelItem { + cursor: pointer; + cursor: hand; + font-weight: bold; + font-size: 1.3em; + padding: 3px; + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.gwt-StackPanel .gwt-StackPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 2px 10px 5px; +} + +.gwt-DecoratedStackPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .gwt-StackPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 5px 10px 2px; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem { + cursor: pointer; + cursor: hand; +} +.gwt-DecoratedStackPanel .stackItemTopLeft, +.gwt-DecoratedStackPanel .stackItemTopRight { + height: 6px; + width: 6px; + zoom: 1; +} +.gwt-DecoratedStackPanel .stackItemTopLeft { + border-left: 1px solid #bbbbbb; + background: #d3def6 url(images/corner.png) no-repeat 0px -49px; + -background: #d3def6 url(images/corner_ie6.png) no-repeat 0px -49px; +} +.gwt-DecoratedStackPanel .stackItemTopRight { + border-right: 1px solid #bbbbbb; + background: #d3def6 url(images/corner.png) no-repeat -6px -49px; + -background: #d3def6 url(images/corner_ie6.png) no-repeat -6px -49px; +} +.gwt-DecoratedStackPanel .stackItemTopLeftInner, +.gwt-DecoratedStackPanel .stackItemTopRightInner { + width: 1px; + height: 1px; +} +* html .gwt-DecoratedStackPanel .stackItemTopLeftInner, +* html .gwt-DecoratedStackPanel .stackItemTopRightInner { + width: 6px; + height: 6px; + overflow: hidden; +} +.gwt-DecoratedStackPanel .stackItemTopCenter { + background: url(images/hborder.png) 0px -21px repeat-x; +} +.gwt-DecoratedStackPanel .stackItemMiddleLeft { + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; + border-left: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .stackItemMiddleLeftInner, +.gwt-DecoratedStackPanel .stackItemMiddleRightInner { + width: 1px; + height: 1px; +} +.gwt-DecoratedStackPanel .stackItemMiddleRight { + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; + border-right: 1px solid #bbbbbb; +} +.gwt-DecoratedStackPanel .stackItemMiddleCenter { + font-weight: bold; + font-size: 1.3em; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem-first .stackItemTopRight, +.gwt-DecoratedStackPanel .gwt-StackPanelItem-first .stackItemTopLeft { + border: 0px; + background-color: white; +} +.gwt-DecoratedStackPanel .gwt-StackPanelItem-below-selected .stackItemTopLeft, +.gwt-DecoratedStackPanel .gwt-StackPanelItem-below-selected .stackItemTopRight { + background-color: white; +} + +.gwt-SuggestBox { + padding: 5px 4px; + border: 1px solid #ccc; + border-top: 1px solid #999; + font-size: 100%; + font-family: Arial Unicode MS, Arial, sans-serif; +} + +.gwt-SuggestBoxPopup { +} + +.gwt-SuggestBoxPopup .item { + padding: 2px 6px; + color: #000; + cursor: default; + font-size: 110%; +} +.gwt-SuggestBoxPopup .item-selected { + background: #D5E2FF; +} +.gwt-SuggestBoxPopup .suggestPopupContent { + background: white; +} +.gwt-SuggestBoxPopup .suggestPopupTopCenter { + border-top: 1px solid #bbb; +} +.gwt-SuggestBoxPopup .suggestPopupBottomCenter { + border-bottom: 1px solid #bbb; +} +.gwt-SuggestBoxPopup .suggestPopupTopCenterInner, +.gwt-SuggestBoxPopup .suggestPopupBottomCenterInner { + height: 1px; + line-height: 1px; +} +.gwt-SuggestBoxPopup .suggestPopupMiddleLeft { + border-left: 1px solid #bbb; +} +.gwt-SuggestBoxPopup .suggestPopupMiddleRight { + border-right: 1px solid #bbb; +} +.gwt-SuggestBoxPopup .suggestPopupMiddleLeftInner, +.gwt-SuggestBoxPopup .suggestPopupMiddleRightInner { + width: 1px; + line-height: 1px; +} +.gwt-SuggestBoxPopup .suggestPopupTopLeftInner { + width: 0px; + height: 0px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupTopRightInner { + width: 0px; + height: 0px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupBottomLeftInner { + width: 0px; + height: 0px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupBottomRightInner { + width: 0px; + height: 0px; + zoom: 1; +} +.gwt-SuggestBoxPopup .suggestPopupTopLeft { + background: url(images/circles.png) no-repeat 0px -6px; + -background: url(images/circles_ie6.png) no-repeat 0px -6px; + width:5px; + height:5px; +} +.gwt-SuggestBoxPopup .suggestPopupTopRight { + background: url(images/circles.png) no-repeat -5px -6px; + -background: url(images/circles_ie6.png) no-repeat -5px -6px; + width:5px; + height:5px; +} +.gwt-SuggestBoxPopup .suggestPopupBottomLeft { + background: url(images/circles.png) no-repeat 0px -11px; + -background: url(images/circles_ie6.png) no-repeat 0px -11px; + width:5px; + height:5px; +} +.gwt-SuggestBoxPopup .suggestPopupBottomRight { + background: url(images/circles.png) no-repeat -5px -11px; + -background: url(images/circles_ie6.png) no-repeat -5px -11px; + width:5px; + height:5px; +} +* html .gwt-SuggestBoxPopup .suggestPopupTopLeftInner { + width: 0px; + height: 0px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupTopRightInner { + width: 0px; + height: 0px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupBottomLeftInner { + width: 0px; + height: 0px; + overflow: hidden; +} +* html .gwt-SuggestBoxPopup .suggestPopupBottomRightInner { + width: 0px; + height: 0px; + overflow: hidden; +} + +.gwt-TabBar { + background: #ccc; + padding-top: 6px; +} +.gwt-TabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.gwt-TabBar .gwt-TabBarRest { +} +.gwt-TabBar .gwt-TabBarItem { + margin-right: 4px; + padding: 4px 8px 4px 8px; + cursor: pointer; + cursor: hand; + color: white; + font-weight: normal; + text-align: center; + background: #8E8E8E; + -moz-border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; +} +.gwt-TabBar .gwt-TabBarItem-selected { + cursor: default; + background: white; + color: #333; + font-weight: bold; +} +.gwt-TabBar .gwt-TabBarItem-disabled { + cursor: default; + color: #999999; +} +.gwt-TabPanel { +} +.gwt-TabPanelBottom { + border-color: #ccc; + border-style: solid; + border-width: 0px 1px 1px; + overflow: hidden; + padding: 6px; +} +.gwt-DecoratedTabBar { + background: #ccc; + padding-top: 6px; +} +.gwt-DecoratedTabBar .gwt-TabBarFirst { + width: 5px; /* first tab distance from the left */ +} +.gwt-DecoratedTabBar .gwt-TabBarRest { +} +.gwt-DecoratedTabBar .gwt-TabBarItem { + border-collapse: collapse; + margin-right: 4px; +} +.gwt-DecoratedTabBar .tabTopCenter { + padding: 0px; + background: #8E8E8E; +} +.gwt-DecoratedTabBar .tabTopLeft, +.gwt-DecoratedTabBar .tabTopRight { + padding: 0px; + zoom: 1; +} +.gwt-DecoratedTabBar .tabTopLeftInner, +.gwt-DecoratedTabBar .tabTopRightInner { + width: 3px; + height: 3px; +} +.gwt-DecoratedTabBar .tabTopLeft { + background: url(images/circles.png) no-repeat 0px 0px; + -background: url(images/circles_ie6.png) no-repeat 0px 0px; +} +.gwt-DecoratedTabBar .tabTopRight { + background: url(images/circles.png) no-repeat -3px 0px; + -background: url(images/circles_ie6.png) no-repeat -3px 0px; +} +* html .gwt-DecoratedTabBar .tabTopLeftInner, +* html .gwt-DecoratedTabBar .tabTopRightInner { + width: 3px; + height: 3px; + overflow: hidden; +} +.gwt-DecoratedTabBar .tabMiddleLeft, +.gwt-DecoratedTabBar .tabMiddleRight { + width: 3px; + padding: 0px; + background: #8E8E8E; +} +.gwt-DecoratedTabBar .tabMiddleLeftInner, +.gwt-DecoratedTabBar .tabMiddleRightInner { + width: 1px; + height: 1px; +} +.gwt-DecoratedTabBar .tabMiddleCenter { + padding: 0px 5px 4px 5px; + cursor: pointer; + cursor: hand; + color: #fff; + font-weight: normal; + text-align: center; + background: #8E8E8E; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopCenter { + background:#fff; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopLeft { + background: url(images/circles.png) no-repeat -6px 0px; + -background: url(images/circles_ie6.png) no-repeat -6px 0px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopRight { + background: url(images/circles.png) no-repeat -9px 0px; + -background: url(images/circles_ie6.png) no-repeat -9px 0px; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleLeft, +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleRight { + background: #fff; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleCenter { + cursor: default; + background: #fff; + color:#333; + font-weight:bold; +} +.gwt-DecoratedTabBar .gwt-TabBarItem-disabled .tabMiddleCenter { + cursor: default; + color: #999999; +} + +.gwt-TextArea { + padding: 4px; + border: 1px solid #ccc; + border-top: 1px solid #666; + font-size: 100%; + font-family: Arial Unicode MS, Arial, sans-serif; +} +.gwt-TextArea-readonly { + color: #888; +} + +.gwt-TextBox { + padding: 5px 4px; + border: 1px solid #ccc; + border-top: 1px solid #999; + font-size: small; + font-family: Arial Unicode MS, Arial, sans-serif; +} +.gwt-TextBox-readonly { + color: #888; +} +.gwt-ToggleButton-up, +.gwt-ToggleButton-up-hovering, +.gwt-ToggleButton-up-disabled, +.gwt-ToggleButton-down, +.gwt-ToggleButton-down-hovering, +.gwt-ToggleButton-down-disabled { + margin: 0; + text-decoration: none; + background: url("images/hborder.png") repeat-x 0px -27px; + -moz-border-radius: 2px; + border-radius: 2px; +} +.gwt-ToggleButton-up, +.gwt-ToggleButton-up-hovering, +.gwt-ToggleButton-up-disabled { + padding: 3px 5px 3px 5px; +} +.gwt-ToggleButton-up { + border:1px solid #bbb; + border-bottom: 1px solid #a0a0a0; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-up-hovering { + border: 1px solid; + border-color: #939393; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-up-disabled { + border: 1px solid #bbb; + cursor: default; + opacity: .5; + zoom: 1; + filter: alpha(opacity=45); +} +.gwt-ToggleButton-down, +.gwt-ToggleButton-down-hovering, +.gwt-ToggleButton-down-disabled { + padding: 4px 6px 2px 4px; +} +.gwt-ToggleButton-down { + background-position: 0 -513px; + border: 1px inset #666; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-down-hovering { + background-position: 0 -513px; + border: 1px inset; + border-color: #9cf #69e #69e #7af; + cursor: pointer; + cursor: hand; +} +.gwt-ToggleButton-down-disabled { + background-position: 0 -513px; + border: 1px inset #ccc; + cursor: default; + opacity: .5; + zoom: 1; + filter: alpha(opacity=45); +} + +.gwt-Tree .gwt-TreeItem { + padding: 1px 0px; + margin: 0px; + white-space: nowrap; + cursor: hand; + cursor: pointer; + zoom: 1; +} +.gwt-Tree .gwt-TreeItem-selected { + background: #ebeff9; +} +.gwt-TreeItem .gwt-RadioButton input, +.gwt-TreeItem .gwt-CheckBox input { + margin-right: 0px; +} +* html .gwt-TreeItem .gwt-RadioButton input, +* html .gwt-TreeItem .gwt-CheckBox input { + margin-right: -4px; +} + +.gwt-DateBox { + padding: 5px 4px; + border: 1px solid #ccc; + border-top: 1px solid #999; + font-size: 100%; +} +.gwt-DateBox input { + width: 8em; +} +.dateBoxFormatError { + background: #ffcccc; +} +.dateBoxPopup { +} + +.gwt-DatePicker { + border: 1px solid #ccc; + border-top:1px solid #999; + cursor: default; +} +.gwt-DatePicker td, +.datePickerMonthSelector td:focus { + outline: none; +} +.datePickerDays { + width: 100%; + background: white; +} +.datePickerDay, +.datePickerWeekdayLabel, +.datePickerWeekendLabel { + font-size: 85%; + text-align: center; + padding: 4px; + outline: none; + font-weight:bold; + color:#333; + border-right: 1px solid #EDEDED; + border-bottom: 1px solid #EDEDED; +} +.datePickerWeekdayLabel, +.datePickerWeekendLabel { + background: #fff; + padding: 0px 4px 2px; + cursor: default; + color:#666; + font-size:70%; + font-weight:normal; +} +.datePickerDay { + padding: 4px 7px; + cursor: hand; + cursor: pointer; +} +.datePickerDayIsWeekend { + background: #f7f7f7; +} +.datePickerDayIsFiller { + color: #999; + font-weight:normal; +} +.datePickerDayIsValue { + background: #d7dfe8; +} +.datePickerDayIsDisabled { + color: #AAAAAA; + font-style: italic; +} +.datePickerDayIsHighlighted { + background: #F0E68C; +} +.datePickerDayIsValueAndHighlighted { + background: #d7dfe8; +} +.datePickerDayIsToday { + padding: 3px; + color: #fff; + background: url(images/hborder.png) repeat-x 0px -2607px; +} + +.datePickerMonthSelector { + width: 100%; + padding: 1px 0 5px 0; + background: #fff; +} +td.datePickerMonth { + text-align: center; + vertical-align: middle; + white-space: nowrap; + font-size: 100%; + font-weight: bold; + color: #333; +} +.datePickerPreviousButton, +.datePickerNextButton { + font-size: 120%; + line-height: 1em; + color: #3a6aad; + cursor: hand; + cursor: pointer; + font-weight: bold; + padding: 0px 4px; + outline: none; +} + +.gwt-StackLayoutPanel { + border-bottom: 1px solid #bbbbbb; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelHeader { + cursor: pointer; + cursor: hand; + font-weight: bold; + font-size: 1.3em; + padding: 3px; + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: #d3def6 url(images/hborder.png) repeat-x 0px -989px; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelHeader-hovering { + background: #d3def6; +} +.gwt-StackLayoutPanel .gwt-StackLayoutPanelContent { + border: 1px solid #bbbbbb; + border-bottom: 0px; + background: white; + padding: 2px 5px 10px 2px; +} + +.gwt-TabLayoutPanel { +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTabs { + background: #ccc; + padding-top: 6px; + padding-right: 5px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelContentContainer { + border-color: #ccc; + border-style: solid; + border-width: 0px 1px 1px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelContent { + overflow: hidden; + padding: 6px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTab { + margin-right: 4px; + padding: 4px 8px 4px 8px; + cursor: pointer; + cursor: hand; + color: white; + font-weight: normal; + text-align: center; + background: #8E8E8E; + -moz-border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; +} +.gwt-TabLayoutPanel .gwt-TabLayoutPanelTab-selected { + cursor: default; + background: white; + color: #333; + font-weight: bold; +} + +.gwt-SplitLayoutPanel-HDragger { + background: #e7e7e7 url(images/thumb_vertical.png) center center no-repeat; + cursor: col-resize; +} + +.gwt-SplitLayoutPanel-VDragger { + background: #e7e7e7 url(images/thumb_horz.png) center center no-repeat; + cursor: row-resize; +} \ No newline at end of file diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/images/circles.png b/common/static/js/capa/jsmolcalc/gwt/clean/images/circles.png new file mode 100644 index 0000000000..2a84b9c320 Binary files /dev/null and b/common/static/js/capa/jsmolcalc/gwt/clean/images/circles.png differ diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/images/circles_ie6.png b/common/static/js/capa/jsmolcalc/gwt/clean/images/circles_ie6.png new file mode 100644 index 0000000000..3a388fc5d3 Binary files /dev/null and b/common/static/js/capa/jsmolcalc/gwt/clean/images/circles_ie6.png differ diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/images/corner.png b/common/static/js/capa/jsmolcalc/gwt/clean/images/corner.png new file mode 100644 index 0000000000..51aa4582aa Binary files /dev/null and b/common/static/js/capa/jsmolcalc/gwt/clean/images/corner.png differ diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/images/corner_ie6.png b/common/static/js/capa/jsmolcalc/gwt/clean/images/corner_ie6.png new file mode 100644 index 0000000000..5197449254 Binary files /dev/null and b/common/static/js/capa/jsmolcalc/gwt/clean/images/corner_ie6.png differ diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/images/hborder.png b/common/static/js/capa/jsmolcalc/gwt/clean/images/hborder.png new file mode 100644 index 0000000000..ec58ae6126 Binary files /dev/null and b/common/static/js/capa/jsmolcalc/gwt/clean/images/hborder.png differ diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/images/hborder_ie6.png b/common/static/js/capa/jsmolcalc/gwt/clean/images/hborder_ie6.png new file mode 100644 index 0000000000..2268f88a76 Binary files /dev/null and b/common/static/js/capa/jsmolcalc/gwt/clean/images/hborder_ie6.png differ diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/images/thumb_horz.png b/common/static/js/capa/jsmolcalc/gwt/clean/images/thumb_horz.png new file mode 100644 index 0000000000..b43e683e1f Binary files /dev/null and b/common/static/js/capa/jsmolcalc/gwt/clean/images/thumb_horz.png differ diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/images/thumb_vertical.png b/common/static/js/capa/jsmolcalc/gwt/clean/images/thumb_vertical.png new file mode 100644 index 0000000000..bd57f594ac Binary files /dev/null and b/common/static/js/capa/jsmolcalc/gwt/clean/images/thumb_vertical.png differ diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/images/vborder.png b/common/static/js/capa/jsmolcalc/gwt/clean/images/vborder.png new file mode 100644 index 0000000000..6840d11a12 Binary files /dev/null and b/common/static/js/capa/jsmolcalc/gwt/clean/images/vborder.png differ diff --git a/common/static/js/capa/jsmolcalc/gwt/clean/images/vborder_ie6.png b/common/static/js/capa/jsmolcalc/gwt/clean/images/vborder_ie6.png new file mode 100644 index 0000000000..90baeb1f99 Binary files /dev/null and b/common/static/js/capa/jsmolcalc/gwt/clean/images/vborder_ie6.png differ diff --git a/common/static/js/capa/jsmolcalc/hosted.html b/common/static/js/capa/jsmolcalc/hosted.html new file mode 100644 index 0000000000..48b87f39b5 --- /dev/null +++ b/common/static/js/capa/jsmolcalc/hosted.html @@ -0,0 +1,365 @@ + + + +This html file is for Development Mode support. + diff --git a/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js b/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js new file mode 100644 index 0000000000..3bdee52fb1 --- /dev/null +++ b/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js @@ -0,0 +1,360 @@ +function jsmolcalc(){ + var $wnd_0 = window, $doc_0 = document, $stats = $wnd_0.__gwtStatsEvent?function(a){ + return $wnd_0.__gwtStatsEvent(a); + } + :null, $sessionId_0 = $wnd_0.__gwtStatsSessionId?$wnd_0.__gwtStatsSessionId:null, scriptsDone, loadDone, bodyDone, base = '', metaProps = {}, values = [], providers = [], answers = [], softPermutationId = 0, onLoadErrorFunc, propertyErrorFunc; + $stats && $stats({moduleName:'jsmolcalc', sessionId:$sessionId_0, subSystem:'startup', evtGroup:'bootstrap', millis:(new Date).getTime(), type:'begin'}); + if (!$wnd_0.__gwt_stylesLoaded) { + $wnd_0.__gwt_stylesLoaded = {}; + } + if (!$wnd_0.__gwt_scriptsLoaded) { + $wnd_0.__gwt_scriptsLoaded = {}; + } + function isHostedMode(){ + var result = false; + try { + var query = $wnd_0.location.search; + return (query.indexOf('gwt.codesvr=') != -1 || (query.indexOf('gwt.hosted=') != -1 || $wnd_0.external && $wnd_0.external.gwtOnLoad)) && query.indexOf('gwt.hybrid') == -1; + } + catch (e) { + } + isHostedMode = function(){ + return result; + } + ; + return result; + } + + function maybeStartModule(){ + if (scriptsDone && loadDone) { + var iframe = $doc_0.getElementById('jsmolcalc'); + var frameWnd = iframe.contentWindow; + if (isHostedMode()) { + frameWnd.__gwt_getProperty = function(name_0){ + return computePropValue(name_0); + } + ; + } + jsmolcalc = null; + frameWnd.gwtOnLoad(onLoadErrorFunc, 'jsmolcalc', base, softPermutationId); + $stats && $stats({moduleName:'jsmolcalc', sessionId:$sessionId_0, subSystem:'startup', evtGroup:'moduleStartup', millis:(new Date).getTime(), type:'end'}); + } + } + + function computeScriptBase(){ + function getDirectoryOfFile(path){ + var hashIndex = path.lastIndexOf('#'); + if (hashIndex == -1) { + hashIndex = path.length; + } + var queryIndex = path.indexOf('?'); + if (queryIndex == -1) { + queryIndex = path.length; + } + var slashIndex = path.lastIndexOf('/', Math.min(queryIndex, hashIndex)); + return slashIndex >= 0?path.substring(0, slashIndex + 1):''; + } + + function ensureAbsoluteUrl(url){ + if (url.match(/^\w+:\/\//)) { + } + else { + var img = $doc_0.createElement('img'); + img.src = url + 'clear.cache.gif'; + url = getDirectoryOfFile(img.src); + } + return url; + } + + function tryMetaTag(){ + var metaVal = __gwt_getMetaProperty('baseUrl'); + if (metaVal != null) { + return metaVal; + } + return ''; + } + + function tryNocacheJsTag(){ + var scriptTags = $doc_0.getElementsByTagName('script'); + for (var i = 0; i < scriptTags.length; ++i) { + if (scriptTags[i].src.indexOf('jsmolcalc.nocache.js') != -1) { + return getDirectoryOfFile(scriptTags[i].src); + } + } + return ''; + } + + function tryMarkerScript(){ + var thisScript; + if (typeof isBodyLoaded == 'undefined' || !isBodyLoaded()) { + var markerId = '__gwt_marker_jsmolcalc'; + var markerScript; + $doc_0.write(' + + + \ No newline at end of file diff --git a/common/static/js/capa/protex/6E05B1CD5BFCAF7D53C7C64D84318178.cache.html b/common/static/js/capa/protex/6E05B1CD5BFCAF7D53C7C64D84318178.cache.html new file mode 100644 index 0000000000..ce6b444862 --- /dev/null +++ b/common/static/js/capa/protex/6E05B1CD5BFCAF7D53C7C64D84318178.cache.html @@ -0,0 +1,750 @@ + + + + \ No newline at end of file diff --git a/common/static/js/capa/protex/C824A958AB642DC2213DFFDAC640BEAA.cache.html b/common/static/js/capa/protex/C824A958AB642DC2213DFFDAC640BEAA.cache.html new file mode 100644 index 0000000000..f84a8b9822 --- /dev/null +++ b/common/static/js/capa/protex/C824A958AB642DC2213DFFDAC640BEAA.cache.html @@ -0,0 +1,760 @@ + + + + \ No newline at end of file diff --git a/common/static/js/capa/protex/D9267DE8FB02F8B995B4A58C66C76E29.cache.html b/common/static/js/capa/protex/D9267DE8FB02F8B995B4A58C66C76E29.cache.html new file mode 100644 index 0000000000..b6fc4f6a08 --- /dev/null +++ b/common/static/js/capa/protex/D9267DE8FB02F8B995B4A58C66C76E29.cache.html @@ -0,0 +1,758 @@ + + + + \ No newline at end of file diff --git a/common/static/js/capa/protex/F275492F7098103BCB05F4F86ABF6218.cache.html b/common/static/js/capa/protex/F275492F7098103BCB05F4F86ABF6218.cache.html new file mode 100644 index 0000000000..311c82b3a0 --- /dev/null +++ b/common/static/js/capa/protex/F275492F7098103BCB05F4F86ABF6218.cache.html @@ -0,0 +1,750 @@ + + + + \ No newline at end of file diff --git a/common/static/js/capa/protex/F3301B0E65F38C7FCF2EF3764B3BB0B6.cache.html b/common/static/js/capa/protex/F3301B0E65F38C7FCF2EF3764B3BB0B6.cache.html new file mode 100644 index 0000000000..f39f0d68d2 --- /dev/null +++ b/common/static/js/capa/protex/F3301B0E65F38C7FCF2EF3764B3BB0B6.cache.html @@ -0,0 +1,754 @@ + + + + \ No newline at end of file diff --git a/common/static/js/capa/protex/clear.cache.gif b/common/static/js/capa/protex/clear.cache.gif new file mode 100644 index 0000000000..e565824aaf Binary files /dev/null and b/common/static/js/capa/protex/clear.cache.gif differ diff --git a/common/static/js/capa/protex/hosted.html b/common/static/js/capa/protex/hosted.html new file mode 100644 index 0000000000..48b87f39b5 --- /dev/null +++ b/common/static/js/capa/protex/hosted.html @@ -0,0 +1,365 @@ + + + +This html file is for Development Mode support. + diff --git a/common/static/js/capa/protex/protex.css b/common/static/js/capa/protex/protex.css new file mode 100644 index 0000000000..882cd010c6 --- /dev/null +++ b/common/static/js/capa/protex/protex.css @@ -0,0 +1,53 @@ +.protex-absolute-panel { + background-color: #BBBBBB; +} + +.protex-canvas { + outline: none; +} + +.protex-caption-panel { + padding: 10px 10px 10px 10px; + margin: 0px 0px 0px 0px; + border:2px solid #4E4E4E; + font: normal normal normal 14pt/normal 'Open Sans', sans-serif; + background-color: #B2B2FF; +} + +.protex-textbox { + font: normal normal normal 12pt/normal 'Open Sans', sans-serif !important; + padding: 2px 2px 2px 2px !important; +} + +.protex-caption-panel-ss-bonds-on { + padding: 10px 10px 10px 10px; + margin: 0px 0px 0px 0px; + border:2px solid #4E4E4E; + font: normal normal normal 14pt/normal 'Open Sans', sans-serif; + background-color: #B2FFFF; +} + +.protex-button { + margin-right: 15px; +} + +.protex-listbox { +} + +.gwt-ProgressBar-shell { + border: 2px solid #faf9f7; + border-right: 2px solid #848280; + border-bottom: 2px solid #848280; + background-color: #AAAAAA; + height: 14pt; + width: 50%; + margin-left: 15px; +} +.gwt-ProgressBar-shell .gwt-ProgressBar-bar { + background-color: #67A7E3; +} +.gwt-ProgressBar-shell .gwt-ProgressBar-text { + padding: 0px; + margin: 0px; + color: white; +} diff --git a/common/static/js/capa/protex/protex.nocache.js b/common/static/js/capa/protex/protex.nocache.js new file mode 100644 index 0000000000..77f770bf9c --- /dev/null +++ b/common/static/js/capa/protex/protex.nocache.js @@ -0,0 +1,18 @@ +function protex(){var P='',xb='" for "gwt:onLoadErrorFn"',vb='" for "gwt:onPropertyErrorFn"',ib='"><\/script>',Z='#',Xb='.cache.html',_='/',lb='//',Qb='39CC89519B0E1FCB47B935AC9FE13D7B',Rb='6E05B1CD5BFCAF7D53C7C64D84318178',Wb=':',pb='::',dc=' + + + + + + + + + + + + + + +
      + +
      +
      +
      + + +
      +
      +
      +
      +
      + +
      +
      + +
      + +
      +
      +
      +
      + +
      + +
      + +
      + +
      + + + + +
      +
      + + + + + + + + + + + + Current View +
      +
      +
      +
      + +
      + +
      + + + +
      +
      +
      +
      +
      + + + + + + + + +
      +
      +
      + +
      +
      +
      +
      + + +
      + +
      +
      + + + diff --git a/common/static/js/vendor/pdfjs/viewer.js b/common/static/js/vendor/pdfjs/viewer.js new file mode 100644 index 0000000000..06d6791884 --- /dev/null +++ b/common/static/js/vendor/pdfjs/viewer.js @@ -0,0 +1,3281 @@ +/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ +/* Copyright 2012 Mozilla Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/* globals PDFJS, PDFBug, FirefoxCom, Stats */ + +'use strict'; + +var DEFAULT_URL = 'compressed.tracemonkey-pldi-09.pdf'; +var DEFAULT_SCALE = 'auto'; +var DEFAULT_SCALE_DELTA = 1.1; +var UNKNOWN_SCALE = 0; +var CACHE_SIZE = 20; +var CSS_UNITS = 96.0 / 72.0; +var SCROLLBAR_PADDING = 40; +var VERTICAL_PADDING = 5; +var MIN_SCALE = 0.25; +var MAX_SCALE = 4.0; +var IMAGE_DIR = './images/'; +var SETTINGS_MEMORY = 20; +var ANNOT_MIN_SIZE = 10; +var RenderingStates = { + INITIAL: 0, + RUNNING: 1, + PAUSED: 2, + FINISHED: 3 +}; +var FindStates = { + FIND_FOUND: 0, + FIND_NOTFOUND: 1, + FIND_WRAPPED: 2, + FIND_PENDING: 3 +}; + + PDFJS.workerSrc = '/static/js/vendor/pdfjs/pdf.js'; + +var mozL10n = document.mozL10n || document.webL10n; + +function getFileName(url) { + var anchor = url.indexOf('#'); + var query = url.indexOf('?'); + var end = Math.min( + anchor > 0 ? anchor : url.length, + query > 0 ? query : url.length); + return url.substring(url.lastIndexOf('/', end) + 1, end); +} + +function scrollIntoView(element, spot) { + // Assuming offsetParent is available (it's not available when viewer is in + // hidden iframe or object). We have to scroll: if the offsetParent is not set + // producing the error. See also animationStartedClosure. + var parent = element.offsetParent, offsetY = element.offsetTop; + if (!parent) { + console.error('offsetParent is not set -- cannot scroll'); + return; + } + while (parent.clientHeight == parent.scrollHeight) { + offsetY += parent.offsetTop; + parent = parent.offsetParent; + if (!parent) + return; // no need to scroll + } + if (spot) + offsetY += spot.top; + parent.scrollTop = offsetY; +} + +var Cache = function cacheCache(size) { + var data = []; + this.push = function cachePush(view) { + var i = data.indexOf(view); + if (i >= 0) + data.splice(i); + data.push(view); + if (data.length > size) + data.shift().destroy(); + }; +}; + +var ProgressBar = (function ProgressBarClosure() { + + function clamp(v, min, max) { + return Math.min(Math.max(v, min), max); + } + + function ProgressBar(id, opts) { + + // Fetch the sub-elements for later + this.div = document.querySelector(id + ' .progress'); + + // Get options, with sensible defaults + this.height = opts.height || 100; + this.width = opts.width || 100; + this.units = opts.units || '%'; + + // Initialize heights + this.div.style.height = this.height + this.units; + } + + ProgressBar.prototype = { + + updateBar: function ProgressBar_updateBar() { + if (this._indeterminate) { + this.div.classList.add('indeterminate'); + return; + } + + var progressSize = this.width * this._percent / 100; + + if (this._percent > 95) + this.div.classList.add('full'); + else + this.div.classList.remove('full'); + this.div.classList.remove('indeterminate'); + + this.div.style.width = progressSize + this.units; + }, + + get percent() { + return this._percent; + }, + + set percent(val) { + this._indeterminate = isNaN(val); + this._percent = clamp(val, 0, 100); + this.updateBar(); + } + }; + + return ProgressBar; +})(); + + +// Settings Manager - This is a utility for saving settings +// First we see if localStorage is available +// If not, we use FUEL in FF +// Use asyncStorage for B2G +var Settings = (function SettingsClosure() { + var isLocalStorageEnabled = (function localStorageEnabledTest() { + // Feature test as per http://diveintohtml5.info/storage.html + // The additional localStorage call is to get around a FF quirk, see + // bug #495747 in bugzilla + try { + return 'localStorage' in window && window['localStorage'] !== null && + localStorage; + } catch (e) { + return false; + } + })(); + + function Settings(fingerprint) { + this.fingerprint = fingerprint; + this.initializedPromise = new PDFJS.Promise(); + + var resolvePromise = (function settingsResolvePromise(db) { + this.initialize(db || '{}'); + this.initializedPromise.resolve(); + }).bind(this); + + + + if (isLocalStorageEnabled) + resolvePromise(localStorage.getItem('database')); + } + + Settings.prototype = { + initialize: function settingsInitialize(database) { + database = JSON.parse(database); + if (!('files' in database)) + database.files = []; + if (database.files.length >= SETTINGS_MEMORY) + database.files.shift(); + var index; + for (var i = 0, length = database.files.length; i < length; i++) { + var branch = database.files[i]; + if (branch.fingerprint == this.fingerprint) { + index = i; + break; + } + } + if (typeof index != 'number') + index = database.files.push({fingerprint: this.fingerprint}) - 1; + this.file = database.files[index]; + this.database = database; + }, + + set: function settingsSet(name, val) { + if (!this.initializedPromise.isResolved) + return; + + var file = this.file; + file[name] = val; + var database = JSON.stringify(this.database); + + + + if (isLocalStorageEnabled) + localStorage.setItem('database', database); + }, + + get: function settingsGet(name, defaultValue) { + if (!this.initializedPromise.isResolved) + return defaultValue; + + return this.file[name] || defaultValue; + } + }; + + return Settings; +})(); + +var cache = new Cache(CACHE_SIZE); +var currentPageNumber = 1; + +var PDFFindController = { + startedTextExtraction: false, + + extractTextPromises: [], + + // If active, find results will be highlighted. + active: false, + + // Stores the text for each page. + pageContents: [], + + pageMatches: [], + + // Currently selected match. + selected: { + pageIdx: -1, + matchIdx: -1 + }, + + // Where find algorithm currently is in the document. + offset: { + pageIdx: null, + matchIdx: null + }, + + resumePageIdx: null, + + resumeCallback: null, + + state: null, + + dirtyMatch: false, + + findTimeout: null, + + initialize: function() { + var events = [ + 'find', + 'findagain', + 'findhighlightallchange', + 'findcasesensitivitychange' + ]; + + this.handleEvent = this.handleEvent.bind(this); + + for (var i = 0; i < events.length; i++) { + window.addEventListener(events[i], this.handleEvent); + } + }, + + calcFindMatch: function(pageIndex) { + var pageContent = this.pageContents[pageIndex]; + var query = this.state.query; + var caseSensitive = this.state.caseSensitive; + var queryLen = query.length; + + if (queryLen === 0) { + // Do nothing the matches should be wiped out already. + return; + } + + if (!caseSensitive) { + pageContent = pageContent.toLowerCase(); + query = query.toLowerCase(); + } + + var matches = []; + + var matchIdx = -queryLen; + while (true) { + matchIdx = pageContent.indexOf(query, matchIdx + queryLen); + if (matchIdx === -1) { + break; + } + + matches.push(matchIdx); + } + this.pageMatches[pageIndex] = matches; + this.updatePage(pageIndex); + if (this.resumePageIdx === pageIndex) { + var callback = this.resumeCallback; + this.resumePageIdx = null; + this.resumeCallback = null; + callback(); + } + }, + + extractText: function() { + if (this.startedTextExtraction) { + return; + } + this.startedTextExtraction = true; + + this.pageContents = []; + for (var i = 0, ii = PDFView.pdfDocument.numPages; i < ii; i++) { + this.extractTextPromises.push(new PDFJS.Promise()); + } + + var self = this; + function extractPageText(pageIndex) { + PDFView.pages[pageIndex].getTextContent().then( + function textContentResolved(data) { + // Build the find string. + var bidiTexts = data.bidiTexts; + var str = ''; + + for (var i = 0; i < bidiTexts.length; i++) { + str += bidiTexts[i].str; + } + + // Store the pageContent as a string. + self.pageContents.push(str); + + self.extractTextPromises[pageIndex].resolve(pageIndex); + if ((pageIndex + 1) < PDFView.pages.length) + extractPageText(pageIndex + 1); + } + ); + } + extractPageText(0); + return this.extractTextPromise; + }, + + handleEvent: function(e) { + if (this.state === null || e.type !== 'findagain') { + this.dirtyMatch = true; + } + this.state = e.detail; + this.updateUIState(FindStates.FIND_PENDING); + + this.extractText(); + + clearTimeout(this.findTimeout); + if (e.type === 'find') { + // Only trigger the find action after 250ms of silence. + this.findTimeout = setTimeout(this.nextMatch.bind(this), 250); + } else { + this.nextMatch(); + } + }, + + updatePage: function(idx) { + var page = PDFView.pages[idx]; + + if (this.selected.pageIdx === idx) { + // If the page is selected, scroll the page into view, which triggers + // rendering the page, which adds the textLayer. Once the textLayer is + // build, it will scroll onto the selected match. + page.scrollIntoView(); + } + + if (page.textLayer) { + page.textLayer.updateMatches(); + } + }, + + nextMatch: function() { + var pages = PDFView.pages; + var previous = this.state.findPrevious; + var numPages = PDFView.pages.length; + + this.active = true; + + if (this.dirtyMatch) { + // Need to recalculate the matches, reset everything. + this.dirtyMatch = false; + this.selected.pageIdx = this.selected.matchIdx = -1; + this.offset.pageIdx = previous ? numPages - 1 : 0; + this.offset.matchIdx = null; + this.hadMatch = false; + this.resumeCallback = null; + this.resumePageIdx = null; + this.pageMatches = []; + var self = this; + + for (var i = 0; i < numPages; i++) { + // Wipe out any previous highlighted matches. + this.updatePage(i); + + // As soon as the text is extracted start finding the matches. + this.extractTextPromises[i].onData(function(pageIdx) { + // Use a timeout since all the pages may already be extracted and we + // want to start highlighting before finding all the matches. + setTimeout(function() { + self.calcFindMatch(pageIdx); + }); + }); + } + } + + // If there's no query there's no point in searching. + if (this.state.query === '') { + this.updateUIState(FindStates.FIND_FOUND); + return; + } + + // If we're waiting on a page, we return since we can't do anything else. + if (this.resumeCallback) { + return; + } + + var offset = this.offset; + // If there's already a matchIdx that means we are iterating through a + // page's matches. + if (offset.matchIdx !== null) { + var numPageMatches = this.pageMatches[offset.pageIdx].length; + if ((!previous && offset.matchIdx + 1 < numPageMatches) || + (previous && offset.matchIdx > 0)) { + // The simple case, we just have advance the matchIdx to select the next + // match on the page. + this.hadMatch = true; + offset.matchIdx = previous ? offset.matchIdx - 1 : offset.matchIdx + 1; + this.updateMatch(true); + return; + } + // We went beyond the current page's matches, so we advance to the next + // page. + this.advanceOffsetPage(previous); + } + // Start searching through the page. + this.nextPageMatch(); + }, + + nextPageMatch: function() { + if (this.resumePageIdx !== null) + console.error('There can only be one pending page.'); + + var matchesReady = function(matches) { + var offset = this.offset; + var numMatches = matches.length; + var previous = this.state.findPrevious; + if (numMatches) { + // There were matches for the page, so initialize the matchIdx. + this.hadMatch = true; + offset.matchIdx = previous ? numMatches - 1 : 0; + this.updateMatch(true); + } else { + // No matches attempt to search the next page. + this.advanceOffsetPage(previous); + if (offset.wrapped) { + offset.matchIdx = null; + if (!this.hadMatch) { + // No point in wrapping there were no matches. + this.updateMatch(false); + return; + } + } + // Search the next page. + this.nextPageMatch(); + } + }.bind(this); + + var pageIdx = this.offset.pageIdx; + var pageMatches = this.pageMatches; + if (!pageMatches[pageIdx]) { + // The matches aren't ready setup a callback so we can be notified, + // when they are ready. + this.resumeCallback = function() { + matchesReady(pageMatches[pageIdx]); + }; + this.resumePageIdx = pageIdx; + return; + } + // The matches are finished already. + matchesReady(pageMatches[pageIdx]); + }, + + advanceOffsetPage: function(previous) { + var offset = this.offset; + var numPages = this.extractTextPromises.length; + offset.pageIdx = previous ? offset.pageIdx - 1 : offset.pageIdx + 1; + offset.matchIdx = null; + if (offset.pageIdx >= numPages || offset.pageIdx < 0) { + offset.pageIdx = previous ? numPages - 1 : 0; + offset.wrapped = true; + return; + } + }, + + updateMatch: function(found) { + var state = FindStates.FIND_NOTFOUND; + var wrapped = this.offset.wrapped; + this.offset.wrapped = false; + if (found) { + var previousPage = this.selected.pageIdx; + this.selected.pageIdx = this.offset.pageIdx; + this.selected.matchIdx = this.offset.matchIdx; + state = wrapped ? FindStates.FIND_WRAPPED : FindStates.FIND_FOUND; + // Update the currently selected page to wipe out any selected matches. + if (previousPage !== -1 && previousPage !== this.selected.pageIdx) { + this.updatePage(previousPage); + } + } + this.updateUIState(state, this.state.findPrevious); + if (this.selected.pageIdx !== -1) { + this.updatePage(this.selected.pageIdx, true); + } + }, + + updateUIState: function(state, previous) { + if (PDFView.supportsIntegratedFind) { + FirefoxCom.request('updateFindControlState', + {result: state, findPrevious: previous}); + return; + } + PDFFindBar.updateUIState(state, previous); + } +}; + +var PDFFindBar = { + // TODO: Enable the FindBar *AFTER* the pagesPromise in the load function + // got resolved + + opened: false, + + initialize: function() { + this.bar = document.getElementById('findbar'); + this.toggleButton = document.getElementById('viewFind'); + this.findField = document.getElementById('findInput'); + this.highlightAll = document.getElementById('findHighlightAll'); + this.caseSensitive = document.getElementById('findMatchCase'); + this.findMsg = document.getElementById('findMsg'); + this.findStatusIcon = document.getElementById('findStatusIcon'); + + var self = this; + this.toggleButton.addEventListener('click', function() { + self.toggle(); + }); + + this.findField.addEventListener('input', function() { + self.dispatchEvent(''); + }); + + this.bar.addEventListener('keydown', function(evt) { + switch (evt.keyCode) { + case 13: // Enter + if (evt.target === self.findField) { + self.dispatchEvent('again', evt.shiftKey); + } + break; + case 27: // Escape + self.close(); + break; + } + }); + + document.getElementById('findPrevious').addEventListener('click', + function() { self.dispatchEvent('again', true); } + ); + + document.getElementById('findNext').addEventListener('click', function() { + self.dispatchEvent('again', false); + }); + + this.highlightAll.addEventListener('click', function() { + self.dispatchEvent('highlightallchange'); + }); + + this.caseSensitive.addEventListener('click', function() { + self.dispatchEvent('casesensitivitychange'); + }); + }, + + dispatchEvent: function(aType, aFindPrevious) { + var event = document.createEvent('CustomEvent'); + event.initCustomEvent('find' + aType, true, true, { + query: this.findField.value, + caseSensitive: this.caseSensitive.checked, + highlightAll: this.highlightAll.checked, + findPrevious: aFindPrevious + }); + return window.dispatchEvent(event); + }, + + updateUIState: function(state, previous) { + var notFound = false; + var findMsg = ''; + var status = ''; + + switch (state) { + case FindStates.FIND_FOUND: + break; + + case FindStates.FIND_PENDING: + status = 'pending'; + break; + + case FindStates.FIND_NOTFOUND: + findMsg = mozL10n.get('find_not_found', null, 'Phrase not found'); + notFound = true; + break; + + case FindStates.FIND_WRAPPED: + if (previous) { + findMsg = mozL10n.get('find_reached_top', null, + 'Reached top of document, continued from bottom'); + } else { + findMsg = mozL10n.get('find_reached_bottom', null, + 'Reached end of document, continued from top'); + } + break; + } + + if (notFound) { + this.findField.classList.add('notFound'); + } else { + this.findField.classList.remove('notFound'); + } + + this.findField.setAttribute('data-status', status); + this.findMsg.textContent = findMsg; + }, + + open: function() { + if (this.opened) return; + + this.opened = true; + this.toggleButton.classList.add('toggled'); + this.bar.classList.remove('hidden'); + this.findField.select(); + this.findField.focus(); + }, + + close: function() { + if (!this.opened) return; + + this.opened = false; + this.toggleButton.classList.remove('toggled'); + this.bar.classList.add('hidden'); + + PDFFindController.active = false; + }, + + toggle: function() { + if (this.opened) { + this.close(); + } else { + this.open(); + } + } +}; + +var PDFView = { + pages: [], + thumbnails: [], + currentScale: UNKNOWN_SCALE, + currentScaleValue: null, + initialBookmark: document.location.hash.substring(1), + startedTextExtraction: false, + pageText: [], + container: null, + thumbnailContainer: null, + initialized: false, + fellback: false, + pdfDocument: null, + sidebarOpen: false, + pageViewScroll: null, + thumbnailViewScroll: null, + isFullscreen: false, + previousScale: null, + pageRotation: 0, + mouseScrollTimeStamp: 0, + mouseScrollDelta: 0, + lastScroll: 0, + previousPageNumber: 1, + + // called once when the document is loaded + initialize: function pdfViewInitialize() { + var self = this; + var container = this.container = document.getElementById('viewerContainer'); + this.pageViewScroll = {}; + this.watchScroll(container, this.pageViewScroll, updateViewarea); + + var thumbnailContainer = this.thumbnailContainer = + document.getElementById('thumbnailView'); + this.thumbnailViewScroll = {}; + this.watchScroll(thumbnailContainer, this.thumbnailViewScroll, + this.renderHighestPriority.bind(this)); + + PDFFindBar.initialize(); + PDFFindController.initialize(); + + this.initialized = true; + container.addEventListener('scroll', function() { + self.lastScroll = Date.now(); + }, false); + }, + + // Helper function to keep track whether a div was scrolled up or down and + // then call a callback. + watchScroll: function pdfViewWatchScroll(viewAreaElement, state, callback) { + state.down = true; + state.lastY = viewAreaElement.scrollTop; + viewAreaElement.addEventListener('scroll', function webViewerScroll(evt) { + var currentY = viewAreaElement.scrollTop; + var lastY = state.lastY; + if (currentY > lastY) + state.down = true; + else if (currentY < lastY) + state.down = false; + // else do nothing and use previous value + state.lastY = currentY; + callback(); + }, true); + }, + + setScale: function pdfViewSetScale(val, resetAutoSettings, noScroll) { + if (val == this.currentScale) + return; + + var pages = this.pages; + for (var i = 0; i < pages.length; i++) + pages[i].update(val * CSS_UNITS); + + if (!noScroll && this.currentScale != val) + this.pages[this.page - 1].scrollIntoView(); + this.currentScale = val; + + var event = document.createEvent('UIEvents'); + event.initUIEvent('scalechange', false, false, window, 0); + event.scale = val; + event.resetAutoSettings = resetAutoSettings; + window.dispatchEvent(event); + }, + + parseScale: function pdfViewParseScale(value, resetAutoSettings, noScroll) { + if ('custom' == value) + return; + + var scale = parseFloat(value); + this.currentScaleValue = value; + if (scale) { + this.setScale(scale, true, noScroll); + return; + } + + var container = this.container; + var currentPage = this.pages[this.page - 1]; + if (!currentPage) { + return; + } + + var pageWidthScale = (container.clientWidth - SCROLLBAR_PADDING) / + currentPage.width * currentPage.scale / CSS_UNITS; + var pageHeightScale = (container.clientHeight - VERTICAL_PADDING) / + currentPage.height * currentPage.scale / CSS_UNITS; + switch (value) { + case 'page-actual': + scale = 1; + break; + case 'page-width': + scale = pageWidthScale; + break; + case 'page-height': + scale = pageHeightScale; + break; + case 'page-fit': + scale = Math.min(pageWidthScale, pageHeightScale); + break; + case 'auto': + scale = Math.min(1.0, pageWidthScale); + break; + } + this.setScale(scale, resetAutoSettings, noScroll); + + selectScaleOption(value); + }, + + zoomIn: function pdfViewZoomIn() { + var newScale = (this.currentScale * DEFAULT_SCALE_DELTA).toFixed(2); + newScale = Math.min(MAX_SCALE, newScale); + this.parseScale(newScale, true); + }, + + zoomOut: function pdfViewZoomOut() { + var newScale = (this.currentScale / DEFAULT_SCALE_DELTA).toFixed(2); + newScale = Math.max(MIN_SCALE, newScale); + this.parseScale(newScale, true); + }, + + set page(val) { + var pages = this.pages; + var input = document.getElementById('pageNumber'); + var event = document.createEvent('UIEvents'); + event.initUIEvent('pagechange', false, false, window, 0); + + if (!(0 < val && val <= pages.length)) { + this.previousPageNumber = val; + event.pageNumber = this.page; + window.dispatchEvent(event); + return; + } + + pages[val - 1].updateStats(); + this.previousPageNumber = currentPageNumber; + currentPageNumber = val; + event.pageNumber = val; + window.dispatchEvent(event); + + // checking if the this.page was called from the updateViewarea function: + // avoiding the creation of two "set page" method (internal and public) + if (updateViewarea.inProgress) + return; + + // Avoid scrolling the first page during loading + if (this.loading && val == 1) + return; + + pages[val - 1].scrollIntoView(); + }, + + get page() { + return currentPageNumber; + }, + + get supportsPrinting() { + var canvas = document.createElement('canvas'); + var value = 'mozPrintCallback' in canvas; + // shadow + Object.defineProperty(this, 'supportsPrinting', { value: value, + enumerable: true, + configurable: true, + writable: false }); + return value; + }, + + get supportsFullscreen() { + var doc = document.documentElement; + var support = doc.requestFullscreen || doc.mozRequestFullScreen || + doc.webkitRequestFullScreen; + + // Disable fullscreen button if we're in an iframe + if (!!window.frameElement) + support = false; + + Object.defineProperty(this, 'supportsFullScreen', { value: support, + enumerable: true, + configurable: true, + writable: false }); + return support; + }, + + get supportsIntegratedFind() { + var support = false; + Object.defineProperty(this, 'supportsIntegratedFind', { value: support, + enumerable: true, + configurable: true, + writable: false }); + return support; + }, + + get supportsDocumentFonts() { + var support = true; + Object.defineProperty(this, 'supportsDocumentFonts', { value: support, + enumerable: true, + configurable: true, + writable: false }); + return support; + }, + + get isHorizontalScrollbarEnabled() { + var div = document.getElementById('viewerContainer'); + return div.scrollWidth > div.clientWidth; + }, + + initPassiveLoading: function pdfViewInitPassiveLoading() { + if (!PDFView.loadingBar) { + PDFView.loadingBar = new ProgressBar('#loadingBar', {}); + } + + window.addEventListener('message', function window_message(e) { + var args = e.data; + + if (typeof args !== 'object' || !('pdfjsLoadAction' in args)) + return; + switch (args.pdfjsLoadAction) { + case 'progress': + PDFView.progress(args.loaded / args.total); + break; + case 'complete': + if (!args.data) { + PDFView.error(mozL10n.get('loading_error', null, + 'An error occurred while loading the PDF.'), e); + break; + } + PDFView.open(args.data, 0); + break; + } + }); + FirefoxCom.requestSync('initPassiveLoading', null); + }, + + setTitleUsingUrl: function pdfViewSetTitleUsingUrl(url) { + this.url = url; + try { + this.setTitle(decodeURIComponent(getFileName(url)) || url); + } catch (e) { + // decodeURIComponent may throw URIError, + // fall back to using the unprocessed url in that case + this.setTitle(url); + } + }, + + setTitle: function pdfViewSetTitle(title) { + document.title = title; + }, + + open: function pdfViewOpen(url, scale, password) { + var parameters = {password: password}; + if (typeof url === 'string') { // URL + this.setTitleUsingUrl(url); + parameters.url = url; + } else if (url && 'byteLength' in url) { // ArrayBuffer + parameters.data = url; + } + + if (!PDFView.loadingBar) { + PDFView.loadingBar = new ProgressBar('#loadingBar', {}); + } + + this.pdfDocument = null; + var self = this; + self.loading = true; + PDFJS.getDocument(parameters).then( + function getDocumentCallback(pdfDocument) { + self.load(pdfDocument, scale); + self.loading = false; + }, + function getDocumentError(message, exception) { + if (exception && exception.name === 'PasswordException') { + if (exception.code === 'needpassword') { + var promptString = mozL10n.get('request_password', null, + 'PDF is protected by a password:'); + password = prompt(promptString); + if (password && password.length > 0) { + return PDFView.open(url, scale, password); + } + } + } + + var loadingErrorMessage = mozL10n.get('loading_error', null, + 'An error occurred while loading the PDF.'); + + if (exception && exception.name === 'InvalidPDFException') { + // change error message also for other builds + var loadingErrorMessage = mozL10n.get('invalid_file_error', null, + 'Invalid or corrupted PDF file.'); + } + + if (exception && exception.name === 'MissingPDFException') { + // special message for missing PDF's + var loadingErrorMessage = mozL10n.get('missing_file_error', null, + 'Missing PDF file.'); + + } + + var loadingIndicator = document.getElementById('loading'); + loadingIndicator.textContent = mozL10n.get('loading_error_indicator', + null, 'Error'); + var moreInfo = { + message: message + }; + self.error(loadingErrorMessage, moreInfo); + self.loading = false; + }, + function getDocumentProgress(progressData) { + self.progress(progressData.loaded / progressData.total); + } + ); + }, + + download: function pdfViewDownload() { + function noData() { + FirefoxCom.request('download', { originalUrl: url }); + } + var url = this.url.split('#')[0]; + url += '#pdfjs.action=download'; + window.open(url, '_parent'); + }, + + fallback: function pdfViewFallback() { + return; + }, + + navigateTo: function pdfViewNavigateTo(dest) { + if (typeof dest === 'string') + dest = this.destinations[dest]; + if (!(dest instanceof Array)) + return; // invalid destination + // dest array looks like that: + var destRef = dest[0]; + var pageNumber = destRef instanceof Object ? + this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] : (destRef + 1); + if (pageNumber > this.pages.length) + pageNumber = this.pages.length; + if (pageNumber) { + this.page = pageNumber; + var currentPage = this.pages[pageNumber - 1]; + currentPage.scrollIntoView(dest); + } + }, + + getDestinationHash: function pdfViewGetDestinationHash(dest) { + if (typeof dest === 'string') + return PDFView.getAnchorUrl('#' + escape(dest)); + if (dest instanceof Array) { + var destRef = dest[0]; // see navigateTo method for dest format + var pageNumber = destRef instanceof Object ? + this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] : + (destRef + 1); + if (pageNumber) { + var pdfOpenParams = PDFView.getAnchorUrl('#page=' + pageNumber); + var destKind = dest[1]; + if (typeof destKind === 'object' && 'name' in destKind && + destKind.name == 'XYZ') { + var scale = (dest[4] || this.currentScale); + pdfOpenParams += '&zoom=' + (scale * 100); + if (dest[2] || dest[3]) { + pdfOpenParams += ',' + (dest[2] || 0) + ',' + (dest[3] || 0); + } + } + return pdfOpenParams; + } + } + return ''; + }, + + /** + * For the firefox extension we prefix the full url on anchor links so they + * don't come up as resource:// urls and so open in new tab/window works. + * @param {String} anchor The anchor hash include the #. + */ + getAnchorUrl: function getAnchorUrl(anchor) { + return anchor; + }, + + /** + * Returns scale factor for the canvas. It makes sense for the HiDPI displays. + * @return {Object} The object with horizontal (sx) and vertical (sy) + scales. The scaled property is set to false if scaling is + not required, true otherwise. + */ + getOutputScale: function pdfViewGetOutputDPI() { + var pixelRatio = 'devicePixelRatio' in window ? window.devicePixelRatio : 1; + return { + sx: pixelRatio, + sy: pixelRatio, + scaled: pixelRatio != 1 + }; + }, + + /** + * Show the error box. + * @param {String} message A message that is human readable. + * @param {Object} moreInfo (optional) Further information about the error + * that is more technical. Should have a 'message' + * and optionally a 'stack' property. + */ + error: function pdfViewError(message, moreInfo) { + var moreInfoText = mozL10n.get('error_version_info', + {version: PDFJS.version || '?', build: PDFJS.build || '?'}, + 'PDF.js v{{version}} (build: {{build}})') + '\n'; + if (moreInfo) { + moreInfoText += + mozL10n.get('error_message', {message: moreInfo.message}, + 'Message: {{message}}'); + if (moreInfo.stack) { + moreInfoText += '\n' + + mozL10n.get('error_stack', {stack: moreInfo.stack}, + 'Stack: {{stack}}'); + } else { + if (moreInfo.filename) { + moreInfoText += '\n' + + mozL10n.get('error_file', {file: moreInfo.filename}, + 'File: {{file}}'); + } + if (moreInfo.lineNumber) { + moreInfoText += '\n' + + mozL10n.get('error_line', {line: moreInfo.lineNumber}, + 'Line: {{line}}'); + } + } + } + + var loadingBox = document.getElementById('loadingBox'); + loadingBox.setAttribute('hidden', 'true'); + + var errorWrapper = document.getElementById('errorWrapper'); + errorWrapper.removeAttribute('hidden'); + + var errorMessage = document.getElementById('errorMessage'); + errorMessage.textContent = message; + + var closeButton = document.getElementById('errorClose'); + closeButton.onclick = function() { + errorWrapper.setAttribute('hidden', 'true'); + }; + + var errorMoreInfo = document.getElementById('errorMoreInfo'); + var moreInfoButton = document.getElementById('errorShowMore'); + var lessInfoButton = document.getElementById('errorShowLess'); + moreInfoButton.onclick = function() { + errorMoreInfo.removeAttribute('hidden'); + moreInfoButton.setAttribute('hidden', 'true'); + lessInfoButton.removeAttribute('hidden'); + }; + lessInfoButton.onclick = function() { + errorMoreInfo.setAttribute('hidden', 'true'); + moreInfoButton.removeAttribute('hidden'); + lessInfoButton.setAttribute('hidden', 'true'); + }; + moreInfoButton.removeAttribute('hidden'); + lessInfoButton.setAttribute('hidden', 'true'); + errorMoreInfo.value = moreInfoText; + + errorMoreInfo.rows = moreInfoText.split('\n').length - 1; + }, + + progress: function pdfViewProgress(level) { + var percent = Math.round(level * 100); + PDFView.loadingBar.percent = percent; + }, + + load: function pdfViewLoad(pdfDocument, scale) { + function bindOnAfterDraw(pageView, thumbnailView) { + // when page is painted, using the image as thumbnail base + pageView.onAfterDraw = function pdfViewLoadOnAfterDraw() { + thumbnailView.setImage(pageView.canvas); + }; + } + + this.pdfDocument = pdfDocument; + + var errorWrapper = document.getElementById('errorWrapper'); + errorWrapper.setAttribute('hidden', 'true'); + + var loadingBox = document.getElementById('loadingBox'); + loadingBox.setAttribute('hidden', 'true'); + var loadingIndicator = document.getElementById('loading'); + loadingIndicator.textContent = ''; + + var thumbsView = document.getElementById('thumbnailView'); + thumbsView.parentNode.scrollTop = 0; + + while (thumbsView.hasChildNodes()) + thumbsView.removeChild(thumbsView.lastChild); + + if ('_loadingInterval' in thumbsView) + clearInterval(thumbsView._loadingInterval); + + var container = document.getElementById('viewer'); + while (container.hasChildNodes()) + container.removeChild(container.lastChild); + + var pagesCount = pdfDocument.numPages; + var id = pdfDocument.fingerprint; + document.getElementById('numPages').textContent = + mozL10n.get('page_of', {pageCount: pagesCount}, 'of {{pageCount}}'); + document.getElementById('pageNumber').max = pagesCount; + + PDFView.documentFingerprint = id; + var store = PDFView.store = new Settings(id); + var storePromise = store.initializedPromise; + + this.pageRotation = 0; + + var pages = this.pages = []; + this.pageText = []; + this.startedTextExtraction = false; + var pagesRefMap = {}; + var thumbnails = this.thumbnails = []; + var pagePromises = []; + for (var i = 1; i <= pagesCount; i++) + pagePromises.push(pdfDocument.getPage(i)); + var self = this; + var pagesPromise = PDFJS.Promise.all(pagePromises); + pagesPromise.then(function(promisedPages) { + for (var i = 1; i <= pagesCount; i++) { + var page = promisedPages[i - 1]; + var pageView = new PageView(container, page, i, scale, + page.stats, self.navigateTo.bind(self)); + var thumbnailView = new ThumbnailView(thumbsView, page, i); + bindOnAfterDraw(pageView, thumbnailView); + + pages.push(pageView); + thumbnails.push(thumbnailView); + var pageRef = page.ref; + pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i; + } + + self.pagesRefMap = pagesRefMap; + }); + + var destinationsPromise = pdfDocument.getDestinations(); + destinationsPromise.then(function(destinations) { + self.destinations = destinations; + }); + + // outline and initial view depends on destinations and pagesRefMap + var promises = [pagesPromise, destinationsPromise, storePromise, + PDFView.animationStartedPromise]; + PDFJS.Promise.all(promises).then(function() { + pdfDocument.getOutline().then(function(outline) { + self.outline = new DocumentOutlineView(outline); + }); + + var storedHash = null; + if (store.get('exists', false)) { + var page = store.get('page', '1'); + var zoom = store.get('zoom', PDFView.currentScale); + var left = store.get('scrollLeft', '0'); + var top = store.get('scrollTop', '0'); + + storedHash = 'page=' + page + '&zoom=' + zoom + ',' + left + ',' + top; + } + + self.setInitialView(storedHash, scale); + }); + + pdfDocument.getMetadata().then(function(data) { + var info = data.info, metadata = data.metadata; + self.documentInfo = info; + self.metadata = metadata; + + // Provides some basic debug information + console.log('PDF ' + pdfDocument.fingerprint + ' [' + + info.PDFFormatVersion + ' ' + (info.Producer || '-') + + ' / ' + (info.Creator || '-') + ']' + + (PDFJS.version ? ' (PDF.js: ' + PDFJS.version + ')' : '')); + + var pdfTitle; + if (metadata) { + if (metadata.has('dc:title')) + pdfTitle = metadata.get('dc:title'); + } + + if (!pdfTitle && info && info['Title']) + pdfTitle = info['Title']; + + if (pdfTitle) + self.setTitle(pdfTitle + ' - ' + document.title); + + if (info.IsAcroFormPresent) { + // AcroForm/XFA was found + PDFView.fallback(); + } + }); + }, + + setInitialView: function pdfViewSetInitialView(storedHash, scale) { + // Reset the current scale, as otherwise the page's scale might not get + // updated if the zoom level stayed the same. + this.currentScale = 0; + this.currentScaleValue = null; + if (this.initialBookmark) { + this.setHash(this.initialBookmark); + this.initialBookmark = null; + } + else if (storedHash) + this.setHash(storedHash); + else if (scale) { + this.parseScale(scale, true); + this.page = 1; + } + + if (PDFView.currentScale === UNKNOWN_SCALE) { + // Scale was not initialized: invalid bookmark or scale was not specified. + // Setting the default one. + this.parseScale(DEFAULT_SCALE, true); + } + }, + + renderHighestPriority: function pdfViewRenderHighestPriority() { + // Pages have a higher priority than thumbnails, so check them first. + var visiblePages = this.getVisiblePages(); + var pageView = this.getHighestPriority(visiblePages, this.pages, + this.pageViewScroll.down); + if (pageView) { + this.renderView(pageView, 'page'); + return; + } + // No pages needed rendering so check thumbnails. + if (this.sidebarOpen) { + var visibleThumbs = this.getVisibleThumbs(); + var thumbView = this.getHighestPriority(visibleThumbs, + this.thumbnails, + this.thumbnailViewScroll.down); + if (thumbView) + this.renderView(thumbView, 'thumbnail'); + } + }, + + getHighestPriority: function pdfViewGetHighestPriority(visible, views, + scrolledDown) { + // The state has changed figure out which page has the highest priority to + // render next (if any). + // Priority: + // 1 visible pages + // 2 if last scrolled down page after the visible pages + // 2 if last scrolled up page before the visible pages + var visibleViews = visible.views; + + var numVisible = visibleViews.length; + if (numVisible === 0) { + return false; + } + for (var i = 0; i < numVisible; ++i) { + var view = visibleViews[i].view; + if (!this.isViewFinished(view)) + return view; + } + + // All the visible views have rendered, try to render next/previous pages. + if (scrolledDown) { + var nextPageIndex = visible.last.id; + // ID's start at 1 so no need to add 1. + if (views[nextPageIndex] && !this.isViewFinished(views[nextPageIndex])) + return views[nextPageIndex]; + } else { + var previousPageIndex = visible.first.id - 2; + if (views[previousPageIndex] && + !this.isViewFinished(views[previousPageIndex])) + return views[previousPageIndex]; + } + // Everything that needs to be rendered has been. + return false; + }, + + isViewFinished: function pdfViewNeedsRendering(view) { + return view.renderingState === RenderingStates.FINISHED; + }, + + // Render a page or thumbnail view. This calls the appropriate function based + // on the views state. If the view is already rendered it will return false. + renderView: function pdfViewRender(view, type) { + var state = view.renderingState; + switch (state) { + case RenderingStates.FINISHED: + return false; + case RenderingStates.PAUSED: + PDFView.highestPriorityPage = type + view.id; + view.resume(); + break; + case RenderingStates.RUNNING: + PDFView.highestPriorityPage = type + view.id; + break; + case RenderingStates.INITIAL: + PDFView.highestPriorityPage = type + view.id; + view.draw(this.renderHighestPriority.bind(this)); + break; + } + return true; + }, + + setHash: function pdfViewSetHash(hash) { + if (!hash) + return; + + if (hash.indexOf('=') >= 0) { + var params = PDFView.parseQueryString(hash); + // borrowing syntax from "Parameters for Opening PDF Files" + if ('nameddest' in params) { + PDFView.navigateTo(params.nameddest); + return; + } + if ('page' in params) { + var pageNumber = (params.page | 0) || 1; + if ('zoom' in params) { + var zoomArgs = params.zoom.split(','); // scale,left,top + // building destination array + + // If the zoom value, it has to get divided by 100. If it is a string, + // it should stay as it is. + var zoomArg = zoomArgs[0]; + var zoomArgNumber = parseFloat(zoomArg); + if (zoomArgNumber) + zoomArg = zoomArgNumber / 100; + + var dest = [null, {name: 'XYZ'}, (zoomArgs[1] | 0), + (zoomArgs[2] | 0), zoomArg]; + var currentPage = this.pages[pageNumber - 1]; + currentPage.scrollIntoView(dest); + } else { + this.page = pageNumber; // simple page + } + } + } else if (/^\d+$/.test(hash)) // page number + this.page = hash; + else // named destination + PDFView.navigateTo(unescape(hash)); + }, + + switchSidebarView: function pdfViewSwitchSidebarView(view) { + var thumbsView = document.getElementById('thumbnailView'); + var outlineView = document.getElementById('outlineView'); + + var thumbsButton = document.getElementById('viewThumbnail'); + var outlineButton = document.getElementById('viewOutline'); + + switch (view) { + case 'thumbs': + var wasOutlineViewVisible = thumbsView.classList.contains('hidden'); + + thumbsButton.classList.add('toggled'); + outlineButton.classList.remove('toggled'); + thumbsView.classList.remove('hidden'); + outlineView.classList.add('hidden'); + + PDFView.renderHighestPriority(); + + if (wasOutlineViewVisible) { + // Ensure that the thumbnail of the current page is visible + // when switching from the outline view. + scrollIntoView(document.getElementById('thumbnailContainer' + + this.page)); + } + break; + + case 'outline': + thumbsButton.classList.remove('toggled'); + outlineButton.classList.add('toggled'); + thumbsView.classList.add('hidden'); + outlineView.classList.remove('hidden'); + + if (outlineButton.getAttribute('disabled')) + return; + break; + } + }, + + getVisiblePages: function pdfViewGetVisiblePages() { + return this.getVisibleElements(this.container, + this.pages, true); + }, + + getVisibleThumbs: function pdfViewGetVisibleThumbs() { + return this.getVisibleElements(this.thumbnailContainer, + this.thumbnails); + }, + + // Generic helper to find out what elements are visible within a scroll pane. + getVisibleElements: function pdfViewGetVisibleElements( + scrollEl, views, sortByVisibility) { + var currentHeight = 0, view; + var top = scrollEl.scrollTop; + + for (var i = 1, ii = views.length; i <= ii; ++i) { + view = views[i - 1]; + currentHeight = view.el.offsetTop; + if (currentHeight + view.el.clientHeight > top) + break; + currentHeight += view.el.clientHeight; + } + + var visible = []; + + // Algorithm broken in fullscreen mode + if (this.isFullscreen) { + var currentPage = this.pages[this.page - 1]; + visible.push({ + id: currentPage.id, + view: currentPage + }); + + return { first: currentPage, last: currentPage, views: visible}; + } + + var bottom = top + scrollEl.clientHeight; + var nextHeight, hidden, percent, viewHeight; + for (; i <= ii && currentHeight < bottom; ++i) { + view = views[i - 1]; + viewHeight = view.el.clientHeight; + currentHeight = view.el.offsetTop; + nextHeight = currentHeight + viewHeight; + hidden = Math.max(0, top - currentHeight) + + Math.max(0, nextHeight - bottom); + percent = Math.floor((viewHeight - hidden) * 100.0 / viewHeight); + visible.push({ id: view.id, y: currentHeight, + view: view, percent: percent }); + currentHeight = nextHeight; + } + + var first = visible[0]; + var last = visible[visible.length - 1]; + + if (sortByVisibility) { + visible.sort(function(a, b) { + var pc = a.percent - b.percent; + if (Math.abs(pc) > 0.001) + return -pc; + + return a.id - b.id; // ensure stability + }); + } + + return {first: first, last: last, views: visible}; + }, + + // Helper function to parse query string (e.g. ?param1=value&parm2=...). + parseQueryString: function pdfViewParseQueryString(query) { + var parts = query.split('&'); + var params = {}; + for (var i = 0, ii = parts.length; i < parts.length; ++i) { + var param = parts[i].split('='); + var key = param[0]; + var value = param.length > 1 ? param[1] : null; + params[unescape(key)] = unescape(value); + } + return params; + }, + + beforePrint: function pdfViewSetupBeforePrint() { + if (!this.supportsPrinting) { + var printMessage = mozL10n.get('printing_not_supported', null, + 'Warning: Printing is not fully supported by this browser.'); + this.error(printMessage); + return; + } + var body = document.querySelector('body'); + body.setAttribute('data-mozPrintCallback', true); + for (var i = 0, ii = this.pages.length; i < ii; ++i) { + this.pages[i].beforePrint(); + } + }, + + afterPrint: function pdfViewSetupAfterPrint() { + var div = document.getElementById('printContainer'); + while (div.hasChildNodes()) + div.removeChild(div.lastChild); + }, + + fullscreen: function pdfViewFullscreen() { + var isFullscreen = document.fullscreenElement || document.mozFullScreen || + document.webkitIsFullScreen; + + if (isFullscreen) { + return false; + } + + var wrapper = document.getElementById('viewerContainer'); + if (document.documentElement.requestFullscreen) { + wrapper.requestFullscreen(); + } else if (document.documentElement.mozRequestFullScreen) { + wrapper.mozRequestFullScreen(); + } else if (document.documentElement.webkitRequestFullScreen) { + wrapper.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT); + } else { + return false; + } + + this.isFullscreen = true; + var currentPage = this.pages[this.page - 1]; + this.previousScale = this.currentScaleValue; + this.parseScale('page-fit', true); + + // Wait for fullscreen to take effect + setTimeout(function() { + currentPage.scrollIntoView(); + }, 0); + + this.showPresentationControls(); + return true; + }, + + exitFullscreen: function pdfViewExitFullscreen() { + this.isFullscreen = false; + this.parseScale(this.previousScale); + this.page = this.page; + this.clearMouseScrollState(); + this.hidePresentationControls(); + }, + + showPresentationControls: function pdfViewShowPresentationControls() { + var DELAY_BEFORE_HIDING_CONTROLS = 3000; + var wrapper = document.getElementById('viewerContainer'); + if (this.presentationControlsTimeout) { + clearTimeout(this.presentationControlsTimeout); + } else { + wrapper.classList.add('presentationControls'); + } + this.presentationControlsTimeout = setTimeout(function hideControls() { + wrapper.classList.remove('presentationControls'); + delete PDFView.presentationControlsTimeout; + }, DELAY_BEFORE_HIDING_CONTROLS); + }, + + hidePresentationControls: function pdfViewShowPresentationControls() { + if (!this.presentationControlsTimeout) { + return; + } + clearTimeout(this.presentationControlsTimeout); + delete this.presentationControlsTimeout; + + var wrapper = document.getElementById('viewerContainer'); + wrapper.classList.remove('presentationControls'); + }, + + rotatePages: function pdfViewPageRotation(delta) { + + this.pageRotation = (this.pageRotation + 360 + delta) % 360; + + for (var i = 0, l = this.pages.length; i < l; i++) { + var page = this.pages[i]; + page.update(page.scale, this.pageRotation); + } + + for (var i = 0, l = this.thumbnails.length; i < l; i++) { + var thumb = this.thumbnails[i]; + thumb.updateRotation(this.pageRotation); + } + + var currentPage = this.pages[this.page - 1]; + + this.parseScale(this.currentScaleValue, true); + + this.renderHighestPriority(); + + // Wait for fullscreen to take effect + setTimeout(function() { + currentPage.scrollIntoView(); + }, 0); + }, + + /** + * This function flips the page in presentation mode if the user scrolls up + * or down with large enough motion and prevents page flipping too often. + * + * @this {PDFView} + * @param {number} mouseScrollDelta The delta value from the mouse event. + */ + mouseScroll: function pdfViewMouseScroll(mouseScrollDelta) { + var MOUSE_SCROLL_COOLDOWN_TIME = 50; + + var currentTime = (new Date()).getTime(); + var storedTime = this.mouseScrollTimeStamp; + + // In case one page has already been flipped there is a cooldown time + // which has to expire before next page can be scrolled on to. + if (currentTime > storedTime && + currentTime - storedTime < MOUSE_SCROLL_COOLDOWN_TIME) + return; + + // In case the user decides to scroll to the opposite direction than before + // clear the accumulated delta. + if ((this.mouseScrollDelta > 0 && mouseScrollDelta < 0) || + (this.mouseScrollDelta < 0 && mouseScrollDelta > 0)) + this.clearMouseScrollState(); + + this.mouseScrollDelta += mouseScrollDelta; + + var PAGE_FLIP_THRESHOLD = 120; + if (Math.abs(this.mouseScrollDelta) >= PAGE_FLIP_THRESHOLD) { + + var PageFlipDirection = { + UP: -1, + DOWN: 1 + }; + + // In fullscreen mode scroll one page at a time. + var pageFlipDirection = (this.mouseScrollDelta > 0) ? + PageFlipDirection.UP : + PageFlipDirection.DOWN; + this.clearMouseScrollState(); + var currentPage = this.page; + + // In case we are already on the first or the last page there is no need + // to do anything. + if ((currentPage == 1 && pageFlipDirection == PageFlipDirection.UP) || + (currentPage == this.pages.length && + pageFlipDirection == PageFlipDirection.DOWN)) + return; + + this.page += pageFlipDirection; + this.mouseScrollTimeStamp = currentTime; + } + }, + + /** + * This function clears the member attributes used with mouse scrolling in + * presentation mode. + * + * @this {PDFView} + */ + clearMouseScrollState: function pdfViewClearMouseScrollState() { + this.mouseScrollTimeStamp = 0; + this.mouseScrollDelta = 0; + } +}; + +var PageView = function pageView(container, pdfPage, id, scale, + stats, navigateTo) { + this.id = id; + this.pdfPage = pdfPage; + + this.rotation = 0; + this.scale = scale || 1.0; + this.viewport = this.pdfPage.getViewport(this.scale, this.pdfPage.rotate); + + this.renderingState = RenderingStates.INITIAL; + this.resume = null; + + this.textContent = null; + this.textLayer = null; + + var anchor = document.createElement('a'); + anchor.name = '' + this.id; + + var div = this.el = document.createElement('div'); + div.id = 'pageContainer' + this.id; + div.className = 'page'; + div.style.width = Math.floor(this.viewport.width) + 'px'; + div.style.height = Math.floor(this.viewport.height) + 'px'; + + container.appendChild(anchor); + container.appendChild(div); + + this.destroy = function pageViewDestroy() { + this.update(); + this.pdfPage.destroy(); + }; + + this.update = function pageViewUpdate(scale, rotation) { + this.renderingState = RenderingStates.INITIAL; + this.resume = null; + + if (typeof rotation !== 'undefined') { + this.rotation = rotation; + } + + this.scale = scale || this.scale; + + var totalRotation = (this.rotation + this.pdfPage.rotate) % 360; + var viewport = this.pdfPage.getViewport(this.scale, totalRotation); + + this.viewport = viewport; + div.style.width = Math.floor(viewport.width) + 'px'; + div.style.height = Math.floor(viewport.height) + 'px'; + + while (div.hasChildNodes()) + div.removeChild(div.lastChild); + div.removeAttribute('data-loaded'); + + delete this.canvas; + + this.loadingIconDiv = document.createElement('div'); + this.loadingIconDiv.className = 'loadingIcon'; + div.appendChild(this.loadingIconDiv); + }; + + Object.defineProperty(this, 'width', { + get: function PageView_getWidth() { + return this.viewport.width; + }, + enumerable: true + }); + + Object.defineProperty(this, 'height', { + get: function PageView_getHeight() { + return this.viewport.height; + }, + enumerable: true + }); + + function setupAnnotations(pdfPage, viewport) { + function bindLink(link, dest) { + link.href = PDFView.getDestinationHash(dest); + link.onclick = function pageViewSetupLinksOnclick() { + if (dest) + PDFView.navigateTo(dest); + return false; + }; + } + function createElementWithStyle(tagName, item, rect) { + if (!rect) { + rect = viewport.convertToViewportRectangle(item.rect); + rect = PDFJS.Util.normalizeRect(rect); + } + var element = document.createElement(tagName); + element.style.left = Math.floor(rect[0]) + 'px'; + element.style.top = Math.floor(rect[1]) + 'px'; + element.style.width = Math.ceil(rect[2] - rect[0]) + 'px'; + element.style.height = Math.ceil(rect[3] - rect[1]) + 'px'; + return element; + } + function createTextAnnotation(item) { + var container = document.createElement('section'); + container.className = 'annotText'; + + var rect = viewport.convertToViewportRectangle(item.rect); + rect = PDFJS.Util.normalizeRect(rect); + // sanity check because of OOo-generated PDFs + if ((rect[3] - rect[1]) < ANNOT_MIN_SIZE) { + rect[3] = rect[1] + ANNOT_MIN_SIZE; + } + if ((rect[2] - rect[0]) < ANNOT_MIN_SIZE) { + rect[2] = rect[0] + (rect[3] - rect[1]); // make it square + } + var image = createElementWithStyle('img', item, rect); + var iconName = item.name; + image.src = IMAGE_DIR + 'annotation-' + + iconName.toLowerCase() + '.svg'; + image.alt = mozL10n.get('text_annotation_type', {type: iconName}, + '[{{type}} Annotation]'); + var content = document.createElement('div'); + content.setAttribute('hidden', true); + var title = document.createElement('h1'); + var text = document.createElement('p'); + content.style.left = Math.floor(rect[2]) + 'px'; + content.style.top = Math.floor(rect[1]) + 'px'; + title.textContent = item.title; + + if (!item.content && !item.title) { + content.setAttribute('hidden', true); + } else { + var e = document.createElement('span'); + var lines = item.content.split(/(?:\r\n?|\n)/); + for (var i = 0, ii = lines.length; i < ii; ++i) { + var line = lines[i]; + e.appendChild(document.createTextNode(line)); + if (i < (ii - 1)) + e.appendChild(document.createElement('br')); + } + text.appendChild(e); + image.addEventListener('mouseover', function annotationImageOver() { + content.removeAttribute('hidden'); + }, false); + + image.addEventListener('mouseout', function annotationImageOut() { + content.setAttribute('hidden', true); + }, false); + } + + content.appendChild(title); + content.appendChild(text); + container.appendChild(image); + container.appendChild(content); + + return container; + } + + pdfPage.getAnnotations().then(function(items) { + for (var i = 0; i < items.length; i++) { + var item = items[i]; + switch (item.type) { + case 'Link': + var link = createElementWithStyle('a', item); + link.href = item.url || ''; + if (!item.url) + bindLink(link, ('dest' in item) ? item.dest : null); + div.appendChild(link); + break; + case 'Text': + var textAnnotation = createTextAnnotation(item); + if (textAnnotation) + div.appendChild(textAnnotation); + break; + } + } + }); + } + + this.getPagePoint = function pageViewGetPagePoint(x, y) { + return this.viewport.convertToPdfPoint(x, y); + }; + + this.scrollIntoView = function pageViewScrollIntoView(dest) { + if (!dest) { + scrollIntoView(div); + return; + } + + var x = 0, y = 0; + var width = 0, height = 0, widthScale, heightScale; + var scale = 0; + switch (dest[1].name) { + case 'XYZ': + x = dest[2]; + y = dest[3]; + scale = dest[4]; + break; + case 'Fit': + case 'FitB': + scale = 'page-fit'; + break; + case 'FitH': + case 'FitBH': + y = dest[2]; + scale = 'page-width'; + break; + case 'FitV': + case 'FitBV': + x = dest[2]; + scale = 'page-height'; + break; + case 'FitR': + x = dest[2]; + y = dest[3]; + width = dest[4] - x; + height = dest[5] - y; + widthScale = (this.container.clientWidth - SCROLLBAR_PADDING) / + width / CSS_UNITS; + heightScale = (this.container.clientHeight - SCROLLBAR_PADDING) / + height / CSS_UNITS; + scale = Math.min(widthScale, heightScale); + break; + default: + return; + } + + if (scale && scale !== PDFView.currentScale) + PDFView.parseScale(scale, true, true); + else if (PDFView.currentScale === UNKNOWN_SCALE) + PDFView.parseScale(DEFAULT_SCALE, true, true); + + var boundingRect = [ + this.viewport.convertToViewportPoint(x, y), + this.viewport.convertToViewportPoint(x + width, y + height) + ]; + setTimeout(function pageViewScrollIntoViewRelayout() { + // letting page to re-layout before scrolling + var scale = PDFView.currentScale; + var x = Math.min(boundingRect[0][0], boundingRect[1][0]); + var y = Math.min(boundingRect[0][1], boundingRect[1][1]); + var width = Math.abs(boundingRect[0][0] - boundingRect[1][0]); + var height = Math.abs(boundingRect[0][1] - boundingRect[1][1]); + + scrollIntoView(div, {left: x, top: y, width: width, height: height}); + }, 0); + }; + + this.getTextContent = function pageviewGetTextContent() { + if (!this.textContent) { + this.textContent = this.pdfPage.getTextContent(); + } + return this.textContent; + }; + + this.draw = function pageviewDraw(callback) { + if (this.renderingState !== RenderingStates.INITIAL) { + console.error('Must be in new state before drawing'); + } + + this.renderingState = RenderingStates.RUNNING; + + var canvas = document.createElement('canvas'); + canvas.id = 'page' + this.id; + canvas.mozOpaque = true; + div.appendChild(canvas); + this.canvas = canvas; + + var textLayerDiv = null; + if (!PDFJS.disableTextLayer) { + textLayerDiv = document.createElement('div'); + textLayerDiv.className = 'textLayer'; + div.appendChild(textLayerDiv); + } + var textLayer = this.textLayer = + textLayerDiv ? new TextLayerBuilder(textLayerDiv, this.id - 1) : null; + + var scale = this.scale, viewport = this.viewport; + var outputScale = PDFView.getOutputScale(); + canvas.width = Math.floor(viewport.width) * outputScale.sx; + canvas.height = Math.floor(viewport.height) * outputScale.sy; + + if (outputScale.scaled) { + var cssScale = 'scale(' + (1 / outputScale.sx) + ', ' + + (1 / outputScale.sy) + ')'; + CustomStyle.setProp('transform' , canvas, cssScale); + CustomStyle.setProp('transformOrigin' , canvas, '0% 0%'); + if (textLayerDiv) { + CustomStyle.setProp('transform' , textLayerDiv, cssScale); + CustomStyle.setProp('transformOrigin' , textLayerDiv, '0% 0%'); + } + } + + var ctx = canvas.getContext('2d'); + // TODO(mack): use data attributes to store these + ctx._scaleX = outputScale.sx; + ctx._scaleY = outputScale.sy; + ctx.save(); + ctx.fillStyle = 'rgb(255, 255, 255)'; + ctx.fillRect(0, 0, canvas.width, canvas.height); + ctx.restore(); + if (outputScale.scaled) { + ctx.scale(outputScale.sx, outputScale.sy); + } + + // Rendering area + + var self = this; + var renderingWasReset = false; + function pageViewDrawCallback(error) { + if (renderingWasReset) { + return; + } + + self.renderingState = RenderingStates.FINISHED; + + if (self.loadingIconDiv) { + div.removeChild(self.loadingIconDiv); + delete self.loadingIconDiv; + } + + if (error) { + PDFView.error(mozL10n.get('rendering_error', null, + 'An error occurred while rendering the page.'), error); + } + + self.stats = pdfPage.stats; + self.updateStats(); + if (self.onAfterDraw) + self.onAfterDraw(); + + cache.push(self); + callback(); + } + + var renderContext = { + canvasContext: ctx, + viewport: this.viewport, + textLayer: textLayer, + continueCallback: function pdfViewcContinueCallback(cont) { + if (self.renderingState === RenderingStates.INITIAL) { + // The page update() was called, we just need to abort any rendering. + renderingWasReset = true; + return; + } + + if (PDFView.highestPriorityPage !== 'page' + self.id) { + self.renderingState = RenderingStates.PAUSED; + self.resume = function resumeCallback() { + self.renderingState = RenderingStates.RUNNING; + cont(); + }; + return; + } + cont(); + } + }; + this.pdfPage.render(renderContext).then( + function pdfPageRenderCallback() { + pageViewDrawCallback(null); + }, + function pdfPageRenderError(error) { + pageViewDrawCallback(error); + } + ); + + if (textLayer) { + this.getTextContent().then( + function textContentResolved(textContent) { + textLayer.setTextContent(textContent); + } + ); + } + + setupAnnotations(this.pdfPage, this.viewport); + div.setAttribute('data-loaded', true); + }; + + this.beforePrint = function pageViewBeforePrint() { + var pdfPage = this.pdfPage; + var viewport = pdfPage.getViewport(1); + // Use the same hack we use for high dpi displays for printing to get better + // output until bug 811002 is fixed in FF. + var PRINT_OUTPUT_SCALE = 2; + var canvas = this.canvas = document.createElement('canvas'); + canvas.width = Math.floor(viewport.width) * PRINT_OUTPUT_SCALE; + canvas.height = Math.floor(viewport.height) * PRINT_OUTPUT_SCALE; + canvas.style.width = (PRINT_OUTPUT_SCALE * viewport.width) + 'pt'; + canvas.style.height = (PRINT_OUTPUT_SCALE * viewport.height) + 'pt'; + var cssScale = 'scale(' + (1 / PRINT_OUTPUT_SCALE) + ', ' + + (1 / PRINT_OUTPUT_SCALE) + ')'; + CustomStyle.setProp('transform' , canvas, cssScale); + CustomStyle.setProp('transformOrigin' , canvas, '0% 0%'); + + var printContainer = document.getElementById('printContainer'); + printContainer.appendChild(canvas); + + var self = this; + canvas.mozPrintCallback = function(obj) { + var ctx = obj.context; + + ctx.save(); + ctx.fillStyle = 'rgb(255, 255, 255)'; + ctx.fillRect(0, 0, canvas.width, canvas.height); + ctx.restore(); + ctx.scale(PRINT_OUTPUT_SCALE, PRINT_OUTPUT_SCALE); + + var renderContext = { + canvasContext: ctx, + viewport: viewport + }; + + pdfPage.render(renderContext).then(function() { + // Tell the printEngine that rendering this canvas/page has finished. + obj.done(); + self.pdfPage.destroy(); + }, function(error) { + console.error(error); + // Tell the printEngine that rendering this canvas/page has failed. + // This will make the print proces stop. + if ('abort' in obj) + obj.abort(); + else + obj.done(); + self.pdfPage.destroy(); + }); + }; + }; + + this.updateStats = function pageViewUpdateStats() { + if (PDFJS.pdfBug && Stats.enabled) { + var stats = this.stats; + Stats.add(this.id, stats); + } + }; +}; + +var ThumbnailView = function thumbnailView(container, pdfPage, id) { + var anchor = document.createElement('a'); + anchor.href = PDFView.getAnchorUrl('#page=' + id); + anchor.title = mozL10n.get('thumb_page_title', {page: id}, 'Page {{page}}'); + anchor.onclick = function stopNavigation() { + PDFView.page = id; + return false; + }; + + var rotation = 0; + var totalRotation = (rotation + pdfPage.rotate) % 360; + var viewport = pdfPage.getViewport(1, totalRotation); + var pageWidth = this.width = viewport.width; + var pageHeight = this.height = viewport.height; + var pageRatio = pageWidth / pageHeight; + this.id = id; + + var canvasWidth = 98; + var canvasHeight = canvasWidth / this.width * this.height; + var scaleX = this.scaleX = (canvasWidth / pageWidth); + var scaleY = this.scaleY = (canvasHeight / pageHeight); + + var div = this.el = document.createElement('div'); + div.id = 'thumbnailContainer' + id; + div.className = 'thumbnail'; + + if (id === 1) { + // Highlight the thumbnail of the first page when no page number is + // specified (or exists in cache) when the document is loaded. + div.classList.add('selected'); + } + + var ring = document.createElement('div'); + ring.className = 'thumbnailSelectionRing'; + ring.style.width = canvasWidth + 'px'; + ring.style.height = canvasHeight + 'px'; + + div.appendChild(ring); + anchor.appendChild(div); + container.appendChild(anchor); + + this.hasImage = false; + this.renderingState = RenderingStates.INITIAL; + + this.updateRotation = function(rot) { + + rotation = rot; + totalRotation = (rotation + pdfPage.rotate) % 360; + viewport = pdfPage.getViewport(1, totalRotation); + pageWidth = this.width = viewport.width; + pageHeight = this.height = viewport.height; + pageRatio = pageWidth / pageHeight; + + canvasHeight = canvasWidth / this.width * this.height; + scaleX = this.scaleX = (canvasWidth / pageWidth); + scaleY = this.scaleY = (canvasHeight / pageHeight); + + div.removeAttribute('data-loaded'); + ring.textContent = ''; + ring.style.width = canvasWidth + 'px'; + ring.style.height = canvasHeight + 'px'; + + this.hasImage = false; + this.renderingState = RenderingStates.INITIAL; + this.resume = null; + }; + + function getPageDrawContext() { + var canvas = document.createElement('canvas'); + canvas.id = 'thumbnail' + id; + canvas.mozOpaque = true; + + canvas.width = canvasWidth; + canvas.height = canvasHeight; + canvas.className = 'thumbnailImage'; + canvas.setAttribute('aria-label', mozL10n.get('thumb_page_canvas', + {page: id}, 'Thumbnail of Page {{page}}')); + + div.setAttribute('data-loaded', true); + + ring.appendChild(canvas); + + var ctx = canvas.getContext('2d'); + ctx.save(); + ctx.fillStyle = 'rgb(255, 255, 255)'; + ctx.fillRect(0, 0, canvasWidth, canvasHeight); + ctx.restore(); + return ctx; + } + + this.drawingRequired = function thumbnailViewDrawingRequired() { + return !this.hasImage; + }; + + this.draw = function thumbnailViewDraw(callback) { + if (this.renderingState !== RenderingStates.INITIAL) { + console.error('Must be in new state before drawing'); + } + + this.renderingState = RenderingStates.RUNNING; + if (this.hasImage) { + callback(); + return; + } + + var self = this; + var ctx = getPageDrawContext(); + var drawViewport = pdfPage.getViewport(scaleX, totalRotation); + var renderContext = { + canvasContext: ctx, + viewport: drawViewport, + continueCallback: function(cont) { + if (PDFView.highestPriorityPage !== 'thumbnail' + self.id) { + self.renderingState = RenderingStates.PAUSED; + self.resume = function() { + self.renderingState = RenderingStates.RUNNING; + cont(); + }; + return; + } + cont(); + } + }; + pdfPage.render(renderContext).then( + function pdfPageRenderCallback() { + self.renderingState = RenderingStates.FINISHED; + callback(); + }, + function pdfPageRenderError(error) { + self.renderingState = RenderingStates.FINISHED; + callback(); + } + ); + this.hasImage = true; + }; + + this.setImage = function thumbnailViewSetImage(img) { + if (this.hasImage || !img) + return; + this.renderingState = RenderingStates.FINISHED; + var ctx = getPageDrawContext(); + ctx.drawImage(img, 0, 0, img.width, img.height, + 0, 0, ctx.canvas.width, ctx.canvas.height); + + this.hasImage = true; + }; +}; + +var DocumentOutlineView = function documentOutlineView(outline) { + var outlineView = document.getElementById('outlineView'); + while (outlineView.firstChild) + outlineView.removeChild(outlineView.firstChild); + + function bindItemLink(domObj, item) { + domObj.href = PDFView.getDestinationHash(item.dest); + domObj.onclick = function documentOutlineViewOnclick(e) { + PDFView.navigateTo(item.dest); + return false; + }; + } + + if (!outline) { + var noOutline = document.createElement('div'); + noOutline.classList.add('noOutline'); + noOutline.textContent = mozL10n.get('no_outline', null, + 'No Outline Available'); + outlineView.appendChild(noOutline); + return; + } + + var queue = [{parent: outlineView, items: outline}]; + while (queue.length > 0) { + var levelData = queue.shift(); + var i, n = levelData.items.length; + for (i = 0; i < n; i++) { + var item = levelData.items[i]; + var div = document.createElement('div'); + div.className = 'outlineItem'; + var a = document.createElement('a'); + bindItemLink(a, item); + a.textContent = item.title; + div.appendChild(a); + + if (item.items.length > 0) { + var itemsDiv = document.createElement('div'); + itemsDiv.className = 'outlineItems'; + div.appendChild(itemsDiv); + queue.push({parent: itemsDiv, items: item.items}); + } + + levelData.parent.appendChild(div); + } + } +}; + +// optimised CSS custom property getter/setter +var CustomStyle = (function CustomStyleClosure() { + + // As noted on: http://www.zachstronaut.com/posts/2009/02/17/ + // animate-css-transforms-firefox-webkit.html + // in some versions of IE9 it is critical that ms appear in this list + // before Moz + var prefixes = ['ms', 'Moz', 'Webkit', 'O']; + var _cache = { }; + + function CustomStyle() { + } + + CustomStyle.getProp = function get(propName, element) { + // check cache only when no element is given + if (arguments.length == 1 && typeof _cache[propName] == 'string') { + return _cache[propName]; + } + + element = element || document.documentElement; + var style = element.style, prefixed, uPropName; + + // test standard property first + if (typeof style[propName] == 'string') { + return (_cache[propName] = propName); + } + + // capitalize + uPropName = propName.charAt(0).toUpperCase() + propName.slice(1); + + // test vendor specific properties + for (var i = 0, l = prefixes.length; i < l; i++) { + prefixed = prefixes[i] + uPropName; + if (typeof style[prefixed] == 'string') { + return (_cache[propName] = prefixed); + } + } + + //if all fails then set to undefined + return (_cache[propName] = 'undefined'); + }; + + CustomStyle.setProp = function set(propName, element, str) { + var prop = this.getProp(propName); + if (prop != 'undefined') + element.style[prop] = str; + }; + + return CustomStyle; +})(); + +var TextLayerBuilder = function textLayerBuilder(textLayerDiv, pageIdx) { + var textLayerFrag = document.createDocumentFragment(); + + this.textLayerDiv = textLayerDiv; + this.layoutDone = false; + this.divContentDone = false; + this.pageIdx = pageIdx; + this.matches = []; + + this.beginLayout = function textLayerBuilderBeginLayout() { + this.textDivs = []; + this.textLayerQueue = []; + this.renderingDone = false; + }; + + this.endLayout = function textLayerBuilderEndLayout() { + this.layoutDone = true; + this.insertDivContent(); + }; + + this.renderLayer = function textLayerBuilderRenderLayer() { + var self = this; + var textDivs = this.textDivs; + var textLayerDiv = this.textLayerDiv; + var canvas = document.createElement('canvas'); + var ctx = canvas.getContext('2d'); + + // No point in rendering so many divs as it'd make the browser unusable + // even after the divs are rendered + var MAX_TEXT_DIVS_TO_RENDER = 100000; + if (textDivs.length > MAX_TEXT_DIVS_TO_RENDER) + return; + + for (var i = 0, ii = textDivs.length; i < ii; i++) { + var textDiv = textDivs[i]; + textLayerFrag.appendChild(textDiv); + + ctx.font = textDiv.style.fontSize + ' ' + textDiv.style.fontFamily; + var width = ctx.measureText(textDiv.textContent).width; + + if (width > 0) { + var textScale = textDiv.dataset.canvasWidth / width; + + CustomStyle.setProp('transform' , textDiv, + 'scale(' + textScale + ', 1)'); + CustomStyle.setProp('transformOrigin' , textDiv, '0% 0%'); + + textLayerDiv.appendChild(textDiv); + } + } + + this.renderingDone = true; + this.updateMatches(); + + textLayerDiv.appendChild(textLayerFrag); + }; + + this.setupRenderLayoutTimer = function textLayerSetupRenderLayoutTimer() { + // Schedule renderLayout() if user has been scrolling, otherwise + // run it right away + var RENDER_DELAY = 200; // in ms + var self = this; + if (Date.now() - PDFView.lastScroll > RENDER_DELAY) { + // Render right away + this.renderLayer(); + } else { + // Schedule + if (this.renderTimer) + clearTimeout(this.renderTimer); + this.renderTimer = setTimeout(function() { + self.setupRenderLayoutTimer(); + }, RENDER_DELAY); + } + }; + + this.appendText = function textLayerBuilderAppendText(geom) { + var textDiv = document.createElement('div'); + + // vScale and hScale already contain the scaling to pixel units + var fontHeight = geom.fontSize * geom.vScale; + textDiv.dataset.canvasWidth = geom.canvasWidth * geom.hScale; + textDiv.dataset.fontName = geom.fontName; + + textDiv.style.fontSize = fontHeight + 'px'; + textDiv.style.fontFamily = geom.fontFamily; + textDiv.style.left = geom.x + 'px'; + textDiv.style.top = (geom.y - fontHeight) + 'px'; + + // The content of the div is set in the `setTextContent` function. + + this.textDivs.push(textDiv); + }; + + this.insertDivContent = function textLayerUpdateTextContent() { + // Only set the content of the divs once layout has finished, the content + // for the divs is available and content is not yet set on the divs. + if (!this.layoutDone || this.divContentDone || !this.textContent) + return; + + this.divContentDone = true; + + var textDivs = this.textDivs; + var bidiTexts = this.textContent.bidiTexts; + + for (var i = 0; i < bidiTexts.length; i++) { + var bidiText = bidiTexts[i]; + var textDiv = textDivs[i]; + + textDiv.textContent = bidiText.str; + textDiv.dir = bidiText.ltr ? 'ltr' : 'rtl'; + } + + this.setupRenderLayoutTimer(); + }; + + this.setTextContent = function textLayerBuilderSetTextContent(textContent) { + this.textContent = textContent; + this.insertDivContent(); + }; + + this.convertMatches = function textLayerBuilderConvertMatches(matches) { + var i = 0; + var iIndex = 0; + var bidiTexts = this.textContent.bidiTexts; + var end = bidiTexts.length - 1; + var queryLen = PDFFindController.state.query.length; + + var lastDivIdx = -1; + var pos; + + var ret = []; + + // Loop over all the matches. + for (var m = 0; m < matches.length; m++) { + var matchIdx = matches[m]; + // # Calculate the begin position. + + // Loop over the divIdxs. + while (i !== end && matchIdx >= (iIndex + bidiTexts[i].str.length)) { + iIndex += bidiTexts[i].str.length; + i++; + } + + // TODO: Do proper handling here if something goes wrong. + if (i == bidiTexts.length) { + console.error('Could not find matching mapping'); + } + + var match = { + begin: { + divIdx: i, + offset: matchIdx - iIndex + } + }; + + // # Calculate the end position. + matchIdx += queryLen; + + // Somewhat same array as above, but use a > instead of >= to get the end + // position right. + while (i !== end && matchIdx > (iIndex + bidiTexts[i].str.length)) { + iIndex += bidiTexts[i].str.length; + i++; + } + + match.end = { + divIdx: i, + offset: matchIdx - iIndex + }; + ret.push(match); + } + + return ret; + }; + + this.renderMatches = function textLayerBuilder_renderMatches(matches) { + // Early exit if there is nothing to render. + if (matches.length === 0) { + return; + } + + var bidiTexts = this.textContent.bidiTexts; + var textDivs = this.textDivs; + var prevEnd = null; + var isSelectedPage = this.pageIdx === PDFFindController.selected.pageIdx; + var selectedMatchIdx = PDFFindController.selected.matchIdx; + var highlightAll = PDFFindController.state.highlightAll; + + var infty = { + divIdx: -1, + offset: undefined + }; + + function beginText(begin, className) { + var divIdx = begin.divIdx; + var div = textDivs[divIdx]; + div.textContent = ''; + + var content = bidiTexts[divIdx].str.substring(0, begin.offset); + var node = document.createTextNode(content); + if (className) { + var isSelected = isSelectedPage && + divIdx === selectedMatchIdx; + var span = document.createElement('span'); + span.className = className + (isSelected ? ' selected' : ''); + span.appendChild(node); + div.appendChild(span); + return; + } + div.appendChild(node); + } + + function appendText(from, to, className) { + var divIdx = from.divIdx; + var div = textDivs[divIdx]; + + var content = bidiTexts[divIdx].str.substring(from.offset, to.offset); + var node = document.createTextNode(content); + if (className) { + var span = document.createElement('span'); + span.className = className; + span.appendChild(node); + div.appendChild(span); + return; + } + div.appendChild(node); + } + + function highlightDiv(divIdx, className) { + textDivs[divIdx].className = className; + } + + var i0 = selectedMatchIdx, i1 = i0 + 1, i; + + if (highlightAll) { + i0 = 0; + i1 = matches.length; + } else if (!isSelectedPage) { + // Not highlighting all and this isn't the selected page, so do nothing. + return; + } + + for (i = i0; i < i1; i++) { + var match = matches[i]; + var begin = match.begin; + var end = match.end; + + var isSelected = isSelectedPage && i === selectedMatchIdx; + var highlightSuffix = (isSelected ? ' selected' : ''); + if (isSelected) + scrollIntoView(textDivs[begin.divIdx], {top: -50}); + + // Match inside new div. + if (!prevEnd || begin.divIdx !== prevEnd.divIdx) { + // If there was a previous div, then add the text at the end + if (prevEnd !== null) { + appendText(prevEnd, infty); + } + // clears the divs and set the content until the begin point. + beginText(begin); + } else { + appendText(prevEnd, begin); + } + + if (begin.divIdx === end.divIdx) { + appendText(begin, end, 'highlight' + highlightSuffix); + } else { + appendText(begin, infty, 'highlight begin' + highlightSuffix); + for (var n = begin.divIdx + 1; n < end.divIdx; n++) { + highlightDiv(n, 'highlight middle' + highlightSuffix); + } + beginText(end, 'highlight end' + highlightSuffix); + } + prevEnd = end; + } + + if (prevEnd) { + appendText(prevEnd, infty); + } + }; + + this.updateMatches = function textLayerUpdateMatches() { + // Only show matches, once all rendering is done. + if (!this.renderingDone) + return; + + // Clear out all matches. + var matches = this.matches; + var textDivs = this.textDivs; + var bidiTexts = this.textContent.bidiTexts; + var clearedUntilDivIdx = -1; + + // Clear out all current matches. + for (var i = 0; i < matches.length; i++) { + var match = matches[i]; + var begin = Math.max(clearedUntilDivIdx, match.begin.divIdx); + for (var n = begin; n <= match.end.divIdx; n++) { + var div = textDivs[n]; + div.textContent = bidiTexts[n].str; + div.className = ''; + } + clearedUntilDivIdx = match.end.divIdx + 1; + } + + if (!PDFFindController.active) + return; + + // Convert the matches on the page controller into the match format used + // for the textLayer. + this.matches = matches = + this.convertMatches(PDFFindController.pageMatches[this.pageIdx] || []); + + this.renderMatches(this.matches); + }; +}; + +document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) { + PDFView.initialize(); + var params = PDFView.parseQueryString(document.location.search.substring(1)); + + var file = params.file || DEFAULT_URL; + + if (!window.File || !window.FileReader || !window.FileList || !window.Blob) { + document.getElementById('openFile').setAttribute('hidden', 'true'); + } else { + document.getElementById('fileInput').value = null; + } + + // Special debugging flags in the hash section of the URL. + var hash = document.location.hash.substring(1); + var hashParams = PDFView.parseQueryString(hash); + + if ('disableWorker' in hashParams) + PDFJS.disableWorker = (hashParams['disableWorker'] === 'true'); + + var locale = navigator.language; + if ('locale' in hashParams) + locale = hashParams['locale']; + mozL10n.setLanguage(locale); + + if ('textLayer' in hashParams) { + switch (hashParams['textLayer']) { + case 'off': + PDFJS.disableTextLayer = true; + break; + case 'visible': + case 'shadow': + case 'hover': + var viewer = document.getElementById('viewer'); + viewer.classList.add('textLayer-' + hashParams['textLayer']); + break; + } + } + + if ('pdfBug' in hashParams) { + PDFJS.pdfBug = true; + var pdfBug = hashParams['pdfBug']; + var enabled = pdfBug.split(','); + PDFBug.enable(enabled); + PDFBug.init(); + } + + if (!PDFView.supportsPrinting) { + document.getElementById('print').classList.add('hidden'); + } + + if (!PDFView.supportsFullscreen) { + document.getElementById('fullscreen').classList.add('hidden'); + } + + if (PDFView.supportsIntegratedFind) { + document.querySelector('#viewFind').classList.add('hidden'); + } + + // Listen for warnings to trigger the fallback UI. Errors should be caught + // and call PDFView.error() so we don't need to listen for those. + PDFJS.LogManager.addLogger({ + warn: function() { + PDFView.fallback(); + } + }); + + var mainContainer = document.getElementById('mainContainer'); + var outerContainer = document.getElementById('outerContainer'); + mainContainer.addEventListener('transitionend', function(e) { + if (e.target == mainContainer) { + var event = document.createEvent('UIEvents'); + event.initUIEvent('resize', false, false, window, 0); + window.dispatchEvent(event); + outerContainer.classList.remove('sidebarMoving'); + } + }, true); + + document.getElementById('sidebarToggle').addEventListener('click', + function() { + this.classList.toggle('toggled'); + outerContainer.classList.add('sidebarMoving'); + outerContainer.classList.toggle('sidebarOpen'); + PDFView.sidebarOpen = outerContainer.classList.contains('sidebarOpen'); + PDFView.renderHighestPriority(); + }); + + document.getElementById('viewThumbnail').addEventListener('click', + function() { + PDFView.switchSidebarView('thumbs'); + }); + + document.getElementById('viewOutline').addEventListener('click', + function() { + PDFView.switchSidebarView('outline'); + }); + + document.getElementById('previous').addEventListener('click', + function() { + PDFView.page--; + }); + + document.getElementById('next').addEventListener('click', + function() { + PDFView.page++; + }); + + document.querySelector('.zoomIn').addEventListener('click', + function() { + PDFView.zoomIn(); + }); + + document.querySelector('.zoomOut').addEventListener('click', + function() { + PDFView.zoomOut(); + }); + + document.getElementById('fullscreen').addEventListener('click', + function() { + PDFView.fullscreen(); + }); + + document.getElementById('openFile').addEventListener('click', + function() { + document.getElementById('fileInput').click(); + }); + + document.getElementById('print').addEventListener('click', + function() { + window.print(); + }); + + document.getElementById('download').addEventListener('click', + function() { + PDFView.download(); + }); + + document.getElementById('pageNumber').addEventListener('click', + function() { + this.select(); + }); + + document.getElementById('pageNumber').addEventListener('change', + function() { + // Handle the user inputting a floating point number. + PDFView.page = (this.value | 0); + + if (this.value !== (this.value | 0).toString()) { + this.value = PDFView.page; + } + }); + + document.getElementById('scaleSelect').addEventListener('change', + function() { + PDFView.parseScale(this.value); + }); + + document.getElementById('first_page').addEventListener('click', + function() { + PDFView.page = 1; + }); + + document.getElementById('last_page').addEventListener('click', + function() { + PDFView.page = PDFView.pdfDocument.numPages; + }); + + document.getElementById('page_rotate_ccw').addEventListener('click', + function() { + PDFView.rotatePages(-90); + }); + + document.getElementById('page_rotate_cw').addEventListener('click', + function() { + PDFView.rotatePages(90); + }); + + + PDFView.open(file, 0); +}, true); + +function updateViewarea() { + + if (!PDFView.initialized) + return; + var visible = PDFView.getVisiblePages(); + var visiblePages = visible.views; + if (visiblePages.length === 0) { + return; + } + + PDFView.renderHighestPriority(); + + var currentId = PDFView.page; + var firstPage = visible.first; + + for (var i = 0, ii = visiblePages.length, stillFullyVisible = false; + i < ii; ++i) { + var page = visiblePages[i]; + + if (page.percent < 100) + break; + + if (page.id === PDFView.page) { + stillFullyVisible = true; + break; + } + } + + if (!stillFullyVisible) { + currentId = visiblePages[0].id; + } + + if (!PDFView.isFullscreen) { + updateViewarea.inProgress = true; // used in "set page" + PDFView.page = currentId; + updateViewarea.inProgress = false; + } + + var currentScale = PDFView.currentScale; + var currentScaleValue = PDFView.currentScaleValue; + var normalizedScaleValue = currentScaleValue == currentScale ? + currentScale * 100 : currentScaleValue; + + var pageNumber = firstPage.id; + var pdfOpenParams = '#page=' + pageNumber; + pdfOpenParams += '&zoom=' + normalizedScaleValue; + var currentPage = PDFView.pages[pageNumber - 1]; + var topLeft = currentPage.getPagePoint(PDFView.container.scrollLeft, + (PDFView.container.scrollTop - firstPage.y)); + pdfOpenParams += ',' + Math.round(topLeft[0]) + ',' + Math.round(topLeft[1]); + + var store = PDFView.store; + store.initializedPromise.then(function() { + store.set('exists', true); + store.set('page', pageNumber); + store.set('zoom', normalizedScaleValue); + store.set('scrollLeft', Math.round(topLeft[0])); + store.set('scrollTop', Math.round(topLeft[1])); + }); + var href = PDFView.getAnchorUrl(pdfOpenParams); + document.getElementById('viewBookmark').href = href; +} + +window.addEventListener('resize', function webViewerResize(evt) { + if (PDFView.initialized && + (document.getElementById('pageWidthOption').selected || + document.getElementById('pageFitOption').selected || + document.getElementById('pageAutoOption').selected)) + PDFView.parseScale(document.getElementById('scaleSelect').value); + updateViewarea(); +}); + +window.addEventListener('hashchange', function webViewerHashchange(evt) { + PDFView.setHash(document.location.hash.substring(1)); +}); + +window.addEventListener('change', function webViewerChange(evt) { + var files = evt.target.files; + if (!files || files.length === 0) + return; + + // Read the local file into a Uint8Array. + var fileReader = new FileReader(); + fileReader.onload = function webViewerChangeFileReaderOnload(evt) { + var buffer = evt.target.result; + var uint8Array = new Uint8Array(buffer); + PDFView.open(uint8Array, 0); + }; + + var file = files[0]; + fileReader.readAsArrayBuffer(file); + PDFView.setTitleUsingUrl(file.name); + + // URL does not reflect proper document location - hiding some icons. + document.getElementById('viewBookmark').setAttribute('hidden', 'true'); + document.getElementById('download').setAttribute('hidden', 'true'); +}, true); + +function selectScaleOption(value) { + var options = document.getElementById('scaleSelect').options; + var predefinedValueFound = false; + for (var i = 0; i < options.length; i++) { + var option = options[i]; + if (option.value != value) { + option.selected = false; + continue; + } + option.selected = true; + predefinedValueFound = true; + } + return predefinedValueFound; +} + +window.addEventListener('localized', function localized(evt) { + document.getElementsByTagName('html')[0].dir = mozL10n.getDirection(); + + // Adjust the width of the zoom box to fit the content. + var container = document.getElementById('scaleSelectContainer'); + var select = document.getElementById('scaleSelect'); + + select.setAttribute('style', 'min-width: inherit;'); + var width = select.clientWidth + 8; + container.setAttribute('style', 'min-width: ' + width + 'px; ' + + 'max-width: ' + width + 'px;'); + select.setAttribute('style', 'min-width: ' + (width + 20) + 'px;'); +}, true); + +window.addEventListener('scalechange', function scalechange(evt) { + var customScaleOption = document.getElementById('customScaleOption'); + customScaleOption.selected = false; + + if (!evt.resetAutoSettings && + (document.getElementById('pageWidthOption').selected || + document.getElementById('pageFitOption').selected || + document.getElementById('pageAutoOption').selected)) { + updateViewarea(); + return; + } + + var predefinedValueFound = selectScaleOption('' + evt.scale); + if (!predefinedValueFound) { + customScaleOption.textContent = Math.round(evt.scale * 10000) / 100 + '%'; + customScaleOption.selected = true; + } + + document.getElementById('zoom_out').disabled = (evt.scale === MIN_SCALE); + document.getElementById('zoom_in').disabled = (evt.scale === MAX_SCALE); + + updateViewarea(); +}, true); + +window.addEventListener('pagechange', function pagechange(evt) { + var page = evt.pageNumber; + if (PDFView.previousPageNumber !== page) { + document.getElementById('pageNumber').value = page; + var selected = document.querySelector('.thumbnail.selected'); + if (selected) + selected.classList.remove('selected'); + var thumbnail = document.getElementById('thumbnailContainer' + page); + thumbnail.classList.add('selected'); + var visibleThumbs = PDFView.getVisibleThumbs(); + var numVisibleThumbs = visibleThumbs.views.length; + // If the thumbnail isn't currently visible scroll it into view. + if (numVisibleThumbs > 0) { + var first = visibleThumbs.first.id; + // Account for only one thumbnail being visible. + var last = numVisibleThumbs > 1 ? + visibleThumbs.last.id : first; + if (page <= first || page >= last) + scrollIntoView(thumbnail); + } + + } + document.getElementById('previous').disabled = (page <= 1); + document.getElementById('next').disabled = (page >= PDFView.pages.length); +}, true); + +// Firefox specific event, so that we can prevent browser from zooming +window.addEventListener('DOMMouseScroll', function(evt) { + if (evt.ctrlKey) { + evt.preventDefault(); + + var ticks = evt.detail; + var direction = (ticks > 0) ? 'zoomOut' : 'zoomIn'; + for (var i = 0, length = Math.abs(ticks); i < length; i++) + PDFView[direction](); + } else if (PDFView.isFullscreen) { + var FIREFOX_DELTA_FACTOR = -40; + PDFView.mouseScroll(evt.detail * FIREFOX_DELTA_FACTOR); + } +}, false); + +window.addEventListener('mousemove', function keydown(evt) { + if (PDFView.isFullscreen) { + PDFView.showPresentationControls(); + } +}, false); + +window.addEventListener('mousedown', function mousedown(evt) { + if (PDFView.isFullscreen && evt.button === 0) { + // Mouse click in fullmode advances a page + evt.preventDefault(); + + PDFView.page++; + } +}, false); + +window.addEventListener('keydown', function keydown(evt) { + var handled = false; + var cmd = (evt.ctrlKey ? 1 : 0) | + (evt.altKey ? 2 : 0) | + (evt.shiftKey ? 4 : 0) | + (evt.metaKey ? 8 : 0); + + // First, handle the key bindings that are independent whether an input + // control is selected or not. + if (cmd == 1 || cmd == 8) { // either CTRL or META key. + switch (evt.keyCode) { + case 70: + if (!PDFView.supportsIntegratedFind) { + PDFFindBar.toggle(); + handled = true; + } + break; + case 61: // FF/Mac '=' + case 107: // FF '+' and '=' + case 187: // Chrome '+' + case 171: // FF with German keyboard + PDFView.zoomIn(); + handled = true; + break; + case 173: // FF/Mac '-' + case 109: // FF '-' + case 189: // Chrome '-' + PDFView.zoomOut(); + handled = true; + break; + case 48: // '0' + case 96: // '0' on Numpad of Swedish keyboard + PDFView.parseScale(DEFAULT_SCALE, true); + handled = true; + break; + } + } + + // CTRL or META with or without SHIFT. + if (cmd == 1 || cmd == 8 || cmd == 5 || cmd == 12) { + switch (evt.keyCode) { + case 71: // g + if (!PDFView.supportsIntegratedFind) { + PDFFindBar.dispatchEvent('again', cmd == 5 || cmd == 12); + handled = true; + } + break; + } + } + + if (handled) { + evt.preventDefault(); + return; + } + + // Some shortcuts should not get handled if a control/input element + // is selected. + var curElement = document.activeElement; + if (curElement && (curElement.tagName == 'INPUT' || + curElement.tagName == 'SELECT')) { + return; + } + var controlsElement = document.getElementById('toolbar'); + while (curElement) { + if (curElement === controlsElement && !PDFView.isFullscreen) + return; // ignoring if the 'toolbar' element is focused + curElement = curElement.parentNode; + } + + if (cmd === 0) { // no control key pressed at all. + switch (evt.keyCode) { + case 38: // up arrow + case 33: // pg up + case 8: // backspace + if (!PDFView.isFullscreen && PDFView.currentScaleValue !== 'page-fit') { + break; + } + /* in fullscreen mode */ + /* falls through */ + case 37: // left arrow + // horizontal scrolling using arrow keys + if (PDFView.isHorizontalScrollbarEnabled) { + break; + } + /* falls through */ + case 75: // 'k' + case 80: // 'p' + PDFView.page--; + handled = true; + break; + case 27: // esc key + if (!PDFView.supportsIntegratedFind && PDFFindBar.opened) { + PDFFindBar.close(); + handled = true; + } + break; + case 40: // down arrow + case 34: // pg down + case 32: // spacebar + if (!PDFView.isFullscreen && PDFView.currentScaleValue !== 'page-fit') { + break; + } + /* falls through */ + case 39: // right arrow + // horizontal scrolling using arrow keys + if (PDFView.isHorizontalScrollbarEnabled) { + break; + } + /* falls through */ + case 74: // 'j' + case 78: // 'n' + PDFView.page++; + handled = true; + break; + + case 36: // home + if (PDFView.isFullscreen) { + PDFView.page = 1; + handled = true; + } + break; + case 35: // end + if (PDFView.isFullscreen) { + PDFView.page = PDFView.pdfDocument.numPages; + handled = true; + } + break; + + case 82: // 'r' + PDFView.rotatePages(90); + break; + } + } + + if (cmd == 4) { // shift-key + switch (evt.keyCode) { + case 82: // 'r' + PDFView.rotatePages(-90); + break; + } + } + + if (handled) { + evt.preventDefault(); + PDFView.clearMouseScrollState(); + } +}); + +window.addEventListener('beforeprint', function beforePrint(evt) { + PDFView.beforePrint(); +}); + +window.addEventListener('afterprint', function afterPrint(evt) { + PDFView.afterPrint(); +}); + +(function fullscreenClosure() { + function fullscreenChange(e) { + var isFullscreen = document.fullscreenElement || document.mozFullScreen || + document.webkitIsFullScreen; + + if (!isFullscreen) { + PDFView.exitFullscreen(); + } + } + + window.addEventListener('fullscreenchange', fullscreenChange, false); + window.addEventListener('mozfullscreenchange', fullscreenChange, false); + window.addEventListener('webkitfullscreenchange', fullscreenChange, false); +})(); + +(function animationStartedClosure() { + // The offsetParent is not set until the pdf.js iframe or object is visible. + // Waiting for first animation. + var requestAnimationFrame = window.requestAnimationFrame || + window.mozRequestAnimationFrame || + window.webkitRequestAnimationFrame || + window.oRequestAnimationFrame || + window.msRequestAnimationFrame || + function startAtOnce(callback) { callback(); }; + PDFView.animationStartedPromise = new PDFJS.Promise(); + requestAnimationFrame(function onAnimationFrame() { + PDFView.animationStartedPromise.resolve(); + }); +})(); + + diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss index 58a92d1ee6..76d52ed930 100644 --- a/common/static/sass/_mixins.scss +++ b/common/static/sass/_mixins.scss @@ -1,19 +1,39 @@ +// font-sizing @function em($pxval, $base: 16) { @return #{$pxval / $base}em; } -// Line-height +@mixin font-size($sizeValue: 1.6){ + font-size: $sizeValue + px; + font-size: ($sizeValue/10) + rem; +} + +// line-height @function lh($amount: 1) { @return $body-line-height * $amount; } -@mixin hide-text(){ - text-indent: -9999px; +// image-replacement hidden text +@mixin text-hide() { + text-indent: 100%; + white-space: nowrap; overflow: hidden; - display: block; } -@mixin vertically-and-horizontally-centered ( $height, $width ) { +// hidden elems - screenreaders +@mixin text-sr() { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} + +// vertical and horizontal centering +@mixin vertically-and-horizontally-centered ($height, $width) { left: 50%; margin-left: -$width / 2; //margin-top: -$height / 2; @@ -22,3 +42,26 @@ position: absolute; top: 150px; } + +// sizing +@mixin size($width: $baseline, $height: $baseline) { + height: $height; + width: $width; +} + +@mixin square($size: $baseline) { + @include size($size); +} + +// placeholder styling +@mixin placeholder($color) { + :-moz-placeholder { + color: $color; + } + ::-webkit-input-placeholder { + color: $color; + } + :-ms-input-placeholder { + color: $color; + } +} \ No newline at end of file diff --git a/common/templates/courseware_vendor_js.html b/common/templates/courseware_vendor_js.html index ab1842dfb4..84e682ddac 100644 --- a/common/templates/courseware_vendor_js.html +++ b/common/templates/courseware_vendor_js.html @@ -1,7 +1,9 @@ <%namespace name='static' file='static_content.html'/> + + diff --git a/common/test/data/conditional/README.md b/common/test/data/conditional/README.md new file mode 100644 index 0000000000..84b9cba58e --- /dev/null +++ b/common/test/data/conditional/README.md @@ -0,0 +1,3 @@ +course for testing conditional module + + diff --git a/common/test/data/conditional/conditional/condone.xml b/common/test/data/conditional/conditional/condone.xml new file mode 100644 index 0000000000..f283e0d4ef --- /dev/null +++ b/common/test/data/conditional/conditional/condone.xml @@ -0,0 +1,3 @@ + + + diff --git a/common/test/data/conditional/course.xml b/common/test/data/conditional/course.xml new file mode 100644 index 0000000000..643e9552b5 --- /dev/null +++ b/common/test/data/conditional/course.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/common/test/data/conditional/html/secret_page.xml b/common/test/data/conditional/html/secret_page.xml new file mode 100644 index 0000000000..63be3cfa8d --- /dev/null +++ b/common/test/data/conditional/html/secret_page.xml @@ -0,0 +1,4 @@ + +

      This is a secret!

      + + diff --git a/common/test/data/conditional/problem/choiceprob.xml b/common/test/data/conditional/problem/choiceprob.xml new file mode 100644 index 0000000000..fa91954977 --- /dev/null +++ b/common/test/data/conditional/problem/choiceprob.xml @@ -0,0 +1,22 @@ + + + +

      Consider a hypothetical magnetic field pointing out of your computer screen. Now imagine an electron traveling from right to left in the plane of your screen. A diagram of this situation is show below…

      +
      + +

      a. The magnitude of the force experienced by the electron is proportional the product of which of the following? (Select all that apply.)

      + + + + +Magnetic field strength… +Electric field strength… +Electric charge of the electron… +Radius of the electron… +Mass of the electron… +Velocity of the electron… + + + + +       diff --git a/common/test/data/full/policies/6.002_Spring_2012.json b/common/test/data/full/policies/6.002_Spring_2012.json index 345309ff5c..2f55528b7b 100644 --- a/common/test/data/full/policies/6.002_Spring_2012.json +++ b/common/test/data/full/policies/6.002_Spring_2012.json @@ -8,6 +8,7 @@ {"type": "courseware"}, {"type": "course_info", "name": "Course Info"}, {"type": "static_tab", "url_slug": "syllabus", "name": "Syllabus"}, + {"type": "static_tab", "url_slug": "resources", "name": "Resources"}, {"type": "discussion", "name": "Discussion"}, {"type": "wiki", "name": "Wiki"}, {"type": "progress", "name": "Progress"} diff --git a/common/test/data/full/tabs/resources.html b/common/test/data/full/tabs/resources.html new file mode 100644 index 0000000000..bf78c92fb1 --- /dev/null +++ b/common/test/data/full/tabs/resources.html @@ -0,0 +1 @@ +

      This is another sample tab

      \ No newline at end of file diff --git a/common/test/data/simple/course.xml b/common/test/data/simple/course.xml index 86dc8df45c..660411384f 100644 --- a/common/test/data/simple/course.xml +++ b/common/test/data/simple/course.xml @@ -15,7 +15,7 @@
      - +
        diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html index be238811c2..de1ff394bd 100644 --- a/lms/templates/discussion/_underscore_templates.html +++ b/lms/templates/discussion/_underscore_templates.html @@ -26,6 +26,10 @@
        + ${"<% if (obj.group_id) { %>"} +
        ${"<%- obj.group_string%>"}
        + ${"<% } %>"} + + ${'<%- votes["up_count"] %>'}

        ${'<%- title %>'}

        diff --git a/lms/templates/discussion/mustache/_content.mustache b/lms/templates/discussion/mustache/_content.mustache index 8f2ebca2a9..6bcf048915 100644 --- a/lms/templates/discussion/mustache/_content.mustache +++ b/lms/templates/discussion/mustache/_content.mustache @@ -1,4 +1,5 @@

        +CONTENT MUSTACHE
        ▲ diff --git a/lms/templates/discussion/mustache/_inline_discussion.mustache b/lms/templates/discussion/mustache/_inline_discussion.mustache index 0140a6221a..6c57fa9dfe 100644 --- a/lms/templates/discussion/mustache/_inline_discussion.mustache +++ b/lms/templates/discussion/mustache/_inline_discussion.mustache @@ -1,6 +1,4 @@
        - -
        diff --git a/lms/templates/discussion/mustache/_inline_discussion_cohorted.mustache b/lms/templates/discussion/mustache/_inline_discussion_cohorted.mustache new file mode 100644 index 0000000000..6daef10dbb --- /dev/null +++ b/lms/templates/discussion/mustache/_inline_discussion_cohorted.mustache @@ -0,0 +1,56 @@ +
        +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        + {{! TODO tags: Getting rid of tags for now. }} + {{!
        }} + {{! }} + {{!
        }} + + Cancel +
        + +
        + {{#allow_anonymous}} + + {{/allow_anonymous}} + {{#allow_anonymous_to_peers}} + + {{/allow_anonymous_to_peers}} + +
        + Make visible to: + +
        + +
        + +
        +
        + +
        + {{#threads}} +
        +
        + {{/threads}} +
        + +
        +
        +
        diff --git a/lms/templates/discussion/mustache/_inline_thread.mustache b/lms/templates/discussion/mustache/_inline_thread.mustache index 150625bfae..b52d3924e7 100644 --- a/lms/templates/discussion/mustache/_inline_thread.mustache +++ b/lms/templates/discussion/mustache/_inline_thread.mustache @@ -1,5 +1,4 @@
        -
          diff --git a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache new file mode 100644 index 0000000000..9223dfd388 --- /dev/null +++ b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache @@ -0,0 +1,22 @@ + \ No newline at end of file diff --git a/lms/templates/dogfood.html b/lms/templates/dogfood.html deleted file mode 100644 index 8460454f81..0000000000 --- a/lms/templates/dogfood.html +++ /dev/null @@ -1,144 +0,0 @@ -<%namespace name='static' file='static_content.html'/> - - -## ----------------------------------------------------------------------------- -## Template for lib.dogfood.views.dj_capa_problem -## -## Used for viewing assesment problems in "dogfood" self-evaluation mode -## ----------------------------------------------------------------------------- - - -## -## - -% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: -## <%static:css group='application'/> -% endif - -% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: -## -% endif - - - - - -% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: - <%static:js group='application'/> -% endif - -% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: - % for jsfn in [ '/static/%s' % x.replace('.coffee','.js') for x in settings.PIPELINE_JS['application']['source_filenames'] ]: - - % endfor -% endif - -## codemirror - - - -## alternate codemirror -## -## -## - -## image input: for clicking on images (see imageinput.html) - - - -<%include file="mathjax_include.html" /> - - - - - - -
          - -## ----------------------------------------------------------------------------- -## information - -##
          -##

          Rendition of your problem code

          -##
          - -## ----------------------------------------------------------------------------- -## rendered problem display - - - - - - - -
          -
          - ${phtml} -
          -
          - - - - - -## - - - -## image input: for clicking on images (see imageinput.html) - - - - - <%block name="js_extra"/> - - - diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss index aa84e0ff52..a5b40ca11c 100644 --- a/lms/templates/feed.rss +++ b/lms/templates/feed.rss @@ -6,7 +6,25 @@ ## EdX Blog - 2013-01-21T14:00:12-07:00 + 2013-02-20T14:00:12-07:00 + + tag:www.edx.org,2012:Post/13 + 2013-02-20T10:00:00-07:00 + 2013-02-20T10:00:00-07:00 + + edX Expands Internationally and Doubles its Institutional Membership with the Addition of Six New Schools + <img src="${static.url('images/press/releases/edx-logo_240x180.png')}" /> + <p></p> + + + tag:www.edx.org,2012:Post/13 + 2013-01-30T10:00:00-07:00 + 2013-01-30T10:00:00-07:00 + + New biology course from human genome pioneer Eric Lander + <img src="${static.url('images/press/releases/eric-lander_240x180.jpg')}" /> + <p></p> + tag:www.edx.org,2012:Post/11 2013-01-22T10:00:00-07:00 @@ -16,6 +34,15 @@ <img src="${static.url('images/press/releases/dr-lewin-316_240x180.jpg')}" /> <p></p> + + tag:www.edx.org,2012:Post/12 + 2013-01-29T10:00:00-07:00 + 2013-01-29T10:00:00-07:00 + + City of Boston and edX partner to establish BostonX to improve educational access for residents + <img src="${static.url('images/press/releases/edx-logo_240x180.png')}" /> + <p></p> + diff --git a/lms/templates/foldit.html b/lms/templates/foldit.html new file mode 100644 index 0000000000..2a8271cc62 --- /dev/null +++ b/lms/templates/foldit.html @@ -0,0 +1,12 @@ +
          + + % if show_basic: + ${folditbasic} + % endif + + + % if show_leader: + ${folditchallenge} + % endif + +
          diff --git a/lms/templates/folditbasic.html b/lms/templates/folditbasic.html new file mode 100644 index 0000000000..0c79a53703 --- /dev/null +++ b/lms/templates/folditbasic.html @@ -0,0 +1,29 @@ +
          +

          Due: ${due} + +

          + Status: + % if success: + You have successfully gotten to level ${goal_level}. + % else: + You have not yet gotten to level ${goal_level}. + % endif +

          + +

          Completed puzzles

          + + + + + + + % for puzzle in completed: + + + + + % endfor +
          LevelSubmitted
          ${'{0}-{1}'.format(puzzle['set'], puzzle['subset'])}${puzzle['created'].strftime('%Y-%m-%d %H:%M')}
          + +
          +
          diff --git a/lms/templates/folditchallenge.html b/lms/templates/folditchallenge.html new file mode 100644 index 0000000000..677bc286c8 --- /dev/null +++ b/lms/templates/folditchallenge.html @@ -0,0 +1,16 @@ +
          +

          Puzzle Leaderboard

          + + + + + + + % for pair in top_scores: + + + + + % endfor +
          UserScore
          ${pair[0]}${pair[1]}
          +
          diff --git a/lms/templates/footer.html b/lms/templates/footer.html index 7fe7c18ccc..248b1c468c 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -24,8 +24,8 @@
          -##

          © 2012 edX, some rights reserved.

          # TODO: (bridger) Update the copyright for edX, then re-enable the link. -

          © 2012 edX, some rights reserved.

          +##

          © 2013 edX, some rights reserved.

          # TODO: (bridger) Update the copyright for edX, then re-enable the link. +

          © 2013 edX, some rights reserved.

          diff --git a/lms/templates/gitupdate.html b/lms/templates/gitupdate.html deleted file mode 100644 index a0cedabeae..0000000000 --- a/lms/templates/gitupdate.html +++ /dev/null @@ -1,32 +0,0 @@ - - -edX gitupdate - - - -
          -

          edX gitupdate

          -
          - -

          Coursename: ${coursename}

          - -% if msg: - - ${msg} - -% else: -

          -Do you REALLY want to overwrite all the course.xml + problems + html -files with version from the main git repository? -

          - -
          - -## - -
          -% endif - -

          Return to site

          - - diff --git a/lms/templates/index.html b/lms/templates/index.html index d08ba09e61..f2fc34c8ec 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -47,8 +47,8 @@

          Explore free courses from edX universities

          -
          -
            +
            +
            1. @@ -65,7 +65,7 @@
        -
      • +
      • @@ -73,11 +73,6 @@
        • - - -
        - -
        1. @@ -86,6 +81,27 @@
        +
      • + + +
        + McGillX +
        +         +
        • +
      • + + +
        + ANUx +
        +         +
        • + + +
        + +
        1. @@ -94,7 +110,7 @@
        -
      • +
      • @@ -102,6 +118,38 @@
        • +
      • + + +
        + University of TorontoX +
        +         +
        • +
      • + + +
        + EPFLx +
        +         +
        • +
      • + + +
        + DelftX +
        +         +
        • +
      • + + +
        + RiceX +
        +         +
      diff --git a/lms/templates/instructor/staff_grading.html b/lms/templates/instructor/staff_grading.html index 085480a332..1c5f7364ad 100644 --- a/lms/templates/instructor/staff_grading.html +++ b/lms/templates/instructor/staff_grading.html @@ -33,8 +33,8 @@

      Problem List

      -
        -
      + +
      @@ -42,23 +42,16 @@

      -

      Problem Information

      -

      Maching Learning Information

      -

      Question

      +

      Prompt (Hide)

      -
      -

      Grading Rubric

      -
      -
      -
      @@ -67,19 +60,24 @@
      -

      Grading

      -

      Student Submission

      +

      Student Response

      +

      +

      +

      Written Feedback

      +

      + Flag as inappropriate content for later review +

      diff --git a/lms/templates/main.html b/lms/templates/main.html index 5d3fd29104..42d5a71228 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -29,13 +29,18 @@ +% if not suppress_toplevel_navigation: <%include file="navigation.html" /> +% endif +
      ${self.body()} <%block name="bodyextra"/>
      +% if not suppress_toplevel_navigation: <%include file="footer.html" /> +% endif <%static:js group='application'/> <%static:js group='module-js'/> diff --git a/lms/templates/open_ended_feedback.html b/lms/templates/open_ended_feedback.html deleted file mode 100644 index d8aa3d1a9e..0000000000 --- a/lms/templates/open_ended_feedback.html +++ /dev/null @@ -1,17 +0,0 @@ -
      -
      Feedback
      -
      -
      -

      Score: ${score}

      - % if grader_type == "ML": -

      Check below for full feedback:

      - % endif -
      -
      -
      -
      - ${ feedback | n} -
      - ${rubric_feedback | n} -
      -
      \ No newline at end of file diff --git a/lms/templates/open_ended_problems/combined_notifications.html b/lms/templates/open_ended_problems/combined_notifications.html new file mode 100644 index 0000000000..deb66b6064 --- /dev/null +++ b/lms/templates/open_ended_problems/combined_notifications.html @@ -0,0 +1,48 @@ +<%inherit file="/main.html" /> +<%block name="bodyclass">${course.css_class} +<%namespace name='static' file='/static_content.html'/> + +<%block name="headextra"> +<%static:css group='course'/> + + +<%block name="title">${course.number} Combined Notifications + +<%include file="/courseware/course_navigation.html" args="active_page='open_ended'" /> + + +
      +
      +
      ${error_text}
      +

      Open Ended Console

      +

      Instructions

      +

      Here are items that could potentially need your attention.

      + % if success: + % if len(notification_list) == 0: +
      + No items require attention at the moment. +
      + %else: +
      + %for notification in notification_list: + % if notification['alert']: +
      + % else: +
      + % endif + +
      ${notification['name']}
      + %if notification['alert']: +

      ${notification['alert_message']}

      + %endif +
      +

      ${notification['description']}

      +
      +       +
      + %endfor +
      + %endif + %endif +
      +
      diff --git a/lms/templates/open_ended_problems/open_ended_flagged_problems.html b/lms/templates/open_ended_problems/open_ended_flagged_problems.html new file mode 100644 index 0000000000..b4c6f43685 --- /dev/null +++ b/lms/templates/open_ended_problems/open_ended_flagged_problems.html @@ -0,0 +1,59 @@ +<%inherit file="/main.html" /> +<%block name="bodyclass">${course.css_class} +<%namespace name='static' file='/static_content.html'/> + +<%block name="headextra"> +<%static:css group='course'/> + + +<%block name="title">${course.number} Flagged Open Ended Problems + +<%include file="/courseware/course_navigation.html" args="active_page='open_ended_flagged_problems'" /> + +<%block name="js_extra"> + <%static:js group='open_ended'/> + + +
      +
      +
      ${error_text}
      +

      Flagged Open Ended Problems

      +

      Instructions

      +

      Here are a list of open ended problems for this course that have been flagged by students as potentially inappropriate.

      + % if success: + % if len(problem_list) == 0: +
      + No flagged problems exist. +
      + %else: + + + + + + + + %for problem in problem_list: + + + + + + + + %endfor +
      NameResponse
      + ${problem['problem_name']} + + ${problem['student_response']} + + Unflag + + Ban + +
      +
      + %endif + %endif +
      +
      diff --git a/lms/templates/open_ended_problems/open_ended_problems.html b/lms/templates/open_ended_problems/open_ended_problems.html new file mode 100644 index 0000000000..3709fb2de6 --- /dev/null +++ b/lms/templates/open_ended_problems/open_ended_problems.html @@ -0,0 +1,53 @@ +<%inherit file="/main.html" /> +<%block name="bodyclass">${course.css_class} +<%namespace name='static' file='/static_content.html'/> + +<%block name="headextra"> +<%static:css group='course'/> + + +<%block name="title">${course.number} Open Ended Problems + +<%include file="/courseware/course_navigation.html" args="active_page='open_ended_problems'" /> + + +
      +
      +
      ${error_text}
      +

      Open Ended Problems

      +

      Instructions

      +

      Here are a list of open ended problems for this course.

      + % if success: + % if len(problem_list) == 0: +
      + You have not attempted any open ended problems yet. +
      + %else: + + + + + + + + %for problem in problem_list: + + + + + + + %endfor +
      Problem NameStatusGrader TypeETA
      + ${problem['problem_name']} + + ${problem['state']} + + ${problem['grader_type']} + + ${problem['eta_string']} +
      + %endif + %endif +
      +
      diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html deleted file mode 100644 index 9f8a2ece4e..0000000000 --- a/lms/templates/open_ended_rubric.html +++ /dev/null @@ -1,30 +0,0 @@ - - % for i in range(len(rubric_categories)): - <% category = rubric_categories[i] %> - - - % for j in range(len(category['options'])): - <% option = category['options'][j] %> - - % endfor - - % endfor -
      - ${category['description']} - % if category['has_score'] == True: - (Your score: ${category['score']}) - % endif - -
      - ${option['text']} - % if option.has_key('selected'): - % if option['selected'] == True: -
      [${option['points']} points]
      - %else: -
      [${option['points']} points]
      - % endif - % else: -
      [${option['points']} points]
      - %endif -
      -
      \ No newline at end of file diff --git a/lms/templates/peer_grading/peer_grading.html b/lms/templates/peer_grading/peer_grading.html index 598c803245..0485b698b2 100644 --- a/lms/templates/peer_grading/peer_grading.html +++ b/lms/templates/peer_grading/peer_grading.html @@ -1,21 +1,5 @@ -<%inherit file="/main.html" /> -<%block name="bodyclass">${course.css_class} -<%namespace name='static' file='/static_content.html'/> - -<%block name="headextra"> - <%static:css group='course'/> - - -<%block name="title">${course.number} Peer Grading - -<%include file="/courseware/course_navigation.html" args="active_page='peer_grading'" /> - -<%block name="js_extra"> - <%static:js group='peer_grading'/> - - -
      -
      +
      +
      ${error_text}

      Peer Grading

      Instructions

      @@ -26,13 +10,49 @@ Nothing to grade!
      %else: -
      diff --git a/lms/templates/peer_grading/peer_grading_closed.html b/lms/templates/peer_grading/peer_grading_closed.html new file mode 100644 index 0000000000..712ad8b380 --- /dev/null +++ b/lms/templates/peer_grading/peer_grading_closed.html @@ -0,0 +1,10 @@ +
      +

      Peer Grading

      +

      The due date has passed, and + % if use_for_single_location: + peer grading for this problem is closed at this time. + %else: + peer grading is closed at this time. + %endif +

      +
      diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html index 9f23c0f0b1..87559ec877 100644 --- a/lms/templates/peer_grading/peer_grading_problem.html +++ b/lms/templates/peer_grading/peer_grading_problem.html @@ -1,69 +1,31 @@ - -<%inherit file="/main.html" /> -<%block name="bodyclass">${course.css_class} -<%namespace name='static' file='/static_content.html'/> - -<%block name="headextra"> - <%static:css group='course'/> - - -<%block name="title">${course.number} Peer Grading. - -<%include file="/courseware/course_navigation.html" args="active_page='peer_grading'" /> - -<%block name="js_extra"> - <%static:js group='peer_grading'/> - - - -
      -
      +
      +
      -

      Peer Grading

      Learning to Grade

      -
      -

      Before you can do any proper peer grading, you first need to understand how your own grading compares to that of the instrutor. Once your grades begin to match the instructor's, you will move on to grading your peers!

      -
      -
      -

      You have successfully managed to calibrate your answers to that of the instructors and have moved onto the next step in the peer grading process.

      -
      -

      Grading

      -
      -

      You cannot start grading until you have graded a sufficient number of training problems and have been able to demonstrate that your scores closely match that of the instructor.

      -
      -
      -

      Now that you have finished your training, you are now allowed to grade your peers. Please keep in mind that students are allowed to respond to the grades and feedback they receive.

      -
      +

      Peer Grading

      -
      -
      Question
      +

      Prompt (Hide)

      +
      -
      -
      Rubric
      -
      -
      -
      -
      -
      -
      +
      -

      Grading

      +

      Student Response

      @@ -74,10 +36,15 @@
      +

      - +
      Flag this submission for review by course staff (use if the submission contains inappropriate content)
      +
      I do not know how to grade this question
      @@ -91,7 +58,6 @@
      -

      How did I do?

      @@ -102,11 +68,20 @@
      -

      Congratulations!

      -

      You have now completed the calibration step. You are now ready to start grading.

      +

      Ready to grade!

      +

      You have finished learning to grade, which means that you are now ready to start grading.

      + +
      +

      Learning to grade

      +

      You have not yet finished learning to grade this problem.

      +

      You will now be shown a series of instructor-scored essays, and will be asked to score them yourself.

      +

      Once you can score the essays similarly to an instructor, you will be ready to grade your peers.

      + +
      +
      diff --git a/lms/templates/problem.html b/lms/templates/problem.html index 83fc18c0f6..b91b324645 100644 --- a/lms/templates/problem.html +++ b/lms/templates/problem.html @@ -1,7 +1,7 @@ <%namespace name='static' file='static_content.html'/>

      ${ problem['name'] } - % if problem['weight'] != 1 and problem['weight'] != None: + % if problem['weight'] != 1 and problem['weight'] is not None: : ${ problem['weight'] } points % endif

      @@ -30,4 +30,4 @@
      % endif
      -
      \ No newline at end of file + diff --git a/lms/templates/problem_ajax.html b/lms/templates/problem_ajax.html index 012e4276c3..42cd18c4e3 100644 --- a/lms/templates/problem_ajax.html +++ b/lms/templates/problem_ajax.html @@ -1 +1 @@ -
      +
      diff --git a/lms/templates/quickedit.html b/lms/templates/quickedit.html deleted file mode 100644 index bc8e74eb65..0000000000 --- a/lms/templates/quickedit.html +++ /dev/null @@ -1,180 +0,0 @@ -<%namespace name='static' file='static_content.html'/> - - -## ----------------------------------------------------------------------------- -## Template for courseware.views.quickedit -## -## Used for quick-edit link present when viewing capa-format assesment problems. -## ----------------------------------------------------------------------------- - - -## -## - -% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: - <%static:css group='application'/> -% endif - -% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: -## -% endif - - - - - -% if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: - <%static:js group='application'/> -% endif - -% if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: - % for jsfn in [ '/static/%s' % x.replace('.coffee','.js') for x in settings.PIPELINE_JS['application']['source_filenames'] ]: - - % endfor -% endif - -## codemirror - - - -## alternate codemirror -## -## -## - -## image input: for clicking on images (see imageinput.html) - - -## - - - -<%block name="headextra"/> - - - <%include file="mathjax_include.html" /> - - - - - - - -## ----------------------------------------------------------------------------- -## information and i4x PSL code - -
      -

      QuickEdit

      -
      -
        -
      • File = ${filename}
        • -
      • ID = ${id}
        • -
      - -
      - -
      - - - -
      - -${msg|n} - -## ----------------------------------------------------------------------------- -## rendered problem display - - - -
      - - - - - - - -
      -
      -
      - ${phtml} -
      -
      -
      - - - - - -## - - - - - - - - <%block name="js_extra"/> - - - diff --git a/lms/templates/self_assessment_rubric.html b/lms/templates/self_assessment_rubric.html deleted file mode 100644 index 2d32ffe8d3..0000000000 --- a/lms/templates/self_assessment_rubric.html +++ /dev/null @@ -1,15 +0,0 @@ -
      -
      -

      Self-assess your answer with this rubric:

      - ${rubric | n } -
      - - % if not read_only: - - % endif - -
      diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html index 22a4a93499..01bc17bd65 100644 --- a/lms/templates/signup_modal.html +++ b/lms/templates/signup_modal.html @@ -21,7 +21,7 @@
      % if has_extauth_info is UNDEFINED: - + diff --git a/lms/templates/staff_problem_info.html b/lms/templates/staff_problem_info.html index 21044c1f80..f89d5ab9d5 100644 --- a/lms/templates/staff_problem_info.html +++ b/lms/templates/staff_problem_info.html @@ -1,7 +1,9 @@ +## The JS for this is defined in xqa_interface.html ${module_content} -%if edit_link: +%if location.category in ['problem','video','html']: +% if edit_link:
      - Edit / + Edit / QA
      -% endif +% endif
      Staff Debug Info
      +% if settings.MITX_FEATURES.get('ENABLE_STUDENT_HISTORY_VIEW') and \ + location.category == 'problem': +
      Submission history
      +% endif + -
      + + +
      +%endif + diff --git a/lms/templates/static_pdfbook.html b/lms/templates/static_pdfbook.html new file mode 100644 index 0000000000..565a59977a --- /dev/null +++ b/lms/templates/static_pdfbook.html @@ -0,0 +1,130 @@ +<%inherit file="main.html" /> +<%namespace name='static' file='static_content.html'/> +<%block name="title"> + + + ${course.number} Textbook + + +<%block name="headextra"> +<%static:css group='course'/> +<%static:js group='courseware'/> + + + + + +<%block name="js_extra"> + + + +<%include file="/courseware/course_navigation.html" args="active_page='pdftextbook/{0}'.format(book_index)" /> + +
      +
      + +
      +
      +
      +
      + + + + +
      + +
      +
      +
      + +
      + +
      + + + +
      +
      +
      +
      +
      + + %if 'chapters' in textbook: +
      +
        + <%def name="print_entry(entry, index_value)"> +
      • + + ${entry.get('title')} + +
        • + + + % for (index, entry) in enumerate(textbook['chapters']): + ${print_entry(entry, index+1)} + % endfor +
      +
      + %endif + +
      +
      + + +
      +
      +
      + +
      + +
      diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html index 91ac16e90c..8b4561da7e 100644 --- a/lms/templates/static_templates/faq.html +++ b/lms/templates/static_templates/faq.html @@ -21,12 +21,12 @@

      What is edX?

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

      -

      EdX currently offers HarvardX, MITx and BerkeleyX classes online for free. Beginning in fall 2013, edX will offer WellesleyX and GeorgetownX classes online for free. The University of Texas System includes nine universities and six health institutions. The edX institutions aim to extend their collective reach to build a global community of online students. Along with offering online courses, the three universities undertake research on how students learn and how technology can transform learning both on-campus and online throughout the world.

      +

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

      Will edX be adding additional X Universities?

      -

      More than 200 institutions from around the world have expressed interest in collaborating with edX since Harvard and MIT announced its creation in May. EdX is focused above all on quality and developing the best not-for-profit model for online education. In addition to providing online courses on the edX platform, the "X University" Consortium will be a forum in which members can share experiences around online learning. Harvard, MIT, UC Berkeley, the University of Texas system and the other consortium members will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities". Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities' educational content together on one site will enable learners worldwide to access the offered course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.

      +

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

      edX will actively explore the addition of other institutions from around the world to the edX platform, and looks forward to adding more "X Universities."

      @@ -39,11 +39,18 @@

      Will certificates be awarded?

      -

      Yes. Online learners who demonstrate mastery of subjects can earn a certificate of mastery. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, MITx or BerkeleyX. For the courses in Fall 2012, those certificates will be free. There is a plan to charge a modest fee for certificates in the future.

      +

      Yes. Online learners who demonstrate mastery of subjects can earn a certificate + of mastery. Certificates will be issued at the discretion of edX and the underlying + X University that offered the course under the name of the underlying "X + University" from where the course originated, i.e. HarvardX, MITx or BerkeleyX. + For the courses in Fall 2012, those certificates will be free. There is a plan to + charge a modest fee for certificates in the future. Note: At this time, edX is + holding certificates for learners connected with Cuba, Iran, Syria and Sudan + pending confirmation that the issuance is in compliance with U.S. embargoes.

      What will the scope of the online courses be? How many? Which faculty?

      -

      Our goal is to offer a wide variety of courses across disciplines. There are currently nine courses offered for Fall 2012.

      +

      Our goal is to offer a wide variety of courses across disciplines. There are currently fifteen offered on the edX platform.

      Who is the learner? Domestic or international? Age range?

      @@ -84,7 +91,7 @@ diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html index 04c9164289..417033fe0e 100644 --- a/lms/templates/static_templates/help.html +++ b/lms/templates/static_templates/help.html @@ -53,12 +53,6 @@

      We are continually reviewing and creating courses to add to the edX platform. Please check the website for future course announcements. You can also "friend" edX on Facebook – you’ll receive updates and announcements.

      -
      -

      How can I help edX?

      -
      -

      You may not realize it, but just by taking a course you are helping edX. That’s because the edX platform has been specifically designed to not only teach, but also gather data about learning. EdX will utilize this data to find out how to improve education online and on-campus.

      -
      -

      When does my course start and/or finish?

      @@ -78,7 +72,7 @@
      -

      What happens if I have to quit a course, are there any penalties, will I be able to take another course in the future?

      +

      What happens if I have to quit a course? Are there any penalties? Will I be able to take another course in the future?

      You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.

      @@ -147,85 +141,103 @@

      The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.

      - -
      -

      Getting Help

      +
      +

      Getting help.

      +
      +

      You have a vibrant, global community of fellow online learners available 24-7 to help with the course within the framework of the Honor Code, as well as support from the TAs who monitor the course. Take a look at the course’s Discussion Forum where you can review questions, answers and comments from fellow online learners, as well as post a question.

      +
      +

      Can I re-take a course?

      -
      +

      Good news: there are unlimited "mulligans" in edX. You may re-take edX courses as often as you wish. Your performance in any particular offering of a course will not effect your standing in future offerings of any edX course, including future offerings of the same course.

      Enrollment for a course that I am interested in is open, but the course has already started. Can I still enroll?

      -
      +

      Yes, but you will not be able to turn in any assignments or exams that have already been due. If it is early in the course, you might still be able to earn enough points for a certificate, but you will have to check with the course in question in order to find out more.

      Is there an exam at the end?

      -
      +

      Different courses have slightly different structures. Please check the course material description to see if there is a final exam or final project.

      Will the same courses be offered again in the future?

      -
      +

      Existing edX courses will be re-offered, and more courses added.

      +
      + + +
      +

      Certificates & Credits

      +

      Will I get a certificate for taking an edX course?

      -
      -

      Online learners who receive a passing grade for a course will receive a certificate of mastery from edX and the underlying X University that offered the course. For example, a certificate of mastery for MITx’s 6.002x Circuits & Electronics will come from edX and MITx.

      +
      +

      Online learners who receive a passing grade for a course will receive a certificate + of mastery at the discretion of edX and the underlying X University that offered + the course. For example, a certificate of mastery for MITx’s 6.002x Circuits & + Electronics will come from edX and MITx.

      +

      If you passed the course, your certificate of mastery will be delivered online + through edx.org. So be sure to check your email in the weeks following the final + grading – you will be able to download and print your certificate. Note: At this + time, edX is holding certificates for learners connected with Cuba, Iran, Syria + and Sudan pending confirmation that the issuance is in compliance with U.S. + embargoes.

      How are edX certificates delivered?

      -
      +

      EdX certificates are delivered online through edx.org. So be sure to check your email in the weeks following the final grading – you will be able to download and print your certificate.

      What is the difference between a proctored certificate and an honor code certificate?

      -
      +

      A proctored certificate is given to students who take and pass an exam under proctored conditions. An honor-code certificate is given to students who have completed all of the necessary online coursework associated with a course and have signed the edX honor code .

      -

      Yes. The requirements for both certificates can be independently satisfied.

      -
      -

      It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.

      +

      Can I get both a proctored certificate and an honor code certificate?

      +
      +

      Yes. The requirements for both certificates can be independently satisfied.

      Will my grade be shown on my certificate?

      -
      +

      No. Grades are not displayed on either honor code or proctored certificates.

      How can I talk to professors, fellows and teaching assistants?

      -
      +

      The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.

      The only certificates distributed with grades by edX were for the initial prototype course.

      -
      +

      You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.

      Will my university accept my edX coursework for credit?

      -
      +

      Each educational institution makes its own decision regarding whether to accept edX coursework for credit. Check with your university for its policy.

      I lost my edX certificate – can you resend it to me?

      -
      +

      Please log back in to your account to find certificates from the same profile page where they were originally posted. You will be able to re-print your certificate from there.

      @@ -286,12 +298,25 @@

      There’s no need to delete you account. An old, unused edX account with no course completions associated with it will disappear.

      +
      +

      I made a mistake creating my username – how do I fix it?

      +
      +

      In most cases it would simplest and fastest to create a new account. Your old unused account will vanish naturally. If you were not aware of your mistake until much later, you should send us a detailed change request and we will do our best to edit your username. Please bear in mind that usernames are unique, and the one you want may be taken.

      +
      +

      I am experiencing problems with the display. E.g., There are tools missing from the course display, or I am unable to view video.

      Please check your browser and settings. We recommend downloading the current version of Firefox or Chrome. Alternatively, you may re-register with a different email account. There is no need to delete the old account, as it will disappear if unused.

      +
      +

      How can I help edX?

      +
      +

      You may not realize it, but just by taking a course you are helping edX. That’s because the edX platform has been specifically designed to not only teach, but also gather data about learning. EdX will utilize this data to find out how to improve education online and on-campus.

      +
      +
      +
      @@ -299,7 +324,7 @@ diff --git a/lms/templates/static_templates/jobs.html b/lms/templates/static_templates/jobs.html index f2752a0939..da31e07e42 100644 --- a/lms/templates/static_templates/jobs.html +++ b/lms/templates/static_templates/jobs.html @@ -14,17 +14,17 @@
      -

      Our mission is to transform learning.

      +

      Our mission is to transform learning.

      -
      -

      “EdX represents a unique opportunity to improve education on our campuses through online learning, while simultaneously creating a bold new educational path for millions of learners worldwide.”

      - —Rafael Reif, MIT President -
      +
      +

      “EdX represents a unique opportunity to improve education on our campuses through online learning, while simultaneously creating a bold new educational path for millions of learners worldwide.”

      + —Rafael Reif, MIT President +
      -
      -

      “EdX gives Harvard and MIT an unprecedented opportunity to dramatically extend our collective reach by conducting groundbreaking research into effective education and by extending online access to quality higher education.”

      - —Drew Faust, Harvard President -
      +
      +

      “EdX gives Harvard and MIT an unprecedented opportunity to dramatically extend our collective reach by conducting groundbreaking research into effective education and by extending online access to quality higher education.”

      + —Drew Faust, Harvard President +
      @@ -34,132 +34,428 @@
      -
      +

      EdX is looking to add new talent to our team!

      Our mission is to give a world-class education to everyone, everywhere, regardless of gender, income or social status

      Today, EdX.org, a not-for-profit provides hundreds of thousands of people from around the globe with access to free education.  We offer amazing quality classes by the best professors from the best schools. We enable our members to uncover a new passion that will transform their lives and their communities.

      -

      Around the world-from coast to coast, in over 192 countries, people are making the decision to take one or several of our courses. As we continue to grow our operations, we are looking for talented, passionate people with great ideas to join the edX team. We aim to create an environment that is supportive, diverse, and as fun as our brand. If you're results-oriented, dedicated, and ready to contribute to an unparalleled member experience for our community, we really want you to apply.

      +

      Around the world-from coast to coast, in over 192 countries, people are making the decision to take one or several of our courses. As we continue to grow our operations, we are looking for talented, passionate people with great ideas to join the edX team. We aim to create an environment that is supportive, diverse, and as fun as our brand. If you’re results-oriented, dedicated, and ready to contribute to an unparalleled member experience for our community, we really want you to apply.

      As part of the edX team, you’ll receive:

      • Competitive compensation
      • Generous benefits package
      • Free lunch every day
        • -
      • A great working experience where everyone cares
        • +
      • A great working experience where everyone cares and wants to change the world (no, we’re not kidding)
      -

      While we appreciate every applicant's interest, only those under consideration will be contacted. We regret that phone calls will not be accepted.

      +

      While we appreciate every applicant’s interest, only those under consideration will be contacted. We regret that phone calls will not be accepted. Equal opportunity employer.

      +
      +
      + + + + + + +
      +
      +

      DIRECTOR OF EDUCATIONAL SERVICES

      +

      The edX Director of Education Services reporting to the VP of Engineering and Educational Services is responsible for:

      +
        +
      1. Delivering 20 new courses in 2013 in collaboration with the partner Universities +
          +

        • Reporting to the Director of Educational Services are the Video production team, responsible for post-production of Course Video. The Director must understand how to balance artistic quality and learning objectives, and reduce production time so that video capabilities are readily accessible and at reasonable costs.

          +
        • Reporting to the Director are a small team of Program Managers, who are responsible for managing the day to day of course production and operations. The Director must be experienced in capacity planning and operations, understand how to deploy lean collaboration and able to build alliances inside edX and the University. In conjunction with the Program Managers, the Director of Educational Services will supervise the collection of research, the retrospectives with Professors and the assembly of best practices in course production and operations. The three key deliverables are the use of a well-defined lean process for onboarding Professors, the development of tracking tools, and assessment of effectiveness of Best Practices. +
        • Also reporting to the Director of Education Services are content engineers and Course Fellows, skilled in the development of edX assessments. The Director of Educational Services will also be responsible for communicating to the VP of Engineering requirements for new types of course assessments. Course Fellows are extremely talented Ph.D.’s who work directly with the Professors to define and develop assessments and course curriculum.
          • +
        +
        2. +
      2. Training and Onboarding of 30 Partner Universities and Affiliates +
          +
        • The edX Director of Educational Services is responsible for building out the Training capabilities and delivery mechanisms for onboarding Professors at partner Universities. The edX Director must build out both the Training Team and the curriculum. Training will be delivered in both online courses, self-paced formats, and workshops. The training must cover a curriculum that enables partner institutions to be completely independent. Additionally, partner institutions should be engaged to contribute to the curriculum and partner with edX in the delivery of the material. The curriculum must exemplify the best in online learning, so the Universities are inspired to offer the kind of learning they have experienced in their edX Training.
          • +
        • Expand and extend the education goals of the partner Universities by operationalizing best practices.
          • +
        • Engage with University Boards to design and define the success that the technology makes possible.
          • +
        +
        3. +
      3. Growing the Team, Growing the Business +
          +
        • The edX Director will be responsible for working with Business Development to identify revenue opportunities and build profitable plans to grow the business and grow the team.
          • +
        • Maintain for-profit nimbleness in an organization committed to non-profit ideals.
          • +
        • Design scalable solutions to opportunities revealed by technical innovations
          • +
        +
        4. +
      4. Integrating a Strong Team within Strong Organization +
          +
        • Connect organization’s management and University leadership with consistent and high quality expectations and deployment
          • +
        • Integrate with a highly collaborative leadership team to maximize talents of the organization
          • +
        • Successfully escalate issues within and beyond the organization to ensure the best possible educational outcome for students and Universities
          • +
        +
        5. +
      +

      Skills:

      +
        +
      • Ability to lead simultaneous initiatives in an entrepreneurial culture
        • +
      • Self-starter, challenger, strategic planner, analytical thinker
        • +
      • Excellent written and verbal skills
        • +
      • Strong, proactive leadership
        • +
      • Experience with deploying educational technologies on a large scale
        • +
      • Develop team skills in a ferociously intelligent group
        • +
      • Fan the enthusiasm of the partner Universities when the enormity of the transition they are facing becomes intimidating
        • +
      • Encourage creativity to allow the technology to provoke pedagogical possibilities that brick and mortar classes have precluded.
        • +
      • Lean and Agile thinking and training. Experienced in scrum or kanban.
        • +
      • Design and deliver hiring/development plans which meet rapidly changing skill needs.
        • +
      + +

      If you are interested in this position, please send an email to jobs@edx.org.

      +
      +
      + +
      +
      +

      MANAGER OF TRAINING SERVICES

      +

      The Manager of Training Services is an integral member of the edX team, a leader who is also a doer, working hands-on in the development and delivery of edX’s training portfolio. Reporting to the Director of Educational Services, the manager will be a strategic thinker, providing leadership and vision in the development of world-class training solutions tailored to meet the diverse needs of edX Universities, partners and stakeholders

      +

      Responsibilities:

      +
        +
      • Working with the Director of Educational Services, create and manage a world-class training program that includes in-person workshops and online formats such as self-paced courses, and webinars.
        • +
      • Work across a talented team of product developers, video producers and content experts to identify training needs and proactively develop training curricula for new products and services as they are deployed.
        • +
      • Develop the means for sharing and showcasing edX best practices for both internal and external audiences.
        • +
      • Apply sound instructional design theory and practice in the development of all edX training resources.
        • +
      • Work with program managers to develop training benchmarks and Key Performance Indicators. Monitor progress and proactively make adjustments as necessary.
        • +
      • Collaborate with product development on creating documentation and user guides.
        • +
      • Provide on-going evaluation of the effectiveness of edX training programs.
        • +
      • Assist in the revision/refinement of training curricula and resources.
        • +
      • Grow a train-the-trainer organization with edX partners, identifying expert edX users to provide on-site peer assistance.
        • +
      • Deliver internal and external trainings.
        • +
      • Coordinate with internal teams to ensure appropriate preparation for trainings, and follow-up after delivery.
        • +
      • Maintain training reporting database and training records.
        • +
      • Produce training evaluation reports, training support plans, and training improvement plans.
        • +
      • Quickly become an expert on edX’s standards, procedures and tools.
        • +
      • Stay current on emerging trends in eLearning, platform support and implementation strategy.
        • +
      +

      Requirements:

      +
        +
      • Minimum of 5-7 years experience developing and delivering educational training, preferably in an educational technology organization.
        • +
      • Lean and Agile thinking and training. Experienced in Scrum or kanban.
        • +
      • Excellent interpersonal skills including proven presentation and facilitation skills.
        • +
      • Strong oral and written communication skills.
        • +
      • Proven experience with production and delivery of online training programs that utilize asychronous and synchronous delivery mechanisms.
        • +
      • Flexibility to work on a variety of initiatives; prior startup experience preferred.
        • +
      • Outstanding work ethic, results-oriented, and creative/innovative style.
        • +
      • Proactive, optimistic approach to problem solving.
        • +
      • Commitment to constant personal and organizational improvement.
        • +
      • Willingness to travel to partner sites as needed.
        • +
      • Bachelors required, Master’s in Education, organizational learning, or other related field preferred.
        • +
      + +

      If you are interested in this position, please send an email to jobs@edx.org.

      -

      INSTRUCTIONAL DESIGNER — CONTRACT OPPORTUNITY

      -

      The Instructional Designer will work collaboratively with the edX content and engineering teams to plan, develop and deliver highly engaging and media rich online courses. The Instructional Designer will be a flexible thinker, able to determine and apply sound pedagogical strategies to unique situations and a diverse set of academic disciplines.

      -

      Responsibilities:

      -
        -
      • Work with the video production team, product managers and course staff on the implementation of instructional design approaches in the development of media and other course materials.
        • -
      • Based on course staff and faculty input, articulate learning objectives and align them to design strategies and assessments.
        • -
      • Develop flipped classroom instructional strategies in coordination with community college faculty.
        • -
      • Produce clear and instructionally effective copy, instructional text, and audio and video scripts
        • -
      • Identify and deploy instructional design best practices for edX course staff and faculty as needed.
        • -
      • Create course communication style guides. Train and coach teaching staff on best practices for communication and discussion management.
        • -
      • Serve as a liaison to instructional design teams based at X universities.
        • -
      • Consult on peer review processes to be used by learners in selected courses.
        • -
      • Ability to apply game-based learning theory and design into selected courses as appropriate.
        • -
      • Use learning analytics and metrics to inform course design and revision process.
        • -
      • Collaborate with key research and learning sciences stakeholders at edX and partner institutions for the development of best practices for MOOC teaching and learning and course design.
        • -
      • Support the development of pilot courses and modules used for sponsored research initiatives.
        • -
      -

      Qualifications:

      -
        -
      • Master's Degree in Educational Technology, Instructional Design or related field. Experience in higher education with additional experience in a start-up or research environment preferable.
        • -
      • Excellent interpersonal and communication (written and verbal), project management, problem-solving and time management skills. The ability to be flexible with projects and to work on multiple courses essential. Ability to meet deadlines and manage expectations of constituents.
        • -
      • Capacity to develop new and relevant technology skills. Experience using game theory design and learning analytics to inform instructional design decisions and strategy.
        • -
      • Technical Skills: Video and screencasting experience. LMS Platform experience, xml, HTML, CSS, Adobe Design Suite, Camtasia or Captivate experience. Experience with web 2.0 collaboration tools.
        • -
      -

      Eligible candidates will be invited to respond to an Instructional Design task based on current or future edX course development needs.

      -

      If you are interested in this position, please send an email to jobs@edx.org.

      -
      -
      - -
      -
      -

      MEMBER SERVICES MANAGER

      -

      The edX Member Services Manager is responsible for both defining support best practices and directly supporting edX members by handling or routing issues that come in from our websites, email and social media tools.  We are looking for a passionate person to help us define and own this experience. While this is a Manager level position, we see this candidate quickly moving through the ranks, leading a larger team of employees over time. This staff member will be running our fast growth support organization.

      +

      INSTRUCTIONAL DESIGNER

      +

      The Instructional Designer will work collaboratively with the edX content and engineering teams to plan, develop and deliver highly engaging and media rich online courses. The Instructional Designer will be a flexible thinker, able to determine and apply sound pedagogical strategies to unique situations and a diverse set of academic disciplines.

      Responsibilities:

        -
      • Define and rollout leading technology, best practices and policies to support a growing team of member care representatives.
        • -
      • Provide reports and visibility into member care metrics.
        • -
      • Identify a staffing plan that mirrors growth and work to grow the team with passionate, member-first focused staff.
        • -
      • Manage member services staff to predefined service levels.
        • -
      • Resolve issues according to edX policies; escalates non-routine issues.
        • -
      • Educate members on edX policies and getting started
        • -
      • May assist new members with edX procedures and processing registration issues.
        • -
      • Provides timely follow-up and resolution to issues.
        • -
      • A passion for doing the right thing - at edX the member is always our top priority
        -
        • +
      • Work with the video production team, product managers and course staff on the implementation of instructional design approaches in the development of media and other course materials.
        • +
      • Based on course staff and faculty input, articulate learning objectives and align them to design strategies and assessments.
        • +
      • Develop flipped classroom instructional strategies in coordination with community college faculty.
        • +
      • Produce clear and instructionally effective copy, instructional text, and audio and video scripts
        • +
      • Identify and deploy instructional design best practices for edX course staff and faculty as needed.
        • +
      • Create course communication style guides. Train and coach teaching staff on best practices for communication and discussion management.
        • +
      • Serve as a liaison to instructional design teams based at our partner Universities.
        • +
      • Consult on peer review processes to be used by learners in selected courses.
        • +
      • Ability to apply game-based learning theory and design into selected courses as appropriate.
        • +
      • Use learning analytics and metrics to inform course design and revision process.
        • +
      • Collaborate with key research and learning sciences stakeholders at edX and partner institutions for the development of best practices for MOOC teaching and learning and course design.
        • +
      • Support the development of pilot courses and modules used for sponsored research initiatives.

      Qualifications:

        -
      • 5-8 years in a call center or support team management
        • -
      • Exemplary customer service skills
        • -
      • Experience in creating and rolling out support/service best practices
        • -
      • Solid computer skills – must be fluent with desktop applications and have a basic understanding of web technologies (i.e. basic HTML)
        • -
      • Problem solving - the individual identifies and resolves problems in a timely manner, gathers and analyzes information skillfully and maintains confidentiality.
        • -
      • Interpersonal skills - the individual maintains confidentiality, remains open to others' ideas and exhibits willingness to try new things.
        • -
      • Oral communication - the individual speaks clearly and persuasively in positive or negative situations and demonstrates group presentation skills.
        • -
      • Written communication – the individual edits work for spelling and grammar, presents numerical data effectively and is able to read and interpret written information.
        • -
      • Adaptability - the individual adapts to changes in the work environment, manages competing demands and is able to deal with frequent change, delays or unexpected events.
        • -
      • Dependability - the individual is consistently at work and on time, follows instructions, responds to management direction and solicits feedback to improve performance.
        • -
      • College degree
        • +
      • Master's Degree in Educational Technology, Instructional Design or related field. Experience in higher education with additional experience in a start-up or research environment preferable.
        • +
      • Excellent interpersonal and communication (written and verbal), project management, problem-solving and time management skills. The ability to be flexible with projects and to work on multiple courses essential.
        • Ability to meet deadlines and manage expectations of constituents. +
      • Capacity to develop new and relevant technology skills. Experience using game theory design and learning analytics to inform instructional design decisions and strategy.
        • +
      • Technical Skills: Video and screencasting experience. LMS Platform experience, xml, HTML, CSS, Adobe Design Suite, Camtasia or Captivate experience. Experience with web 2.0 collaboration tools.
        • +
      + +

      Eligible candidates will be invited to respond to an Instructional Design task based on current or future edX course development needs.

      +

      If you are interested in this position, please send an email to jobs@edx.org.

      +
      +
      + + +
      +
      +

      PROGRAM MANAGER

      +

      edX Program Managers (PM) lead the edX's course production process. They are systems thinkers who manage the creation of a course from start to finish. PMs work with University Professors and course staff to help them take advantage of edX services to create world class online learning offerings and encourage the exploration of an emerging form of higher education.

      +

      Responsibilities:

      +
        +
      • Create and execute the course production cycle. PMs are able to examine and explain what they do in great detail and able to think abstractly about people, time, and processes. They coordinate the efforts of multiple
        • teams engaged in the production of the courses assigned to them. +
      • Train partners and drive best practices adoption. PMs train course staff from partner institutions and help them adopt best practices for workflow and tools.
        • +
      • Build capacity. Mentor staff at partner institutions, train the trainers that help them scale their course production ability.
        • +
      • Create visibility. PMs are responsible for making the state of the course production system accessible and comprehensible to all stakeholders. They are capable of training Course development teams in Scrum and
        • Kanban, and are Lean thinkers and educators. +
      • Improve workflows. PMs are responsible for carefully assessing the methods and outputs of each course and adjusting them to take best advantage of available resources.
        • +
      • Encourage innovation. Spark creativity in course teams to build new courses that could never be produced in brick and mortar settings.
        • +
      +

      Qualifications:

      +
        +
      • Bachelor's Degree. Master's Degree preferred.
        • +
      • At least 2 years of experience working with University faculty and administrators.
        • +
      • Proven record of successful Scrum or Kanban project management, including use of project management tools.
        • +
      • Ability to create processes that systematically provide solutions to open ended challenges.
        • +
      • Excellent interpersonal and communication (written and verbal) skills, the ability to define and solve technical, process and organizational problems, and time management skills.
        • +
      • Proactive, optimistic approach to problem solving.
        • +
      • Commitment to constant personal and organizational improvement.
        • +
      + +

      Preferred qualifications

      +
        +
      • Some teaching experience,
        • +
      • Online course design and development experience.
        • +
      • Experience with Lean and Agile thinking and processes.
        • +
      • Experience with online collaboration tools
        • +
      • Familiarity with video production.
        • +
      • Basic HTML, XML, programming skills.
        • +

      If you are interested in this position, please send an email to jobs@edx.org.

      -
      +
      -

      DIRECTOR OF PR AND COMMUNICATIONS

      -

      The edX Director of PR & Communications is responsible for creating and executing all PR strategy and providing company-wide leadership to help create and refine the edX core messages and identity as the revolutionary global leader in both on-campus and worldwide education. The Director will design and direct a communications program that conveys cohesive and compelling information about edX's mission, activities, personnel and products while establishing a distinct identity for edX as the leader in online education for both students and learning institutions.

      +

      PROJECT MANAGER (PMO)

      +

      As a fast paced, rapidly growing organization serving the evolving online higher education market, edX maximizes its talents and resources. To help make the most of this unapologetically intelligent and dedicated team, we seek a project manager to increase the accuracy of our resource and schedule estimates and our stakeholder satisfaction.

      Responsibilities:

        -
      • Develop and execute goals and strategy for a comprehensive external and internal communications program focused on driving student engagement around courses and institutional adoption of the edX learning platform.
        • -
      • Work with media, either directly or through our agency of record, to establish edX as the industry leader in global learning.
        • -
      • Work with key influencers including government officials on a global scale to ensure the edX mission, content and tools are embraced and supported worldwide.
        • -
      • Work with marketing colleagues to co-develop and/or monitor and evaluate the content and delivery of all communications messages and collateral.
        • -
      • Initiate and/or plan thought leadership events developed to heighten target-audience awareness; participate in meetings and trade shows
        • -
      • Conduct periodic research to determine communications benchmarks
        • -
      • Inform employees about edX's vision, values, policies, and strategies to enable them to perform their jobs efficiently and drive morale.
        • -
      • Work with and manage existing communications team to effectively meet strategic goals.
        • +
      • Coordinate multiple projects to bring Courses, Software Product and Marketing initiatives to market, all of which are related, which have both dedicated and shared resources.
        • +
      • Provide, at a moment’s notice, the state of development, so that priorities can be enforced or reset, so that future expectations can be set accurately.
        • +
      • Develop lean processes that supports a wide variety of efforts which draw on a shared resource pool.
        • +
      • Develop metrics on resource use that support the leadership team in optimizing how they respond to unexpected challenges and new opportunities.
        • +
      • Accurately and clearly escalate only those issues which need escalation for productive resolution. Assist in establishing consensus for all other issues.
        • +
      • Advise the team on best practices, whether developed internally or as industry standards.
        • +
      • Recommend to the leadership team how to re-deploy key resources to better match stated priorities.
        • +
      • Help the organization deliver on its commitments with more consistency and efficiency. Allow the organization to respond to new opportunities with more certainty in its ability to forecast resource needs.
        • +
      • Select and maintain project management tools for Scrum and Kanban that can serve as the standard for those we use with our partners.
        • +
      • Forecast future resource needs given the strategic direction of the organization.
      -

      Qualifications:

      +

      Skills:

        -
      • Ten years of experience in PR and communications
        • -
      • Ability to work creatively and provide company-wide leadership in a fast-paced, dynamic start-up environment required
        • -
      • Adaptability - the individual adapts to changes in the work environment, manages competing demands and is able to deal with frequent change, delays or unexpected events.
        • -
      • Experience in working in successful consumer-focused startups preferred
        • -
      • PR agency experience in setting strategy for complex multichannel, multinational organizations a plus.
        • -
      • Extensive writing experience and simply amazing oral, written, and interpersonal communications skills
        • -
      • B.A./B.S. in communications or related field
        • +
      • Bachelor’s degree or higher
        • +
      • Exquisite communication skills, especially listening
        • +
      • Inexhaustible attention to detail with the ability to let go of perfection
        • +
      • Deep commitment to Lean project management, including a dedication to its best intentions not just its rituals
        • +
      • Sense of humor and humility
        • +
      • Ability to hold on to the important in the face of the urgent

      If you are interested in this position, please send an email to jobs@edx.org.

      -
      +
      + + +
      +
      +

      DIRECTOR, PRODUCT MANAGEMENT

      +

      When the power of edX is at its fullest, individuals become the students they had always hoped to be, Professors teach the courses they had always imagined and Universities offer educational opportunities never before seen. None of that happens by accident, so edX is seeking a Product Manager who can keep their eyes on the future and their heart and hands with a team of ferociously intelligent and dedicated technologists. +

      +

      The responsibility of a Product Manager is first and foremost to provide evidence to the development team that what they build will succeed in the marketplace. It is the responsibility of the Product Manager to define the product backlog and the team to build the backlog. The Product Manager is one of the most highly leveraged individuals in the Engineering organization. They work to bring a deep knowledge of the Customer – Students, Professors and Course Staff to the product roadmap. The Product Manager is well-versed in the data and sets the KPI’s that drives the team, the Product Scorecard and the Company Scorecard. They are expected to become experts in the business of online learning, familiar with blended models, MOOC’s and University and Industry needs and the competition. The Product Manager must be able to understand the edX stakeholders. +

      +

      Responsibilities:

      +
        +
      • Assess users’ needs, whether students, Professors or Universities.
        • +
      • Research markets and competitors to provide data driven decisions.
        • +
      • Work with multiple engineering teams, through consensus and with data-backed arguments, in order to provide technology which defines the state of the art for online courses.
        • +
      • Repeatedly build and launch new products and services, complete with the training, documentation and metrics needed to enhance the already impressive brands of the edX partner institutions.
        • +
      • Establish the vision and future direction of the product with input from edX leadership and guidance from partner organizations.
        • +
      • Work in a lean organization, committed to Scrum and Kanban.
        • +
      +

      Qualifications:

      +
        +
      • Bachelor’s degree or higher in a Technical Area
        • +
      • MBA or Masters in Design preferred
        • +
      • Proven ability to develop and implement strategy
        • +
      • Exquisite organizational skills
        • +
      • Deep analytical skills
        • +
      • Social finesse and business sense
        • +
      • Scrum, Kanban
        • +
      • Infatuation with technology, in all its frustrating and fragile complexity
        • +
      • Top flight communication skills, oral and written, with teams which are centrally located and spread all over the world.
        • +
      • Personal commitment and experience of the transformational possibilities of higher education
        • +
      + +

      If you are interested in this position, please send an email to jobs@edx.org.

      +
      +
      + + +
      +
      +

      CONTENT ENGINEER

      +

      Content engineers help create the technology for specific courses. The tasks include:

      +
        +
      • Developing of course-specific user-facing elements, such as the circuit editor and simulator.
        • +
      • Integrating course materials into courses
        • +
      • Creating programs to grade questions designed with complex technical features
        • +
      • Knowledge of Python, XML, and/or JavaScript is desired. Strong interest and background in pedagogy and education is desired as well.
        • +
      • Building course components in straight XML or through our course authoring tool, edX Studio.
        • +
      • Assisting University teams and in house staff take advantage of new course software, including designing and developing technical refinements for implementation.
        • +
      • Pushing content to production servers predictably and cleanly.
        • +
      • Sending high volumes of course email adhering to email engine protocols.
        • +
      +

      Qualifications:

      +
        +
      • Bachelor’s degree or higher
        • +
      • Thorough knowledge of Python, DJango, XML,HTML, CSS , Javascript and backbone.js
        • +
      • Ability to work on multiple projects simultaneously without splintering
        • +
      • Tactfully escalate conflicting deadlines or priorities only when needed. Otherwise help the team members negotiate a solution.
        • +
      • Unfailing attention to detail, especially the details the course teams have seen so often they don’t notice them anymore.
        • +
      • Readily zoom from the big picture to the smallest course component to notice when typos, inconsistencies or repetitions have unknowingly crept in
        • +
      • Curiosity to step into the shoes of an online student working to master the course content.
        • +
      • Solid interpersonal skills, especially good listening
        • +
      + +

      If you are interested in this position, please send an email to jobs@edx.org.

      +
      +
      + + +
      +
      +

      DIRECTOR ENGINEERING, OPEN SOURCE COMMUNITY MANAGER

      +

      In edX courses, students make (and break) electronic circuits, they manipulate molecules on the fly and they do it all at once, in their tens of thousands. We have great Professors and great Universities. But we can’t possibly keep up with all the great ideas out there, so we’re making our platform open source, to turn up the volume on great education. To do that well, we’ll need a Director of Engineering who can lead our Open Source Community efforts.

      +

      Responsibilities:

      +
        +
      • Define and implement software design standards that make the open source community most welcome and productive.
        • +
      • Work with others to establish the governance standards for the edX Open Source Platform, establish the infrastructure, and manage the team to deliver releases and leverage our University partners and stakeholders to
        • make the edX platform the world’s best learning platform. +
      • Help the organization recognize the benefits and limitations inherent in open source solutions.
        • +
      • Establish best practices and key tool usage, especially those based on industry standards.
        • +
      • Provide visibility for the leadership team into the concerns and challenges faced by the open source community.
        • +
      • Foster a thriving community by providing the communication, documentation and feedback that they need to be enthusiastic.
        • +
      • Maximize the good code design coming from the open source community.
        • +
      • Provide the wit and firmness that the community needs to channel their energy productively.
        • +
      • Tactfully balance the internal needs of the organization to pursue new opportunities with the community’s need to participate in the platform’s evolution.
        • +
      • Shorten lines of communication and build trust across entire team
        • +
      +

      Qualifications:

      +
        + +
      • Bachelors, preferably Masters in Computer Science
        • +
      • Solid communication skills, especially written
        • +
      • Committed to Agile practice, Scrum and Kanban
        • +
      • Charm and humor
        • +
      • Deep familiarity with Open Source, participant and contributor
        • +
      • Python, Django, Javascript
        • +
      • Commitment to support your technical recommendations, both within and beyond the organization.
        • +
      + +

      If you are interested in this position, please send an email to jobs@edx.org.

      +
      +
      + + +
      +
      +

      SOFTWARE ENGINEER

      +

      edX is looking for engineers who can contribute to its Open Source learning platform. We are a small team with a startup, lean culture, committed to building open-source software that scales and dramatically changes the face of education. Our ideal candidates are hands on developers who understand how to build scalable, service based systems, preferably in Python and have a proven track record of bringing their ideas to market. We are looking for engineers with all levels of experience, but you must be a proven leader and outstanding developer to work at edX.

      + +

      There are a number of projects for which we are recruiting engineers:
      + +

      Learning Management System: We are developing an Open Source Standard that allows for the creation of instructional plug-ins and assessments in our platform. You must have a deep interest in semantics of learning, and able to build services at scale.

      + +

      Forums: We are building our own Forums software because we believe that education requires a forums platform capable of supporting learning communities. We are analytics driven. The ideal Forums candidates are focused on metrics and key performance indicators, understand how to build on top of a service based architecture and are wedded to quick iterations and user feedback. + +

      Analytics: We are looking for a platform engineer who has deep MongoDB or no SQL database experience. Our data infrastructure needs to scale to multiple terabytes. Researchers from Harvard, MIT, Berkeley and edX Universities will use our analytics platform to research and examine the fundamentals of learning. The analytics engineer will be responsible for both building out an analytics platform and a pub-sub and real-time pipeline processing architecture. Together they will allow researchers, students and Professors access to never before seen analytics. + +

      Course Development Authoring Tools: We are committed to making it easy for Professors to develop and publish their courses online. So we are building the tools that allow them to readily convert their vision to an online course ready for thousands of students.

      + +

      Requirements:

      +
        +
      • Real-world experience with Python or other dynamic development languages.
        • +
      • Able to code front to back, including HTML, CSS, Javascript, Django, Python
        • +
      • You must be committed to an agile development practices, in Scrum or Kanban
        • +
      • Demonstrated skills in building Service based architecture
        • +
      • Test Driven Development
        • +
      • Committed to Documentation best practices so your code can be consumed in an open source environment
        • +
      • Contributor to or consumer of Open Source Frameworks
        • +
      • BS in Computer Science from top-tier institution
        • +
      • Acknowledged by peers as a technology leader
        • +
      + +

      If you are interested in this position, please send an email to jobs@edx.org.

      +
      +
      +

      Positions

      How to Apply

      -

      E-mail your resume, coverletter and any other materials to jobs@edx.org

      +

      E-mail your resume, cover letter and any other materials to jobs@edx.org

      Our Location

      11 Cambridge Center
      - Cambridge, MA 02142

      + Cambridge, MA 02142

      diff --git a/lms/templates/static_templates/press_releases/bostonx_announcement.html b/lms/templates/static_templates/press_releases/bostonx_announcement.html new file mode 100644 index 0000000000..5aee02dd9e --- /dev/null +++ b/lms/templates/static_templates/press_releases/bostonx_announcement.html @@ -0,0 +1,64 @@ +<%! from django.core.urlresolvers import reverse %> +<%inherit file="../../main.html" /> + +<%namespace name='static' file='../../static_content.html'/> + +<%block name="title">City of Boston and edX partner to establish BostonX to improve educational access for residents +
      + + +
      +
      +

      City of Boston and edX partner to establish BostonX to improve educational access for residents

      +
      +
      +

      Pilot project offers online courses, educational support and jobs training through Boston community centers

      + +

      CAMBRIDGE, MA – January 29, 2013 – +EdX, the not-for-profit online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), announced today a pilot project with the City of Boston, Harvard and MIT to make online courses available through internet-connected Boston neighborhood community centers, high schools and libraries. A first-of-its-kind project, BostonX brings together innovators from the country’s center of higher education to offer Boston residents access to courses, internships, job training and placement services, and locations for edX students to gather, socialize and deepen learning.

      + +

      “We must connect adults and youth in our neighborhoods with the opportunities of the knowledge economy,” said Mayor Tom Menino. “BostonX will help update our neighbors’ skills and our community centers. As a first step, I’m pleased to announce a pilot with Harvard, MIT and edX, their online learning initiative, which will bring free courses and training to our community centers.”

      + +

      BostonX builds on edX’s mission of expanding access to education and delivering high-quality courses on its cutting-edge platform using innovative tools and educational techniques. The City of Boston will provide BostonX sites at community centers with computer access and basic computer training, support for internships, career counseling, and job transitioning. Harvard, MIT and edX will work with the city to provide courses selected to eliminate skills gaps, in-person lessons from affiliated instructors, training in online learning best practices and certificates of mastery for those who successfully complete the courses.

      + +

      “EdX’s innovative content, learning methodologies and game-like laboratories and teaching methods are transforming education, from 16-year-old students in Bangladesh, to community college students at Bunker Hill and MassBay, and now learners across Boston,” said Anant Agarwal, President of edX. “We’re thrilled to be able to partner with Mayor Menino and the City of Boston to provide this first-ever experience and hope that this idea will spread and create a number of CityX’s around the world, including Cambridge, Massachusetts where edX was founded.”

      + +

      This new pilot with the City of Boston follows another edX project with two Boston-area community colleges. This month, Bunker Hill and MassBay Community Colleges began offering an adapted version of the MITx 6.00x Introduction to Computer Science and Programming course at their respective campuses. The BostonX initiative goes one step further by allowing, encouraging and supporting residents of all ages, regardless of social status or neighborhood, to participate in life changing educational opportunities.

      + +

      About edX

      + +

      EdX is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.

      + + +
      +

      Contact:

      +

      Brad Baker, Weber Shandwick for edX

      +

      BBaker@webershandwick.com

      +

      (617) 520-7043

      +
      + +
      +
      +

      01 - 29 - 2013

      + +
      +
      +
      +
      diff --git a/lms/templates/static_templates/press_releases/edx_expands_internationally.html b/lms/templates/static_templates/press_releases/edx_expands_internationally.html new file mode 100644 index 0000000000..0ee42dafa9 --- /dev/null +++ b/lms/templates/static_templates/press_releases/edx_expands_internationally.html @@ -0,0 +1,81 @@ +<%! from django.core.urlresolvers import reverse %> +<%inherit file="../../main.html" /> + +<%namespace name='static' file='../../static_content.html'/> + +<%block name="title">edX Expands Internationally and Doubles its Institutional Membership with the Addition of Six New Schools +
      + + +
      +
      +

      edX Expands Internationally and Doubles its Institutional Membership with the Addition of Six New Schools

      +
      +
      +

      edX welcomes The Australian National University, Delft University of Technology, École Polytechnique Fédérale de Lausanne, McGill University, Rice University and University of Toronto to its X University Consortium of the world’s leading higher education institutions

      + +

      CAMBRIDGE, MA – Feb. 20, 2013 – +EdX, the not-for-profit online learning enterprise founded by Harvard University and the Massachusetts Institute of Technology (MIT), announced today the international expansion of its X University Consortium with the addition of six new global higher education institutions. The Australian National University (ANU), Delft University of Technology in the Netherlands, École Polytechnique Fédérale de Lausanne (EPFL) in Switzerland, McGill University and the University of Toronto in Canada, and Rice University in the United States are joining the Consortium and will use the edX platform to deliver the next generation of online and blended courses. This international expansion enables edX to better achieve its mission of providing world-class courses to everyone, everywhere, and is the natural next step to continue serving the large international student body already using edX on a daily basis. +

      + +

      While MOOCs, or massive open online courses, have typically focused on offering a variety of online courses inexpensively or for free, edX's vision is much larger. EdX is building an open source educational platform and a network of the world's top universities to improve education both online and on campus while conducting research on how students learn. To date, edX has more than 700,000 individuals on its platform, who account for more than 900,000 course enrollments. The addition of these new higher education institutions stretching from North America to Europe to the Asia Pacific will double the number of X University Consortium members and add a rich variety of new courses to edX’s offerings: +

      + +
        +
      • The Australian National University, a celebrated place of intensive research, education and policy engagement, will provide a series of ANUx courses to the open source platform including Astrophysics taught by Nobel Laureate and Professor of Astrophysics Brian Schmidt and his colleague Dr. Paul Francis, and Engaging India, taught by Dr. McComas Taylor and Dr. Peter Friedlander.
        • + +
      • Delft University of Technology, the largest and oldest technological university in the Netherlands, will provide a series of DelftX courses under Creative Commons license, including Introduction to Aerospace Engineering by Professor Jacco Hoekstra, Solar Energy by Dr. Arno Smets, and Water Treatment Engineering by Professor Jules van Lier.
        • + +
      • École Polytechnique Fédérale de Lausanne, one of the most famous institutions of science and technology in Europe, will provide a series of EPFLx courses specially tailored to fit the edX format, originating from its five schools -- Engineering, Life Sciences, Informatics and Communication, Architecture and Basic Sciences.
        • + +
      • McGill University, one of Canada's best-known institutions of higher learning and one of the leading universities in the world, will provide a series of McGillX courses in areas ranging from science and the humanities to public policy issues.
        • + +
      • Rice University, in Houston, Texas, is consistently ranked among the nation's top 20 universities by U.S. News & World Report. Rice has highly respected schools of Architecture, Business, Continuing Studies, Engineering, Humanities, Music, Natural Sciences and Social Sciences and is home to the Baker Institute for Public Policy. Rice's Smalley Institute for Nanoscale Science and Technology was the world’s first nanotechnology center when it opened in 1991. Rice will initially provide four RiceX courses and investigate ways to integrate its learning analytics tools from OpenStax Tutor to enable students and instructors to track their progress in real time.
        • + +
      • University of Toronto, one of the most respected and influential institutions of higher education and advanced research in the world, will provide a series of TorontoX courses including Terrestrial Energy System by Professor Bryan Kanrey, Behavioral Economics by Professor Dilip Soman, The Logic of Business: Building Blocks for Organizational Design by Professor Mihnea Moldoveanu, and Bioinformatic Methods by Professor Nicholas Provart.
        • +
      + +

      “We have had an international student community from the very beginning, and bringing these leading universities, from North America and Europe and the Asia Pacific into the edX organization will help us meet the tremendous demand we are experiencing,” said Anant Agarwal, President of edX. “Each of these schools was carefully selected for the distinct expertise they bring to our growing family of edX institutions. We remain committed to growing edX to meet the needs of the world while maintaining a superior learning experience for all.”

      + +

      Courses offered by institutions on the edX platform provide the same rigor as on-campus classes but are designed to take advantage of the unique features and benefits of online learning environments, including game-like experiences, instant feedback and cutting-edge virtual laboratories. Through edX, the new X Universities will provide interactive education experiences for students around the world. All that is required of edX students is access to the Internet and a desire to learn. By breaking down the barriers of location and cost and enabling the global exchange of information and ideas, edX is changing the foundations of both teaching and learning.

      + +

      The new member institutions will join founding universities MIT and Harvard, as well as the University of California, Berkeley, the University of Texas System, Wellesley College and Georgetown University in the X University Consortium. ANUx, DelftX, EPFLx, McGillX, RiceX and TorontoX will offer courses on edX beginning in late 2013. All of the courses will be hosted on edX’s open source platform at www.edx.org. +

      + +

      About edX

      + +

      EdX is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.

      + + +
      +

      Media Contact:

      +

      Dan O'Connell

      +

      oconnell@edx.org

      +

      (617) 480-6585

      +
      + +
      +
      +

      02 - 20 - 2013

      + +
      +
      +
      +
      diff --git a/lms/templates/static_templates/press_releases/eric_lander_secret_of_life.html b/lms/templates/static_templates/press_releases/eric_lander_secret_of_life.html new file mode 100644 index 0000000000..d91c8091d7 --- /dev/null +++ b/lms/templates/static_templates/press_releases/eric_lander_secret_of_life.html @@ -0,0 +1,92 @@ +<%! from django.core.urlresolvers import reverse %> +<%inherit file="../../main.html" /> + +<%namespace name='static' file='../../static_content.html'/> + +<%block name="title">Human Genome Pioneer Eric Lander to reveal “the secret of life” +
      + + +
      +
      +

      Human Genome Pioneer Eric Lander to reveal “the secret of life”

      +
      +
      +

      Broad Institute Director shares his MIT introductory biology course, covering topics in biochemistry, genetics and genomics, through edX.

      + +
      + +
      +

      Eric Lander, the founding director of the Broad Institute and a professor at MIT and Harvard Medical School.

      + High Resolution Image

      +
      +
      + + + +

      CAMBRIDGE, MA – January 30, 2013 – +In the past 10 years, the ability to decode or “sequence” DNA has grown by a million-fold, a stunning rate of progress that is producing a flood of information about human biology and disease. Because of these advances, the scientific community — and the world as a whole — stands on the verge of a revolution in biology. In the coming decades scientists will be able to understand how cells are “wired” and how that wiring is disrupted in human diseases ranging from diabetes to cancer to schizophrenia. Now, with his free online course, 7.00x Introductory Biology: “The Secret of Life”, genome pioneer Eric Lander, the founding director of the Broad Institute and a professor at MIT and Harvard Medical School, will explain to students around the world the basics of biology – the secret of life, so to speak – so that they can understand today’s revolution in biology.

      + +

      EdX, the not-for-profit online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), brings the best courses from the best faculty at the best institutions to anyone with an Internet connection. For the past 20 years, legendary teacher Lander has taught Introductory Biology to more than half of all MIT students. He has now adapted his course for online education, creating the newest course on the edX platform. The course, 7.00X, is now open for enrollment, with the first class slated for March 5th. This course will include innovative technology including a 3D molecule viewer and gene explorer tool to transform the learning experience. It is open to all levels and types of learners.

      + +

      “Introducing the freshman class of MIT to the basics of biology is exhilarating,” said Lander. “Now, with this edX course, I look forward to teaching people around the world. There are no prerequisites for this course – other than curiosity and an interest in understanding some of the greatest scientific challenges of our time.”

      + +

      Those taking the course will learn the fundamental ideas that underlie modern biology and medicine, including genetics, biochemistry, molecular biology, recombinant DNA, genomics and genomic medicine. They will become familiar with the structure and function of macromolecules such as DNA, RNA and proteins and understand how information flows within cells. Students will explore how mutations affect biological function and cause human disease. They will learn about modern molecular biological techniques and their wide-ranging impact.

      + +

      “Eric Lander has created this remarkable digitally enhanced introduction to genetics and biology,” said Anant Agarwal, President of edX. “With this unique online version, he has brought the introductory biology course to a new level. It has been completely rethought and retooled, incorporating cutting-edge online interactive tools as well as community-building contests and milestone-based prizes.”

      + +

      With online courses through edX like 7.00x, what matters isn’t what people have achieved or their transcripts, but their desire to learn. Students only need to come with a real interest in science and the desire to understand what's going on at the forefront of biology, and to learn the fundamental principles on which an amazing biomedical revolution is based – from one of the top scientist in the world. 7.00x Introductory Biology: The Secret of Life is now available for enrollment. Classes will start on March 5, 2013.

      + +

      Dr. Eric Lander is President and Founding Director of the Broad Institute of Harvard and MIT, a new kind of collaborative biomedical research institution focused on genomic medicine. Dr. Lander is also Professor of Biology at MIT and Professor of Systems Biology at the Harvard Medical School. In addition, Dr. Lander serves as Co-Chair of the President’s Council of Advisors on Science and Technology, which advises the White House on science and technology. A geneticist, molecular biologist and mathematician, Dr. Lander has played a pioneering role in all aspects of the reading, understanding and medical application of the human genome. He was a principal leader of the international Human Genome Project (HGP) from 1990-2003, with his group being the largest contributor to the mapping and sequencing of the human genetic blueprint. Dr. Lander was an early pioneer in the free availability of genomic tools and information. Finally, he has mentored an extraordinary cadre of young scientists who have become the next generation of leaders in medical genomics. The recipient of numerous awards and honorary degrees, Dr. Lander was elected a member of the U.S. National Academy of Sciences in 1997 and of the U.S. Institute of Medicine in 1999.

      + + +

      Previously announced new 2013 courses include: +8.02x Electricity and Magnetism from Walter Lewin +Justice from Michael Sandel; Introduction to Statistics from Ani Adhikari; The Challenges of Global Poverty from Esther Duflo; The Ancient Greek Hero from Gregory Nagy; Quantum Mechanics and Quantum Computation from Umesh Vazirani; Human Health and Global Environmental Change, from Aaron Bernstein and Jack Spengler.

      + +

      In addition to these new courses, edX is bringing back several courses from the popular fall 2012 semester: Introduction to Computer Science and Programming; Introduction to Solid State Chemistry; Introduction to Artificial Intelligence; Software as a Service I; Software as a Service II; Foundations of Computer Graphics.

      + +

      About the Broad Institute of MIT and Harvard

      + +

      The Eli and Edythe L. Broad Institute of MIT and Harvard was founded in 2003 to empower this generation of creative scientists to transform medicine with new genome-based knowledge. The Broad Institute seeks to describe all the molecular components of life and their connections; discover the molecular basis of major human diseases; develop effective new approaches to diagnostics and therapeutics; and disseminate discoveries, tools, methods and data openly to the entire scientific community.

      + +

      Founded by MIT, Harvard and its affiliated hospitals, and the visionary Los Angeles philanthropists Eli and Edythe L. Broad, the Broad Institute includes faculty, professional staff and students from throughout the MIT and Harvard biomedical research communities and beyond, with collaborations spanning over a hundred private and public institutions in more than 40 countries worldwide. For further information about the Broad Institute, go to www.broadinstitute.org.

      + +

      About edX

      + +

      EdX is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.

      + +
      +

      Contact:

      +

      Brad Baker, Weber Shandwick for edX

      +

      BBaker@webershandwick.com

      +

      (617) 520-7043

      +
      + + +
      +
      +

      01 - 30 - 2013

      + +
      +
      +
      +
      diff --git a/lms/templates/static_templates/press_releases/template.html b/lms/templates/static_templates/press_releases/template.html new file mode 100644 index 0000000000..52eebf49f5 --- /dev/null +++ b/lms/templates/static_templates/press_releases/template.html @@ -0,0 +1,60 @@ +<%! from django.core.urlresolvers import reverse %> +<%inherit file="../../main.html" /> + +<%namespace name='static' file='../../static_content.html'/> + +<%block name="title">TITLE +
      + + +
      +
      +

      TITLE

      +
      +
      +

      SUBTITLE

      + +

      CAMBRIDGE, MA – MONTH DAY, YEAR – + +Text

      + +

      more text

      + + +

      About edX

      + +

      EdX is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.

      + + +
      +

      Media Contact:

      +

      Dan O'Connell

      +

      oconnell@edx.org

      +

      (617) 480-6585

      +
      + +
      +
      +

      DATE: 01 - 29 - 2013

      + +
      +
      +
      +
      diff --git a/lms/templates/test_center_register.html b/lms/templates/test_center_register.html index f6c53c0e89..6b87860fad 100644 --- a/lms/templates/test_center_register.html +++ b/lms/templates/test_center_register.html @@ -466,7 +466,7 @@ Last Eligible Appointment Date: ${exam_info.last_eligible_appointment_date_text}
    4. - Registration End Date: ${exam_info.registration_end_date_text} + Registration Ends: ${exam_info.registration_end_date_text}
      5. % endif diff --git a/lms/templates/university_profile/anux.html b/lms/templates/university_profile/anux.html new file mode 100644 index 0000000000..c19310c70f --- /dev/null +++ b/lms/templates/university_profile/anux.html @@ -0,0 +1,24 @@ +<%inherit file="base.html" /> +<%namespace name='static' file='../static_content.html'/> + +<%block name="title">ANUx + +<%block name="university_header"> +
      +
      +
      + +

      ANUx

      +
      +
      +
      + + + +<%block name="university_description"> +

      The Australian National University (ANU) is a celebrated place of intensive research, education and policy engagement. Our research has always been central to everything we do, shaping a holistic learning experience that goes beyond the classroom, giving students access to researchers who are among the best in their fields and to opportunities for development around Australia and the world.

      + + +${parent.body()} diff --git a/lms/templates/university_profile/delftx.html b/lms/templates/university_profile/delftx.html new file mode 100644 index 0000000000..feb3092dd9 --- /dev/null +++ b/lms/templates/university_profile/delftx.html @@ -0,0 +1,24 @@ +<%inherit file="base.html" /> +<%namespace name='static' file='../static_content.html'/> + +<%block name="title">DelftX + +<%block name="university_header"> +
      +
      +
      + +

      DelftX

      +
      +
      +
      + + + +<%block name="university_description"> +

      Delft University of Technology is the largest and oldest technological university in the Netherlands. Our research is inspired by the desire to increase fundamental understanding, as well as by societal challenges. We encourage our students to be independent thinkers so they will become engineers capable of solving complex problems. Our students have chosen Delft University of Technology because of our reputation for quality education and research.

      + + +${parent.body()} diff --git a/lms/templates/university_profile/epflx.html b/lms/templates/university_profile/epflx.html new file mode 100644 index 0000000000..5119a223de --- /dev/null +++ b/lms/templates/university_profile/epflx.html @@ -0,0 +1,27 @@ +<%inherit file="base.html" /> +<%namespace name='static' file='../static_content.html'/> + +<%block name="title">EPFLx + +<%block name="university_header"> +
      +
      +
      + +

      EPFLx

      +
      +
      +
      + + + +<%block name="university_description"> +

      EPFL is one of the two Swiss Federal Institutes of Technology. With the status of a national school since 1969, the young engineering school has grown in many dimensions, to the extent of becoming one of the most famous European institutions of science and technology. It has three core missions: training, research and technology transfer.

      + +

      EPFL is located in Lausanne in Switzerland, on the shores of the largest lake in Europe, Lake Geneva and at the foot of the Alps and Mont-Blanc. Its main campus brings together over 11,000 persons, students, researchers and staff in the same magical place. Because of its dynamism and rich student community, EPFL has been able to create a special spirit imbued with curiosity and simplicity. Daily interactions amongst students, researchers and entrepreneurs on campus give rise to new scientific, technological and architectural projects. +

      + + +${parent.body()} diff --git a/lms/templates/university_profile/mcgillx.html b/lms/templates/university_profile/mcgillx.html new file mode 100644 index 0000000000..ca0801aa3b --- /dev/null +++ b/lms/templates/university_profile/mcgillx.html @@ -0,0 +1,24 @@ +<%inherit file="base.html" /> +<%namespace name='static' file='../static_content.html'/> + +<%block name="title">McGillX + +<%block name="university_header"> +
      +
      +
      + +

      McGillX

      +
      +
      +
      + + + +<%block name="university_description"> +

      McGill University is one of Canada's best-known institutions of higher learning and one of the leading universities in the world. McGill is located in vibrant multicultural Montreal, in the province of Quebec. Our 11 faculties and 11 professional schools offer more than 300 programs to some 38,000 graduate, undergraduate and continuing studies students. McGill ranks 1st in Canada among medical-doctoral universities (Maclean’s) and 18th in the world (QS World University Rankings).

      + + +${parent.body()} diff --git a/lms/templates/university_profile/ricex.html b/lms/templates/university_profile/ricex.html new file mode 100644 index 0000000000..36acea2836 --- /dev/null +++ b/lms/templates/university_profile/ricex.html @@ -0,0 +1,24 @@ +<%inherit file="base.html" /> +<%namespace name='static' file='../static_content.html'/> + +<%block name="title">RiceX + +<%block name="university_header"> +
      +
      +
      + +

      RiceX

      +
      +
      +
      + + + +<%block name="university_description"> +

      Located on a 300-acre forested campus in Houston, Rice University is consistently ranked among the nation's top 20 universities by U.S. News & World Report. Rice has highly respected schools of Architecture, Business, Continuing Studies, Engineering, Humanities, Music, Natural Sciences and Social Sciences and is home to the Baker Institute for Public Policy. With 3,708 undergraduates and 2,374 graduate students, Rice's undergraduate student-to-faculty ratio is 6-to-1. Its residential college system builds close-knit communities and lifelong friendships, just one reason why Rice has been ranked No. 1 for best quality of life multiple times by the Princeton Review and No. 2 for "best value" among private universities by Kiplinger's Personal Finance.

      + + +${parent.body()} diff --git a/lms/templates/university_profile/template.html b/lms/templates/university_profile/template.html new file mode 100644 index 0000000000..44fc3f3ab4 --- /dev/null +++ b/lms/templates/university_profile/template.html @@ -0,0 +1,24 @@ +<%inherit file="base.html" /> +<%namespace name='static' file='../static_content.html'/> + +<%block name="title">SCHOOLX + +<%block name="university_header"> +
      +
      +
      + +

      SCHOOLX

      +
      +
      +
      + + + +<%block name="university_description"> +

      + + +${parent.body()} diff --git a/lms/templates/university_profile/torontox.html b/lms/templates/university_profile/torontox.html new file mode 100644 index 0000000000..6ae50d21b9 --- /dev/null +++ b/lms/templates/university_profile/torontox.html @@ -0,0 +1,24 @@ +<%inherit file="base.html" /> +<%namespace name='static' file='../static_content.html'/> + +<%block name="title">University of TorontoX + +<%block name="university_header"> +
      +
      +
      + +

      University of TorontoX

      +
      +
      +
      + + + +<%block name="university_description"> +

      Established in 1827, the University of Toronto is a vibrant and diverse academic community. It includes 80,000 students, 12,000 colleagues holding faculty appointments, 200 librarians, and 6,000 staff members across three distinctive campuses and at many partner sites, including world-renowned hospitals. With over 800 undergraduate programs, 150 graduate programs, and 40 professional programs, U of T attracts students of the highest calibre, from across Canada and from 160 countries around the world. The University is one of the most respected and influential institutions of higher education and advanced research in the world. Its strengths extend across the full range of disciplines: the 2012-13 Times Higher Education ranking groups the University of Toronto with Stanford, UC Berkeley, UCLA, Columbia, Cambridge, Oxford, the University of Melbourne, and the University of Michigan as the only institutions in the top 27 in all 6 broad disciplinary areas. The University is also consistently rated one of Canada’s Top 100 employers, and ranks with Harvard and Yale for the top university library resources in North America.

      + + +${parent.body()} diff --git a/lms/templates/video.html b/lms/templates/video.html index 6cee9ed39b..afbb9015ee 100644 --- a/lms/templates/video.html +++ b/lms/templates/video.html @@ -2,9 +2,19 @@

      ${display_name}

      % endif - %if settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
      + +%elif settings.MITX_FEATURES.get('USE_YOUTUBE_OBJECT_API') and normal_speed_video_id: + + + + + %else:
      diff --git a/lms/templates/videoalpha.html b/lms/templates/videoalpha.html new file mode 100644 index 0000000000..2028d3c320 --- /dev/null +++ b/lms/templates/videoalpha.html @@ -0,0 +1,43 @@ +% if display_name is not UNDEFINED and display_name is not None: +

      ${display_name}

      +% endif + +%if settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']: +
      +%else: +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +%endif + +% if sources.get('main'): +
      +

      Download video here.

      +
      +% endif + +% if track: +
      +

      Download subtitles here.

      +
      +% endif diff --git a/lms/urls.py b/lms/urls.py index 9d590387e4..5e5ac9a7f2 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -2,6 +2,7 @@ from django.conf import settings from django.conf.urls import patterns, include, url from django.contrib import admin from django.conf.urls.static import static +from django.views.generic import RedirectView import django.contrib.auth.views # Uncomment the next two lines to enable the admin: @@ -13,7 +14,7 @@ urlpatterns = ('', # certificate view url(r'^update_certificate$', 'certificates.views.update_certificate'), - url(r'^$', 'branding.views.index', name="root"), # Main marketing page, or redirect to courseware + url(r'^$', 'branding.views.index', name="root"), # Main marketing page, or redirect to courseware url(r'^dashboard$', 'student.views.dashboard', name="dashboard"), url(r'^admin_dashboard$', 'dashboard.views.dashboard'), @@ -35,7 +36,7 @@ urlpatterns = ('', # url(r'^testcenter/logout$', 'student.test_center_views.logout'), url(r'^event$', 'track.views.user_track'), - url(r'^t/(?P