From 4b842e7ac85ed508db46379f14d9591301485654 Mon Sep 17 00:00:00 2001
From: Edward Loveall <edward@apprentice.io>
Date: Thu, 17 May 2012 16:31:34 -0400
Subject: [PATCH 1/3] Adds ARIA labels to page elements

This includes calculator open/close button, navigation, profile, and
book's table of content.
---
 static/js/application.js               |  7 ++++++-
 templates/coffee/src/calculator.coffee |  5 +++++
 templates/courseware.html              |  2 +-
 templates/info.html                    |  4 ++--
 templates/main.html                    |  4 ++--
 templates/marketing.html               |  2 +-
 templates/navigation.html              |  2 +-
 templates/profile.html                 | 12 ++++++------
 templates/seq_module.html              |  4 ++--
 templates/simplewiki_base.html         |  2 +-
 templates/staticbook.html              |  2 +-
 11 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/static/js/application.js b/static/js/application.js
index 876a926ff3..7da71476c8 100644
--- a/static/js/application.js
+++ b/static/js/application.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.3.2-pre
+// Generated by CoffeeScript 1.3.3
 (function() {
 
   window.Calculator = (function() {
@@ -20,6 +20,11 @@
     Calculator.prototype.toggle = function() {
       $('li.calc-main').toggleClass('open');
       $('#calculator_wrapper #calculator_input').focus();
+      if ($('.calc.closed').length) {
+        $('.calc').attr('aria-label', 'Open Calculator');
+      } else {
+        $('.calc').attr('aria-label', 'Close Calculator');
+      }
       return $('.calc').toggleClass('closed');
     };
 
diff --git a/templates/coffee/src/calculator.coffee b/templates/coffee/src/calculator.coffee
index 7d62f5a794..003cf5b1f4 100644
--- a/templates/coffee/src/calculator.coffee
+++ b/templates/coffee/src/calculator.coffee
@@ -10,6 +10,11 @@ class window.Calculator
   toggle: ->
     $('li.calc-main').toggleClass 'open'
     $('#calculator_wrapper #calculator_input').focus()
+    if $('.calc.closed').length
+      $('.calc').attr 'aria-label', 'Open Calculator'
+    else
+      $('.calc').attr 'aria-label', 'Close Calculator'
+
     $('.calc').toggleClass 'closed'
 
   helpToggle: ->
diff --git a/templates/courseware.html b/templates/courseware.html
index 050172626a..404871e49c 100644
--- a/templates/courseware.html
+++ b/templates/courseware.html
@@ -20,7 +20,7 @@
 
 <section class="main-content">
   <div class="course-wrapper">
-    <section class="course-index">
+    <section aria-label="Course Navigation" class="course-index">
       <header id="open_close_accordion">
         <h2>Courseware Index</h2>
         <a href="#">close</a>
diff --git a/templates/info.html b/templates/info.html
index 8c914f9f60..67ce69ec85 100644
--- a/templates/info.html
+++ b/templates/info.html
@@ -27,14 +27,14 @@ $(document).ready(function(){
     <section class="updates">
       <%include file="updates.html" />
     </section>
-    <section class="handouts">
+    <section aria-label="Handout Navigation" class="handouts">
       <%include file="handouts.html" />
     </section>
     % else:
     <section class="updates">
       <%include file="guest_updates.html" />
     </section>
-    <section class="handouts">
+    <section aria-label="Handout Navigation" class="handouts">
       <%include file="guest_handouts.html" />
     </section>
     % endif
diff --git a/templates/main.html b/templates/main.html
index 014248bcd6..c916b80f27 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -40,7 +40,7 @@
     <p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a>
 </p>
       <nav>
-      <ul class="social">
+      <ul aria-label="Social Links" class="social">
         <li class="linkedin">
           <a href="http://www.linkedin.com/groups/Friends-Alumni-MITx-4316538">Linked In</a>
         </li>
@@ -54,7 +54,7 @@
     <ul>
       <li><a href="#feedback_div" rel="leanModal">Feedback</a></li>
       <li class="calc-main">
-        <a href="#" class="calc">Calculator</a>
+        <a aria-label="Open Calculator" href="#" class="calc">Calculator</a>
 
         <div id="calculator_wrapper">
           <form id="calculator">
diff --git a/templates/marketing.html b/templates/marketing.html
index a18397b26e..a986bb33cc 100644
--- a/templates/marketing.html
+++ b/templates/marketing.html
@@ -97,7 +97,7 @@ function postJSON(url, data, callback) {
       <li><a href="/t/mitx_help.html">Help</a></li>
     </ul>
 
-    <ul class="social">
+    <ul aria-label="Social Links" class="social">
       <li class="linkedin">
         <a href="http://www.linkedin.com/groups/Friends-Alumni-MITx-4316538">Linked In</a>
       </li>
diff --git a/templates/navigation.html b/templates/navigation.html
index b134b26856..c36e6e6ab0 100644
--- a/templates/navigation.html
+++ b/templates/navigation.html
@@ -1,6 +1,6 @@
 <%page args="active_page" />
 <div class="header-wrapper">
-  <header>
+  <header aria-label="Global Navigation">
     <hgroup>
       <h1><em>
         % if settings.ENABLE_MULTICOURSE:
diff --git a/templates/profile.html b/templates/profile.html
index a43b4e04c8..bbfc4ce8be 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -179,7 +179,7 @@ $(function() {
 
     </section>
 
-    <section class="user-info">
+    <section aria-label="Profile Navigation" class="user-info">
 
       <header>
         <h1>Student Profile</h1>
@@ -189,7 +189,7 @@ $(function() {
         <li>
           Name: <strong>${name}</strong>
           %if True:
-          <a href="#apply_name_change" rel="leanModal" class="name-edit">Edit</a>
+          <a href="#apply_name_change" rel="leanModal" class="name-edit" aria-label="Edit Name">Edit</a>
           %else:
           (Name change pending)
           %endif
@@ -200,18 +200,18 @@ $(function() {
         </li>
 
         <li>
-          E-mail: <strong>${email}</strong> <a href="#change_email" rel="leanModal" class="edit-email">Edit</a>
+          E-mail: <strong>${email}</strong> <a href="#change_email" rel="leanModal" class="edit-email" aria-label="Edit Email">Edit</a>
         </li>
         <li>
-          Location: <div id="location_sub">${location}</div><div id="description"></div> <a href="#" id="change_location">Edit</a>
+          Location: <div id="location_sub">${location}</div><div id="description"></div> <a href="#" id="change_location" aria-label="Edit Location">Edit</a>
         </li>
         <li>
-          Language: <div id="language_sub">${language}</div> <a href="#" id="change_language">Edit</a>
+          Language: <div id="language_sub">${language}</div> <a href="#" id="change_language" aria-label="Edit Language">Edit</a>
         </li>
         <li>
           Password reset
           <input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
-          <input type="submit" id="pwd_reset_button" value="Reset" />
+          <input type="submit" id="pwd_reset_button" value="Reset" aria-label="Reset Password" />
           <p>We'll e-mail a password reset link to ${email}.</p>
         </li>
       </ul>
diff --git a/templates/seq_module.html b/templates/seq_module.html
index f71a371e22..94aa1661bc 100644
--- a/templates/seq_module.html
+++ b/templates/seq_module.html
@@ -1,4 +1,4 @@
-<nav class="sequence-nav">
+<nav aria-label="Section Navigation" class="sequence-nav">
   <ol>
     % for t in range(1,1+len(items)):
     <li><a href="#" class="seq_inactive" id="tt_${ t }"></a></li>
@@ -14,7 +14,7 @@
 <div id="seq_content"></div>
 
 <nav class="sequence-bottom">
-<ul>
+<ul aria-label="Section Navigation">
   <li class="${ id }prev prev"><a href="#">Previous</a></li>
   <li class="${ id }next next"><a href="#">Next</a></li>
 </ul>
diff --git a/templates/simplewiki_base.html b/templates/simplewiki_base.html
index 9acdffbf41..380d971515 100644
--- a/templates/simplewiki_base.html
+++ b/templates/simplewiki_base.html
@@ -77,7 +77,7 @@
 <section class="main-content">
   <div class="wiki-wrapper">
     <%block name="wiki_panel">
-    <div id="wiki_panel">
+    <div aria-label="Wiki Navigation" id="wiki_panel">
     <h2>Course Wiki</h2>
       <%
           if (wiki_article is not UNDEFINED):
diff --git a/templates/staticbook.html b/templates/staticbook.html
index 29553c9423..0e510a486c 100644
--- a/templates/staticbook.html
+++ b/templates/staticbook.html
@@ -59,7 +59,7 @@ $("#open_close_accordion a").click(function(){
 <section class="main-content">
   <div class="book-wrapper">
 
-    <section class="book-sidebar">
+    <section aria-label="Textbook Navigation" class="book-sidebar">
       <header id="open_close_accordion">
         <h2>Table of Contents</h2>
         <a href="#">close</a>

From 03a9be7e78991392be16e3dd3169374da1205c49 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Mon, 21 May 2012 11:56:20 -0400
Subject: [PATCH 2/3] Add newrelic handler, rather than custom function to log
 exceptions

---
 djangoapps/courseware/views.py   | 13 ++++++-------
 envs/logsettings.py              |  9 +++++++--
 lib/newrelic_logging/__init__.py | 14 ++++++++++++++
 lib/util/errors.py               |  7 -------
 4 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 lib/newrelic_logging/__init__.py
 delete mode 100644 lib/util/errors.py

diff --git a/djangoapps/courseware/views.py b/djangoapps/courseware/views.py
index 857bdd2e03..3427442fcc 100644
--- a/djangoapps/courseware/views.py
+++ b/djangoapps/courseware/views.py
@@ -19,7 +19,6 @@ from lxml import etree
 from module_render import render_module, make_track_function, I4xSystem
 from models import StudentModule
 from student.models import UserProfile
-from util.errors import record_exception
 from util.views import accepts
 from multicourse import multicourse_settings
 
@@ -114,7 +113,7 @@ def render_section(request, section):
     try:
         dom = content_parser.section_file(user, section, coursename)
     except:
-        record_exception(log, "Unable to parse courseware xml")
+        log.exception("Unable to parse courseware xml")
         return render_to_response('courseware-error.html', {})
 
     context = {
@@ -133,7 +132,7 @@ def render_section(request, section):
     try:
         module = render_module(user, request, dom, module_object_preload)
     except:
-        record_exception(log, "Unable to load module")
+        log.exception("Unable to load module")
         context.update({
             'init': '',
             'content': render_to_string("module-error.html", {}),
@@ -182,7 +181,7 @@ def index(request, course=None, chapter="Using the System", section="Hints"):
     try:
         dom = content_parser.course_file(user,course)	# also pass course to it, for course-specific XML path
     except:
-        record_exception(log, "Unable to parse courseware xml")
+        log.exception("Unable to parse courseware xml")
         return render_to_response('courseware-error.html', {})
 
     dom_module = dom.xpath("//course[@name=$course]/chapter[@name=$chapter]//section[@name=$section]/*[1]", 
@@ -211,7 +210,7 @@ def index(request, course=None, chapter="Using the System", section="Hints"):
     try:
         module = render_module(user, request, module, module_object_preload)
     except:
-        record_exception(log, "Unable to load module")
+        log.exception("Unable to load module")
         context.update({
             'init': '',
             'content': render_to_string("module-error.html", {}),
@@ -256,7 +255,7 @@ def modx_dispatch(request, module=None, dispatch=None, id=None):
     try:
         xml = content_parser.module_xml(request.user, module, 'id', id, coursename)
     except:
-        record_exception(log, "Unable to load module during ajax call")
+        log.exception("Unable to load module during ajax call")
         if accepts(request, 'text/html'):
             return render_to_response("module-error.html", {})
         else:
@@ -276,7 +275,7 @@ def modx_dispatch(request, module=None, dispatch=None, id=None):
                                                              id, 
                                                              state=oldstate)
     except:
-        record_exception(log, "Unable to load module instance during ajax call")
+        log.exception("Unable to load module instance during ajax call")
         if accepts(request, 'text/html'):
             return render_to_response("module-error.html", {})
         else:
diff --git a/envs/logsettings.py b/envs/logsettings.py
index 9edf9ad0b3..5302e231a3 100644
--- a/envs/logsettings.py
+++ b/envs/logsettings.py
@@ -29,7 +29,7 @@ def get_logger_config(log_dir,
                      " %(process)d] [%(filename)s:%(lineno)d] - %(message)s").format(
                         logging_env=logging_env, hostname=hostname)
 
-    handlers = ['console'] if debug else ['console', 'syslogger']
+    handlers = ['console'] if debug else ['console', 'syslogger', 'newrelic']
 
     return {
         'version': 1,
@@ -60,6 +60,11 @@ def get_logger_config(log_dir,
                 'filename' : tracking_file_loc,
                 'formatter' : 'raw',
             },
+            'newrelic' : {
+                'level': 'ERROR',
+                'class': 'newrelic_logging.NewRelicHandler',
+                'formatter': 'raw',
+            }
         },
         'loggers' : {
             'django' : {
@@ -83,4 +88,4 @@ def get_logger_config(log_dir,
                 'propagate' : False
             },
         }
-    }
\ No newline at end of file
+    }
diff --git a/lib/newrelic_logging/__init__.py b/lib/newrelic_logging/__init__.py
new file mode 100644
index 0000000000..2c5749e3fa
--- /dev/null
+++ b/lib/newrelic_logging/__init__.py
@@ -0,0 +1,14 @@
+import newrelic.agent
+
+import logging
+
+class NewRelicHandler(logging.Handler):
+    def emit(self, record):
+        if record.exc_info is not None:
+            params = record.__dict__
+            params['log_message'] = record.getMessage()
+
+            newrelic.agent.record_exception(
+                *record.exc_info,
+                params=params
+            )
diff --git a/lib/util/errors.py b/lib/util/errors.py
deleted file mode 100644
index c662003a11..0000000000
--- a/lib/util/errors.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import newrelic.agent
-import sys
-
-def record_exception(logger, msg, params={}, ignore_errors=[]):
-    logger.exception(msg)
-    newrelic.agent.record_exception(*sys.exc_info())
-

From 431704ac88dd54e0b72cab426b58f0f54fefabd1 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Mon, 21 May 2012 12:59:38 -0400
Subject: [PATCH 3/3] Make courseware work with multicourse disabled

---
 djangoapps/courseware/module_render.py | 10 ++++++++--
 djangoapps/courseware/views.py         |  9 +++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/djangoapps/courseware/module_render.py b/djangoapps/courseware/module_render.py
index fc7240286f..278d19fd2c 100644
--- a/djangoapps/courseware/module_render.py
+++ b/djangoapps/courseware/module_render.py
@@ -98,14 +98,20 @@ def render_x_module(user, request, xml_module, module_object_preload):
 
     # get coursename if stored
     coursename = multicourse_settings.get_coursename_from_request(request)
-    xp = multicourse_settings.get_course_xmlpath(coursename)	# path to XML for the course
+
+    if coursename and settings.ENABLE_MULTICOURSE:
+        xp = multicourse_settings.get_course_xmlpath(coursename)	# path to XML for the course
+        data_root = settings.DATA_DIR + xp
+    else:
+        data_root = settings.DATA_DIR
 
     # Create a new instance
     ajax_url = settings.MITX_ROOT_URL + '/modx/'+module_type+'/'+module_id+'/'
+    
     system = I4xSystem(track_function = make_track_function(request), 
                        render_function = lambda x: render_module(user, request, x, module_object_preload), 
                        ajax_url = ajax_url,
-                       filestore = OSFS(settings.DATA_DIR + xp),
+                       filestore = OSFS(data_root),
                        )
     instance=module_class(system, 
                           etree.tostring(xml_module), 
diff --git a/djangoapps/courseware/views.py b/djangoapps/courseware/views.py
index 3427442fcc..313259bdb7 100644
--- a/djangoapps/courseware/views.py
+++ b/djangoapps/courseware/views.py
@@ -249,7 +249,12 @@ def modx_dispatch(request, module=None, dispatch=None, id=None):
 
     # get coursename if stored
     coursename = multicourse_settings.get_coursename_from_request(request)
-    xp = multicourse_settings.get_course_xmlpath(coursename)	# path to XML for the course
+
+    if coursename and settings.ENABLE_MULTICOURSE:
+        xp = multicourse_settings.get_course_xmlpath(coursename)	# path to XML for the course
+        data_root = settings.DATA_DIR + xp
+    else:
+        data_root = settings.DATA_DIR
 
     # Grab the XML corresponding to the request from course.xml
     try:
@@ -266,7 +271,7 @@ def modx_dispatch(request, module=None, dispatch=None, id=None):
     system = I4xSystem(track_function = make_track_function(request), 
                        render_function = None, 
                        ajax_url = ajax_url,
-                       filestore = OSFS(settings.DATA_DIR + xp),
+                       filestore = OSFS(data_root),
                        )
 
     try: