Skip to content

E
edx-platform
Commit 44cfcb88 by Chris Dodge
Options

Merge branch 'master' into feature/cdodge/cms-master-merge4

parents 0e2d8be4 7ac36d2f
Showing with 473 additions and 400 deletions
common/djangoapps/student/models.py
...@@ -272,8 +272,9 @@ class TestCenterUserForm(ModelForm): ...@@ -272,8 +272,9 @@ class TestCenterUserForm(ModelForm):
new_user = self.save(commit=False) new_user = self.save(commit=False)
# create additional values here: # create additional values here:
new_user.user_updated_at = datetime.utcnow() new_user.user_updated_at = datetime.utcnow()
new_user.upload_status = ''
new_user.save() new_user.save()
log.info("Updated demographic information for user's test center exam registration: username \"{}\" ".format(new_user.username)) log.info("Updated demographic information for user's test center exam registration: username \"{}\" ".format(new_user.user.username))
# add validation: # add validation:
...@@ -534,6 +535,7 @@ class TestCenterRegistrationForm(ModelForm): ...@@ -534,6 +535,7 @@ class TestCenterRegistrationForm(ModelForm):
registration = self.save(commit=False) registration = self.save(commit=False)
# create additional values here: # create additional values here:
registration.user_updated_at = datetime.utcnow() registration.user_updated_at = datetime.utcnow()
registration.upload_status = ''
registration.save() registration.save()
log.info("Updated registration information for user's test center exam registration: username \"{}\" course \"{}\", examcode \"{}\"".format(registration.testcenter_user.user.username, registration.course_id, registration.exam_series_code)) log.info("Updated registration information for user's test center exam registration: username \"{}\" course \"{}\", examcode \"{}\"".format(registration.testcenter_user.user.username, registration.course_id, registration.exam_series_code))
......
common/djangoapps/student/views.py
...@@ -632,15 +632,18 @@ def begin_exam_registration(request, course_id): ...@@ -632,15 +632,18 @@ def begin_exam_registration(request, course_id):
user = request.user user = request.user
try: try:
course = (course_from_id(course_id)) course = course_from_id(course_id)
except ItemNotFoundError: except ItemNotFoundError:
# TODO: do more than just log!! The rest will fail, so we should fail right now. log.error("User {0} enrolled in non-existent course {1}".format(user.username, course_id))
log.error("User {0} enrolled in non-existent course {1}" raise Http404
.format(user.username, course_id))
# get the exam to be registered for: # get the exam to be registered for:
# (For now, we just assume there is one at most.) # (For now, we just assume there is one at most.)
# if there is no exam now (because someone bookmarked this stupid page),
# then return a 404:
exam_info = course.current_test_center_exam exam_info = course.current_test_center_exam
if exam_info is None:
raise Http404
# determine if the user is registered for this course: # determine if the user is registered for this course:
registration = exam_registration_info(user, course) registration = exam_registration_info(user, course)
...@@ -675,11 +678,18 @@ def create_exam_registration(request, post_override=None): ...@@ -675,11 +678,18 @@ def create_exam_registration(request, post_override=None):
username = post_vars['username'] username = post_vars['username']
user = User.objects.get(username=username) user = User.objects.get(username=username)
course_id = post_vars['course_id'] course_id = post_vars['course_id']
course = (course_from_id(course_id)) # assume it will be found.... course = course_from_id(course_id) # assume it will be found....
# make sure that any demographic data values received from the page have been stripped.
# Whitespace is not an acceptable response for any of these values
demographic_data = {}
for fieldname in TestCenterUser.user_provided_fields():
if fieldname in post_vars:
demographic_data[fieldname] = (post_vars[fieldname]).strip()
try: try:
testcenter_user = TestCenterUser.objects.get(user=user) testcenter_user = TestCenterUser.objects.get(user=user)
needs_updating = testcenter_user.needs_update(post_vars) needs_updating = testcenter_user.needs_update(demographic_data)
log.info("User {0} enrolled in course {1} {2}updating demographic info for exam registration".format(user.username, course_id, "" if needs_updating else "not ")) log.info("User {0} enrolled in course {1} {2}updating demographic info for exam registration".format(user.username, course_id, "" if needs_updating else "not "))
except TestCenterUser.DoesNotExist: except TestCenterUser.DoesNotExist:
# do additional initialization here: # do additional initialization here:
...@@ -691,7 +701,7 @@ def create_exam_registration(request, post_override=None): ...@@ -691,7 +701,7 @@ def create_exam_registration(request, post_override=None):
if needs_updating: if needs_updating:
# first perform validation on the user information # first perform validation on the user information
# using a Django Form. # using a Django Form.
form = TestCenterUserForm(instance=testcenter_user, data=post_vars) form = TestCenterUserForm(instance=testcenter_user, data=demographic_data)
if form.is_valid(): if form.is_valid():
form.update_and_save() form.update_and_save()
else: else:
......
common/lib/xmodule/xmodule/combined_open_ended_module.py
...@@ -22,8 +22,6 @@ from xmodule.modulestore import Location ...@@ -22,8 +22,6 @@ from xmodule.modulestore import Location
import self_assessment_module import self_assessment_module
import open_ended_module import open_ended_module
from mitxmako.shortcuts import render_to_string
log = logging.getLogger("mitx.courseware") log = logging.getLogger("mitx.courseware")
# Set the default number of max attempts. Should be 1 for production # Set the default number of max attempts. Should be 1 for production
...@@ -319,7 +317,7 @@ class CombinedOpenEndedModule(XModule): ...@@ -319,7 +317,7 @@ class CombinedOpenEndedModule(XModule):
Output: HTML rendered directly via Mako Output: HTML rendered directly via Mako
""" """
context = self.get_context() context = self.get_context()
html = render_to_string('combined_open_ended.html', context) html = self.system.render_template('combined_open_ended.html', context)
return html return html
def get_html_base(self): def get_html_base(self):
...@@ -369,17 +367,17 @@ class CombinedOpenEndedModule(XModule): ...@@ -369,17 +367,17 @@ class CombinedOpenEndedModule(XModule):
self.static_data, instance_state=task_state) self.static_data, instance_state=task_state)
last_response = task.latest_answer() last_response = task.latest_answer()
last_score = task.latest_score() last_score = task.latest_score()
last_post_assessment = task.latest_post_assessment() last_post_assessment = task.latest_post_assessment(self.system)
last_post_feedback = "" last_post_feedback = ""
if task_type == "openended": if task_type == "openended":
last_post_assessment = task.latest_post_assessment(short_feedback=False, join_feedback=False) last_post_assessment = task.latest_post_assessment(self.system, short_feedback=False, join_feedback=False)
if isinstance(last_post_assessment, list): if isinstance(last_post_assessment, list):
eval_list = [] eval_list = []
for i in xrange(0, len(last_post_assessment)): for i in xrange(0, len(last_post_assessment)):
eval_list.append(task.format_feedback_with_evaluation(last_post_assessment[i])) eval_list.append(task.format_feedback_with_evaluation(self.system, last_post_assessment[i]))
last_post_evaluation = "".join(eval_list) last_post_evaluation = "".join(eval_list)
else: else:
last_post_evaluation = task.format_feedback_with_evaluation(last_post_assessment) last_post_evaluation = task.format_feedback_with_evaluation(self.system, last_post_assessment)
last_post_assessment = last_post_evaluation last_post_assessment = last_post_evaluation
last_correctness = task.is_last_response_correct() last_correctness = task.is_last_response_correct()
max_score = task.max_score() max_score = task.max_score()
...@@ -442,7 +440,7 @@ class CombinedOpenEndedModule(XModule): ...@@ -442,7 +440,7 @@ class CombinedOpenEndedModule(XModule):
self.update_task_states() self.update_task_states()
response_dict = self.get_last_response(task_number) response_dict = self.get_last_response(task_number)
context = {'results': response_dict['post_assessment'], 'task_number': task_number + 1} context = {'results': response_dict['post_assessment'], 'task_number': task_number + 1}
html = render_to_string('combined_open_ended_results.html', context) html = self.system.render_template('combined_open_ended_results.html', context)
return {'html': html, 'success': True} return {'html': html, 'success': True}
def handle_ajax(self, dispatch, get): def handle_ajax(self, dispatch, get):
......
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
from mitxmako.shortcuts import render_to_string
import logging import logging
from lxml import etree from lxml import etree
log=logging.getLogger(__name__) log=logging.getLogger(__name__)
class CombinedOpenEndedRubric: class CombinedOpenEndedRubric(object):
@staticmethod @staticmethod
def render_rubric(rubric_xml): def render_rubric(rubric_xml, system):
try: try:
rubric_categories = CombinedOpenEndedRubric.extract_rubric_categories(rubric_xml) rubric_categories = CombinedOpenEndedRubric.extract_rubric_categories(rubric_xml)
html = render_to_string('open_ended_rubric.html', {'rubric_categories' : rubric_categories}) html = system.render_template('open_ended_rubric.html', {'rubric_categories' : rubric_categories})
except: except:
log.exception("Could not parse the rubric.") log.exception("Could not parse the rubric.")
html = rubric_xml html = rubric_xml
......
common/lib/xmodule/xmodule/gst_module.py
...@@ -24,11 +24,10 @@ class GraphicalSliderToolModule(XModule): ...@@ -24,11 +24,10 @@ class GraphicalSliderToolModule(XModule):
''' '''
js = { js = {
'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')],
'js': [ 'js': [
# 3rd party libraries used by graphic slider tool. # 3rd party libraries used by graphic slider tool.
# TODO - where to store them - outside xmodule? # TODO - where to store them - outside xmodule?
resource_string(__name__, 'js/src/graphical_slider_tool/jstat-1.0.0.min.js'),
resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'), resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'),
resource_string(__name__, 'js/src/graphical_slider_tool/state.js'), resource_string(__name__, 'js/src/graphical_slider_tool/state.js'),
resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'), resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'),
...@@ -38,8 +37,8 @@ class GraphicalSliderToolModule(XModule): ...@@ -38,8 +37,8 @@ class GraphicalSliderToolModule(XModule):
resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'), resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'),
resource_string(__name__, 'js/src/graphical_slider_tool/el_output.js'), resource_string(__name__, 'js/src/graphical_slider_tool/el_output.js'),
resource_string(__name__, 'js/src/graphical_slider_tool/g_label_el_output.js'), resource_string(__name__, 'js/src/graphical_slider_tool/g_label_el_output.js'),
resource_string(__name__, 'js/src/graphical_slider_tool/gst.js') resource_string(__name__, 'js/src/graphical_slider_tool/gst.js')
] ]
} }
js_module_name = "GraphicalSliderTool" js_module_name = "GraphicalSliderTool"
......
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
...@@ -401,7 +401,7 @@ define('Graph', ['logme'], function (logme) { ...@@ -401,7 +401,7 @@ define('Graph', ['logme'], function (logme) {
return false; return false;
} }
} else { } else {
logme('MESSAGE: "xticks" were not specified. Using defaults.'); // logme('MESSAGE: "xticks" were not specified. Using defaults.');
return false; return false;
} }
...@@ -416,7 +416,7 @@ define('Graph', ['logme'], function (logme) { ...@@ -416,7 +416,7 @@ define('Graph', ['logme'], function (logme) {
return false; return false;
} }
} else { } else {
logme('MESSAGE: "yticks" were not specified. Using defaults.'); // logme('MESSAGE: "yticks" were not specified. Using defaults.');
return false; return false;
} }
......
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
...@@ -14,7 +14,9 @@ window.GraphicalSliderTool = function (el) { ...@@ -14,7 +14,9 @@ window.GraphicalSliderTool = function (el) {
// with a unique DOM ID), we will iterate over all children, and for // with a unique DOM ID), we will iterate over all children, and for
// each match, we will call GstMain module. // each match, we will call GstMain module.
$(el).children('.graphical_slider_tool').each(function (index, value) { $(el).children('.graphical_slider_tool').each(function (index, value) {
GstMain($(value).attr('id')); JavascriptLoader.executeModuleScripts($(value), function(){
GstMain($(value).attr('id'));
});
}); });
}); });
}; };
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
...@@ -19,7 +19,7 @@ define( ...@@ -19,7 +19,7 @@ define(
if ($('#' + gstId).attr('data-processed') !== 'processed') { if ($('#' + gstId).attr('data-processed') !== 'processed') {
$('#' + gstId).attr('data-processed', 'processed'); $('#' + gstId).attr('data-processed', 'processed');
} else { } else {
logme('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.'); // logme('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.');
return; return;
} }
......
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
...@@ -20,9 +20,9 @@ define('Sliders', ['logme'], function (logme) { ...@@ -20,9 +20,9 @@ define('Sliders', ['logme'], function (logme) {
} else if (sliderDiv.length > 1) { } else if (sliderDiv.length > 1) {
logme('ERROR: Found more than one slider for the parameter "' + paramName + '".'); logme('ERROR: Found more than one slider for the parameter "' + paramName + '".');
logme('sliderDiv.length = ', sliderDiv.length); logme('sliderDiv.length = ', sliderDiv.length);
} else { } // else {
logme('MESSAGE: Did not find a slider for the parameter "' + paramName + '".'); // logme('MESSAGE: Did not find a slider for the parameter "' + paramName + '".');
} // }
} }
function createSlider(sliderDiv, paramName) { function createSlider(sliderDiv, paramName) {
......
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
...@@ -24,7 +24,7 @@ define('State', ['logme'], function (logme) { ...@@ -24,7 +24,7 @@ define('State', ['logme'], function (logme) {
dynamicElByElId = {}; dynamicElByElId = {};
stateInst += 1; stateInst += 1;
logme('MESSAGE: Creating state instance # ' + stateInst + '.'); // logme('MESSAGE: Creating state instance # ' + stateInst + '.');
// Initially, there are no parameters to track. So, we will instantiate // Initially, there are no parameters to track. So, we will instantiate
// an empty object. // an empty object.
......
common/lib/xmodule/xmodule/open_ended_module.py
...@@ -30,7 +30,6 @@ from xmodule.modulestore import Location ...@@ -30,7 +30,6 @@ from xmodule.modulestore import Location
from capa.util import * from capa.util import *
import openendedchild import openendedchild
from mitxmako.shortcuts import render_to_string
from numpy import median from numpy import median
from datetime import datetime from datetime import datetime
...@@ -256,7 +255,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -256,7 +255,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
@param system: Modulesystem @param system: Modulesystem
@return: Boolean True (not useful currently) @return: Boolean True (not useful currently)
""" """
new_score_msg = self._parse_score_msg(score_msg) new_score_msg = self._parse_score_msg(score_msg, system)
if not new_score_msg['valid']: if not new_score_msg['valid']:
score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.' score_msg['feedback'] = 'Invalid grader reply. Please contact the course staff.'
...@@ -370,7 +369,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -370,7 +369,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
return u"\n".join([feedback_list_part1, feedback_list_part2]) return u"\n".join([feedback_list_part1, feedback_list_part2])
def _format_feedback(self, response_items): def _format_feedback(self, response_items, system):
""" """
Input: Input:
Dictionary called feedback. Must contain keys seen below. Dictionary called feedback. Must contain keys seen below.
...@@ -382,13 +381,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -382,13 +381,13 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
rubric_feedback="" rubric_feedback=""
feedback = self._convert_longform_feedback_to_html(response_items) feedback = self._convert_longform_feedback_to_html(response_items)
if response_items['rubric_scores_complete']==True: if response_items['rubric_scores_complete']==True:
rubric_feedback = CombinedOpenEndedRubric.render_rubric(response_items['rubric_xml']) rubric_feedback = CombinedOpenEndedRubric.render_rubric(response_items['rubric_xml'], system)
if not response_items['success']: if not response_items['success']:
return system.render_template("open_ended_error.html", return system.render_template("open_ended_error.html",
{'errors': feedback}) {'errors': feedback})
feedback_template = render_to_string("open_ended_feedback.html", { feedback_template = system.render_template("open_ended_feedback.html", {
'grader_type': response_items['grader_type'], 'grader_type': response_items['grader_type'],
'score': "{0} / {1}".format(response_items['score'], self.max_score()), 'score': "{0} / {1}".format(response_items['score'], self.max_score()),
'feedback': feedback, 'feedback': feedback,
...@@ -398,7 +397,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -398,7 +397,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
return feedback_template return feedback_template
def _parse_score_msg(self, score_msg, join_feedback=True): def _parse_score_msg(self, score_msg, system, join_feedback=True):
""" """
Grader reply is a JSON-dump of the following dict Grader reply is a JSON-dump of the following dict
{ 'correct': True/False, { 'correct': True/False,
...@@ -450,7 +449,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -450,7 +449,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
'rubric_scores_complete' : score_result['rubric_scores_complete'], 'rubric_scores_complete' : score_result['rubric_scores_complete'],
'rubric_xml' : score_result['rubric_xml'], 'rubric_xml' : score_result['rubric_xml'],
} }
feedback_items.append(self._format_feedback(new_score_result)) feedback_items.append(self._format_feedback(new_score_result, system))
if join_feedback: if join_feedback:
feedback = "".join(feedback_items) feedback = "".join(feedback_items)
else: else:
...@@ -458,7 +457,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -458,7 +457,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
score = int(median(score_result['score'])) score = int(median(score_result['score']))
else: else:
#This is for instructor and ML grading #This is for instructor and ML grading
feedback = self._format_feedback(score_result) feedback = self._format_feedback(score_result, system)
score = score_result['score'] score = score_result['score']
self.submission_id = score_result['submission_id'] self.submission_id = score_result['submission_id']
...@@ -466,7 +465,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -466,7 +465,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
return {'valid': True, 'score': score, 'feedback': feedback} return {'valid': True, 'score': score, 'feedback': feedback}
def latest_post_assessment(self, short_feedback=False, join_feedback=True): def latest_post_assessment(self, system, short_feedback=False, join_feedback=True):
""" """
Gets the latest feedback, parses, and returns Gets the latest feedback, parses, and returns
@param short_feedback: If the long feedback is wanted or not @param short_feedback: If the long feedback is wanted or not
...@@ -475,7 +474,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -475,7 +474,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
if not self.history: if not self.history:
return "" return ""
feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""), join_feedback=join_feedback) feedback_dict = self._parse_score_msg(self.history[-1].get('post_assessment', ""), system, join_feedback=join_feedback)
if not short_feedback: if not short_feedback:
return feedback_dict['feedback'] if feedback_dict['valid'] else '' return feedback_dict['feedback'] if feedback_dict['valid'] else ''
if feedback_dict['valid']: if feedback_dict['valid']:
...@@ -483,14 +482,14 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -483,14 +482,14 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
json.loads(self.history[-1].get('post_assessment', ""))) json.loads(self.history[-1].get('post_assessment', "")))
return short_feedback if feedback_dict['valid'] else '' return short_feedback if feedback_dict['valid'] else ''
def format_feedback_with_evaluation(self, feedback): def format_feedback_with_evaluation(self, system, feedback):
""" """
Renders a given html feedback into an evaluation template Renders a given html feedback into an evaluation template
@param feedback: HTML feedback @param feedback: HTML feedback
@return: Rendered html @return: Rendered html
""" """
context = {'msg': feedback, 'id': "1", 'rows': 50, 'cols': 50} context = {'msg': feedback, 'id': "1", 'rows': 50, 'cols': 50}
html = render_to_string('open_ended_evaluation.html', context) html = system.render_template('open_ended_evaluation.html', context)
return html return html
def handle_ajax(self, dispatch, get, system): def handle_ajax(self, dispatch, get, system):
...@@ -582,7 +581,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild): ...@@ -582,7 +581,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
if self.state != self.INITIAL: if self.state != self.INITIAL:
latest = self.latest_answer() latest = self.latest_answer()
previous_answer = latest if latest is not None else self.initial_display previous_answer = latest if latest is not None else self.initial_display
post_assessment = self.latest_post_assessment() post_assessment = self.latest_post_assessment(system)
score = self.latest_score() score = self.latest_score()
correct = 'correct' if self.is_submission_correct(score) else 'incorrect' correct = 'correct' if self.is_submission_correct(score) else 'incorrect'
else: else:
......
common/lib/xmodule/xmodule/openendedchild.py
...@@ -35,7 +35,7 @@ MAX_ATTEMPTS = 1 ...@@ -35,7 +35,7 @@ MAX_ATTEMPTS = 1
# Overriden by max_score specified in xml. # Overriden by max_score specified in xml.
MAX_SCORE = 1 MAX_SCORE = 1
class OpenEndedChild(): class OpenEndedChild(object):
""" """
States: States:
...@@ -123,7 +123,7 @@ class OpenEndedChild(): ...@@ -123,7 +123,7 @@ class OpenEndedChild():
return None return None
return self.history[-1].get('score') return self.history[-1].get('score')
def latest_post_assessment(self): def latest_post_assessment(self, system):
"""None if not available""" """None if not available"""
if not self.history: if not self.history:
return "" return ""
......
common/lib/xmodule/xmodule/self_assessment_module.py
...@@ -122,7 +122,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild): ...@@ -122,7 +122,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
if self.state == self.INITIAL: if self.state == self.INITIAL:
return '' return ''
rubric_html = CombinedOpenEndedRubric.render_rubric(self.rubric) rubric_html = CombinedOpenEndedRubric.render_rubric(self.rubric, system)
# we'll render it # we'll render it
context = {'rubric': rubric_html, context = {'rubric': rubric_html,
...@@ -147,7 +147,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild): ...@@ -147,7 +147,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
if self.state == self.DONE: if self.state == self.DONE:
# display the previous hint # display the previous hint
latest = self.latest_post_assessment() latest = self.latest_post_assessment(system)
hint = latest if latest is not None else '' hint = latest if latest is not None else ''
else: else:
hint = '' hint = ''
......
lms/static/sass/multicourse/_about_pages.scss
...@@ -194,30 +194,9 @@ ...@@ -194,30 +194,9 @@
margin-bottom: 40px; margin-bottom: 40px;
h3 { h3 {
background: url('/static/images/bullet-closed.png') no-repeat left 0.25em;
font-family: $sans-serif; font-family: $sans-serif;
font-weight: 700; font-weight: 700;
margin-bottom: 10px; margin-bottom: 15px;
padding-left: 20px;
cursor: pointer;
}
.answer {
display: none;
color: #3c3c3c;
padding-left: 16px;
font-family: $serif;
li {
line-height: 1.6em;
}
}
// opened states
&.opened {
h3 {
background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
}
} }
} }
} }
......
lms/static/sass/multicourse/_dashboard.scss
...@@ -426,6 +426,14 @@ ...@@ -426,6 +426,14 @@
font-size: 1.2rem; font-size: 1.2rem;
font-weight: bold; font-weight: bold;
} }
strong {
font-weight: 700;
a {
font-weight: 700;
}
}
} }
.actions { .actions {
......
lms/static/sass/multicourse/_help.scss
.static-container.help { .static-container.help {
section.questions { section.questions {
float: left; @include clearfix;
width: flex-grid(9);
margin-right: flex-gutter();
article { nav.categories {
margin-bottom: 40px; border: 1px solid rgb(220,220,220);
@include box-sizing(border-box);
float: left;
margin-left: flex-gutter();
padding: 20px;
width: flex-grid(3);
h2 { a {
border-bottom: 1px solid rgb(220,220,220); display: block;
margin-bottom: 40px; letter-spacing: 1px;
padding-bottom: 20px; margin: 0px -20px;
padding: 12px 0px 12px 20px;
text-align: left;
&:hover {
background: rgb(245,245,245);
text-decoration: none;
}
} }
} }
}
section.emails { .responses {
border: 1px solid rgb(220,220,220); float: left;
@include box-sizing(border-box); width: flex-grid(9);
float: left;
padding: 20px;
width: flex-grid(3);
ul { .category {
margin-left: 0; padding-top: 40px;
padding-left: 0;
list-style: none;
li { &:first-child {
margin-bottom: 1em; padding-top: 0px;
}
> h2 {
border-bottom: 1px solid rgb(220,220,220);
margin-bottom: 40px;
padding-bottom: 20px;
}
}
.response {
margin-bottom: 40px;
h3 {
background: url('/static/images/bullet-closed.png') no-repeat left 0.25em;
font-family: $sans-serif;
font-weight: 700;
margin-bottom: 10px;
padding-left: 20px;
cursor: pointer;
}
.answer {
display: none;
color: #3c3c3c;
padding-left: 16px;
font-family: $serif;
li {
line-height: 1.6em;
}
}
// opened states
&.opened {
h3 {
background: url('/static/images/bullet-open.png') no-repeat left 0.25em;
}
}
} }
} }
} }
} }
lms/static/sass/multicourse/_testcenter-register.scss
...@@ -232,8 +232,9 @@ $red: rgb(178, 6, 16); ...@@ -232,8 +232,9 @@ $red: rgb(178, 6, 16);
} }
input, textarea { input, textarea {
height: 100%;
width: 100%; width: 100%;
padding: $baseline ($baseline*.75); padding: ($baseline/2);
&.long { &.long {
width: 100%; width: 100%;
......
lms/templates/dashboard.html
...@@ -243,22 +243,15 @@ ...@@ -243,22 +243,15 @@
% endif % endif
% if registration.is_rejected: % if registration.is_rejected:
<div class="message message-status is-shown exam-schedule"> <div class="message message-status is-shown exam-schedule">
<p class="message-copy">Your <p class="message-copy"><strong>Your registration for the Pearson exam has been rejected. Please <a href="${testcenter_register_target}" id="exam_register_link">see your registration status details</a></strong>. Otherwise <a class="contact-link" href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}">contact edX at exam-help@edx.org</a> for further help.</p>
<a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
has been rejected. Please check the information you provided, and try to correct any demographic errors. Otherwise
contact edX for further help.</p>
<a href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.number}" class="button contact-button">Contact exam-help@edx.org</a>
</div> </div>
% endif % endif
% if not registration.is_accepted and not registration.is_rejected: % if not registration.is_accepted and not registration.is_rejected:
<div class="message message-status is-shown"> <div class="message message-status is-shown">
<p class="message-copy">Your <p class="message-copy"><strong>Your <a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a> is pending</strong>. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
<a href="${testcenter_register_target}" id="exam_register_link">registration for the Pearson exam</a>
is pending. Within a few days, you should see a confirmation number here, which can be used to schedule your exam.</p>
</div> </div>
% endif % endif
% endif % endif
% endif % endif
<% <%
......
lms/templates/index.html
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<section id="video-modal" class="modal home-page-video-modal video-modal"> <section id="video-modal" class="modal home-page-video-modal video-modal">
<div class="inner-wrapper"> <div class="inner-wrapper">
<iframe width="640" height="360" src="http://www.youtube.com/embed/IlNU60ZKj3I?showinfo=0" frameborder="0" allowfullscreen></iframe> <iframe width="640" height="360" src="http://www.youtube.com/embed/XNaiOGxWeto?showinfo=0" frameborder="0" allowfullscreen></iframe>
</div> </div>
</section> </section>
......
lms/templates/static_templates/faq.html
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
<%block name="title"><title>FAQ</title></%block> <%block name="title"><title>FAQ</title></%block>
<%block name="js_extra">
<script src="${static.url('js/faq.js')}"></script>
</%block>
<section class="container about"> <section class="container about">
<nav> <nav>
<a href="${reverse('about_edx')}">Vision</a> <a href="${reverse('about_edx')}">Vision</a>
...@@ -17,298 +13,80 @@ ...@@ -17,298 +13,80 @@
<a href="${reverse('contact')}">Contact</a> <a href="${reverse('contact')}">Contact</a>
</nav> </nav>
<section class="faq"> <section class="faq">
<section class="responses"> <section class="responses">
<section id="the-organization" class="category">
<section id="edx_basics_faq" class="category"> <h2>Organization</h2>
<h2>edX Basics</h2>
<article class="response">
<h3 class="question">How do I sign up to take a class?</h3>
<div class ="answer" id="edx_basics_faq_answer_0">
<p>Simply create an edX account (it's free) and then register for the course of your choice (also free). Follow the prompts on the edX website.</p>
</div>
</article>
<article class="response">
<h3 class="question">What does it cost to take a class? Is this really free?</h3>
<div class ="answer" id="edx_basics_faq_answer_1">
<p>EdX courses are free for everyone. All you need is an Internet connection.</p>
</div>
</article>
<article class="response">
<h3 class="question">What happens after I sign up for a course?</h3>
<div class ="answer" id="edx_basics_faq_answer_2">
<p>You will receive an activation email. Follow the prompts in that email to activate your account. You will need to log in each time you access your course(s). Once the course begins, it’s time to hit the virtual books. You can access the lectures, homework, tutorials, etc., for each week, one week at a time.</p>
</div>
</article>
<article class="response">
<h3 class="question">Who can take an edX course?</h3>
<div class ="answer" id="edx_basics_faq_answer_3">
<p>You, your mom, your little brother, your grandfather -- anyone with Internet access can take an edX course. Free.</p>
</div>
</article>
<article class="response">
<h3 class="question">Are the courses only offered in English?</h3>
<div class ="answer" id="edx_basics_faq_answer_4">
<p>Some edX courses include a translation of the lecture in the text bar to the right of the video. Some have the specific option of requesting a course in other languages. Please check your course to determine foreign language options.</p>
</div>
</article>
<article class="response">
<h3 class="question">When will there be more courses on other subjects?</h3>
<div class ="answer" id="edx_basics_faq_answer_5">
<p>We are continually reviewing and creating courses to add to the edX platform. Please check the website for future course announcements. You can also "friend" edX on Facebook – you’ll receive updates and announcements.</p>
</div>
</article>
<article class="response">
<h3 class="question">How can I help edX?</h3>
<div class ="answer" id="edx_basics_faq_answer_6">
<p>You may not realize it, but just by taking a course you are helping edX. That’s because the edX platform has been specifically designed to not only teach, but also gather data about learning. EdX will utilize this data to find out how to improve education online and on-campus.</p>
</div>
</article>
<article class="response"> <article class="response">
<h3 class="question">When does my course start and/or finish?</h3> <h3>What is edX?</h3>
<div class ="answer" id="edx_basics_faq_answer_7"> <p>edX is a not-for-profit enterprise of its founding partners, the Massachusetts Institute of Technology (MIT) and Harvard University that offers online learning to on-campus students and to millions of people around the world. To do so, edX is building an open-source online learning platform and hosts an online web portal at <a href="http://www.edx.org">www.edx.org</a> for online education.</p>
<p>You can find the start and stop dates for each course on each course description page.</p> <p>EdX currently offers HarvardX, <em>MITx</em> and BerkeleyX classes online for free. Beginning in fall 2013, edX will offer WellesleyX and GeorgetownX classes online for free. The University of Texas System includes nine universities and six health institutions. The edX institutions aim to extend their collective reach to build a global community of online students. Along with offering online courses, the three universities undertake research on how students learn and how technology can transform learning both on-campus and online throughout the world.</p>
</div>
</article> </article>
<article class="response">
<h3 class="question">Is there a walk-through of a sample course session?</h3>
<div class ="answer" id="edx_basics_faq_answer_8">
<p> There are video introductions for every course that will give you a good sense of how the course works and what to expect.</p>
</div>
</article>
<article class="response">
<h3 class="question">I don't have the prerequisites for a course that I am interested in. Can I still take the course?</h3>
<div class ="answer" id="edx_basics_faq_answer_9">
<p>We do not check students for prerequisites, so you are allowed to attempt the course. However, if you do not know prerequisite subjects before taking a class, you will have to learn the prerequisite material on your own over the semester, which can be an extremely difficult task.</p>
</div>
</article>
<article class="response">
<h3 class="question">What happens if I have to quit a course, are there any penalties, will I be able to take another course in the future?</h3>
<div class ="answer" id="edx_basics_faq_answer_10">
<p>You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.</p>
</div>
</article>
</section>
<section id="classes_faq" class="category">
<h2>The Classes</h2>
<article class="response">
<h3 class="question">How much work will I have to do to pass my course?</h3>
<div class ="answer" id="classes_faq_answer_0">
<p>The projected hours of study required for each course are described on the specific course description page.</p>
</div>
</article>
<article class="response">
<h3 class="question">What should I do before I take a course (prerequisites)?</h3>
<div class ="answer" id="classes_faq_answer_1">
<p>Each course is different – some have prerequisites, and some don’t. Take a look at your specific course’s recommended prerequisites. If you do not have a particular prerequisite, you may still take the course.</p>
</div>
</article>
<article class="response">
<h3 class="question">What books should I read? (I am interested in reading materials before the class starts).</h3>
<div class ="answer" id="classes_faq_answer_2">
<p>Take a look at the specific course prerequisites. All required academic materials will be provided during the course, within the browser. Some of the course descriptions may list additional resources. For supplemental reading material before or during the course, you can post a question on the course’s Discussion Forum to ask your online coursemates for suggestions.</p>
</div>
</article>
<article class="response">
<h3 class="question"> Can I download the book for my course?</h3>
<div class ="answer" id="classes_faq_answer_3">
<p>EdX book content may only be viewed within the browser, and downloading it violates copyright laws. If you need or want a hard copy of the book, we recommend that you purchase a copy.</p>
</div>
</article>
<article class="response">
<h3 class="question">Can I take more than one course at a time?</h3>
<div class ="answer" id="classes_faq_answer_4">
<p>You may take multiple edX courses, however we recommend checking the requirements on each course description page to determine your available study hours and the demands of the intended courses.</p>
</div>
</article>
<article class="response"> <article class="response">
<h3 class="question">How do I log in to take an edX class?</h3> <h3>Will edX be adding additional X Universities?</h3>
<div class ="answer" id="classes_faq_answer_5"> <p>More than 200 institutions from around the world have expressed interest in collaborating with edX since Harvard and MIT announced its creation in May. EdX is focused above all on quality and developing the best not-for-profit model for online education. In addition to providing online courses on the edX platform, the "X University" Consortium will be a forum in which members can share experiences around online learning. Harvard, MIT, UC Berkeley, the University of Texas system and the other consortium members will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities". Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities' educational content together on one site will enable learners worldwide to access the offered course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.</p>
<p>Once you sign up for a course and activate your account, click on the "Log In" button on the edx.org home page. You will need to type in your email address and edX password each time you log in.</p> <p>edX will actively explore the addition of other institutions from around the world to the edX platform, and looks forward to adding more "X Universities."</p>
</div>
</article>
<article class="response">
<h3 class="question">What time is the class?</h3>
<div class ="answer" id="classes_faq_answer_6">
<p>EdX classes take place at your convenience. Prefer to sleep in and study late? No worries. Videos and problem sets are available 24 hours a day, which means you can watch video and complete work whenever you have spare time. You simply log in to your course via the Internet and work through the course material, one week at a time.</p>
</div>
</article>
<article class="response">
<h3 class="question">If I miss a week, how does this affect my grade?</h3>
<div class ="answer" id="classes_faq_answer_7">
<p>It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.</p>
</div>
</article>
<article class="response">
<h3 class="question">How can I meet/find other students?</h3>
<div class ="answer" id="classes_faq_answer_8">
<p>All edX courses have Discussion Forums where you can chat with and help each other within the framework of the Honor Code.</p>
</div>
</article>
<article class="response">
<h3 class="question">How can I talk to professors, fellows and teaching assistants?</h3>
<div class ="answer" id="classes_faq_answer_9">
<p>The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.</p>
</div>
</article> </article>
</section> </section>
<section id="getting_help_faq" class="category"> <section id="students" class="category">
<h2>Getting Help</h2> <h2>Students</h2>
<article class="response"> <article class="response">
<h3 class="question">Can I re-take a course?</h3> <h3>Who can take edX courses? Will there be an admissions process?</h3>
<div class ="answer" id="getting_help_faq_answer_0"> <p>EdX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.</p>
<p>Good news: there are unlimited "mulligans" in edX. You may re-take edX courses as often as you wish. Your performance in any particular offering of a course will not effect your standing in future offerings of any edX course, including future offerings of the same course.</p>
</div>
</article> </article>
<article class="response"> <article class="response">
<h3 class="question">Enrollment for a course that I am interested in is open, but the course has already started. Can I still enroll?</h3> <h3>Will certificates be awarded?</h3>
<div class ="answer" id="getting_help_faq_answer_1"> <p>Yes. Online learners who demonstrate mastery of subjects can earn a certificate of mastery. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, <em>MITx</em> or BerkeleyX. For the courses in Fall 2012, those certificates will be free. There is a plan to charge a modest fee for certificates in the future.</p>
<p>Yes, but you will not be able to turn in any assignments or exams that have already been due. If it is early in the course, you might still be able to earn enough points for a certificate, but you will have to check with the course in question in order to find out more.</p>
</div>
</article> </article>
<article class="response"> <article class="response">
<h3 class="question">Is there an exam at the end?</h3> <h3>What will the scope of the online courses be? How many? Which faculty?</h3>
<div class ="answer" id="getting_help_faq_answer_2"> <p>Our goal is to offer a wide variety of courses across disciplines. There are currently <a href="/courses">nine courses</a> offered for Fall 2012.</p>
<p>Different courses have slightly different structures. Please check the course material description to see if there is a final exam or final project.</p>
</div>
</article> </article>
<article class="response"> <article class="response">
<h3 class="question">Will the same courses be offered again in the future?</h3> <h3>Who is the learner? Domestic or international? Age range?</h3>
<div class ="answer" id="getting_help_faq_answer_3"> <p>Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don't have a target group of potential learners, as the goal is to make these courses available to anyone in the world - from any demographic - who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for MITx's first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years-old.</p>
<p>Existing edX courses will be re-offered, and more courses added.</p>
</div>
</article> </article>
<article class="response"> <article class="response">
<h3 class="question">Will I get a certificate for taking an edX course?</h3> <h3>Will participating universities' standards apply to all courses offered on the edX platform?</h3>
<div class ="answer" id="getting_help_faq_answer_4"> <p>Yes: the reach changes exponentially, but the rigor remains the same.</p>
<p>Online learners who receive a passing grade for a course will receive a certificate of mastery from edX and the underlying X University that offered the course. For example, a certificate of mastery for MITx’s 6.002x Circuits & Electronics will come from edX and MITx.</p>
</div>
</article> </article>
<article class="response"> <article class="response">
<h3 class="question">How are edX certificates delivered?</h3> <h3>How do you intend to test whether this approach is improving learning?</h3>
<div class ="answer" id="getting_help_faq_answer_5"> <p>Edx institutions have assembled faculty members who will collect and analyze data to assess results and the impact edX is having on learning.</p>
<p>EdX certificates are delivered online through edx.org. So be sure to check your email in the weeks following the final grading – you will be able to download and print your certificate.</p>
</div>
</article> </article>
<article class="response"> <article class="response">
<h3 class="question">What is the difference between a proctored certificate and an honor code certificate?</h3> <h3>How may I apply to study with edX?</h3>
<div class ="answer" id="getting_help_faq_answer_6"> <p>Simply complete the online <a href="#signup-modal" rel="leanModal">signup form</a>. Enrolling will create your unique student record in the edX database, allow you to register for classes, and to receive a certificate on successful completion.</p>
<p>A proctored certificate is given to students who take and pass an exam under proctored conditions. An honor-code certificate is given to students who have completed all of the necessary online coursework associated with a course and have signed <link> the edX honor code </link>.</p>
</div>
</article> </article>
<article class="response"> <article class="response">
<h3 class="question">Yes. The requirements for both certificates can be independently satisfied.</h3> <h3>How may another university participate in edX? </h3>
<div class ="answer" id="getting_help_faq_answer_7"> <p>If you are from a university interested in discussing edX, please email <a href="mailto:university@edx.org">university@edx.org</a></p>
<p>It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.</p>
</div>
</article>
<article class="response">
<h3 class="question">Will my grade be shown on my certificate?</h3>
<div class ="answer" id="getting_help_faq_answer_8">
<p>No. Grades are not displayed on either honor code or proctored certificates.</p>
</div>
</article>
<article class="response">
<h3 class="question">How can I talk to professors, fellows and teaching assistants?</h3>
<div class ="answer" id="getting_help_faq_answer_9">
<p>The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.</p>
</div>
</article>
<article class="response">
<h3 class="question">The only certificates distributed with grades by edX were for the initial prototype course.</h3>
<div class ="answer" id="getting_help_faq_answer_10">
<p>You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.</p>
</div>
</article>
<article class="response">
<h3 class="question">Will my university accept my edX coursework for credit?</h3>
<div class ="answer" id="getting_help_faq_answer_11">
<p>Each educational institution makes its own decision regarding whether to accept edX coursework for credit. Check with your university for its policy.</p>
</div>
</article>
<article class="response">
<h3 class="question">I lost my edX certificate – can you resend it to me?</h3>
<div class ="answer" id="getting_help_faq_answer_12">
<p>Please log back in to your account to find certificates from the same profile page where they were originally posted. You will be able to re-print your certificate from there.</p>
</div>
</article>
</section>
<section id="open_source_faq" class="category">
<h2>edX & Open Source</h2>
<article class="response">
<h3 class="question">What’s open source?</h3>
<div class ="answer" id="open_source_faq_answer_0">
<p>Open source is a philosophy that generally refers to making software freely available for use or modification as users see fit. In exchange for use of the software, users generally add their contributions to the software, making it a public collaboration. The edX platform will be made available as open source code in order to allow world talent to improve and share it on an ongoing basis.</p>
</div>
</article>
<article class="response">
<h3 class="question">When/how can I get the open-source platform technology?</h3>
<div class ="answer" id="open_source_faq_answer_1">
<p>We are still building the edX technology platform and will be making announcements in the future about its availability.</p>
</div>
</article> </article>
</section> </section>
<section id="other_help_faq" class="category"> <section id="technology-platform" class="category">
<h2>Other Help Questions - Account Questions</h2> <h2>Technology Platform</h2>
<article class="response">
<h3 class="question">My username is taken.</h3>
<div class ="answer" id="other_help_faq_answer_0">
<p>Now’s your chance to be creative: please try a different, more unique username – for example, try adding a random number to the end.</p>
</div>
</article>
<article class="response">
<h3 class="question">Why does my password show on my course login page?</h3>
<div class ="answer" id="other_help_faq_answer_1">
<p>Oops! This may be because of the way you created your account. For example, you may have mistakenly typed your password into the login box.</p>
</div>
</article>
<article class="response">
<h3 class="question">I am having login problems (password/email unrecognized).</h3>
<div class ="answer" id="other_help_faq_answer_2">
<p>Please check your browser’s settings to make sure that you have the current version of Firefox or Chrome, and then try logging in again. If you find access impossible, you may simply create a new account using an alternate email address – the old, unused account will disappear later.</p>
</div>
</article>
<article class="response">
<h3 class="question">I did not receive an activation email.</h3>
<div class ="answer" id="other_help_faq_answer_3">
<p>If you did not receive an activation email it may be because:</p>
<ul>
<li>There was a typo in your email address.</li>
<li>Your spam filter may have caught the activation email. Please check your spam folder. </li>
<li>You may be using an older browser. We recommend downloading the current version of Firefox or Chrome. </li>
<li>JavaScript is disabled in your browser. Please check your browser settings and confirm that JavaScript is enabled. </li>
</ul>
<p>If you continue to have problems activating your account, we recommend that you try creating a new account. There is no need to do anything about the old account. If it is not activated through the link in the email, it will disappear later.</p>
</div>
</article>
<article class="response"> <article class="response">
<h3 class="question">Can I delete my account?</h3> <h3>What technology will edX use?</h3>
<div class ="answer" id="other_help_faq_answer_4"> <p>The edX open-source online learning platform will feature interactive learning designed specifically for the web. Features will include: self-paced learning, online discussion groups, wiki-based collaborative learning, assessment of learning as a student progresses through a course, and online laboratories and other interactive learning tools. The platform will also serve as a laboratory from which data will be gathered to better understand how students learn. Because it is open source, the platform will be continuously improved by a worldwide community of collaborators, with new features added as needs arise.</p>
<p>There’s no need to delete you account. An old, unused edX account with no course completions associated with it will disappear.</p> <p>The first version of the technology was used in the first <em>MITx</em> course, 6.002x Circuits and Electronics, which launched in Spring, 2012.</p>
</div>
</article> </article>
<article class="response"> <article class="response">
<h3 class="question">I am experiencing problems with the display. E.g., There are tools missing from the course display, or I am unable to view video.</h3> <h3>How is this different from what other universities are doing online?</h3>
<div class ="answer" id="other_help_faq_answer_5"> <p>EdX is a not-for-profit enterprise built upon the shared educational missions of its founding partners, Harvard University and MIT. The edX platform will be available as open source. Also, a primary goal of edX is to improve teaching and learning on campus by experimenting with blended models of learning and by supporting faculty in conducting significant research on how students learn.</p>
<p>Please check your browser and settings. We recommend downloading the current version of Firefox or Chrome. Alternatively, you may re-register with a different email account. There is no need to delete the old account, as it will disappear if unused.</p>
</div>
</article> </article>
</section> </section>
</section> </section>
<nav class="categories"> <nav class="categories">
<a href="#edx_basics_faq">edX Basics</a> <a href="#organization">Organization</a>
<a href="#classes_faq">The Classes</a> <a href="#students">Students</a>
<a href="#getting_help_faq">Getting Help</a> <a href="#technology-platform">Technology Platform</a>
<a href="#open_source_faq">edX & Open source</a>
<a href="#other_help_faq">Other Help Questions - Account Questions</a>
</nav> </nav>
</section> </section>
</section> </section>
......
lms/templates/static_templates/help.html
...@@ -5,40 +5,304 @@ ...@@ -5,40 +5,304 @@
<%block name="title"><title>edX Help</title></%block> <%block name="title"><title>edX Help</title></%block>
<%block name="js_extra">
<script src="${static.url('js/help.js')}"></script>
</%block>
<section class="static-container help"> <section class="static-container help">
<h1>Help</h1> <h1>Help</h1>
<hr class="horizontal-divider"> <hr class="horizontal-divider">
<section class="questions"> <section class="questions">
<article class="response"> <section class="responses">
<h2>I tried to sign up, but it says the username is already taken.</h2> <section id="edx_basics_faq" class="category">
<p>If you have previously signed up for an MITx account, you already have an edX account and can log in with your existing username and password. If you don’t have an MITx account and received this error, it's possible that someone else has already signed up with that username. Please try a different, more unique username &ndash; for example, try adding a random number to the end.</p> <h2>edX Basics</h2>
</article> <article class="response">
<article class="response"> <h3 class="question">How do I sign up to take a class?</h3>
<h2>How will I know that the course I have signed up for has started?</h2> <div class ="answer" id="edx_basics_faq_answer_0">
<p>The start date for each course is listed on the right-hand side of the Course About page.</p> <p>Simply create an edX account (it's free) and then register for the course of your choice (also free). Follow the prompts on the edX website.</p>
</article> </div>
<article class="response"> </article>
<h2>I just signed up into edX. I have not received any form of acknowledgement that I have enrolled.</h2> <article class="response">
<p>You should receive a single activation e-mail. If you did not, it may be because:</p> <h3 class="question">What does it cost to take a class? Is this really free?</h3>
<ul> <div class ="answer" id="edx_basics_faq_answer_1">
<li>There was a typo in your e-mail address.</li> <p>EdX courses are free for everyone. All you need is an Internet connection.</p>
<li>The activation e-mail was caught by your spam filter. Please check your spam folder.</li> </div>
<li>You may be using an older browser. We recommend downloading the current version of Firefox or Chrome.</li> </article>
<li>JavaScript is disabled in your browser. Please confirm it is enabled.</li> <article class="response">
<li>If you run into issues, try recreating your account. There is no need to do anything about the old account, if any. If it is not activated through the link in the e-mail, it will disappear later.</li> <h3 class="question">What happens after I sign up for a course?</h3>
</ul> <div class ="answer" id="edx_basics_faq_answer_2">
</article> <p>You will receive an activation email. Follow the prompts in that email to activate your account. You will need to log in each time you access your course(s). Once the course begins, it’s time to hit the virtual books. You can access the lectures, homework, tutorials, etc., for each week, one week at a time.</p>
</section> </div>
</article>
<article class="response">
<h3 class="question">Who can take an edX course?</h3>
<div class ="answer" id="edx_basics_faq_answer_3">
<p>You, your mom, your little brother, your grandfather -- anyone with Internet access can take an edX course. Free.</p>
</div>
</article>
<article class="response">
<h3 class="question">Are the courses only offered in English?</h3>
<div class ="answer" id="edx_basics_faq_answer_4">
<p>Some edX courses include a translation of the lecture in the text bar to the right of the video. Some have the specific option of requesting a course in other languages. Please check your course to determine foreign language options.</p>
</div>
</article>
<article class="response">
<h3 class="question">When will there be more courses on other subjects?</h3>
<div class ="answer" id="edx_basics_faq_answer_5">
<p>We are continually reviewing and creating courses to add to the edX platform. Please check the website for future course announcements. You can also "friend" edX on Facebook – you’ll receive updates and announcements.</p>
</div>
</article>
<article class="response">
<h3 class="question">How can I help edX?</h3>
<div class ="answer" id="edx_basics_faq_answer_6">
<p>You may not realize it, but just by taking a course you are helping edX. That’s because the edX platform has been specifically designed to not only teach, but also gather data about learning. EdX will utilize this data to find out how to improve education online and on-campus.</p>
</div>
</article>
<article class="response">
<h3 class="question">When does my course start and/or finish?</h3>
<div class ="answer" id="edx_basics_faq_answer_7">
<p>You can find the start and stop dates for each course on each course description page.</p>
</div>
</article>
<article class="response">
<h3 class="question">Is there a walk-through of a sample course session?</h3>
<div class ="answer" id="edx_basics_faq_answer_8">
<p> There are video introductions for every course that will give you a good sense of how the course works and what to expect.</p>
</div>
</article>
<article class="response">
<h3 class="question">I don't have the prerequisites for a course that I am interested in. Can I still take the course?</h3>
<div class ="answer" id="edx_basics_faq_answer_9">
<p>We do not check students for prerequisites, so you are allowed to attempt the course. However, if you do not know prerequisite subjects before taking a class, you will have to learn the prerequisite material on your own over the semester, which can be an extremely difficult task.</p>
</div>
</article>
<article class="response">
<h3 class="question">What happens if I have to quit a course, are there any penalties, will I be able to take another course in the future?</h3>
<div class ="answer" id="edx_basics_faq_answer_10">
<p>You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.</p>
</div>
</article>
</section>
<section id="classes_faq" class="category">
<h2>The Classes</h2>
<article class="response">
<h3 class="question">How much work will I have to do to pass my course?</h3>
<div class ="answer" id="classes_faq_answer_0">
<p>The projected hours of study required for each course are described on the specific course description page.</p>
</div>
</article>
<article class="response">
<h3 class="question">What should I do before I take a course (prerequisites)?</h3>
<div class ="answer" id="classes_faq_answer_1">
<p>Each course is different – some have prerequisites, and some don’t. Take a look at your specific course’s recommended prerequisites. If you do not have a particular prerequisite, you may still take the course.</p>
</div>
</article>
<article class="response">
<h3 class="question">What books should I read? (I am interested in reading materials before the class starts).</h3>
<div class ="answer" id="classes_faq_answer_2">
<p>Take a look at the specific course prerequisites. All required academic materials will be provided during the course, within the browser. Some of the course descriptions may list additional resources. For supplemental reading material before or during the course, you can post a question on the course’s Discussion Forum to ask your online coursemates for suggestions.</p>
</div>
</article>
<article class="response">
<h3 class="question"> Can I download the book for my course?</h3>
<div class ="answer" id="classes_faq_answer_3">
<p>EdX book content may only be viewed within the browser, and downloading it violates copyright laws. If you need or want a hard copy of the book, we recommend that you purchase a copy.</p>
</div>
</article>
<article class="response">
<h3 class="question">Can I take more than one course at a time?</h3>
<div class ="answer" id="classes_faq_answer_4">
<p>You may take multiple edX courses, however we recommend checking the requirements on each course description page to determine your available study hours and the demands of the intended courses.</p>
</div>
</article>
<article class="response">
<h3 class="question">How do I log in to take an edX class?</h3>
<div class ="answer" id="classes_faq_answer_5">
<p>Once you sign up for a course and activate your account, click on the "Log In" button on the edx.org home page. You will need to type in your email address and edX password each time you log in.</p>
</div>
</article>
<article class="response">
<h3 class="question">What time is the class?</h3>
<div class ="answer" id="classes_faq_answer_6">
<p>EdX classes take place at your convenience. Prefer to sleep in and study late? No worries. Videos and problem sets are available 24 hours a day, which means you can watch video and complete work whenever you have spare time. You simply log in to your course via the Internet and work through the course material, one week at a time.</p>
</div>
</article>
<article class="response">
<h3 class="question">If I miss a week, how does this affect my grade?</h3>
<div class ="answer" id="classes_faq_answer_7">
<p>It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.</p>
</div>
</article>
<article class="response">
<h3 class="question">How can I meet/find other students?</h3>
<div class ="answer" id="classes_faq_answer_8">
<p>All edX courses have Discussion Forums where you can chat with and help each other within the framework of the Honor Code.</p>
</div>
</article>
<article class="response">
<h3 class="question">How can I talk to professors, fellows and teaching assistants?</h3>
<div class ="answer" id="classes_faq_answer_9">
<p>The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.</p>
</div>
</article>
</section>
<section id="getting_help_faq" class="category">
<h2>Getting Help</h2>
<article class="response">
<h3 class="question">Can I re-take a course?</h3>
<div class ="answer" id="getting_help_faq_answer_0">
<p>Good news: there are unlimited "mulligans" in edX. You may re-take edX courses as often as you wish. Your performance in any particular offering of a course will not effect your standing in future offerings of any edX course, including future offerings of the same course.</p>
</div>
</article>
<article class="response">
<h3 class="question">Enrollment for a course that I am interested in is open, but the course has already started. Can I still enroll?</h3>
<div class ="answer" id="getting_help_faq_answer_1">
<p>Yes, but you will not be able to turn in any assignments or exams that have already been due. If it is early in the course, you might still be able to earn enough points for a certificate, but you will have to check with the course in question in order to find out more.</p>
</div>
</article>
<article class="response">
<h3 class="question">Is there an exam at the end?</h3>
<div class ="answer" id="getting_help_faq_answer_2">
<p>Different courses have slightly different structures. Please check the course material description to see if there is a final exam or final project.</p>
</div>
</article>
<article class="response">
<h3 class="question">Will the same courses be offered again in the future?</h3>
<div class ="answer" id="getting_help_faq_answer_3">
<p>Existing edX courses will be re-offered, and more courses added.</p>
</div>
</article>
<article class="response">
<h3 class="question">Will I get a certificate for taking an edX course?</h3>
<div class ="answer" id="getting_help_faq_answer_4">
<p>Online learners who receive a passing grade for a course will receive a certificate of mastery from edX and the underlying X University that offered the course. For example, a certificate of mastery for MITx’s 6.002x Circuits & Electronics will come from edX and MITx.</p>
</div>
</article>
<article class="response">
<h3 class="question">How are edX certificates delivered?</h3>
<div class ="answer" id="getting_help_faq_answer_5">
<p>EdX certificates are delivered online through edx.org. So be sure to check your email in the weeks following the final grading – you will be able to download and print your certificate.</p>
</div>
</article>
<article class="response">
<h3 class="question">What is the difference between a proctored certificate and an honor code certificate?</h3>
<div class ="answer" id="getting_help_faq_answer_6">
<p>A proctored certificate is given to students who take and pass an exam under proctored conditions. An honor-code certificate is given to students who have completed all of the necessary online coursework associated with a course and have signed <link> the edX honor code </link>.</p>
</div>
</article>
<article class="response">
<h3 class="question">Yes. The requirements for both certificates can be independently satisfied.</h3>
<div class ="answer" id="getting_help_faq_answer_7">
<p>It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.</p>
</div>
</article>
<article class="response">
<h3 class="question">Will my grade be shown on my certificate?</h3>
<div class ="answer" id="getting_help_faq_answer_8">
<p>No. Grades are not displayed on either honor code or proctored certificates.</p>
</div>
</article>
<article class="response">
<h3 class="question">How can I talk to professors, fellows and teaching assistants?</h3>
<div class ="answer" id="getting_help_faq_answer_9">
<p>The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don’t have to wait in line or rearrange your schedule to fit your professor’s – just post your questions. The response isn’t always immediate, but it’s usually pretty darned quick.</p>
</div>
</article>
<article class="response">
<h3 class="question">The only certificates distributed with grades by edX were for the initial prototype course.</h3>
<div class ="answer" id="getting_help_faq_answer_10">
<p>You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.</p>
</div>
</article>
<article class="response">
<h3 class="question">Will my university accept my edX coursework for credit?</h3>
<div class ="answer" id="getting_help_faq_answer_11">
<p>Each educational institution makes its own decision regarding whether to accept edX coursework for credit. Check with your university for its policy.</p>
</div>
</article>
<article class="response">
<h3 class="question">I lost my edX certificate – can you resend it to me?</h3>
<div class ="answer" id="getting_help_faq_answer_12">
<p>Please log back in to your account to find certificates from the same profile page where they were originally posted. You will be able to re-print your certificate from there.</p>
</div>
</article>
</section>
<section id="open_source_faq" class="category">
<h2>edX & Open Source</h2>
<article class="response">
<h3 class="question">What’s open source?</h3>
<div class ="answer" id="open_source_faq_answer_0">
<p>Open source is a philosophy that generally refers to making software freely available for use or modification as users see fit. In exchange for use of the software, users generally add their contributions to the software, making it a public collaboration. The edX platform will be made available as open source code in order to allow world talent to improve and share it on an ongoing basis.</p>
</div>
</article>
<article class="response">
<h3 class="question">When/how can I get the open-source platform technology?</h3>
<div class ="answer" id="open_source_faq_answer_1">
<p>We are still building the edX technology platform and will be making announcements in the future about its availability.</p>
</div>
</article>
</section>
<section id="other_help_faq" class="category">
<h2>Other Help Questions - Account Questions</h2>
<article class="response">
<h3 class="question">My username is taken.</h3>
<div class ="answer" id="other_help_faq_answer_0">
<p>Now’s your chance to be creative: please try a different, more unique username – for example, try adding a random number to the end.</p>
</div>
</article>
<article class="response">
<h3 class="question">Why does my password show on my course login page?</h3>
<div class ="answer" id="other_help_faq_answer_1">
<p>Oops! This may be because of the way you created your account. For example, you may have mistakenly typed your password into the login box.</p>
</div>
</article>
<article class="response">
<h3 class="question">I am having login problems (password/email unrecognized).</h3>
<div class ="answer" id="other_help_faq_answer_2">
<p>Please check your browser’s settings to make sure that you have the current version of Firefox or Chrome, and then try logging in again. If you find access impossible, you may simply create a new account using an alternate email address – the old, unused account will disappear later.</p>
</div>
</article>
<article class="response">
<h3 class="question">I did not receive an activation email.</h3>
<div class ="answer" id="other_help_faq_answer_3">
<p>If you did not receive an activation email it may be because:</p>
<ul>
<li>There was a typo in your email address.</li>
<li>Your spam filter may have caught the activation email. Please check your spam folder. </li>
<li>You may be using an older browser. We recommend downloading the current version of Firefox or Chrome. </li>
<li>JavaScript is disabled in your browser. Please check your browser settings and confirm that JavaScript is enabled. </li>
</ul>
<p>If you continue to have problems activating your account, we recommend that you try creating a new account. There is no need to do anything about the old account. If it is not activated through the link in the email, it will disappear later.</p>
</div>
</article>
<article class="response">
<h3 class="question">Can I delete my account?</h3>
<div class ="answer" id="other_help_faq_answer_4">
<p>There’s no need to delete you account. An old, unused edX account with no course completions associated with it will disappear.</p>
</div>
</article>
<article class="response">
<h3 class="question">I am experiencing problems with the display. E.g., There are tools missing from the course display, or I am unable to view video.</h3>
<div class ="answer" id="other_help_faq_answer_5">
<p>Please check your browser and settings. We recommend downloading the current version of Firefox or Chrome. Alternatively, you may re-register with a different email account. There is no need to delete the old account, as it will disappear if unused.</p>
</div>
</article>
</section>
</section>
<section class="emails"> <nav class="categories">
<h2>Help email</h2> <a href="#edx_basics_faq">edX Basics</a>
<a href="#classes_faq">The Classes</a>
<a href="#getting_help_faq">Getting Help</a>
<a href="#open_source_faq">edX & Open source</a>
<a href="#other_help_faq">Other Help Questions - Account Questions</a>
</nav>
<ul>
<li><p>System-related questions: <a href="mailto:technical@edx.org">technical@edx.org</a></p></li>
<li><p>Content-related questions: <a href="mailto:content@edx.org">content@edx.org</a></p></li>
<li><p>Bug reports: <a href="mailto:bugs@edx.org">bugs@edx.org</a></p></li>
<li><p>Suggestions: <a href="mailto:suggestions@edx.org">suggestions@edx.org</a></p></li>
</ul>
</section> </section>
</section> </section>
lms/templates/test_center_register.html
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
% if registration.registration_is_rejected: % if registration.registration_is_rejected:
<section class="status message message-flash registration-rejected message-action is-shown"> <section class="status message message-flash registration-rejected message-action is-shown">
<h3 class="message-title">Your registration for the Pearson exam has been rejected</h3> <h3 class="message-title">Your registration for the Pearson exam has been rejected</h3>
<p class="message-copy">Please see your registration status details for more information.</p> <p class="message-copy">Please see your <strong>registration status</strong> details for more information.</p>
</section> </section>
% endif % endif
...@@ -246,25 +246,25 @@ ...@@ -246,25 +246,25 @@
<li class="field-group phoneinfo"> <li class="field-group phoneinfo">
<div class="field required" id="field-phone"> <div class="field required" id="field-phone">
<label for="phone">Phone Number</label> <label for="phone">Phone Number</label>
<input id="phone" type="tel" name="phone" value="${testcenteruser.phone}" placeholder="e.g. 1-55-555-5555" /> <input id="phone" type="tel" name="phone" value="${testcenteruser.phone}" />
</div> </div>
<div class="field" id="field-extension"> <div class="field" id="field-extension">
<label for="extension">Extension</label> <label for="extension">Extension</label>
<input id="extension" class="short" type="tel" name="extension" value="${testcenteruser.extension}" placeholder="e.g. 555" /> <input id="extension" class="short" type="tel" name="extension" value="${testcenteruser.extension}" />
</div> </div>
<div class="field required" id="field-phone_country_code"> <div class="field required" id="field-phone_country_code">
<label for="phone_country_code">Phone Country Code</label> <label for="phone_country_code">Phone Country Code</label>
<input id="phone_country_code" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" placeholder="e.g. 1, 44, 976" /> <input id="phone_country_code" class="short" type="text" name="phone_country_code" value="${testcenteruser.phone_country_code}" />
</div> </div>
</li> </li>
<li class="field-group faxinfo"> <li class="field-group faxinfo">
<div class="field" id="field-fax"> <div class="field" id="field-fax">
<label for="fax">Fax Number</label> <label for="fax">Fax Number</label>
<input id="fax" type="tel" class="short" name="fax" value="${testcenteruser.fax}" placeholder="e.g. 1-55-555-5555" /> <input id="fax" type="tel" class="short" name="fax" value="${testcenteruser.fax}" />
</div> </div>
<div class="field" id="field-fax_country_code"> <div class="field" id="field-fax_country_code">
<label for="fax_country_code">Fax Country Code</label> <label for="fax_country_code">Fax Country Code</label>
<input id="fax_country_code" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" placeholder="e.g. 1, 44, 976" /> <input id="fax_country_code" class="short" type="text" name="fax_country_code" value="${testcenteruser.fax_country_code}" />
</div> </div>
</li> </li>
<li class="field" id="field-company_name"> <li class="field" id="field-company_name">
...@@ -474,7 +474,7 @@ ...@@ -474,7 +474,7 @@
<div class="details details-contact"> <div class="details details-contact">
<h4>Questions</h4> <h4>Questions</h4>
<p>If you have a specific question pertaining to your registration, you may contact <a class="contact-link" href="${exam_help_href}">exam-help@edx.org</a>.</p> <p>If you have a specific question pertaining to your registration, you may <a class="contact-link" href="${exam_help_href}">contact edX at exam-help@edx.org</a>.</p>
</div> </div>
</aside> </aside>
</section> </section>
requirements.txt
...@@ -52,8 +52,7 @@ pil==1.1.7 ...@@ -52,8 +52,7 @@ pil==1.1.7
nltk==2.0.4 nltk==2.0.4
django-debug-toolbar-mongo django-debug-toolbar-mongo
dogstatsd-python==0.2.1 dogstatsd-python==0.2.1
# Taking out MySQL-python for now because it requires mysql to be installed, so breaks updates on content folks' envs. MySQL-python==1.2.4c1
# MySQL-python
sphinx==1.1.3 sphinx==1.1.3
factory_boy factory_boy
Shapely==1.2.16 Shapely==1.2.16
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment