Merge branch 'master' into feature/btalbot/studio-alerts

.gitignore

@@ -29,3 +29,4 @@ cover_html/
 .idea/
 .redcar/
 chromedriver.log
+ghostdriver.log

.pylintrc

@@ -12,7 +12,7 @@ profile=no
 
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
-ignore=CVS
+ignore=CVS, migrations
 
 # Pickle collected data for later comparisons.
 persistent=yes
@@ -43,7 +43,7 @@ disable=E1102,W0142
 output-format=text
 
 # Include message's id in output
-include-ids=no
+include-ids=yes
 
 # Put messages in a separate file for each module / package specified on the
 # command line instead of printing them on stdout. Reports (if any) will be
@@ -97,7 +97,7 @@ bad-functions=map,filter,apply,input
 module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 
 # Regular expression which should only match correct module level names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__)|log)$
 
 # Regular expression which should only match correct class names
 class-rgx=[A-Z_][a-zA-Z0-9]+$

.ruby-version

-1.8.7-p371
+1.9.3-p374
\ No newline at end of file

Gemfile

-source :rubygems
+source 'https://rubygems.org'
 gem 'rake', '~> 10.0.3'
 gem 'sass', '3.1.15'
 gem 'bourbon', '~> 1.3.6'

cms/djangoapps/contentstore/features/advanced-settings.feature

@@ -7,6 +7,7 @@ Feature: Advanced (manual) course policy
     When I select the Advanced Settings
     Then I see only the display name
 
+  @skip-phantom
   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
@@ -14,6 +15,7 @@ Feature: Advanced (manual) course policy
     And I reload the page
     Then there are no advanced policy settings
 
+  @skip-phantom
   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
@@ -32,6 +34,7 @@ Feature: Advanced (manual) course policy
     And I press the "Cancel" notification button
     Then the policy key value is unchanged
 
+  @skip-phantom
   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

cms/djangoapps/contentstore/features/advanced-settings.py

 from lettuce import world, step
 from common import *
 import time
+from selenium.common.exceptions import WebDriverException
+from selenium.webdriver.support import expected_conditions as EC
 
-from nose.tools import assert_equal
-from nose.tools import assert_true
+from nose.tools import assert_true, assert_false, assert_equal
 
 """
 http://selenium.googlecode.com/svn/trunk/docs/api/py/webdriver/selenium.webdriver.common.keys.html
@@ -19,6 +20,7 @@ def i_select_advanced_settings(step):
         css_click(expand_icon_css)
     link_css = 'li.nav-course-settings-advanced a'
     css_click(link_css)
+    # world.browser.click_link_by_text('Advanced Settings')
 
 
 @step('I am on the Advanced Course Settings page in Studio$')
@@ -37,13 +39,25 @@ def reload_the_page(step):
 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')
+    e.type('_new')
 
 
 @step(u'I press the "([^"]*)" notification button$')
 def press_the_notification_button(step, name):
-    world.browser.click_link_by_text(name)
+    def is_visible(driver):
+        return EC.visibility_of_element_located((By.CSS_SELECTOR,css,))
+    def is_invisible(driver):
+        return EC.invisibility_of_element_located((By.CSS_SELECTOR,css,))
 
+    css = 'a.%s-button' % name.lower()
+    wait_for(is_visible)
+
+    try:
+        css_click_at(css)
+        wait_for(is_invisible)
+    except WebDriverException, e:
+        css_click_at(css)
+        wait_for(is_invisible)
 
 @step(u'I edit the value of a policy key$')
 def edit_the_value_of_a_policy_key(step):
@@ -83,7 +97,12 @@ def i_see_only_display_name(step):
 
 @step('there are no advanced policy settings$')
 def no_policy_settings(step):
-    assert_policy_entries([], [])
+    keys_css = 'input.policy-key'
+    val_css = 'textarea.json'
+    k = world.browser.is_element_not_present_by_css(keys_css, 5)
+    v = world.browser.is_element_not_present_by_css(val_css, 5)
+    assert_true(k)
+    assert_true(v)
 
 
 @step('they are alphabetized$')
@@ -99,29 +118,29 @@ def it_is_formatted(step):
 @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')
+    val = css_find(policy_key_css).first.value
+    assert_equal(val, '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')
+    val = css_find(policy_key_css).first.value
+    assert_equal(val, 'display_name_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"')
+    val = css_find(policy_value_css).first.value
+    assert_equal(val, '"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"')
+    val = css_find(policy_value_css).first.value
+    assert_equal(val, '"Robot Super Course X"')
 
 
 ############# HELPERS ###############
@@ -132,19 +151,23 @@ def create_entry(key, value):
     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
+#   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 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)
+    # Add in a TAB key press because intermittently on ubuntu the
+    # last character of "value" above was not getting typed in
+    css_find(new_value_css).last._element.send_keys(Keys.TAB)
 
 
 def delete_entry(index):
     """ 
     Delete the nth entry where index is 0-based
     """
-    css = '.delete-button'
+    css = 'a.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))
@@ -152,8 +175,8 @@ def delete_entry(index):
 
 
 def assert_policy_entries(expected_keys, expected_values):
-    assert_entries('.key input', expected_keys)
-    assert_entries('.json', expected_values)
+    assert_entries('.key input.policy-key', expected_keys)
+    assert_entries('textarea.json', expected_values)
 
 
 def assert_entries(css, expected_values):
@@ -165,16 +188,8 @@ def assert_entries(css, expected_values):
 
 
 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)
+    css = "a.save-button"
+    css_click_at(css)
 
 
 def fill_last_field(value):

cms/djangoapps/contentstore/features/common.py

@@ -3,18 +3,20 @@ from lettuce.django import django_url
 from nose.tools import assert_true
 from nose.tools import assert_equal
 from selenium.webdriver.support.ui import WebDriverWait
+from selenium.common.exceptions import WebDriverException, StaleElementReferenceException
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.common.by import By
 
 from terrain.factories import UserFactory, RegistrationFactory, UserProfileFactory
 from terrain.factories import CourseFactory, GroupFactory
-import xmodule.modulestore.django
+from xmodule.modulestore.django import _MODULESTORES, modulestore
+from xmodule.templates import update_templates
 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
@@ -52,9 +54,8 @@ def i_have_opened_a_new_course(step):
     log_into_studio()
     create_a_course()
 
-####### HELPER FUNCTIONS ##############
-
 
+####### HELPER FUNCTIONS ##############
 def create_studio_user(
         uname='robot',
         email='robot+studio@edx.org',
@@ -83,9 +84,9 @@ def flush_xmodule_store():
     # (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()
+    _MODULESTORES = {}
+    modulestore().collection.drop()
+    update_templates()
 
 
 def assert_css_with_text(css, text):
@@ -94,8 +95,16 @@ def assert_css_with_text(css, text):
 
 
 def css_click(css):
-    assert_true(world.browser.is_element_present_by_css(css, 5))
-    world.browser.find_by_css(css).first.click()
+    '''
+    First try to use the regular click method, 
+    but if clicking in the middle of an element
+    doesn't work it might be that it thinks some other
+    element is on top of it there so click in the upper left
+    '''
+    try:
+        css_find(css).first.click()
+    except WebDriverException, e:
+        css_click_at(css)
 
 
 def css_click_at(css, x=10, y=10):
@@ -103,8 +112,7 @@ 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 = css_find(css).first
     e.action_chains.move_to_element_with_offset(e._element, x, y)
     e.action_chains.click()
     e.action_chains.perform()
@@ -115,11 +123,16 @@ def css_fill(css, value):
 
 
 def css_find(css):
+    def is_visible(driver):
+        return EC.visibility_of_element_located((By.CSS_SELECTOR,css,))
+
+    world.browser.is_element_present_by_css(css, 5)
+    wait_for(is_visible)
     return world.browser.find_by_css(css)
 
 
 def wait_for(func):
-    WebDriverWait(world.browser.driver, 10).until(func)
+    WebDriverWait(world.browser.driver, 5).until(func)
 
 
 def id_find(id):

cms/djangoapps/contentstore/features/section.feature

@@ -26,6 +26,7 @@ Feature: Create Section
     And I save a new section release date
     Then the section release date is updated
 
+  @skip-phantom
   Scenario: Delete section
     Given I have opened a new course in Studio
     And I have added a new section

cms/djangoapps/contentstore/features/section.py

 from lettuce import world, step
 from common import *
 from nose.tools import assert_equal
+from selenium.webdriver.common.keys import Keys
+import time
 
 ############### ACTIONS ####################
 
@@ -37,10 +39,14 @@ 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')
-    # click here to make the calendar go away
-    css_click(time_css)
+    # hit TAB to get to the time field
+    e = css_find(date_css).first
+    e._element.send_keys(Keys.TAB)
     css_fill(time_css, '12:00am')
-    css_click('a.save-button')
+    e = css_find(time_css).first
+    e._element.send_keys(Keys.TAB)
+    time.sleep(float(1))
+    world.browser.click_link_by_text('Save')
 
 
 ############ ASSERTIONS ###################
@@ -106,7 +112,7 @@ def the_section_release_date_picker_not_visible(step):
 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'
+    assert_equal(status_text,'Will Release: 12/25/2013 at 12:00am')
 
 
 ############ HELPER METHODS ###################

cms/djangoapps/contentstore/features/signup.py

 from lettuce import world, step
+from common import *
 
 
 @step('I fill in the registration form$')
@@ -13,10 +14,11 @@ def i_fill_in_the_registration_form(step):
 
 @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')
-    submit_css = 'button#submit'
-    register_form.find_by_css(submit_css).click()
-
+    submit_css = 'form#register_form button#submit'
+    # Workaround for click not working on ubuntu
+    # for some unknown reason.
+    e = css_find(submit_css)
+    e.type(' ')
 
 @step('I should see be on the studio home page$')
 def i_should_see_be_on_the_studio_home_page(step):

cms/djangoapps/contentstore/features/studio-overview-togglesection.feature

@@ -21,6 +21,7 @@ Feature: Overview Toggle Section
 		Then I see the "Collapse All Sections" link
 		And all sections are expanded
 
+	@skip-phantom
 	Scenario: Collapse link is not removed after last section of a course is deleted
 		Given I have a course with 1 section
 		And I navigate to the course overview page

cms/djangoapps/contentstore/features/subsection.feature

@@ -17,6 +17,7 @@ Feature: Create Subsection
     And I click to edit the subsection name
     Then I see the complete subsection name with a quote in the editor
 
+    @skip-phantom
     Scenario: Delete a subsection
     Given I have opened a new course section in Studio
     And I have added a new subsection

cms/djangoapps/contentstore/views.py

@@ -86,12 +86,14 @@ 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):
@@ -104,6 +106,7 @@ 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)
@@ -115,6 +118,7 @@ def ux_alerts(request):
 
 # ==== Views for any logged-in user ==================================
 
+
 @login_required
 @ensure_csrf_cookie
 def index(request):
@@ -148,6 +152,7 @@ def index(request):
 
 # ==== Views with per-item permissions================================
 
+
 def has_access(user, location, role=STAFF_ROLE_NAME):
     '''
     Return True if user allowed to access this piece of data
@@ -396,6 +401,7 @@ def preview_component(request, location):
         'editor': wrap_xmodule(component.get_html, component, 'xmodule_edit.html')(),
     })
 
+
 @expect_json
 @login_required
 @ensure_csrf_cookie
@@ -639,6 +645,17 @@ def delete_item(request):
     if item.location.revision is None and item.location.category == 'vertical' and delete_all_versions:
         modulestore('direct').delete_item(item.location)
 
+    # cdodge: we need to remove our parent's pointer to us so that it is no longer dangling
+
+    parent_locs = modulestore('direct').get_parent_locations(item_loc, None)
+
+    for parent_loc in parent_locs:
+        parent = modulestore('direct').get_item(parent_loc)
+        item_url = item_loc.url()
+        if item_url in parent.definition["children"]:
+            parent.definition["children"].remove(item_url)
+            modulestore('direct').update_children(parent.location, parent.definition["children"])
+
     return HttpResponse()
 
 
@@ -712,6 +729,7 @@ def create_draft(request):
 
     return HttpResponse()
 
+
 @login_required
 @expect_json
 def publish_draft(request):
@@ -741,6 +759,7 @@ def unpublish_unit(request):
 
     return HttpResponse()
 
+
 @login_required
 @expect_json
 def clone_item(request):
@@ -771,8 +790,7 @@ def clone_item(request):
 
     return HttpResponse(json.dumps({'id': dest_location.url()}))
 
-#@login_required
-#@ensure_csrf_cookie
+
 def upload_asset(request, org, course, coursename):
     '''
     cdodge: this method allows for POST uploading of files into the course asset library, which will
@@ -834,6 +852,7 @@ def upload_asset(request, org, course, coursename):
     response['asset_url'] = StaticContent.get_url_path_from_location(content.location)
     return response
 
+
 '''
 This view will return all CMS users who are editors for the specified course
 '''
@@ -866,6 +885,7 @@ def create_json_response(errmsg = None):
 
     return resp
 
+
 '''
 This POST-back view will add a user - specified by email - to the list of editors for
 the specified course
@@ -898,6 +918,7 @@ def add_user(request, location):
 
     return create_json_response()
 
+
 '''
 This POST-back view will remove a user - specified by email - from the list of editors for
 the specified course
@@ -929,6 +950,7 @@ def remove_user(request, location):
 def landing(request, org, course, coursename):
     return render_to_response('temp-course-landing.html', {})
 
+
 @login_required
 @ensure_csrf_cookie
 def static_pages(request, org, course, coursename):
@@ -1032,6 +1054,7 @@ def edit_tabs(request, org, course, coursename):
         'components': components
         })
 
+
 def not_found(request):
     return render_to_response('error.html', {'error': '404'})
 
@@ -1067,6 +1090,7 @@ def course_info(request, org, course, name, provided_id=None):
         'handouts_location': Location(['i4x', org, course, 'course_info', 'handouts']).url()
     })
 
+
 @expect_json
 @login_required
 @ensure_csrf_cookie
@@ -1164,6 +1188,7 @@ def get_course_settings(request, org, course, name):
                                        "section": "details"})
     })
 
+
 @login_required
 @ensure_csrf_cookie
 def course_config_graders_page(request, org, course, name):
@@ -1187,6 +1212,7 @@ def course_config_graders_page(request, org, course, name):
         'course_details': json.dumps(course_details, cls=CourseSettingsEncoder)
     })
 
+
 @login_required
 @ensure_csrf_cookie
 def course_config_advanced_page(request, org, course, name):
@@ -1210,6 +1236,7 @@ def course_config_advanced_page(request, org, course, name):
         'advanced_dict' : json.dumps(CourseMetadata.fetch(location)),
     })
 
+
 @expect_json
 @login_required
 @ensure_csrf_cookie
@@ -1241,6 +1268,7 @@ def course_settings_updates(request, org, course, name, section):
         return HttpResponse(json.dumps(manager.update_from_json(request.POST), cls=CourseSettingsEncoder),
                             mimetype="application/json")
 
+
 @expect_json
 @login_required
 @ensure_csrf_cookie
@@ -1366,6 +1394,7 @@ def asset_index(request, org, course, name):
 def edge(request):
     return render_to_response('university_profiles/edge.html', {})
 
+
 @login_required
 @expect_json
 def create_new_course(request):
@@ -1421,6 +1450,7 @@ def create_new_course(request):
 
     return HttpResponse(json.dumps({'id': new_course.location.url()}))
 
+
 def initialize_course_tabs(course):
     # set up the default tabs
     # I've added this because when we add static tabs, the LMS either expects a None for the tabs list or
@@ -1438,6 +1468,7 @@ def initialize_course_tabs(course):
 
     modulestore('direct').update_metadata(course.location.url(), course.own_metadata)
 
+
 @ensure_csrf_cookie
 @login_required
 def import_course(request, org, course, name):
@@ -1515,6 +1546,7 @@ def import_course(request, org, course, name):
                         course_module.location.name])
         })
 
+
 @ensure_csrf_cookie
 @login_required
 def generate_export_course(request, org, course, name):
@@ -1566,6 +1598,7 @@ def export_course(request, org, course, name):
         '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

cms/envs/aws.py

@@ -62,3 +62,6 @@ AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
 DATABASES = AUTH_TOKENS['DATABASES']
 MODULESTORE = AUTH_TOKENS['MODULESTORE']
 CONTENTSTORE = AUTH_TOKENS['CONTENTSTORE']
+
+# Datadog for events!
+DATADOG_API = AUTH_TOKENS.get("DATADOG_API")
\ No newline at end of file

cms/one_time_startup.py

+from dogapi import dog_http_api, dog_stats_api
+from django.conf import settings
+
+if hasattr(settings, 'DATADOG_API'):
+    dog_http_api.api_key = settings.DATADOG_API
+    dog_stats_api.start(api_key=settings.DATADOG_API, statsd=True)

cms/static/js/views/settings/advanced_view.js

@@ -31,7 +31,8 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
         // because these are outside of this.$el, they can't be in the event hash
         $('.save-button').on('click', this, this.saveView);
         $('.cancel-button').on('click', this, this.revertView);
-        this.model.on('error', this.handleValidationError, this);
+        this.listenTo(this.model, 'error', CMS.ServerError);
+        this.listenTo(this.model, 'invalid', this.handleValidationError);
     },
     render: function() {
         // catch potential outside call before template loaded
@@ -228,7 +229,7 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
                 var error = {};
                 error[oldKey] = 'You have already defined "' + newKey + '" in the manual policy definitions.';
                 error[newKey] = "You tried to enter a duplicate of this key.";
-                this.model.trigger("error", this.model, error);
+                this.model.trigger("invalid", this.model, error);
                 return false;
             }
 
@@ -244,7 +245,7 @@ CMS.Views.Settings.Advanced = CMS.Views.ValidatingView.extend({
                     // swap to the key which the map knows about
                     validation[oldKey] = validation[newKey];
                 }
-                this.model.trigger("error", this.model, validation);
+                this.model.trigger("invalid", this.model, validation);
                 // abandon update
                 return;
             }

cms/static/js/views/settings/main_settings_view.js

@@ -26,7 +26,8 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
         var dateIntrospect = new Date();
         this.$el.find('#timezone').html("(" + dateIntrospect.getTimezone() + ")");
 
-        this.model.on('error', this.handleValidationError, this);
+        this.listenTo(this.model, 'error', CMS.ServerError);
+        this.listenTo(this.model, 'invalid', this.handleValidationError);
         this.selectorToField = _.invert(this.fieldToSelectorMap);
     },
 

cms/static/js/views/settings/settings_grading_view.js

@@ -44,7 +44,8 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
             self.render();
         }
         );
-        this.model.on('error', this.handleValidationError, this);
+        this.listenTo(this.model, 'error', CMS.ServerError);
+        this.listenTo(this.model, 'invalid', this.handleValidationError);
         this.model.get('graders').on('remove', this.render, this);
         this.model.get('graders').on('reset', this.render, this);
         this.model.get('graders').on('add', this.render, this);
@@ -316,7 +317,8 @@ CMS.Views.Settings.GraderView = CMS.Views.ValidatingView.extend({
         'blur :input' : "inputUnfocus"
     },
     initialize : function() {
-        this.model.on('error', this.handleValidationError, this);
+        this.listenTo(this.model, 'error', CMS.ServerError);
+        this.listenTo(this.model, 'invalid', this.handleValidationError);
         this.selectorToField = _.invert(this.fieldToSelectorMap);
         this.render();
     },

cms/static/js/views/validating_view.js

@@ -3,7 +3,8 @@ CMS.Views.ValidatingView = Backbone.View.extend({
     // decorates the fields. Needs wiring per class, but this initialization shows how 
     // either have your init call this one or copy the contents
     initialize : function() {
-        this.model.on('error', this.handleValidationError, this);
+        this.listenTo(this.model, 'error', CMS.ServerError);
+        this.listenTo(this.model, 'invalid', this.handleValidationError);
         this.selectorToField = _.invert(this.fieldToSelectorMap);
     },
 
@@ -18,20 +19,11 @@ CMS.Views.ValidatingView = Backbone.View.extend({
         // which may be the subjects of validation errors
     },
     _cacheValidationErrors : [],
+
     handleValidationError : function(model, error) {
-        // error triggered either by validation or server error
         // error is object w/ fields and error strings
         for (var field in error) {
             var ele = this.$el.find('#' + this.fieldToSelectorMap[field]);
-            if (ele.length === 0) {
-                // check if it might a server error: note a typo in the field name 
-                // or failure to put in a map may cause this to muffle validation errors
-                if (_.has(error, 'error') && _.has(error, 'responseText')) {
-                    CMS.ServerError(model, error);
-                    return;
-                }
-                else continue;
-            }
             this._cacheValidationErrors.push(ele);
             if ($(ele).is('div')) {
                 // put error on the contained inputs

cms/urls.py

 from django.conf import settings
 from django.conf.urls import patterns, include, url
+from . import one_time_startup
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin

common/djangoapps/course_groups/cohorts.py

@@ -120,7 +120,8 @@ def get_cohort(user, course_id):
         return None
 
     choices = course.auto_cohort_groups
-    if len(choices) == 0:
+    n = len(choices)
+    if n == 0:
         # Nowhere to put user
         log.warning("Course %s is auto-cohorted, but there are no"
                     " auto_cohort_groups specified",
@@ -128,7 +129,14 @@ def get_cohort(user, course_id):
         return None
 
     # Put user in a random group, creating it if needed
-    group_name = random.choice(choices)
+    choice = random.randrange(0, n)
+    group_name = choices[choice]
+
+    # Victor: we are seeing very strange behavior on prod, where almost all users
+    # end up in the same group.  Log at INFO to try to figure out what's going on.
+    log.info("DEBUG: adding user {0} to cohort {1}.  choice={2}".format(
+        user, group_name,choice))
+
     group, created = CourseUserGroup.objects.get_or_create(
         course_id=course_id,
         group_type=CourseUserGroup.COHORT,

common/djangoapps/course_groups/tests/tests.py

@@ -6,7 +6,7 @@ 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)
+                                   is_commentable_cohorted, get_cohort_by_name)
 
 from xmodule.modulestore.django import modulestore, _MODULESTORES
 
@@ -180,6 +180,37 @@ class TestCohorts(django.test.TestCase):
                           "user2 should still be in originally placed cohort")
 
 
+    def test_auto_cohorting_randomization(self):
+        """
+        Make sure get_cohort() randomizes properly.
+        """
+        course = modulestore().get_course("edX/toy/2012_Fall")
+        self.assertEqual(course.id, "edX/toy/2012_Fall")
+        self.assertFalse(course.is_cohorted)
+
+        groups = ["group_{0}".format(n) for n in range(5)]
+        self.config_course_cohorts(course, [], cohorted=True,
+                                   auto_cohort=True,
+                                   auto_cohort_groups=groups)
+
+        # Assign 100 users to cohorts
+        for i in range(100):
+            user = User.objects.create(username="test_{0}".format(i),
+                                       email="a@b{0}.com".format(i))
+            get_cohort(user, course.id)
+
+        # Now make sure that the assignment was at least vaguely random:
+        # each cohort should have at least 1, and fewer than 50 students.
+        # (with 5 groups, probability of 0 users in any group is about
+        # .8**100= 2.0e-10)
+        for cohort_name in groups:
+            cohort = get_cohort_by_name(course.id, cohort_name)
+            num_users = cohort.users.count()
+            self.assertGreater(num_users, 1)
+            self.assertLess(num_users, 50)
+
+
+
     def test_get_course_cohorts(self):
         course1_id = 'a/b/c'
         course2_id = 'e/f/g'

common/djangoapps/heartbeat/views.py

@@ -2,8 +2,9 @@ import json
 from datetime import datetime
 from django.http import HttpResponse
 from xmodule.modulestore.django import modulestore
+from dogapi import dog_stats_api
 
-
+@dog_stats_api.timed('edxapp.heartbeat')
 def heartbeat(request):
     """
     Simple view that a loadbalancer can check to verify that the app is up

common/djangoapps/static_replace/__init__.py

@@ -84,12 +84,19 @@ def replace_static_urls(text, data_directory, course_namespace=None):
         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):
+        if settings.DEBUG and finders.find(rest, True):
             return original
+        # if we're running with a MongoBacked store course_namespace is not None, then use studio style urls
+        elif  course_namespace is not None and not isinstance(modulestore(), XMLModuleStore):
+            # first look in the static file pipeline and see if we are trying to reference
+            # a piece of static content which is in the mitx repo (e.g. JS associated with an xmodule)
+            if staticfiles_storage.exists(rest):
+                url = staticfiles_storage.url(rest)
+            else:
+                # if not, then assume it's courseware specific content and then look in the
+                # Mongo-backed database
+                url = StaticContent.convert_legacy_static_url(rest, course_namespace)
         # Otherwise, look the file up in staticfiles_storage, and append the data directory if needed
         else:
             course_path = "/".join((data_directory, rest))

common/djangoapps/student/management/commands/pearson_transfer.py

@@ -10,6 +10,7 @@ import paramiko
 import boto
 
 dog_http_api.api_key = settings.DATADOG_API
+dog_stats_api.start(api_key=settings.DATADOG_API, statsd=True)
 
 
 class Command(BaseCommand):

common/djangoapps/terrain/browser.py

@@ -13,6 +13,7 @@ from django.core.management import call_command
 def initial_setup(server):
     # Launch the browser app (choose one of these below)
     world.browser = Browser('chrome')
+    # world.browser = Browser('phantomjs')
     # world.browser = Browser('firefox')
 
 

common/lib/capa/capa/calc.py

@@ -183,7 +183,7 @@ def evaluator(variables, functions, string, cs=False):
 
     # 0.33k or -17
     number = (Optional(minus | plus) + inner_number
-              + Optional(CaselessLiteral("E") + Optional("-") + number_part)
+              + Optional(CaselessLiteral("E") + Optional((plus | minus)) + number_part)
               + Optional(number_suffix))
     number = number.setParseAction(number_parse_action)  # Convert to number
 

common/lib/capa/capa/capa_problem.py

@@ -29,6 +29,7 @@ import sys
 
 from lxml import etree
 from xml.sax.saxutils import unescape
+from copy import deepcopy
 
 import chem
 import chem.chemcalc
@@ -497,11 +498,10 @@ class LoncapaProblem(object):
 
         Used by get_html.
         '''
-
         if (problemtree.tag == 'script' and problemtree.get('type')
             and 'javascript' in problemtree.get('type')):
             # leave javascript intact.
-            return problemtree
+            return deepcopy(problemtree)
 
         if problemtree.tag in html_problem_semantics:
             return

common/lib/capa/capa/correctmap.py

@@ -111,14 +111,13 @@ class CorrectMap(object):
             return None
 
     def get_npoints(self, answer_id):
-        """ 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):
+        """Return the number of points for an answer, used for partial credit."""
         npoints = self.get_property(answer_id, 'npoints')
-            return npoints if npoints is not None else 1
-        else:
+        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
 
     def set_property(self, answer_id, property, value):

common/lib/capa/capa/inputtypes.py

@@ -366,6 +366,12 @@ class ChoiceGroup(InputTypeBase):
 
         self.choices = self.extract_choices(self.xml)
 
+    @classmethod
+    def get_attributes(cls):
+        return [Attribute("show_correctness", "always"),
+                Attribute("submitted_message", "Answer received.")]
+
+
     def _extra_context(self):
         return {'input_type': self.html_input_type,
                 'choices': self.choices,

common/lib/capa/capa/templates/choicegroup.html

 <form class="choicegroup capa_inputtype" id="inputtype_${id}">
-
-  <fieldset>
-    % for choice_id, choice_description in choices:
-    <label for="input_${id}_${choice_id}">          
-
-        % if choice_id in value:
-        <span class="indicator_container">
-            % if status == 'unsubmitted':
+    <div class="indicator_container">
+    % if input_type == 'checkbox' or not value:
+        % if status == 'unsubmitted' or show_correctness == 'never':
         <span class="unanswered" style="display:inline-block;" id="status_${id}"></span>
         % elif status == 'correct': 
         <span class="correct" id="status_${id}"></span>
@@ -15,23 +10,38 @@
         % elif status == 'incomplete':
         <span class="incorrect" id="status_${id}"></span>
         % endif
-        </span>
-        % else:
-        <span class="indicator_container">&#160;</span>
     % endif
+    </div>
+
+    <fieldset>
 
+        % for choice_id, choice_description in choices:
+        <label for="input_${id}_${choice_id}"
+            % if input_type == 'radio' and choice_id in value:
+            <% 
+                if status == 'correct':
+                    correctness = 'correct'
+                elif status == 'incorrect':
+                    correctness = 'incorrect'
+                else:
+                    correctness = None
+            %>
+            % if correctness and not show_correctness=='never':
+            class="choicegroup_${correctness}"
+            % endif
+            % endif
+            >  
             <input type="${input_type}" name="input_${id}${name_array_suffix}" id="input_${id}_${choice_id}" value="${choice_id}"
             % if choice_id in value:
             checked="true" 
             % endif
-    />
-    
-    ${choice_description}
-
-    </label>
 
+            /> ${choice_description} </label>
         % endfor
         <span id="answer_${id}"></span>
     </fieldset>
 
+    % if show_correctness == "never" and (value or status not in ['unsubmitted']):
+    <div class="capa_alert">${submitted_message}</div>
+    %endif
 </form>

common/lib/capa/capa/tests/test_correctmap.py

@@ -91,12 +91,12 @@ class CorrectMapTest(unittest.TestCase):
                     npoints=0)
 
         # Assert that we get the expected points
-        # If points assigned and correct --> npoints
+        # If points assigned --> npoints
         # If no points assigned and correct --> 1 point
-        # Otherwise --> 0 points
+        # If no points assigned and incorrect --> 0 points
         self.assertEqual(self.cmap.get_npoints('1_2_1'), 5)
         self.assertEqual(self.cmap.get_npoints('2_2_1'), 1)
-        self.assertEqual(self.cmap.get_npoints('3_2_1'), 0)
+        self.assertEqual(self.cmap.get_npoints('3_2_1'), 5)
         self.assertEqual(self.cmap.get_npoints('4_2_1'), 0)
         self.assertEqual(self.cmap.get_npoints('5_2_1'), 0)
 

common/lib/capa/capa/tests/test_html_render.py

@@ -3,6 +3,7 @@ from lxml import etree
 import os
 import textwrap
 import json
+
 import mock
 
 from capa.capa_problem import LoncapaProblem
@@ -49,6 +50,8 @@ class CapaHtmlRenderTest(unittest.TestCase):
         self.assertEqual(test_element.text, "Test include")
 
 
+
+
     def test_process_outtext(self):
         # Generate some XML with <startouttext /> and <endouttext />
         xml_str = textwrap.dedent("""
@@ -86,6 +89,25 @@ class CapaHtmlRenderTest(unittest.TestCase):
         script_element = rendered_html.find('script')
         self.assertEqual(None, script_element)
 
+    def test_render_javascript(self):
+        # Generate some XML with a <script> tag
+        xml_str = textwrap.dedent("""
+            <problem>
+                <script type="text/javascript">function(){}</script>
+            </problem>
+        """)
+
+        # Create the problem
+        problem = LoncapaProblem(xml_str, '1', system=test_system)
+
+        # Render the HTML
+        rendered_html = etree.XML(problem.get_html())
+
+
+        # expect the javascript is still present in the rendered html
+        self.assertTrue("<script type=\"text/javascript\">function(){}</script>" in etree.tostring(rendered_html))
+
+
     def test_render_response_xml(self):
         # Generate some XML for a string response
         kwargs = {'question_text': "Test question",

common/lib/capa/capa/tests/test_inputtypes.py

@@ -102,6 +102,8 @@ class ChoiceGroupTest(unittest.TestCase):
                     'choices': [('foil1', '<text>This is foil One.</text>'),
                                 ('foil2', '<text>This is foil Two.</text>'),
                                 ('foil3', 'This is foil Three.'), ],
+                    'show_correctness': 'always',
+                    'submitted_message': 'Answer received.',
                     'name_array_suffix': expected_suffix,   # what is this for??
                     }
 

common/lib/capa/capa/tests/test_responsetypes.py

@@ -642,6 +642,15 @@ class NumericalResponseTest(ResponseTest):
         incorrect_responses = ["", "2.11", "1.89", "0"]
         self.assert_multiple_grade(problem, correct_responses, incorrect_responses)
 
+    def test_exponential_answer(self):
+        problem = self.build_problem(question_text="What 5 * 10?",
+                                     explanation="The answer is 50",
+                                     answer="5e+1")
+        correct_responses = ["50", "50.0", "5e1", "5e+1", "50e0", "500e-1"]
+        incorrect_responses = ["", "3.9", "4.1", "0", "5.01e1"]
+        self.assert_multiple_grade(problem, correct_responses, incorrect_responses)
+
+
 
 class CustomResponseTest(ResponseTest):
     from response_xml_factory import CustomResponseXMLFactory

common/lib/xmodule/xmodule/capa_module.py

@@ -582,7 +582,7 @@ class CapaModule(XModule):
     @staticmethod
     def make_dict_of_responses(get):
         '''Make dictionary of student responses (aka "answers")
-        get is POST dictionary.
+        get is POST dictionary (Djano QueryDict).
 
         The *get* dict has keys of the form 'x_y', which are mapped
         to key 'y' in the returned dict.  For example,
@@ -606,6 +606,7 @@ class CapaModule(XModule):
             to 'input_1' in the returned dict)
         '''
         answers = dict()
+        
         for key in get:
             # e.g. input_resistor_1 ==> resistor_1
             _, _, name = key.partition('_')
@@ -613,7 +614,7 @@ class CapaModule(XModule):
             # If key has no underscores, then partition
             # will return (key, '', '')
             # We detect this and raise an error
-            if name is '':
+            if not name:
                 raise ValueError("%s must contain at least one underscore" % str(key))
 
             else:
@@ -625,10 +626,7 @@ class CapaModule(XModule):
                 name = name[:-2] if is_list_key else name
 
                 if is_list_key:
-                    if type(get[key]) is list:
-                        val = get[key]
-                    else:
-                        val = [get[key]]
+                    val = get.getlist(key)
                 else:
                     val = get[key]
 

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -10,7 +10,6 @@ from xmodule.open_ended_grading_classes.combined_open_ended_modulev1 import Comb
 
 log = logging.getLogger("mitx.courseware")
 
-
 VERSION_TUPLES = (
     ('1', CombinedOpenEndedV1Descriptor, CombinedOpenEndedV1Module),
 )
@@ -18,6 +17,7 @@ VERSION_TUPLES = (
 DEFAULT_VERSION = 1
 DEFAULT_VERSION = str(DEFAULT_VERSION)
 
+
 class CombinedOpenEndedModule(XModule):
     """
     This is a module that encapsulates all open ended grading (self assessment, peer assessment, etc).
@@ -129,13 +129,15 @@ class CombinedOpenEndedModule(XModule):
             version_index = versions.index(self.version)
 
         static_data = {
-            'rewrite_content_links' : self.rewrite_content_links,
+            'rewrite_content_links': self.rewrite_content_links,
         }
 
         self.child_descriptor = descriptors[version_index](self.system)
-        self.child_definition = descriptors[version_index].definition_from_xml(etree.fromstring(definition['data']), self.system)
+        self.child_definition = descriptors[version_index].definition_from_xml(etree.fromstring(definition['data']),
+                                                                               self.system)
         self.child_module = modules[version_index](self.system, location, self.child_definition, self.child_descriptor,
-            instance_state = json.dumps(instance_state), metadata = self.metadata, static_data= static_data)
+                                                   instance_state=json.dumps(instance_state), metadata=self.metadata,
+                                                   static_data=static_data)
 
     def get_html(self):
         return self.child_module.get_html()

common/lib/xmodule/xmodule/course_module.py

@@ -246,7 +246,7 @@ class CourseDescriptor(SequenceDescriptor):
             policy = json.loads(cls.read_grading_policy(paths, system))
         except ValueError:
             system.error_tracker("Unable to decode grading policy as json")
-            policy = None
+            policy = {}
 
         # cdodge: import the grading policy information that is on disk and put into the
         # descriptor 'definition' bucket as a dictionary so that it is persisted in the DB
@@ -356,7 +356,14 @@ class CourseDescriptor(SequenceDescriptor):
         """
         Return the pdf_textbooks config, as a python object, or None if not specified.
         """
-        return self.metadata.get('pdf_textbooks')
+        return self.metadata.get('pdf_textbooks', [])
+
+    @property
+    def html_textbooks(self):
+        """
+        Return the html_textbooks config, as a python object, or None if not specified.
+        """
+        return self.metadata.get('html_textbooks', [])
 
     @tabs.setter
     def tabs(self, value):

common/lib/xmodule/xmodule/css/capa/display.scss

@@ -42,6 +42,14 @@ section.problem {
     label.choicegroup_correct{
       &:after{
         content: url('../images/correct-icon.png');
+        margin-left:15px
+      }
+    }
+
+    label.choicegroup_incorrect{
+      &:after{
+        content: url('../images/incorrect-icon.png');
+        margin-left:15px;
       }
     }
 
@@ -52,6 +60,7 @@ section.problem {
     .indicator_container {
       float: left;
       width: 25px;
+      height: 1px;
       margin-right: 15px;
     }
 
@@ -69,7 +78,7 @@ section.problem {
     }
 
     text {
-      display: block;
+      display: inline;
       margin-left: 25px;
     }
   }

common/lib/xmodule/xmodule/foldit_module.py

@@ -86,7 +86,10 @@ class FolditModule(XModule):
         """
         from foldit.models import Score
 
-        return [(e['username'], e['score']) for e in Score.get_tops_n(10)]
+        leaders = [(e['username'], e['score']) for e in Score.get_tops_n(10)]
+        leaders.sort(key=lambda x: x[1])
+
+        return leaders
 
     def get_html(self):
         """

common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py

@@ -8,6 +8,7 @@ class ControllerQueryService(GradingService):
     """
     Interface to staff grading backend.
     """
+
     def __init__(self, config, system):
         config['system'] = system
         super(ControllerQueryService, self).__init__(config)
@@ -75,15 +76,16 @@ class ControllerQueryService(GradingService):
         response = self.post(self.take_action_on_flags_url, params)
         return response
 
+
 def convert_seconds_to_human_readable(seconds):
     if seconds < 60:
         human_string = "{0} seconds".format(seconds)
     elif seconds < 60 * 60:
-        human_string = "{0} minutes".format(round(seconds/60,1))
-    elif seconds < (24*60*60):
-        human_string = "{0} hours".format(round(seconds/(60*60),1))
+        human_string = "{0} minutes".format(round(seconds / 60, 1))
+    elif seconds < (24 * 60 * 60):
+        human_string = "{0} hours".format(round(seconds / (60 * 60), 1))
     else:
-        human_string = "{0} days".format(round(seconds/(60*60*24),1))
+        human_string = "{0} days".format(round(seconds / (60 * 60 * 24), 1))
 
     eta_string = "{0}".format(human_string)
     return eta_string

common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py

@@ -19,6 +19,7 @@ class GradingService(object):
     """
     Interface to staff grading backend.
     """
+
     def __init__(self, config):
         self.username = config['username']
         self.password = config['password']

common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py

@@ -5,6 +5,7 @@ to send them to S3.
 
 try:
     from PIL import Image
+
     ENABLE_PIL = True
 except:
     ENABLE_PIL = False
@@ -51,6 +52,7 @@ class ImageProperties(object):
     """
     Class to check properties of an image and to validate if they are allowed.
     """
+
     def __init__(self, image_data):
         """
         Initializes class variables
@@ -141,6 +143,7 @@ class URLProperties(object):
     Checks to see if a URL points to acceptable content.  Added to check if students are submitting reasonable
     links to the peer grading image functionality of the external grading service.
     """
+
     def __init__(self, url_string):
         self.url_string = url_string
 
@@ -252,7 +255,8 @@ def upload_to_s3(file_to_upload, keyname, s3_interface):
         return True, public_url
     except:
         #This is a dev_facing_error
-        error_message = "Could not connect to S3 to upload peer grading image.  Trying to utilize bucket: {0}".format(bucketname.lower())
+        error_message = "Could not connect to S3 to upload peer grading image.  Trying to utilize bucket: {0}".format(
+            bucketname.lower())
         log.error(error_message)
         return False, error_message
 

common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py

@@ -77,7 +77,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             self.send_to_grader(self.latest_answer(), system)
             self.created = False
 
-
     def _parse(self, oeparam, prompt, rubric, system):
         '''
         Parse OpenEndedResponse XML:
@@ -104,7 +103,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             # response types)
         except TypeError, ValueError:
             #This is a dev_facing_error
-            log.exception("Grader payload from external open ended grading server is not a json object! Object: {0}".format(grader_payload))
+            log.exception(
+                "Grader payload from external open ended grading server is not a json object! Object: {0}".format(
+                    grader_payload))
 
         self.initial_display = find_with_default(oeparam, 'initial_display', '')
         self.answer = find_with_default(oeparam, 'answer_display', 'No answer given.')
@@ -148,7 +149,9 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
         for tag in ['feedback', 'submission_id', 'grader_id', 'score']:
             if tag not in survey_responses:
                 #This is a student_facing_error
-                return {'success': False, 'msg': "Could not find needed tag {0} in the survey responses.  Please try submitting again.".format(tag)}
+                return {'success': False,
+                        'msg': "Could not find needed tag {0} in the survey responses.  Please try submitting again.".format(
+                            tag)}
         try:
             submission_id = int(survey_responses['submission_id'])
             grader_id = int(survey_responses['grader_id'])
@@ -266,7 +269,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         return True
 
-
     def get_answers(self):
         """
         Gets and shows the answer for this problem.
@@ -300,7 +302,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         # We want to display available feedback in a particular order.
         # This dictionary specifies which goes first--lower first.
-        priorities = {  # These go at the start of the feedback
+        priorities = {# These go at the start of the feedback
                       'spelling': 0,
                       'grammar': 1,
                       # needs to be after all the other feedback
@@ -411,7 +413,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
 
         return feedback_template, rubric_scores
 
-
     def _parse_score_msg(self, score_msg, system, join_feedback=True):
         """
          Grader reply is a JSON-dump of the following dict
@@ -437,12 +438,12 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'valid': False,
             'score': 0,
             'feedback': '',
-            'rubric_scores' : [[0]],
-            'grader_types' : [''],
-            'feedback_items' : [''],
-            'feedback_dicts' : [{}],
-            'grader_ids' : [0],
-            'submission_ids' : [0],
+            'rubric_scores': [[0]],
+            'grader_types': [''],
+            'feedback_items': [''],
+            'feedback_dicts': [{}],
+            'grader_ids': [0],
+            'submission_ids': [0],
         }
         try:
             score_result = json.loads(score_msg)
@@ -527,12 +528,12 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'valid': True,
             'score': score,
             'feedback': feedback,
-            'rubric_scores' : rubric_scores,
-            'grader_types' : grader_types,
-            'feedback_items' : feedback_items,
-            'feedback_dicts' : feedback_dicts,
-            'grader_ids' : grader_ids,
-            'submission_ids' : submission_ids,
+            'rubric_scores': rubric_scores,
+            'grader_types': grader_types,
+            'feedback_items': feedback_items,
+            'feedback_dicts': feedback_dicts,
+            'grader_ids': grader_ids,
+            'submission_ids': submission_ids,
         }
 
     def latest_post_assessment(self, system, short_feedback=False, join_feedback=True):
@@ -585,7 +586,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             #This is a dev_facing_error
             log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
             #This is a dev_facing_error
-            return json.dumps({'error': 'Error handling action.  Please try again.', 'success' : False})
+            return json.dumps({'error': 'Error handling action.  Please try again.', 'success': False})
 
         before = self.get_progress()
         d = handlers[dispatch](get, system)
@@ -679,7 +680,6 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             correct = ""
             previous_answer = self.initial_display
 
-
         context = {
             'prompt': self.prompt,
             'previous_answer': previous_answer,
@@ -692,7 +692,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'child_type': 'openended',
             'correct': correct,
             'accept_file_upload': self.accept_file_upload,
-            'eta_message' : eta_string,
+            'eta_message': eta_string,
         }
         html = system.render_template('{0}/open_ended.html'.format(self.TEMPLATE_DIR), context)
         return html
@@ -723,7 +723,9 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
         for child in ['openendedparam']:
             if len(xml_object.xpath(child)) != 1:
                 #This is a staff_facing_error
-                raise ValueError("Open Ended definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
+                raise ValueError(
+                    "Open Ended definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(
+                        child))
 
         def parse(k):
             """Assumes that xml_object has child k"""

common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py

@@ -108,13 +108,12 @@ class OpenEndedChild(object):
         self._max_score = static_data['max_score']
         if system.open_ended_grading_interface:
             self.peer_gs = PeerGradingService(system.open_ended_grading_interface, system)
-            self.controller_qs = controller_query_service.ControllerQueryService(system.open_ended_grading_interface,system)
+            self.controller_qs = controller_query_service.ControllerQueryService(system.open_ended_grading_interface,
+                                                                                 system)
         else:
             self.peer_gs = MockPeerGradingService()
             self.controller_qs = None
 
-
-
         self.system = system
 
         self.location_string = location
@@ -152,7 +151,8 @@ class OpenEndedChild(object):
             return True, {
                 'success': False,
                 #This is a student_facing_error
-                'error': 'You have attempted this problem {0} times.  You are allowed {1} attempts.'.format(self.attempts, self.max_attempts)
+                'error': 'You have attempted this problem {0} times.  You are allowed {1} attempts.'.format(
+                    self.attempts, self.max_attempts)
             }
         else:
             return False, {}
@@ -308,7 +308,7 @@ class OpenEndedChild(object):
         @return: Boolean correct.
         """
         correct = False
-        if(isinstance(score, (int, long, float, complex))):
+        if (isinstance(score, (int, long, float, complex))):
             score_ratio = int(score) / float(self.max_score())
             correct = (score_ratio >= 0.66)
         return correct
@@ -342,7 +342,8 @@ class OpenEndedChild(object):
 
             try:
                 image_data.seek(0)
-                success, s3_public_url = open_ended_image_submission.upload_to_s3(image_data, image_key, self.s3_interface)
+                success, s3_public_url = open_ended_image_submission.upload_to_s3(image_data, image_key,
+                                                                                  self.s3_interface)
             except:
                 log.exception("Could not upload image to S3.")
 
@@ -454,16 +455,18 @@ class OpenEndedChild(object):
             success = True
         except:
             #This is a dev_facing_error
-            log.error("Could not contact external open ended graders for location {0} and student {1}".format(self.location_string,student_id))
+            log.error("Could not contact external open ended graders for location {0} and student {1}".format(
+                self.location_string, student_id))
             #This is a student_facing_error
             error_message = "Could not contact the graders.  Please notify course staff."
             return success, allowed_to_submit, error_message
-        if count_graded>=count_required:
+        if count_graded >= count_required:
             return success, allowed_to_submit, ""
         else:
             allowed_to_submit = False
             #This is a student_facing_error
-            error_message = error_string.format(count_required-count_graded, count_graded, count_required, student_sub_count)
+            error_message = error_string.format(count_required - count_graded, count_graded, count_required,
+                                                student_sub_count)
             return success, allowed_to_submit, error_message
 
     def get_eta(self):
@@ -478,7 +481,7 @@ class OpenEndedChild(object):
 
         success = response['success']
         if isinstance(success, basestring):
-            success = (success.lower()=="true")
+            success = (success.lower() == "true")
 
         if success:
             eta = controller_query_service.convert_seconds_to_human_readable(response['eta'])
@@ -487,6 +490,3 @@ class OpenEndedChild(object):
             eta_string = ""
 
         return eta_string
-
-
-

common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py

@@ -14,6 +14,7 @@ class PeerGradingService(GradingService):
     """
     Interface with the grading controller for peer grading
     """
+
     def __init__(self, config, system):
         config['system'] = system
         super(PeerGradingService, self).__init__(config)
@@ -39,7 +40,8 @@ class PeerGradingService(GradingService):
                             {'location': problem_location, 'grader_id': grader_id})
         return self.try_to_decode(self._render_rubric(response))
 
-    def save_grade(self, location, grader_id, submission_id, score, feedback, submission_key, rubric_scores, submission_flagged):
+    def save_grade(self, location, grader_id, submission_id, score, feedback, submission_key, rubric_scores,
+                   submission_flagged):
         data = {'grader_id': grader_id,
                 'submission_id': submission_id,
                 'score': score,
@@ -89,6 +91,7 @@ class PeerGradingService(GradingService):
             pass
         return text
 
+
 """
 This is a mock peer grading service that can be used for unit tests
 without making actual service calls to the grading controller

common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py

@@ -73,7 +73,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         html = system.render_template('{0}/self_assessment_prompt.html'.format(self.TEMPLATE_DIR), context)
         return html
 
-
     def handle_ajax(self, dispatch, get, system):
         """
         This is called by courseware.module_render, to handle an AJAX call.
@@ -95,7 +94,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
             #This is a dev_facing_error
             log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
             #This is a dev_facing_error
-            return json.dumps({'error': 'Error handling action.  Please try again.', 'success' : False})
+            return json.dumps({'error': 'Error handling action.  Please try again.', 'success': False})
 
         before = self.get_progress()
         d = handlers[dispatch](get, system)
@@ -159,7 +158,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
 
         return system.render_template('{0}/self_assessment_hint.html'.format(self.TEMPLATE_DIR), context)
 
-
     def save_answer(self, get, system):
         """
         After the answer is submitted, show the rubric.
@@ -224,7 +222,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
         try:
             score = int(get['assessment'])
             score_list = get.getlist('score_list[]')
-            for i in xrange(0,len(score_list)):
+            for i in xrange(0, len(score_list)):
                 score_list[i] = int(score_list[i])
         except ValueError:
             #This is a dev_facing_error
@@ -305,7 +303,9 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
         for child in expected_children:
             if len(xml_object.xpath(child)) != 1:
                 #This is a staff_facing_error
-                raise ValueError("Self assessment definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(child))
+                raise ValueError(
+                    "Self assessment definition must include exactly one '{0}' tag. Contact the learning sciences group for assistance.".format(
+                        child))
 
         def parse(k):
             """Assumes that xml_object has child k"""

common/lib/xmodule/xmodule/peer_grading_module.py

@@ -53,12 +53,11 @@ class PeerGradingModule(XModule):
         #We need to set the location here so the child modules can use it
         system.set('location', location)
         self.system = system
-        if(self.system.open_ended_grading_interface):
+        if (self.system.open_ended_grading_interface):
             self.peer_gs = PeerGradingService(self.system.open_ended_grading_interface, self.system)
         else:
             self.peer_gs = MockPeerGradingService()
 
-
         self.use_for_single_location = self.metadata.get('use_for_single_location', USE_FOR_SINGLE_LOCATION)
         if isinstance(self.use_for_single_location, basestring):
             self.use_for_single_location = (self.use_for_single_location in TRUE_DICT)
@@ -90,7 +89,6 @@ class PeerGradingModule(XModule):
 
         self.display_due_date = self.timeinfo.display_due_date
 
-
         self.ajax_url = self.system.ajax_url
         if not self.ajax_url.endswith("/"):
             self.ajax_url = self.ajax_url + "/"
@@ -154,7 +152,7 @@ class PeerGradingModule(XModule):
             #This is a dev_facing_error
             log.error("Cannot find {0} in handlers in handle_ajax function for open_ended_module.py".format(dispatch))
             #This is a dev_facing_error
-            return json.dumps({'error': 'Error handling action.  Please try again.', 'success' : False})
+            return json.dumps({'error': 'Error handling action.  Please try again.', 'success': False})
 
         d = handlers[dispatch](get)
 
@@ -191,7 +189,8 @@ class PeerGradingModule(XModule):
         except:
             success, response = self.query_data_for_location()
             if not success:
-                log.exception("No instance data found and could not get data from controller for loc {0} student {1}".format(
+                log.exception(
+                    "No instance data found and could not get data from controller for loc {0} student {1}".format(
                         self.system.location.url(), self.system.anonymous_student_id
                     ))
                 return None
@@ -271,7 +270,8 @@ class PeerGradingModule(XModule):
             error: if there was an error in the submission, this is the error message
         """
 
-        required = set(['location', 'submission_id', 'submission_key', 'score', 'feedback', 'rubric_scores[]', 'submission_flagged'])
+        required = set(['location', 'submission_id', 'submission_key', 'score', 'feedback', 'rubric_scores[]',
+                        'submission_flagged'])
         success, message = self._check_required(get, required)
         if not success:
             return self._err_response(message)
@@ -430,7 +430,9 @@ class PeerGradingModule(XModule):
             return response
         except GradingServiceError:
             #This is a dev_facing_error
-            log.exception("Error saving calibration grade, location: {0}, submission_id: {1}, submission_key: {2}, grader_id: {3}".format(location, submission_id, submission_key, grader_id))
+            log.exception(
+                "Error saving calibration grade, location: {0}, submission_id: {1}, submission_key: {2}, grader_id: {3}".format(
+                    location, submission_id, submission_key, grader_id))
             #This is a student_facing_error
             return self._err_response('There was an error saving your score.  Please notify course staff.')
 
@@ -508,7 +510,6 @@ class PeerGradingModule(XModule):
                 problem['due'] = None
                 problem['closed'] = False
 
-
         ajax_url = self.ajax_url
         html = self.system.render_template('peer_grading/peer_grading.html', {
             'course_id': self.system.course_id,
@@ -531,7 +532,8 @@ class PeerGradingModule(XModule):
             if not self.use_for_single_location:
                 #This is an error case, because it must be set to use a single location to be called without get parameters
                 #This is a dev_facing_error
-                log.error("Peer grading problem in peer_grading_module called with no get parameters, but use_for_single_location is False.")
+                log.error(
+                    "Peer grading problem in peer_grading_module called with no get parameters, but use_for_single_location is False.")
                 return {'html': "", 'success': False}
             problem_location = self.link_to_location
 
@@ -596,7 +598,9 @@ class PeerGradingDescriptor(XmlDescriptor, EditingDescriptor):
         for child in expected_children:
             if len(xml_object.xpath(child)) == 0:
                 #This is a staff_facing_error
-                raise ValueError("Peer grading definition must include at least one '{0}' tag.  Contact the learning sciences group for assistance.".format(child))
+                raise ValueError(
+                    "Peer grading definition must include at least one '{0}' tag.  Contact the learning sciences group for assistance.".format(
+                        child))
 
         def parse_task(k):
             """Assumes that xml_object has child k"""

common/lib/xmodule/xmodule/tests/test_capa_module.py

@@ -11,6 +11,8 @@ from xmodule.capa_module import CapaModule
 from xmodule.modulestore import Location
 from lxml import etree
 
+from django.http import QueryDict
+
 from . import test_system
 
 
@@ -326,14 +328,18 @@ class CapaModuleTest(unittest.TestCase):
 
     def test_parse_get_params(self):
 
+        # We have to set up Django settings in order to use QueryDict
+        from django.conf import settings
+        settings.configure()
+
         # Valid GET param dict
-        valid_get_dict = {'input_1': 'test',
+        valid_get_dict = self._querydict_from_dict({'input_1': 'test',
                                                     'input_1_2': 'test',
                                                     'input_1_2_3': 'test',
                                                     'input_[]_3': 'test',
                                                     'input_4': None,
                                                     'input_5': [],
-                        'input_6': 5}
+                                                    'input_6': 5})
 
         result = CapaModule.make_dict_of_responses(valid_get_dict)
 
@@ -347,20 +353,19 @@ class CapaModuleTest(unittest.TestCase):
 
 
         # Valid GET param dict with list keys
-        valid_get_dict = {'input_2[]': ['test1', 'test2']}
+        valid_get_dict = self._querydict_from_dict({'input_2[]': ['test1', 'test2']})
         result = CapaModule.make_dict_of_responses(valid_get_dict)
         self.assertTrue('2' in result)
-        self.assertEqual(valid_get_dict['input_2[]'], result['2'])
+        self.assertEqual(['test1','test2'], result['2'])
 
         # If we use [] at the end of a key name, we should always
         # get a list, even if there's just one value
-        valid_get_dict = {'input_1[]': 'test'}
+        valid_get_dict = self._querydict_from_dict({'input_1[]': 'test'})
         result = CapaModule.make_dict_of_responses(valid_get_dict)
         self.assertEqual(result['1'], ['test'])
 
-
         # If we have no underscores in the name, then the key is invalid
-        invalid_get_dict = {'input': 'test'}
+        invalid_get_dict = self._querydict_from_dict({'input': 'test'})
         with self.assertRaises(ValueError):
             result = CapaModule.make_dict_of_responses(invalid_get_dict)
 
@@ -368,11 +373,32 @@ class CapaModuleTest(unittest.TestCase):
         # Two equivalent names (one list, one non-list)
         # One of the values would overwrite the other, so detect this
         # and raise an exception
-        invalid_get_dict = {'input_1[]': 'test 1',
-                            'input_1': 'test 2' }
+        invalid_get_dict = self._querydict_from_dict({'input_1[]': 'test 1',
+                                                    'input_1': 'test 2' })
         with self.assertRaises(ValueError):
             result = CapaModule.make_dict_of_responses(invalid_get_dict)
 
+    def _querydict_from_dict(self, param_dict):
+        """ Create a Django QueryDict from a Python dictionary """
+
+        # QueryDict objects are immutable by default, so we make
+        # a copy that we can update.
+        querydict = QueryDict('')
+        copyDict = querydict.copy()
+
+        for (key, val) in param_dict.items():
+
+            # QueryDicts handle lists differently from ordinary values,
+            # so we have to specifically tell the QueryDict that
+            # this is a list
+            if type(val) is list:
+                copyDict.setlist(key, val)
+            else:
+                copyDict[key] = val
+
+        return copyDict
+
+
     def test_check_problem_correct(self):
 
         module = CapaFactory.create(attempts=1)

common/lib/xmodule/xmodule/tests/test_combined_open_ended.py

@@ -14,6 +14,7 @@ from datetime import datetime
 from . import test_system
 
 import test_util_open_ended
+
 """
 Tests for the various pieces of the CombinedOpenEndedGrading system
 
@@ -46,9 +47,9 @@ class OpenEndedChildTest(unittest.TestCase):
         'display_name': 'Name',
         'accept_file_upload': False,
         'close_date': None,
-            's3_interface' : "",
-            'open_ended_grading_interface' : {},
-            'skip_basic_checks' : False,
+        's3_interface': "",
+        'open_ended_grading_interface': {},
+        'skip_basic_checks': False,
     }
     definition = Mock()
     descriptor = Mock()
@@ -58,22 +59,18 @@ class OpenEndedChildTest(unittest.TestCase):
         self.openendedchild = OpenEndedChild(self.test_system, self.location,
                                              self.definition, self.descriptor, self.static_data, self.metadata)
 
-
     def test_latest_answer_empty(self):
         answer = self.openendedchild.latest_answer()
         self.assertEqual(answer, "")
 
-
     def test_latest_score_empty(self):
         answer = self.openendedchild.latest_score()
         self.assertEqual(answer, None)
 
-
     def test_latest_post_assessment_empty(self):
         answer = self.openendedchild.latest_post_assessment(self.test_system)
         self.assertEqual(answer, "")
 
-
     def test_new_history_entry(self):
         new_answer = "New Answer"
         self.openendedchild.new_history_entry(new_answer)
@@ -99,7 +96,6 @@ class OpenEndedChildTest(unittest.TestCase):
         score = self.openendedchild.latest_score()
         self.assertEqual(score, 4)
 
-
     def test_record_latest_post_assessment(self):
         new_answer = "New Answer"
         self.openendedchild.new_history_entry(new_answer)
@@ -124,13 +120,11 @@ class OpenEndedChildTest(unittest.TestCase):
         self.assertEqual(score['score'], new_score)
         self.assertEqual(score['total'], self.static_data['max_score'])
 
-
     def test_reset(self):
         self.openendedchild.reset(self.test_system)
         state = json.loads(self.openendedchild.get_instance_state())
         self.assertEqual(state['state'], OpenEndedChild.INITIAL)
 
-
     def test_is_last_response_correct(self):
         new_answer = "New Answer"
         self.openendedchild.new_history_entry(new_answer)
@@ -165,11 +159,11 @@ class OpenEndedModuleTest(unittest.TestCase):
         'max_score': max_score,
         'display_name': 'Name',
         'accept_file_upload': False,
-            'rewrite_content_links' : "",
+        'rewrite_content_links': "",
         'close_date': None,
-            's3_interface' : test_util_open_ended.S3_INTERFACE,
-            'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
-            'skip_basic_checks' : False,
+        's3_interface': test_util_open_ended.S3_INTERFACE,
+        'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+        'skip_basic_checks': False,
     }
 
     oeparam = etree.XML('''
@@ -188,7 +182,8 @@ class OpenEndedModuleTest(unittest.TestCase):
         self.test_system.location = self.location
         self.mock_xqueue = MagicMock()
         self.mock_xqueue.send_to_queue.return_value = (None, "Message")
-        self.test_system.xqueue = {'interface': self.mock_xqueue, 'callback_url': '/', 'default_queuename': 'testqueue', 'waittime': 1}
+        self.test_system.xqueue = {'interface': self.mock_xqueue, 'callback_url': '/', 'default_queuename': 'testqueue',
+                                   'waittime': 1}
         self.openendedmodule = OpenEndedModule(self.test_system, self.location,
                                                self.definition, self.descriptor, self.static_data, self.metadata)
 
@@ -301,12 +296,12 @@ class CombinedOpenEndedModuleTest(unittest.TestCase):
         'rubric': rubric,
         'max_score': max_score,
         'display_name': 'Name',
-            'accept_file_upload' : False,
-            'rewrite_content_links' : "",
-            'close_date' : "",
-            's3_interface' : test_util_open_ended.S3_INTERFACE,
-            'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
-            'skip_basic_checks' : False,
+        'accept_file_upload': False,
+        'rewrite_content_links': "",
+        'close_date': "",
+        's3_interface': test_util_open_ended.S3_INTERFACE,
+        'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+        'skip_basic_checks': False,
     }
 
     oeparam = etree.XML('''
@@ -344,7 +339,7 @@ class CombinedOpenEndedModuleTest(unittest.TestCase):
                                                     self.location,
                                                     self.definition,
                                                     self.descriptor,
-                                                static_data = self.static_data, 
+                                                    static_data=self.static_data,
                                                     metadata=self.metadata)
 
     def test_get_tag_name(self):

common/lib/xmodule/xmodule/tests/test_self_assessment.py

@@ -10,8 +10,8 @@ from . import test_system
 
 import test_util_open_ended
 
-class SelfAssessmentTest(unittest.TestCase):
 
+class SelfAssessmentTest(unittest.TestCase):
     rubric = '''<rubric><rubric>
         <category>
         <description>Response Quality</description>
@@ -48,9 +48,9 @@ class SelfAssessmentTest(unittest.TestCase):
             'display_name': "Name",
             'accept_file_upload': False,
             'close_date': None,
-                's3_interface' : test_util_open_ended.S3_INTERFACE,
-                'open_ended_grading_interface' : test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
-                'skip_basic_checks' : False,
+            's3_interface': test_util_open_ended.S3_INTERFACE,
+            'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
+            'skip_basic_checks': False,
         }
 
         self.module = SelfAssessmentModule(test_system(), self.location,
@@ -64,13 +64,14 @@ class SelfAssessmentTest(unittest.TestCase):
 
     def test_self_assessment_flow(self):
         responses = {'assessment': '0', 'score_list[]': ['0', '0']}
+
         def get_fake_item(name):
             return responses[name]
 
-        def get_data_for_location(self,location,student):
+        def get_data_for_location(self, location, student):
             return {
-            'count_graded' : 0,
-            'count_required' : 0,
+                'count_graded': 0,
+                'count_required': 0,
                 'student_sub_count': 0,
             }
 
@@ -89,7 +90,6 @@ class SelfAssessmentTest(unittest.TestCase):
         self.module.save_assessment(mock_query_dict, self.module.system)
         self.assertEqual(self.module.state, self.module.DONE)
 
-
         d = self.module.reset({})
         self.assertTrue(d['success'])
         self.assertEqual(self.module.state, self.module.INITIAL)

common/lib/xmodule/xmodule/tests/test_util_open_ended.py

 OPEN_ENDED_GRADING_INTERFACE = {
-    'url' : 'http://127.0.0.1:3033/',
-    'username' : 'incorrect',
-    'password' : 'incorrect',
-    'staff_grading' : 'staff_grading',
-    'peer_grading' : 'peer_grading',
-    'grading_controller' : 'grading_controller'
+    'url': 'http://127.0.0.1:3033/',
+    'username': 'incorrect',
+    'password': 'incorrect',
+    'staff_grading': 'staff_grading',
+    'peer_grading': 'peer_grading',
+    'grading_controller': 'grading_controller'
 }
 
 S3_INTERFACE = {
-    'aws_access_key' : "",
-    'aws_secret_key' : "",
-    "aws_bucket_name" : "",
+    'aws_access_key': "",
+    'aws_secret_key': "",
+    "aws_bucket_name": "",
 }
\ No newline at end of file

github-requirements.txt

@@ -3,4 +3,3 @@
 -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
 -e git://github.com/MITx/django-wiki.git@e2e84558#egg=django-wiki
 -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
--e git://github.com/MITx/dogapi.git@003a4fc9#egg=dogapi

jenkins/quality.sh

-#! /bin/bash
-
-set -e
-set -x
-
-git remote prune origin
-
-# Reset the submodule, in case it changed
-git submodule foreach 'git reset --hard HEAD'
-
-# Set the IO encoding to UTF-8 so that askbot will start
-export PYTHONIOENCODING=UTF-8
-
-rake clobber
-rake pep8 || echo "pep8 failed, continuing"
-rake pylint || echo "pylint failed, continuing"

jenkins/test.sh

@@ -38,6 +38,9 @@ pip install -q -r test-requirements.txt
 yes w | pip install -q -r requirements.txt
 
 rake clobber
+rake pep8
+rake pylint
+
 TESTS_FAILED=0
 rake test_cms[false] || TESTS_FAILED=1
 rake test_lms[false] || TESTS_FAILED=1

lms/djangoapps/courseware/module_render.py

@@ -500,7 +500,7 @@ def modx_dispatch(request, dispatch, location, course_id):
     if instance is None:
         # Either permissions just changed, or someone is trying to be clever
         # and load something they shouldn't have access to.
-        log.debug("No module {0} for user {1}--access denied?".format(location, user))
+        log.debug("No module {0} for user {1}--access denied?".format(location, request.user))
         raise Http404
 
     instance_module = get_instance_module(course_id, request.user, instance, student_module_cache)

lms/djangoapps/courseware/tabs.py

@@ -130,6 +130,17 @@ def _pdf_textbooks(tab, user, course, active_page):
                 for index, textbook in enumerate(course.pdf_textbooks)]
     return []
 
+def _html_textbooks(tab, user, course, active_page):
+    """
+    Generates one tab per textbook.  Only displays if user is authenticated.
+    """
+    if user.is_authenticated():
+        # since there can be more than one textbook, active_page is e.g. "book/0".
+        return [CourseTab(textbook['tab_title'], reverse('html_book', args=[course.id, index]),
+                          active_page == "htmltextbook/{0}".format(index))
+                for index, textbook in enumerate(course.html_textbooks)]
+    return []
+
 def _staff_grading(tab, user, course, active_page):
     if has_access(user, course, 'staff'):
         link = reverse('staff_grading', args=[course.id])
@@ -209,6 +220,7 @@ VALID_TAB_TYPES = {
     'external_link': TabImpl(key_checker(['name', 'link']), _external_link),
     'textbooks': TabImpl(null_validator, _textbooks),
     'pdf_textbooks': TabImpl(null_validator, _pdf_textbooks),
+    'html_textbooks': TabImpl(null_validator, _html_textbooks),
     'progress': TabImpl(need_name, _progress),
     'static_tab': TabImpl(key_checker(['name', 'url_slug']), _static_tab),
     'peer_grading': TabImpl(null_validator, _peer_grading),

lms/djangoapps/django_comment_client/utils.py

@@ -18,7 +18,6 @@ import pystache_custom as pystache
 
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.search import path_to_location
 
 log = logging.getLogger(__name__)
 
@@ -166,7 +165,6 @@ def initialize_discussion_info(course):
     # get all discussion models within this course_id
     all_modules = modulestore().get_items(['i4x', course.location.org, course.location.course, 'discussion', None], course_id=course_id)
 
-    path_to_locations = {}
     for module in all_modules:
         skip_module = False
         for key in ('id', 'discussion_category', 'for'):
@@ -174,14 +172,6 @@ def initialize_discussion_info(course):
                 log.warning("Required key '%s' not in discussion %s, leaving out of category map" % (key, module.location))
                 skip_module = True
 
-        # cdodge: pre-compute the path_to_location. Note this can throw an exception for any
-        # dangling discussion modules
-        try:
-            path_to_locations[module.location] = path_to_location(modulestore(), course.id, module.location)
-        except NoPathToItem:
-            log.warning("Could not compute path_to_location for {0}. Perhaps this is an orphaned discussion module?!? Skipping...".format(module.location))
-            skip_module = True
-
         if skip_module:
             continue
 
@@ -246,7 +236,6 @@ def initialize_discussion_info(course):
     _DISCUSSIONINFO[course.id]['id_map'] = discussion_id_map
     _DISCUSSIONINFO[course.id]['category_map'] = category_map
     _DISCUSSIONINFO[course.id]['timestamp'] = datetime.now()
-    _DISCUSSIONINFO[course.id]['path_to_location'] = path_to_locations
 
 
 class JsonResponse(HttpResponse):
@@ -403,21 +392,8 @@ def get_courseware_context(content, course):
         location = id_map[id]["location"].url()
         title = id_map[id]["title"]
 
-        # cdodge: did we pre-compute, if so, then let's use that rather than recomputing
-        if 'path_to_location' in _DISCUSSIONINFO[course.id] and location in _DISCUSSIONINFO[course.id]['path_to_location']:
-            (course_id, chapter, section, position) = _DISCUSSIONINFO[course.id]['path_to_location'][location]
-        else:
-            try:
-                (course_id, chapter, section, position) = path_to_location(modulestore(), course.id, location)
-            except NoPathToItem:
-                # Object is not in the graph any longer, let's just get path to the base of the course
-                # so that we can at least return something to the caller
-                (course_id, chapter, section, position) = path_to_location(modulestore(), course.id, course.location)
-
-        url = reverse('courseware_position', kwargs={"course_id":course_id,
-                                                     "chapter":chapter,
-                                                     "section":section,
-                                                     "position":position})
+        url = reverse('jump_to', kwargs={"course_id":course.location.course_id, 
+                                                    "location": location})
 
         content_info = {"courseware_url": url, "courseware_title": title}
     return content_info

lms/djangoapps/foldit/models.py

@@ -59,7 +59,7 @@ class Score(models.Model):
         scores = Score.objects \
             .filter(puzzle_id__in=puzzles) \
             .annotate(total_score=models.Sum('best_score')) \
-            .order_by('-total_score')[:n]
+            .order_by('total_score')[:n]
         num = len(puzzles)
 
         return [{'username': s.user.username,

lms/djangoapps/foldit/tests.py

@@ -143,11 +143,12 @@ class FolditTestCase(TestCase):
     def test_SetPlayerPuzzleScores_manyplayers(self):
         """
         Check that when we send scores from multiple users, the correct order
-        of scores is displayed.
+        of scores is displayed. Note that, before being processed by
+        display_score, lower scores are better.
         """
         puzzle_id = ['1']
-        player1_score = 0.07
-        player2_score = 0.08
+        player1_score = 0.08
+        player2_score = 0.02
         response1 = self.make_puzzle_score_request(puzzle_id, player1_score,
                 self.user)
 
@@ -164,8 +165,12 @@ class FolditTestCase(TestCase):
         self.assertEqual(len(top_10), 2)
 
         # Top score should be player2_score. Second should be player1_score
-        self.assertEqual(top_10[0]['score'], Score.display_score(player2_score))
-        self.assertEqual(top_10[1]['score'], Score.display_score(player1_score))
+        self.assertAlmostEqual(top_10[0]['score'],
+                Score.display_score(player2_score),
+                delta=0.5)
+        self.assertAlmostEqual(top_10[1]['score'],
+                Score.display_score(player1_score),
+                delta=0.5)
 
         # Top score user should be self.user2.username
         self.assertEqual(top_10[0]['username'], self.user2.username)

lms/djangoapps/open_ended_grading/open_ended_notifications.py

@@ -22,7 +22,7 @@ NOTIFICATION_TYPES = (
     ('staff_needs_to_grade', 'staff_grading', 'Staff Grading'),
     ('new_student_grading_to_view', 'open_ended_problems', 'Problems you have submitted'),
     ('flagged_submissions_exist', 'open_ended_flagged_problems', 'Flagged Submissions')
-    )
+)
 
 
 def staff_grading_notifications(course, user):
@@ -46,7 +46,9 @@ def staff_grading_notifications(course, user):
         #Non catastrophic error, so no real action
         notifications = {}
         #This is a dev_facing_error
-        log.info("Problem with getting notifications from staff grading service for course {0} user {1}.".format(course_id, student_id))
+        log.info(
+            "Problem with getting notifications from staff grading service for course {0} user {1}.".format(course_id,
+                                                                                                            student_id))
 
     if pending_grading:
         img_path = "/static/images/grading_notification.png"
@@ -80,7 +82,9 @@ def peer_grading_notifications(course, user):
         #Non catastrophic error, so no real action
         notifications = {}
         #This is a dev_facing_error
-        log.info("Problem with getting notifications from peer grading service for course {0} user {1}.".format(course_id, student_id))
+        log.info(
+            "Problem with getting notifications from peer grading service for course {0} user {1}.".format(course_id,
+                                                                                                           student_id))
 
     if pending_grading:
         img_path = "/static/images/grading_notification.png"
@@ -105,7 +109,9 @@ def combined_notifications(course, user):
         return notification_dict
 
     min_time_to_query = user.last_login
-    last_module_seen = StudentModule.objects.filter(student=user, course_id=course_id, modified__gt=min_time_to_query).values('modified').order_by('-modified')
+    last_module_seen = StudentModule.objects.filter(student=user, course_id=course_id,
+                                                    modified__gt=min_time_to_query).values('modified').order_by(
+        '-modified')
     last_module_seen_count = last_module_seen.count()
 
     if last_module_seen_count > 0:
@@ -117,7 +123,8 @@ def combined_notifications(course, user):
 
     img_path = ""
     try:
-        controller_response = controller_qs.check_combined_notifications(course.id, student_id, user_is_staff, last_time_viewed)
+        controller_response = controller_qs.check_combined_notifications(course.id, student_id, user_is_staff,
+                                                                         last_time_viewed)
         log.debug(controller_response)
         notifications = json.loads(controller_response)
         if notifications['success']:
@@ -127,7 +134,9 @@ def combined_notifications(course, user):
         #Non catastrophic error, so no real action
         notifications = {}
         #This is a dev_facing_error
-        log.exception("Problem with getting notifications from controller query service for course {0} user {1}.".format(course_id, student_id))
+        log.exception(
+            "Problem with getting notifications from controller query service for course {0} user {1}.".format(
+                course_id, student_id))
 
     if pending_grading:
         img_path = "/static/images/grading_notification.png"
@@ -151,7 +160,8 @@ def set_value_in_cache(student_id, course_id, notification_type, value):
 
 
 def create_key_name(student_id, course_id, notification_type):
-    key_name = "{prefix}{type}_{course}_{student}".format(prefix=KEY_PREFIX, type=notification_type, course=course_id, student=student_id)
+    key_name = "{prefix}{type}_{course}_{student}".format(prefix=KEY_PREFIX, type=notification_type, course=course_id,
+                                                          student=student_id)
     return key_name
 
 

lms/djangoapps/open_ended_grading/staff_grading.py

@@ -15,6 +15,7 @@ class StaffGrading(object):
     """
     Wrap up functionality for staff grading of submissions--interface exposes get_html, ajax views.
     """
+
     def __init__(self, course):
         self.course = course
 

lms/djangoapps/open_ended_grading/staff_grading_service.py

@@ -20,10 +20,12 @@ log = logging.getLogger(__name__)
 
 STAFF_ERROR_MESSAGE = 'Could not contact the external grading server.  Please contact the development team.  If you do not have a point of contact, you can contact Vik at vik@edx.org.'
 
+
 class MockStaffGradingService(object):
     """
     A simple mockup of a staff grading service, testing.
     """
+
     def __init__(self):
         self.cnt = 0
 
@@ -45,13 +47,16 @@ class MockStaffGradingService(object):
         return json.dumps({'success': True,
                            'problem_list': [
                                json.dumps({'location': 'i4x://MITx/3.091x/problem/open_ended_demo1',
-            'problem_name': "Problem 1", 'num_graded': 3, 'num_pending': 5, 'min_for_ml': 10}),
+                                           'problem_name': "Problem 1", 'num_graded': 3, 'num_pending': 5,
+                                           'min_for_ml': 10}),
                                json.dumps({'location': 'i4x://MITx/3.091x/problem/open_ended_demo2',
-            'problem_name': "Problem 2", 'num_graded': 1, 'num_pending': 5, 'min_for_ml': 10})
+                                           'problem_name': "Problem 2", 'num_graded': 1, 'num_pending': 5,
+                                           'min_for_ml': 10})
                            ]})
 
 
-    def save_grade(self, course_id, grader_id, submission_id, score, feedback, skipped, rubric_scores, submission_flagged):
+    def save_grade(self, course_id, grader_id, submission_id, score, feedback, skipped, rubric_scores,
+                   submission_flagged):
         return self.get_next(course_id, 'fake location', grader_id)
 
 
@@ -59,6 +64,7 @@ class StaffGradingService(GradingService):
     """
     Interface to staff grading backend.
     """
+
     def __init__(self, config):
         config['system'] = ModuleSystem(None, None, None, render_to_string, None)
         super(StaffGradingService, self).__init__(config)
@@ -114,7 +120,8 @@ class StaffGradingService(GradingService):
         return json.dumps(self._render_rubric(response))
 
 
-    def save_grade(self, course_id, grader_id, submission_id, score, feedback, skipped, rubric_scores, submission_flagged):
+    def save_grade(self, course_id, grader_id, submission_id, score, feedback, skipped, rubric_scores,
+                   submission_flagged):
         """
         Save a score and feedback for a submission.
 
@@ -297,7 +304,7 @@ def save_grade(request, course_id):
     if request.method != 'POST':
         raise Http404
 
-    required = set(['score', 'feedback', 'submission_id', 'location','submission_flagged', 'rubric_scores[]'])
+    required = set(['score', 'feedback', 'submission_id', 'location', 'submission_flagged', 'rubric_scores[]'])
     actual = set(request.POST.keys())
     missing = required - actual
     if len(missing) > 0:
@@ -307,7 +314,6 @@ def save_grade(request, course_id):
     grader_id = unique_id_for_user(request.user)
     p = request.POST
 
-
     location = p['location']
     skipped = 'skipped' in p
 
@@ -322,7 +328,9 @@ def save_grade(request, course_id):
                                                          p['submission_flagged'])
     except GradingServiceError:
         #This is a dev_facing_error
-        log.exception("Error saving grade in the staff grading interface in open ended grading.  Request: {0} Course ID: {1}".format(request, course_id))
+        log.exception(
+            "Error saving grade in the staff grading interface in open ended grading.  Request: {0} Course ID: {1}".format(
+                request, course_id))
         #This is a staff_facing_error
         return _err_response(STAFF_ERROR_MESSAGE)
 
@@ -330,13 +338,16 @@ def save_grade(request, course_id):
         result = json.loads(result_json)
     except ValueError:
         #This is a dev_facing_error
-        log.exception("save_grade returned broken json in the staff grading interface in open ended grading: {0}".format(result_json))
+        log.exception(
+            "save_grade returned broken json in the staff grading interface in open ended grading: {0}".format(
+                result_json))
         #This is a staff_facing_error
         return _err_response(STAFF_ERROR_MESSAGE)
 
     if not result.get('success', False):
         #This is a dev_facing_error
-        log.warning('Got success=False from staff grading service in open ended grading.  Response: {0}'.format(result_json))
+        log.warning(
+            'Got success=False from staff grading service in open ended grading.  Response: {0}'.format(result_json))
         return _err_response(STAFF_ERROR_MESSAGE)
 
     # Ok, save_grade seemed to work.  Get the next submission to grade.

lms/djangoapps/open_ended_grading/tests.py

@@ -22,6 +22,7 @@ from xmodule.x_module import ModuleSystem
 from mitxmako.shortcuts import render_to_string
 
 import logging
+
 log = logging.getLogger(__name__)
 from django.test.utils import override_settings
 from django.http import QueryDict
@@ -36,6 +37,7 @@ class TestStaffGradingService(ct.PageLoader):
     access control and error handling logic -- all the actual work is on the
     backend.
     '''
+
     def setUp(self):
         xmodule.modulestore.django._MODULESTORES = {}
 
@@ -50,6 +52,7 @@ class TestStaffGradingService(ct.PageLoader):
 
         self.course_id = "edX/toy/2012_Fall"
         self.toy = modulestore().get_course(self.course_id)
+
         def make_instructor(course):
             group_name = _course_staff_group_name(course.location)
             g = Group.objects.create(name=group_name)
@@ -130,6 +133,7 @@ class TestPeerGradingService(ct.PageLoader):
     access control and error handling logic -- all the actual work is on the
     backend.
     '''
+
     def setUp(self):
         xmodule.modulestore.django._MODULESTORES = {}
 
@@ -148,11 +152,12 @@ class TestPeerGradingService(ct.PageLoader):
 
         self.mock_service = peer_grading_service.MockPeerGradingService()
         self.system = ModuleSystem(location, None, None, render_to_string, None,
-            s3_interface = test_util_open_ended.S3_INTERFACE,
+                                   s3_interface=test_util_open_ended.S3_INTERFACE,
                                    open_ended_grading_interface=test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE
         )
         self.descriptor = peer_grading_module.PeerGradingDescriptor(self.system)
-        self.peer_module = peer_grading_module.PeerGradingModule(self.system, location, "<peergrading/>", self.descriptor)
+        self.peer_module = peer_grading_module.PeerGradingModule(self.system, location, "<peergrading/>",
+                                                                 self.descriptor)
         self.peer_module.peer_gs = self.mock_service
         self.logout()
 
@@ -185,8 +190,10 @@ class TestPeerGradingService(ct.PageLoader):
         }
 
         qdict = MagicMock()
+
         def fake_get_item(key):
             return data[key]
+
         qdict.__getitem__.side_effect = fake_get_item
         qdict.getlist = fake_get_item
         qdict.keys = data.keys
@@ -247,8 +254,10 @@ class TestPeerGradingService(ct.PageLoader):
         }
 
         qdict = MagicMock()
+
         def fake_get_item(key):
             return data[key]
+
         qdict.__getitem__.side_effect = fake_get_item
         qdict.getlist = fake_get_item
         qdict.keys = data.keys

lms/djangoapps/open_ended_grading/views.py

@@ -50,22 +50,24 @@ def _reverse_without_slash(url_name, course_id):
     ajax_url = reverse(url_name, kwargs={'course_id': course_id})
     return ajax_url
 
+
 DESCRIPTION_DICT = {
     'Peer Grading': "View all problems that require peer assessment in this particular course.",
     'Staff Grading': "View ungraded submissions submitted by students for the open ended problems in the course.",
     'Problems you have submitted': "View open ended problems that you have previously submitted for grading.",
     'Flagged Submissions': "View submissions that have been flagged by students as inappropriate."
-    }
+}
 ALERT_DICT = {
     'Peer Grading': "New submissions to grade",
     'Staff Grading': "New submissions to grade",
     'Problems you have submitted': "New grades have been returned",
     'Flagged Submissions': "Submissions have been flagged for review"
-    }
+}
 
 STUDENT_ERROR_MESSAGE = "Error occured while contacting the grading service.  Please notify course staff."
 STAFF_ERROR_MESSAGE = "Error occured while contacting the grading service.  Please notify the development team.  If you do not have a point of contact, please email Vik at vik@edx.org"
 
+
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 def staff_grading(request, course_id):
     """
@@ -92,7 +94,7 @@ def peer_grading(request, course_id):
     #Get the current course
     course = get_course_with_access(request.user, course_id, 'load')
     course_id_parts = course.id.split("/")
-    false_dict = [False,"False", "false", "FALSE"]
+    false_dict = [False, "False", "false", "FALSE"]
 
     #Reverse the base course url
     base_course_url = reverse('courses')
@@ -174,7 +176,7 @@ def student_problem_list(request, course_id):
                 except:
                     #This is a student_facing_error
                     eta_string = "Error getting ETA."
-            problem_list[i].update({'eta_string' : eta_string})
+            problem_list[i].update({'eta_string': eta_string})
 
     except GradingServiceError:
         #This is a student_facing_error
@@ -318,12 +320,13 @@ def take_action_on_flags(request, course_id):
     if request.method != 'POST':
         raise Http404
 
-
     required = ['submission_id', 'action_type', 'student_id']
     for key in required:
         if key not in request.POST:
             #This is a staff_facing_error
-            return HttpResponse(json.dumps({'success': False, 'error': STAFF_ERROR_MESSAGE + 'Missing key {0} from submission.  Please reload and try again.'.format(key)}),
+            return HttpResponse(json.dumps({'success': False,
+                                            'error': STAFF_ERROR_MESSAGE + 'Missing key {0} from submission.  Please reload and try again.'.format(
+                                                key)}),
                                 mimetype="application/json")
 
     p = request.POST
@@ -338,5 +341,7 @@ def take_action_on_flags(request, course_id):
         return HttpResponse(response, mimetype="application/json")
     except GradingServiceError:
         #This is a dev_facing_error
-        log.exception("Error taking action on flagged peer grading submissions, submission_id: {0}, action_type: {1}, grader_id: {2}".format(submission_id, action_type, grader_id))
+        log.exception(
+            "Error taking action on flagged peer grading submissions, submission_id: {0}, action_type: {1}, grader_id: {2}".format(
+                submission_id, action_type, grader_id))
         return _err_response(STAFF_ERROR_MESSAGE)

lms/djangoapps/staticbook/views.py

 from lxml import etree
 
-# from django.conf import settings
 from django.contrib.auth.decorators import login_required
+from django.http import Http404
 from mitxmako.shortcuts import render_to_response
 
 from courseware.access import has_access
@@ -15,6 +15,8 @@ def index(request, course_id, book_index, page=None):
     staff_access = has_access(request.user, course, 'staff')
 
     book_index = int(book_index)
+    if book_index < 0 or book_index >= len(course.textbooks):
+        raise Http404("Invalid book index value: {0}".format(book_index))
     textbook = course.textbooks[book_index]
     table_of_contents = textbook.table_of_contents
 
@@ -40,6 +42,8 @@ def pdf_index(request, course_id, book_index, chapter=None, page=None):
     staff_access = has_access(request.user, course, 'staff')
 
     book_index = int(book_index)
+    if book_index < 0 or book_index >= len(course.pdf_textbooks):
+        raise Http404("Invalid book index value: {0}".format(book_index))
     textbook = course.pdf_textbooks[book_index]
 
     def remap_static_url(original_url, course):
@@ -67,3 +71,39 @@ def pdf_index(request, course_id, book_index, chapter=None, page=None):
                                'chapter': chapter,
                                'page': page,
                                'staff_access': staff_access})
+
+@login_required
+def html_index(request, course_id, book_index, chapter=None, anchor_id=None):
+    course = get_course_with_access(request.user, course_id, 'load')
+    staff_access = has_access(request.user, course, 'staff')
+
+    book_index = int(book_index)
+    if book_index < 0 or book_index >= len(course.html_textbooks):
+        raise Http404("Invalid book index value: {0}".format(book_index))
+    textbook = course.html_textbooks[book_index]
+
+    def remap_static_url(original_url, course):
+        input_url = "'" + original_url + "'"
+        output_url = replace_static_urls(
+                    input_url,
+                    course.metadata['data_dir'],
+                    course_namespace=course.location
+                )
+        # strip off the quotes again...
+        return output_url[1:-1]
+
+    if 'url' in textbook:
+        textbook['url'] = remap_static_url(textbook['url'], course)
+    # then remap all the chapter URLs as well, if they are provided.
+    if 'chapters' in textbook:
+        for entry in textbook['chapters']:
+            entry['url'] = remap_static_url(entry['url'], course)
+
+
+    return render_to_response('static_htmlbook.html',
+                              {'book_index': book_index,
+                               'course': course,
+                               'textbook': textbook,
+                               'chapter': chapter,
+                               'anchor_id': anchor_id,
+                               'staff_access': staff_access})

lms/one_time_startup.py

+from dogapi import dog_http_api, dog_stats_api
+from django.conf import settings
+
+if hasattr(settings, 'DATADOG_API'):
+    dog_http_api.api_key = settings.DATADOG_API
+    dog_stats_api.start(api_key=settings.DATADOG_API, statsd=True)

lms/static/sass/course/_textbook.scss

@@ -158,6 +158,19 @@ div.book-wrapper {
       img {
         max-width: 100%;
       }
+
+      div {
+        text-align: left;
+	line-height: 1.6em;
+	margin-left: 5px;
+	margin-right: 5px;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	
+	.Paragraph, h2 {
+	   margin-top: 10px;
+	}	   
+      }
     }
   }
 

lms/templates/static_htmlbook.html

+<%inherit file="main.html" />
+<%namespace name='static' file='static_content.html'/>
+<%block name="title"><title>${course.number} Textbook</title>
+</%block>
+
+<%block name="headextra">
+<%static:css group='course'/>
+<%static:js group='courseware'/>
+</%block>
+
+<%block name="js_extra">
+  <script type="text/javascript">
+(function($) {
+    $.fn.myHTMLViewer = function(options) {
+        var urlToLoad = null;
+        if (options.url) {
+            urlToLoad = options.url;
+        }
+        var chapterUrls = null;
+        if (options.chapters) {
+            chapterUrls = options.chapters;
+        }
+        var chapterToLoad = 1;
+        if (options.chapterNum) {
+            // TODO: this should only be specified if there are 
+            // chapters, and it should be in-bounds.
+            chapterToLoad = options.chapterNum;
+        }
+        var anchorToLoad = null;
+        if (options.chapters) {
+            anchorToLoad = options.anchor_id;
+        }
+
+        loadUrl = function htmlViewLoadUrl(url, anchorId) {
+            // clear out previous load, if any:
+            parentElement = document.getElementById('bookpage');
+            while (parentElement.hasChildNodes())
+                parentElement.removeChild(parentElement.lastChild);
+	    // load new URL in:
+            $('#bookpage').load(url);
+
+	    // if there is an anchor set, then go to that location:
+            if (anchorId != null) {
+		// TODO: add implementation....
+            } 
+
+        }; 
+
+        loadChapterUrl = function htmlViewLoadChapterUrl(chapterNum, anchorId) {
+            if (chapterNum < 1 || chapterNum > chapterUrls.length) {
+                return;
+            }
+            var chapterUrl = chapterUrls[chapterNum-1];
+            loadUrl(chapterUrl, anchorId);
+        };
+
+        // define navigation links for chapters:  
+        if (chapterUrls != null) {
+            var loadChapterUrlHelper = function(i) {
+                return function(event) {
+                    // when opening a new chapter, always open to the top:
+                    loadChapterUrl(i, null);
+                };
+            };
+            for (var index = 1; index <= chapterUrls.length; index += 1) {
+                $("#htmlchapter-" + index).click(loadChapterUrlHelper(index));
+            }   
+        }
+
+        // finally, load the appropriate url/page
+        if (urlToLoad != null) {
+            loadUrl(urlToLoad, anchorToLoad);
+        } else {
+            loadChapterUrl(chapterToLoad, anchorToLoad);
+        }       
+
+    }
+})(jQuery);
+
+    $(document).ready(function() {
+        var options = {};
+        %if 'url' in textbook:
+            options.url = "${textbook['url']}";
+        %endif
+        %if 'chapters' in textbook:
+            var chptrs = [];
+            %for chap in textbook['chapters']:
+                chptrs.push("${chap['url']}");
+            %endfor
+            options.chapters = chptrs;
+        %endif
+        %if chapter is not None:
+            options.chapterNum = ${chapter};
+        %endif
+        %if anchor_id is not None:
+            options.anchor_id = ${anchor_id};
+        %endif
+
+        $('#outerContainer').myHTMLViewer(options);
+    });
+  </script>  
+</%block>
+
+<%include file="/courseware/course_navigation.html" args="active_page='htmltextbook/{0}'.format(book_index)" />
+
+    <div id="outerContainer">
+      <div id="mainContainer" class="book-wrapper">
+
+        %if 'chapters' in textbook:
+        <section aria-label="Textbook Navigation" class="book-sidebar">
+          <ul id="booknav" class="treeview-booknav">
+            <%def name="print_entry(entry, index_value)">
+              <li id="htmlchapter-${index_value}">
+                <a class="chapter">
+                  ${entry.get('title')}
+                </a>
+              </li>
+            </%def>
+
+            %for (index, entry) in enumerate(textbook['chapters']):
+              ${print_entry(entry, index+1)}
+            % endfor
+          </ul>
+        </section>
+        %endif
+
+        <section id="viewerContainer" class="book">
+          <section class="page"> 
+            <div id="bookpage" />
+          </section> 
+        </section>
+
+      </div>
+    </div>
+

lms/urls.py

@@ -3,6 +3,9 @@ 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
+
+from . import one_time_startup
+
 import django.contrib.auth.views
 
 # Uncomment the next two lines to enable the admin:
@@ -277,6 +280,15 @@ if settings.COURSEWARE_ENABLED:
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/pdfbook/(?P<book_index>[^/]*)/chapter/(?P<chapter>[^/]*)/(?P<page>[^/]*)$',
             'staticbook.views.pdf_index'),
 
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/htmlbook/(?P<book_index>[^/]*)/$',
+            'staticbook.views.html_index', name="html_book"),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/htmlbook/(?P<book_index>[^/]*)/chapter/(?P<chapter>[^/]*)/$',
+            'staticbook.views.html_index'),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/htmlbook/(?P<book_index>[^/]*)/chapter/(?P<chapter>[^/]*)/(?P<anchor_id>[^/]*)/$',
+            'staticbook.views.html_index'),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/htmlbook/(?P<book_index>[^/]*)/(?P<anchor_id>[^/]*)/$',
+            'staticbook.views.html_index'),
+
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/courseware/?$',
             'courseware.views.index', name="courseware"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/courseware/(?P<chapter>[^/]*)/$',

requirements.txt

@@ -58,3 +58,4 @@ ipython==0.13.1
 xmltodict==0.4.1
 paramiko==1.9.0
 Pillow==1.7.8
+dogapi==1.2.1