From e82582e329eb2731ad44b160204ee54d08760f46 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 9 Aug 2012 11:17:26 -0400
Subject: [PATCH 01/30] added course name to global nav bar

---
 lms/static/sass/course/base/_extends.scss | 18 ++++++++++++++++++
 lms/templates/navigation.html             |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss
index 72e2f56bbb..62a6b25393 100644
--- a/lms/static/sass/course/base/_extends.scss
+++ b/lms/static/sass/course/base/_extends.scss
@@ -185,3 +185,21 @@ h1.top-header {
 .tran {
   @include transition( all, .2s, $ease-in-out-quad);
 }
+
+.global {
+  h2 {
+    float: left;
+    font-size: 0.9em;
+    font-weight: 600;
+    line-height: 40px;
+    letter-spacing: 0;
+    text-transform: none;
+    text-shadow: 0 1px 0 #fff;
+
+    .provider {
+      font: inherit;
+      font-weight: bold;
+      color: #6d6d6d;
+    }
+  }
+}
\ No newline at end of file
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index f628e346f2..f0242f995b 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -7,11 +7,16 @@
 <header class="global" aria-label="Global Navigation">
   <nav>
     <h1 class="logo"><a href="${reverse('root')}"></a></h1>
-    <ol class="left">
+    
+    %if course:
+      <h2><span class="provider">${course.org}:</span> ${course.number} ${course.title}</h2>
+    %else:
+      <ol class="left">
       <li class="primary">
         <a href="${reverse('courses')}">Find Courses</a>
       </li>
     </ol>
+    %endif
 
   %if user.is_authenticated():
     <ol class="user">

From 3d3ee02e52c6e00fd491cc711445724d656c688d Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 9 Aug 2012 12:16:13 -0400
Subject: [PATCH 02/30] started textbook nav styles

---
 lms/static/sass/course/_textbook.scss  |  6 ++++++
 lms/static/sass/multicourse/_jobs.scss | 12 ++++++++++++
 lms/templates/staticbook.html          |  6 +++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lms/static/sass/course/_textbook.scss b/lms/static/sass/course/_textbook.scss
index 50986f5dd5..2698393ebe 100644
--- a/lms/static/sass/course/_textbook.scss
+++ b/lms/static/sass/course/_textbook.scss
@@ -9,6 +9,12 @@ div.book-wrapper {
     ul#booknav {
       font-size: em(14);
 
+      .page-number {
+        float: right;
+        font-size: .8em;
+        color: #9a9a9a;
+      }
+
       li {
         background: none;
         border-bottom: 0;
diff --git a/lms/static/sass/multicourse/_jobs.scss b/lms/static/sass/multicourse/_jobs.scss
index 306851e602..d2f86e93a6 100644
--- a/lms/static/sass/multicourse/_jobs.scss
+++ b/lms/static/sass/multicourse/_jobs.scss
@@ -135,6 +135,18 @@
           font-weight: 700;
           margin-bottom: 15px;
         }
+
+        ul {
+          padding-left: 50px;
+        }
+
+        li {
+          font-family: $serif;
+          font-size: 1em;
+          line-height: 1.6em;
+          color: #3c3c3c;
+          margin-bottom: 0.2em;
+        }
       }
     }
   }
diff --git a/lms/templates/staticbook.html b/lms/templates/staticbook.html
index 804676de97..693dea44e9 100644
--- a/lms/templates/staticbook.html
+++ b/lms/templates/staticbook.html
@@ -75,7 +75,11 @@ $("#open_close_accordion a").click(function(){
           <%def name="print_entry(entry)">
               <li>
                   <a href="javascript:goto_page(${entry.get('page')})">
-                      ${' '.join(entry.get(attribute, '') for attribute in ['chapter', 'name', 'page_label'])}
+                      <!--${' '.join(entry.get(attribute, '') for attribute in ['chapter', 'name', 'page_label'])}-->
+                      %if entry.get('chapter'):
+                        <span class="chapter-number">${entry.get('chapter')}</span> 
+                      %endif
+                      <span class="chapter-name">${entry.get('name')}</span> <span class="page-number">${entry.get('page_label')}</span>
                   </a>
                   % if len(entry) > 0:
                       <ul>

From ced521c17d0a6f7b636bf577b34313821d6dd394 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 9 Aug 2012 14:44:50 -0400
Subject: [PATCH 03/30] cleaned up textbook nav styles

---
 lms/static/sass/course/_textbook.scss | 20 ++++++++++++++++++++
 lms/templates/staticbook.html         | 13 ++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/lms/static/sass/course/_textbook.scss b/lms/static/sass/course/_textbook.scss
index 2698393ebe..8e88f8befd 100644
--- a/lms/static/sass/course/_textbook.scss
+++ b/lms/static/sass/course/_textbook.scss
@@ -9,10 +9,25 @@ div.book-wrapper {
     ul#booknav {
       font-size: em(14);
 
+      .chapter-number {
+        
+      }
+
+      .chapter {
+        float: left;
+        width: 87%;
+        line-height: 1.4em;
+      }
+
       .page-number {
         float: right;
+        width: 12%;
         font-size: .8em;
+        line-height: 2.1em;
+        text-align: right;
         color: #9a9a9a;
+        opacity: 0;
+        @include transition(opacity .15s);
       }
 
       li {
@@ -22,9 +37,14 @@ div.book-wrapper {
 
         a {
           padding: 0;
+          @include clearfix;
 
           &:hover {
             background-color: transparent;
+
+            .page-number {
+              opacity: 1;
+            }
           }
         }
 
diff --git a/lms/templates/staticbook.html b/lms/templates/staticbook.html
index 693dea44e9..2a0a6f03bb 100644
--- a/lms/templates/staticbook.html
+++ b/lms/templates/staticbook.html
@@ -75,11 +75,14 @@ $("#open_close_accordion a").click(function(){
           <%def name="print_entry(entry)">
               <li>
                   <a href="javascript:goto_page(${entry.get('page')})">
-                      <!--${' '.join(entry.get(attribute, '') for attribute in ['chapter', 'name', 'page_label'])}-->
-                      %if entry.get('chapter'):
-                        <span class="chapter-number">${entry.get('chapter')}</span> 
-                      %endif
-                      <span class="chapter-name">${entry.get('name')}</span> <span class="page-number">${entry.get('page_label')}</span>
+                      <span class="chapter">
+                        %if entry.get('chapter'):
+                          <span class="chapter-number">${entry.get('chapter')}.</span> ${entry.get('name')}
+                        %else:
+                          ${entry.get('name')}
+                        %endif
+                      </span>
+                      <span class="page-number">${entry.get('page_label')}</span>
                   </a>
                   % if len(entry) > 0:
                       <ul>

From 1c3038ff3a95dc874e0a7d9420c6bde4ee2a5dcf Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Thu, 9 Aug 2012 19:47:08 -0400
Subject: [PATCH 04/30] Make accordion remember state

* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
---
 lms/djangoapps/courseware/module_render.py | 39 +++++++++++-----------
 lms/djangoapps/courseware/views.py         | 21 +++++-------
 lms/static/coffee/src/navigation.coffee    |  9 ++++-
 lms/templates/accordion.html               |  3 +-
 lms/urls.py                                | 10 +++---
 5 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 852e3d8a77..d32f3d81ec 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -46,11 +46,12 @@ def toc_for_course(user, request, course, active_chapter, active_section):
        'format': format, 'due': due, 'active' : bool}, ...]
 
     active is set for the section and chapter corresponding to the passed
-    parameters.  Everything else comes from the xml, or defaults to "".
+    parameters, which are expected to be url_names of the chapter+section.
+    Everything else comes from the xml, or defaults to "".
 
     chapters with name 'hidden' are skipped.
     '''
-    
+
     student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(user, course, depth=2)
     course = get_module(user, request, course.location, student_module_cache)
 
@@ -59,8 +60,8 @@ def toc_for_course(user, request, course, active_chapter, active_section):
         sections = list()
         for section in chapter.get_display_items():
 
-            active = (chapter.display_name == active_chapter and
-                      section.display_name == active_section)
+            active = (chapter.url_name == active_chapter and
+                      section.url_name == active_section)
             hide_from_toc = section.metadata.get('hide_from_toc', 'false').lower() == 'true'
 
             if not hide_from_toc:
@@ -73,7 +74,7 @@ def toc_for_course(user, request, course, active_chapter, active_section):
         chapters.append({'display_name': chapter.display_name,
                          'url_name': chapter.url_name,
                          'sections': sections,
-                         'active': chapter.display_name == active_chapter})
+                         'active': chapter.url_name == active_chapter})
     return chapters
 
 
@@ -122,10 +123,10 @@ def get_module(user, request, location, student_module_cache, position=None):
                                 position within module
 
     Returns: xmodule instance
-    
+
     '''
     descriptor = modulestore().get_item(location)
-    
+
     #TODO Only check the cache if this module can possibly have state
     instance_module = None
     shared_module = None
@@ -133,13 +134,13 @@ def get_module(user, request, location, student_module_cache, position=None):
         if descriptor.stores_state:
             instance_module = student_module_cache.lookup(descriptor.category,
                                                   descriptor.location.url())
-        
+
         shared_state_key = getattr(descriptor, 'shared_state_key', None)
         if shared_state_key is not None:
             shared_module = student_module_cache.lookup(descriptor.category,
                                                         shared_state_key)
-        
-        
+
+
 
     instance_state = instance_module.state if instance_module is not None else None
     shared_state = shared_module.state if shared_module is not None else None
@@ -206,13 +207,13 @@ def get_instance_module(user, module, student_module_cache):
     """
     if user.is_authenticated():
         if not module.descriptor.stores_state:
-            log.exception("Attempted to get the instance_module for a module " 
+            log.exception("Attempted to get the instance_module for a module "
                           + str(module.id) + " which does not store state.")
             return None
-        
+
         instance_module = student_module_cache.lookup(module.category,
                                               module.location.url())
-        
+
         if not instance_module:
             instance_module = StudentModule(
                 student=user,
@@ -222,11 +223,11 @@ def get_instance_module(user, module, student_module_cache):
                 max_grade=module.max_score())
             instance_module.save()
             student_module_cache.append(instance_module)
-            
+
         return instance_module
     else:
         return None
-    
+
 def get_shared_instance_module(user, module, student_module_cache):
     """
     Return shared_module is a StudentModule specific to all modules with the same
@@ -236,7 +237,7 @@ def get_shared_instance_module(user, module, student_module_cache):
     if user.is_authenticated():
         # To get the shared_state_key, we need to descriptor
         descriptor = modulestore().get_item(module.location)
-        
+
         shared_state_key = getattr(module, 'shared_state_key', None)
         if shared_state_key is not None:
             shared_module = student_module_cache.lookup(module.category,
@@ -251,7 +252,7 @@ def get_shared_instance_module(user, module, student_module_cache):
                 student_module_cache.append(shared_module)
         else:
             shared_module = None
-        
+
         return shared_module
     else:
         return None
@@ -259,7 +260,7 @@ def get_shared_instance_module(user, module, student_module_cache):
 @csrf_exempt
 def xqueue_callback(request, userid, id, dispatch):
     '''
-    Entry point for graded results from the queueing system. 
+    Entry point for graded results from the queueing system.
     '''
     # Test xqueue package, which we expect to be:
     #   xpackage = {'xqueue_header': json.dumps({'lms_key':'secretkey',...}),
@@ -331,7 +332,7 @@ def modx_dispatch(request, dispatch=None, id=None):
 
     instance_module = get_instance_module(request.user, instance, student_module_cache)
     shared_module = get_shared_instance_module(request.user, instance, student_module_cache)
-    
+
     # Don't track state for anonymous users (who don't have student modules)
     if instance_module is not None:
         oldgrade = instance_module.grade
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index ac00626063..59f8de7b38 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -69,12 +69,12 @@ def gradebook(request, course_id):
     if 'course_admin' not in user_groups(request.user):
         raise Http404
     course = check_course(course_id)
-        
+
     student_objects = User.objects.all()[:100]
     student_info = []
-    
+
     #TODO: Only select students who are in the course
-    for student in student_objects:        
+    for student in student_objects:
         student_info.append({
             'username': student.username,
             'id': student.id,
@@ -104,10 +104,10 @@ def profile(request, course_id, student_id=None):
 
     student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(request.user, course)
     course_module = get_module(request.user, request, course.location, student_module_cache)
-    
+
     courseware_summary = grades.progress_summary(student, course_module, course.grader, student_module_cache)
     grade_summary = grades.grade(request.user, request, course, student_module_cache)
-    
+
     context = {'name': user_info.name,
                'username': student.username,
                'location': user_info.location,
@@ -129,19 +129,14 @@ def render_accordion(request, course, chapter, section):
 
         If chapter and section are '' or None, renders a default accordion.
 
+        course, chapter, and section are the url_names.
+
         Returns the html string'''
 
     # grab the table of contents
     toc = toc_for_course(request.user, request, course, chapter, section)
 
-    active_chapter = 1
-    for i in range(len(toc)):
-        if toc[i]['active']:
-            active_chapter = i
-
-    context = dict([('active_chapter', active_chapter),
-                    ('toc', toc),
-                    ('course_name', course.title),
+    context = dict([('toc', toc),
                     ('course_id', course.id),
                     ('csrf', csrf(request)['csrf_token'])] + template_imports.items())
     return render_to_string('accordion.html', context)
diff --git a/lms/static/coffee/src/navigation.coffee b/lms/static/coffee/src/navigation.coffee
index 7ba0a94fad..1d6b8a8117 100644
--- a/lms/static/coffee/src/navigation.coffee
+++ b/lms/static/coffee/src/navigation.coffee
@@ -1,9 +1,16 @@
 class @Navigation
   constructor: ->
     if $('#accordion').length
+      # First look for an active section
       active = $('#accordion ul:has(li.active)').index('#accordion ul')
+      # if we didn't find one, look for an active chapter
+      if active < 0
+        active = $('#accordion h3.active').index('#accordion h3')
+      # if that didn't work either, default to 0
+      if active < 0
+        active = 0
       $('#accordion').bind('accordionchange', @log).accordion
-        active: if active >= 0 then active else 1
+        active: active
         header: 'h3'
         autoHeight: false
       $('#open_close_accordion a').click @toggle
diff --git a/lms/templates/accordion.html b/lms/templates/accordion.html
index 353b83db70..1f514fe4a4 100644
--- a/lms/templates/accordion.html
+++ b/lms/templates/accordion.html
@@ -1,7 +1,8 @@
 <%! from django.core.urlresolvers import reverse %>
 
 <%def name="make_chapter(chapter)">
-  <h3><a href="#">${chapter['display_name']}</a></h3>
+  <h3 ${' class="active"' if 'active' in chapter and chapter['active'] else ''}><a href="#">${chapter['display_name']}</a>
+  </h3>
 
   <ul>
     % for section in chapter['sections']:
diff --git a/lms/urls.py b/lms/urls.py
index bb3952b73c..bff283d11a 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -15,7 +15,7 @@ urlpatterns = ('',
     url(r'^dashboard$', 'student.views.dashboard', name="dashboard"),
 
     url(r'^admin_dashboard$', 'dashboard.views.dashboard'),
-    
+
     url(r'^change_email$', 'student.views.change_email_request'),
     url(r'^email_confirm/(?P<key>[^/]*)$', 'student.views.confirm_email_change'),
     url(r'^change_name$', 'student.views.change_name_request'),
@@ -118,7 +118,7 @@ if settings.COURSEWARE_ENABLED:
         #About the course
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/about$',
             'courseware.views.course_about', name="about_course"),
-        
+
         #Inside the course
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/info$',
             'courseware.views.course_info', name="info"),
@@ -130,16 +130,18 @@ if settings.COURSEWARE_ENABLED:
             'staticbook.views.index_shifted'),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/courseware/?$',
             'courseware.views.index', name="courseware"),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/courseware/(?P<chapter>[^/]*)/$',
+            'courseware.views.index', name="courseware_chapter"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/courseware/(?P<chapter>[^/]*)/(?P<section>[^/]*)/$',
             'courseware.views.index', name="courseware_section"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/profile$',
             'courseware.views.profile', name="profile"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/profile/(?P<student_id>[^/]*)/$',
             'courseware.views.profile'),
-        
+
         # For the instructor
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/gradebook$',
-            'courseware.views.gradebook'),        
+            'courseware.views.gradebook'),
     )
 
     # Multicourse wiki

From 4f27dd436ed52a20e87e4224fa8b80c8609eb4ef Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Fri, 10 Aug 2012 10:13:18 -0400
Subject: [PATCH 05/30] When in debug mode, check the staticfiles.finders
 before mangling urls

---
 common/djangoapps/static_replace.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/djangoapps/static_replace.py b/common/djangoapps/static_replace.py
index f9660e7f5e..73e473c412 100644
--- a/common/djangoapps/static_replace.py
+++ b/common/djangoapps/static_replace.py
@@ -1,4 +1,6 @@
 from staticfiles.storage import staticfiles_storage
+from staticfiles import finders
+from django.conf import settings
 import re
 
 
@@ -9,7 +11,15 @@ def replace(static_url, prefix=None):
         prefix = prefix + '/'
 
     quote = static_url.group('quote')
-    if staticfiles_storage.exists(static_url.group('rest')):
+
+    servable = (
+        # If in debug mode, we'll serve up anything that the finders can find
+        (settings.DEBUG and finders.find(static_url.group('rest'), True)) or
+        # Otherwise, we'll only serve up stuff that the storages can find
+        staticfiles_storage.exists(static_url.group('rest'))
+    )
+
+    if servable:
         return static_url.group(0)
     else:
         url = staticfiles_storage.url(prefix + static_url.group('rest'))

From 8740ba8837b5e5b07188a890241f324cf310ac64 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Fri, 10 Aug 2012 10:43:20 -0400
Subject: [PATCH 06/30] Did a quick security scan through views.

* we appear to be fairly consistent in using is_staff and has_staff_access_to_course
* cleaned up some docstrings and little code things as I went
* fixed small bug in change_enrollment view (check for non-anon user)
---
 common/djangoapps/student/views.py | 16 +++++++++++-----
 lms/djangoapps/courseware/views.py | 29 +++++++++++++++--------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 87490786c1..53e855b1c9 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -94,8 +94,9 @@ def main_index(extra_context = {}, user=None):
     context.update(extra_context)
     return render_to_response('index.html', context)
 
-def course_from_id(id):
-    course_loc = CourseDescriptor.id_to_location(id)
+def course_from_id(course_id):
+    """Return the CourseDescriptor corresponding to this course_id"""
+    course_loc = CourseDescriptor.id_to_location(course_id)
     return modulestore().get_item(course_loc)
 
 
@@ -158,15 +159,19 @@ def try_change_enrollment(request):
 
 @login_required
 def change_enrollment_view(request):
+    """Delegate to change_enrollment to actually do the work."""
     return HttpResponse(json.dumps(change_enrollment(request)))
 
-
 def change_enrollment(request):
     if request.method != "POST":
         raise Http404
 
-    action = request.POST.get("enrollment_action", "")
     user = request.user
+    if not user.is_authenticated():
+        raise Http404
+
+    action = request.POST.get("enrollment_action", "")
+
     course_id = request.POST.get("course_id", None)
     if course_id == None:
         return HttpResponse(json.dumps({'success': False, 'error': 'There was an error receiving the course id.'}))
@@ -184,7 +189,7 @@ def change_enrollment(request):
         if settings.MITX_FEATURES.get('ACCESS_REQUIRE_STAFF_FOR_COURSE'):
             # require that user be in the staff_* group (or be an overall admin) to be able to enroll
             # eg staff_6.002x or staff_6.00x
-            if not has_staff_access_to_course(user,course):
+            if not has_staff_access_to_course(user, course):
                 staff_group = course_staff_group_name(course)
                 log.debug('user %s denied enrollment to %s ; not in %s' % (user,course.location.url(),staff_group))
                 return {'success': False, 'error' : '%s membership required to access course.' % staff_group}
@@ -264,6 +269,7 @@ def logout_user(request):
 def change_setting(request):
     ''' JSON call to change a profile setting: Right now, location
     '''
+    # TODO (vshnayder): location is no longer used
     up = UserProfile.objects.get(user=request.user)  # request.user.profile_cache
     if 'location' in request.POST:
         up.location = request.POST['location']
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index ac00626063..cdaea6d5d1 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -69,12 +69,12 @@ def gradebook(request, course_id):
     if 'course_admin' not in user_groups(request.user):
         raise Http404
     course = check_course(course_id)
-        
+
     student_objects = User.objects.all()[:100]
     student_info = []
-    
+
     #TODO: Only select students who are in the course
-    for student in student_objects:        
+    for student in student_objects:
         student_info.append({
             'username': student.username,
             'id': student.id,
@@ -104,10 +104,10 @@ def profile(request, course_id, student_id=None):
 
     student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(request.user, course)
     course_module = get_module(request.user, request, course.location, student_module_cache)
-    
+
     courseware_summary = grades.progress_summary(student, course_module, course.grader, student_module_cache)
     grade_summary = grades.grade(request.user, request, course, student_module_cache)
-    
+
     context = {'name': user_info.name,
                'username': student.username,
                'location': user_info.location,
@@ -233,12 +233,10 @@ def jump_to(request, location):
     '''
     Show the page that contains a specific location.
 
-    If the location is invalid, return a 404.
+    If the location is invalid or not in any class, return a 404.
 
-    If the location is valid, but not present in a course, ?
-
-    If the location is valid, but in a course the current user isn't registered for, ?
-        TODO -- let the index view deal with it?
+    Otherwise, delegates to the index view to figure out whether this user
+    has access, and what they should see.
     '''
     # Complain if the location isn't valid
     try:
@@ -254,16 +252,16 @@ def jump_to(request, location):
     except NoPathToItem:
         raise Http404("This location is not in any class: {0}".format(location))
 
-    # Rely on index to do all error handling
+    # Rely on index to do all error handling and access control.
     return index(request, course_id, chapter, section, position)
 
 @ensure_csrf_cookie
 def course_info(request, course_id):
-    '''
+    """
     Display the course's info.html, or 404 if there is no such course.
 
     Assumes the course_id is in a valid format.
-    '''
+    """
     course = check_course(course_id)
 
     return render_to_response('info.html', {'course': course})
@@ -289,7 +287,10 @@ def course_about(request, course_id):
 @ensure_csrf_cookie
 @cache_if_anonymous
 def university_profile(request, org_id):
-    all_courses = sorted(modulestore().get_courses(), key=lambda course: course.number)
+    """
+    Return the profile for the particular org_id.  404 if it's not valid.
+    """
+    all_courses = modulestore().get_courses()
     valid_org_ids = set(c.org for c in all_courses)
     if org_id not in valid_org_ids:
         raise Http404("University Profile not found for {0}".format(org_id))

From 022c65a6b40d572afeefea27fa69475413343267 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Fri, 10 Aug 2012 11:40:16 -0400
Subject: [PATCH 07/30] fixed class name header bug

---
 lms/static/sass/base/_extends.scss        | 19 +++++++++++++++++++
 lms/static/sass/course/base/_base.scss    |  4 ++++
 lms/static/sass/course/base/_extends.scss |  5 +++++
 lms/templates/courseware.html             |  1 -
 lms/templates/navigation.html             |  8 ++++----
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/lms/static/sass/base/_extends.scss b/lms/static/sass/base/_extends.scss
index 9dc10aed5f..0161610a28 100644
--- a/lms/static/sass/base/_extends.scss
+++ b/lms/static/sass/base/_extends.scss
@@ -89,3 +89,22 @@
   border: 1px solid rgb(6, 65, 18);
   color: rgb(255, 255, 255);
 }
+
+.global {
+  h2 {
+    display: none;
+    float: left;
+    font-size: 0.9em;
+    font-weight: 600;
+    line-height: 40px;
+    letter-spacing: 0;
+    text-transform: none;
+    text-shadow: 0 1px 0 #fff;
+
+    .provider {
+      font: inherit;
+      font-weight: bold;
+      color: #6d6d6d;
+    }
+  }
+}
\ No newline at end of file
diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss
index 8d952b5040..cd68b4bbaf 100644
--- a/lms/static/sass/course/base/_base.scss
+++ b/lms/static/sass/course/base/_base.scss
@@ -1,3 +1,7 @@
+body {
+  min-width: 980px;
+}
+
 body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a {
   font-family: $sans-serif;
 }
diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss
index 62a6b25393..418074ee01 100644
--- a/lms/static/sass/course/base/_extends.scss
+++ b/lms/static/sass/course/base/_extends.scss
@@ -187,7 +187,12 @@ h1.top-header {
 }
 
 .global {
+  .find-courses-button {
+    display: none;
+  }
+
   h2 {
+    display: block;
     float: left;
     font-size: 0.9em;
     font-weight: 600;
diff --git a/lms/templates/courseware.html b/lms/templates/courseware.html
index a14f35d154..8811509088 100644
--- a/lms/templates/courseware.html
+++ b/lms/templates/courseware.html
@@ -1,6 +1,5 @@
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
-<%block name="bodyclass">courseware</%block>
 <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
 
 <%block name="headextra">
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index f0242f995b..7ba5cca8d0 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -7,16 +7,16 @@
 <header class="global" aria-label="Global Navigation">
   <nav>
     <h1 class="logo"><a href="${reverse('root')}"></a></h1>
-    
+
     %if course:
       <h2><span class="provider">${course.org}:</span> ${course.number} ${course.title}</h2>
-    %else:
-      <ol class="left">
+    %endif
+
+    <ol class="left find-courses-button">
       <li class="primary">
         <a href="${reverse('courses')}">Find Courses</a>
       </li>
     </ol>
-    %endif
 
   %if user.is_authenticated():
     <ol class="user">

From 2005492f7ffae19c1d2d876e9b73353610646e1d Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Wed, 8 Aug 2012 18:18:22 -0400
Subject: [PATCH 08/30] Remove noisy debug message

* also adds a comment to lms/urls.py
---
 lms/djangoapps/courseware/courses.py | 2 --
 lms/urls.py                          | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index 5312a38584..e649bf89f6 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -156,8 +156,6 @@ def has_staff_access_to_course(user, course):
     # note this is the Auth group, not UserTestGroup
     user_groups = [x[1] for x in user.groups.values_list()]
     staff_group = course_staff_group_name(course)
-    log.debug('course %s, staff_group %s, user %s, groups %s' % (
-        course, staff_group, user, user_groups))
     if staff_group in user_groups:
         return True
     return False
diff --git a/lms/urls.py b/lms/urls.py
index bff283d11a..cbe138b883 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -85,7 +85,6 @@ urlpatterns = ('',
     (r'^pressrelease$', 'django.views.generic.simple.redirect_to', {'url': '/press/uc-berkeley-joins-edx'}),
 
 
-
     (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),
 
     # TODO: These urls no longer work. They need to be updated before they are re-enabled
@@ -136,6 +135,7 @@ if settings.COURSEWARE_ENABLED:
             'courseware.views.index', name="courseware_section"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/profile$',
             'courseware.views.profile', name="profile"),
+        # Takes optional student_id for instructor use--shows profile as that student sees it.
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/profile/(?P<student_id>[^/]*)/$',
             'courseware.views.profile'),
 

From 5882a89c820ed6e94b14a9c58e4a238a898101ae Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Wed, 8 Aug 2012 18:19:35 -0400
Subject: [PATCH 09/30] Add management command to create random users

* required some refactoring in create_account() view
---
 .../commands/create_random_users.py           |  36 +++++
 common/djangoapps/student/views.py            | 123 ++++++++++--------
 2 files changed, 107 insertions(+), 52 deletions(-)
 create mode 100644 common/djangoapps/student/management/commands/create_random_users.py

diff --git a/common/djangoapps/student/management/commands/create_random_users.py b/common/djangoapps/student/management/commands/create_random_users.py
new file mode 100644
index 0000000000..c6cf452a43
--- /dev/null
+++ b/common/djangoapps/student/management/commands/create_random_users.py
@@ -0,0 +1,36 @@
+##
+## A script to create some dummy users
+
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from django.contrib.auth.models import User
+from student.models import UserProfile, CourseEnrollment
+
+from student.views import _do_create_account, get_random_post_override
+
+def create(n, course_id):
+    """Create n users, enrolling them in course_id if it's not None"""
+    for i in range(n):
+        (user, user_profile, _) = _do_create_account(get_random_post_override())
+        if course_id is not None:
+            CourseEnrollment.objects.create(user=user, course_id=course_id)
+
+class Command(BaseCommand):
+    help = """Create N new users, with random parameters.
+
+Usage: create_random_users.py N [course_id_to_enroll_in].
+
+Examples:
+  create_random_users.py 1
+  create_random_users.py 10 MITx/6.002x/2012_Fall
+  create_random_users.py 100 HarvardX/CS50x/2012
+"""
+
+    def handle(self, *args, **options):
+        if len(args) < 1 or len(args) > 2:
+            print Command.help
+            return
+
+        n = int(args[0])
+        course_id = args[1] if len(args) == 2 else None
+        create(n, course_id)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 53e855b1c9..ac928a7bd4 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -278,6 +278,58 @@ def change_setting(request):
     return HttpResponse(json.dumps({'success': True,
                                     'location': up.location, }))
 
+def _do_create_account(post_vars):
+    """
+    Given cleaned post variables, create the User and UserProfile objects, as well as the
+    registration for this user.
+
+    Returns a tuple (User, UserProfile, Registration).
+
+    Note: this function is also used for creating test users.
+    """
+    u = User(username=post_vars['username'],
+             email=post_vars['email'],
+             is_active=False)
+    u.set_password(post_vars['password'])
+    r = Registration()
+    # TODO: Rearrange so that if part of the process fails, the whole process fails.
+    # Right now, we can have e.g. no registration e-mail sent out and a zombie account
+    try:
+        u.save()
+    except IntegrityError:
+        # Figure out the cause of the integrity error
+        if len(User.objects.filter(username=post_vars['username'])) > 0:
+            js['value'] = "An account with this username already exists."
+            js['field'] = 'username'
+            return HttpResponse(json.dumps(js))
+
+        if len(User.objects.filter(email=post_vars['email'])) > 0:
+            js['value'] = "An account with this e-mail already exists."
+            js['field'] = 'email'
+            return HttpResponse(json.dumps(js))
+
+        raise
+
+    r.register(u)
+
+    up = UserProfile(user=u)
+    up.name = post_vars['name']
+    up.level_of_education = post_vars.get('level_of_education')
+    up.gender = post_vars.get('gender')
+    up.mailing_address = post_vars.get('mailing_address')
+    up.goals = post_vars.get('goals')
+
+    try:
+        up.year_of_birth = int(post_vars['year_of_birth'])
+    except (ValueError, KeyError):
+        up.year_of_birth = None  # If they give us garbage, just ignore it instead
+                                # of asking them to put an integer.
+    try:
+        up.save()
+    except Exception:
+        log.exception("UserProfile creation failed for user {0}.".format(u.id))
+    return (u, up, r)
+
 
 @ensure_csrf_cookie
 def create_account(request, post_override=None):
@@ -349,47 +401,8 @@ def create_account(request, post_override=None):
         js['field'] = 'username'
         return HttpResponse(json.dumps(js))
 
-    u = User(username=post_vars['username'],
-             email=post_vars['email'],
-             is_active=False)
-    u.set_password(post_vars['password'])
-    r = Registration()
-    # TODO: Rearrange so that if part of the process fails, the whole process fails.
-    # Right now, we can have e.g. no registration e-mail sent out and a zombie account
-    try:
-        u.save()
-    except IntegrityError:
-        # Figure out the cause of the integrity error
-        if len(User.objects.filter(username=post_vars['username'])) > 0:
-            js['value'] = "An account with this username already exists."
-            js['field'] = 'username'
-            return HttpResponse(json.dumps(js))
-
-        if len(User.objects.filter(email=post_vars['email'])) > 0:
-            js['value'] = "An account with this e-mail already exists."
-            js['field'] = 'email'
-            return HttpResponse(json.dumps(js))
-
-        raise
-
-    r.register(u)
-
-    up = UserProfile(user=u)
-    up.name = post_vars['name']
-    up.level_of_education = post_vars.get('level_of_education')
-    up.gender = post_vars.get('gender')
-    up.mailing_address = post_vars.get('mailing_address')
-    up.goals = post_vars.get('goals')
-
-    try:
-        up.year_of_birth = int(post_vars['year_of_birth'])
-    except (ValueError, KeyError):
-        up.year_of_birth = None  # If they give us garbage, just ignore it instead
-                                # of asking them to put an integer.
-    try:
-        up.save()
-    except Exception:
-        log.exception("UserProfile creation failed for user {0}.".format(u.id))
+    # Ok, looks like everything is legit.  Create the account.
+    (u, up, r) = _do_create_account(post_vars)
 
     d = {'name': post_vars['name'],
          'key': r.activation_key,
@@ -437,24 +450,30 @@ def create_account(request, post_override=None):
     return HttpResponse(json.dumps(js), mimetype="application/json")
 
 
-def create_random_account(create_account_function):
-
+def get_random_post_override():
+    """
+    Return a dictionary suitable for passing to post_vars of _do_create_account or post_override
+    of create_account, with random user info.
+    """
     def id_generator(size=6, chars=string.ascii_uppercase + string.ascii_lowercase + string.digits):
         return ''.join(random.choice(chars) for x in range(size))
 
-    def inner_create_random_account(request):
-        post_override = {'username': "random_" + id_generator(),
-                            'email': id_generator(size=10, chars=string.ascii_lowercase) + "_dummy_test@mitx.mit.edu",
-                            'password': id_generator(),
-                            'location': id_generator(size=5, chars=string.ascii_uppercase),
-                            'name': id_generator(size=5, chars=string.ascii_lowercase) + " " + id_generator(size=7, chars=string.ascii_lowercase),
-                            'honor_code': u'true',
-                            'terms_of_service': u'true', }
+    return {'username': "random_" + id_generator(),
+            'email': id_generator(size=10, chars=string.ascii_lowercase) + "_dummy_test@mitx.mit.edu",
+            'password': id_generator(),
+            'name': (id_generator(size=5, chars=string.ascii_lowercase) + " " +
+                     id_generator(size=7, chars=string.ascii_lowercase)),
+                     'honor_code': u'true',
+                     'terms_of_service': u'true', }
 
-        return create_account_function(request, post_override=post_override)
+
+def create_random_account(create_account_function):
+    def inner_create_random_account(request):
+        return create_account_function(request, post_override=get_random_post_override())
 
     return inner_create_random_account
 
+# TODO (vshnayder): do we need GENERATE_RANDOM_USER_CREDENTIALS for anything?
 if settings.GENERATE_RANDOM_USER_CREDENTIALS:
     create_account = create_random_account(create_account)
 

From 15a4db1774daa09af3834b2e5735e098d80ae561 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Wed, 8 Aug 2012 18:20:17 -0400
Subject: [PATCH 10/30] Only show enrolled students in course gradebook

* also added todo about need for pagination
---
 lms/djangoapps/courseware/views.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 96d6890823..76f17fb53d 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -27,7 +27,8 @@ from xmodule.course_module import CourseDescriptor
 from util.cache import cache, cache_if_anonymous
 from student.models import UserTestGroup, CourseEnrollment
 from courseware import grades
-from courseware.courses import check_course, get_courses_by_university
+from courseware.courses import (check_course, get_courses_by_university,
+                                has_staff_access_to_course)
 
 
 log = logging.getLogger("mitx.courseware")
@@ -70,18 +71,18 @@ def gradebook(request, course_id):
         raise Http404
     course = check_course(course_id)
 
-    student_objects = User.objects.all()[:100]
-    student_info = []
+    enrolled_students = User.objects.filter(courseenrollment__course_id=course_id).order_by('username')
 
-    #TODO: Only select students who are in the course
-    for student in student_objects:
-        student_info.append({
-            'username': student.username,
-            'id': student.id,
-            'email': student.email,
-            'grade_summary': grades.grade(student, request, course),
-            'realname': UserProfile.objects.get(user=student).name
-        })
+    # TODO (vshnayder): implement pagination.
+    enrolled_students = enrolled_students[:1000]   # HACK!
+
+    student_info = [{'username': student.username,
+                     'id': student.id,
+                     'email': student.email,
+                     'grade_summary': grades.grade(student, request, course),
+                     'realname': UserProfile.objects.get(user=student).name
+                     }
+                     for student in enrolled_students]
 
     return render_to_response('gradebook.html', {'students': student_info, 'course': course})
 

From 1903a66beabedc032c503cbd9adeafcf5801cd21 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Wed, 8 Aug 2012 18:21:16 -0400
Subject: [PATCH 11/30] Style cleanup in gradebook

* don't display thousands of '%' characters
* s/percentage/fraction/, since that's what it is
---
 lms/templates/gradebook.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lms/templates/gradebook.html b/lms/templates/gradebook.html
index bdc1516339..e6f92c50b3 100644
--- a/lms/templates/gradebook.html
+++ b/lms/templates/gradebook.html
@@ -9,7 +9,7 @@
 
 <%block name="headextra">
   <%static:css group='course'/>
-  
+
   <style type="text/css">
   .grade_A {color:green;}
   .grade_B {color:Chocolate;}
@@ -17,7 +17,7 @@
   .grade_F {color:DimGray;}
   .grade_None {color:LightGray;}
   </style>
-  
+
 </%block>
 
 <%include file="course_navigation.html" args="active_page=''" />
@@ -26,14 +26,14 @@
 <div class="gradebook-wrapper">
   <section class="gradebook-content">
     <h1>Gradebook</h1>
-    
+
     %if len(students) > 0:
     <table>
       <%
       templateSummary = students[0]['grade_summary']
       %>
-      
-      
+
+
       <tr> <!-- Header Row -->
         <th>Student</th>
         %for section in templateSummary['section_breakdown']:
@@ -41,22 +41,22 @@
         %endfor
         <th>Total</th>
       </tr>
-      
-      <%def name="percent_data(percentage)">
+
+      <%def name="percent_data(fraction)">
         <%
           letter_grade = 'None'
-          if percentage > 0:
+          if fraction > 0:
             letter_grade = 'F'
             for grade in ['A', 'B', 'C']:
-              if percentage >= course.grade_cutoffs[grade]:
+              if fraction >= course.grade_cutoffs[grade]:
                 letter_grade = grade
                 break
-          
+
           data_class = "grade_" + letter_grade
         %>
-        <td class="${data_class}" data-percent="${percentage}">${ "{0:.0%}".format( percentage ) }</td>
+        <td class="${data_class}" data-percent="${fraction}">${ "{0:.0f}".format( 100 * fraction ) }</td>
       </%def>
-      
+
       %for student in students:
       <tr>
         <td><a href="/profile/${student['id']}/">${student['username']}</a></td>

From 43d6948f024a3c9b49ca93dcdba078b6fc7d8aa8 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Wed, 8 Aug 2012 18:48:57 -0400
Subject: [PATCH 12/30] Fix links to student profile pages from gradebook

---
 lms/djangoapps/courseware/views.py | 3 ++-
 lms/templates/gradebook.html       | 6 +++++-
 lms/urls.py                        | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 76f17fb53d..59fa5d69e1 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -84,7 +84,8 @@ def gradebook(request, course_id):
                      }
                      for student in enrolled_students]
 
-    return render_to_response('gradebook.html', {'students': student_info, 'course': course})
+    return render_to_response('gradebook.html', {'students': student_info,
+                                                 'course': course, 'course_id': course_id})
 
 
 @login_required
diff --git a/lms/templates/gradebook.html b/lms/templates/gradebook.html
index e6f92c50b3..5b88a7f2b6 100644
--- a/lms/templates/gradebook.html
+++ b/lms/templates/gradebook.html
@@ -1,4 +1,5 @@
 <%inherit file="main.html" />
+<%! from django.core.urlresolvers import reverse %>
 <%namespace name='static' file='static_content.html'/>
 
 <%block name="js_extra">
@@ -59,7 +60,10 @@
 
       %for student in students:
       <tr>
-        <td><a href="/profile/${student['id']}/">${student['username']}</a></td>
+        <td><a href="${reverse('student_profile',
+                               kwargs={'course_id' : course_id,
+                                       'student_id': student['id']})}">
+                      ${student['username']}</a></td>
         %for section in student['grade_summary']['section_breakdown']:
           ${percent_data( section['percent'] )}
         %endfor
diff --git a/lms/urls.py b/lms/urls.py
index cbe138b883..8f4e251ade 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -137,7 +137,7 @@ if settings.COURSEWARE_ENABLED:
             'courseware.views.profile', name="profile"),
         # Takes optional student_id for instructor use--shows profile as that student sees it.
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/profile/(?P<student_id>[^/]*)/$',
-            'courseware.views.profile'),
+            'courseware.views.profile', name="student_profile"),
 
         # For the instructor
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/gradebook$',

From 1d8dcf30f95a59d370a6301944f57418c37a98cd Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Thu, 9 Aug 2012 18:48:15 -0400
Subject: [PATCH 13/30] docstring cleanups

---
 common/lib/xmodule/xmodule/abtest_module.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/abtest_module.py b/common/lib/xmodule/xmodule/abtest_module.py
index bb55fa7ee8..035413a402 100644
--- a/common/lib/xmodule/xmodule/abtest_module.py
+++ b/common/lib/xmodule/xmodule/abtest_module.py
@@ -11,18 +11,19 @@ DEFAULT = "_DEFAULT_GROUP"
 
 
 def group_from_value(groups, v):
-    ''' Given group: (('a',0.3),('b',0.4),('c',0.3)) And random value
+    """
+    Given group: (('a', 0.3), ('b', 0.4), ('c', 0.3)) and random value v
     in [0,1], return the associated group (in the above case, return
-    'a' if v<0.3, 'b' if 0.3<=v<0.7, and 'c' if v>0.7
-'''
+    'a' if v < 0.3, 'b' if 0.3 <= v < 0.7, and 'c' if v > 0.7
+    """
     sum = 0
     for (g, p) in groups:
         sum = sum + p
         if sum > v:
             return g
 
-    # Round off errors might cause us to run to the end of the list
-    # If the do, return the last element
+    # Round off errors might cause us to run to the end of the list.
+    # If the do, return the last element.
     return g
 
 

From c9fd7b22a05c2a830e096e9049ab46f3db4f91df Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Thu, 9 Aug 2012 18:51:38 -0400
Subject: [PATCH 14/30] Add instructor dashboard

* dashboard links to gradebook and dummy grade summary page
---
 lms/djangoapps/courseware/courses.py    |  11 +-
 lms/djangoapps/courseware/views.py      | 165 +++++++++++++++---------
 lms/templates/course_navigation.html    |   9 +-
 lms/templates/grade_summary.html        |  16 +++
 lms/templates/instructor_dashboard.html |  24 ++++
 lms/urls.py                             |   7 +-
 6 files changed, 168 insertions(+), 64 deletions(-)
 create mode 100644 lms/templates/grade_summary.html
 create mode 100644 lms/templates/instructor_dashboard.html

diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py
index e649bf89f6..3e603a108d 100644
--- a/lms/djangoapps/courseware/courses.py
+++ b/lms/djangoapps/courseware/courses.py
@@ -145,6 +145,8 @@ def has_staff_access_to_course(user, course):
     '''
     Returns True if the given user has staff access to the course.
     This means that user is in the staff_* group, or is an overall admin.
+    TODO (vshnayder): this needs to be changed to allow per-course_id permissions, not per-course
+    (e.g. staff in 2012 is different from 2013, but maybe some people always have access)
 
     course is the course field of the location being accessed.
     '''
@@ -160,7 +162,14 @@ def has_staff_access_to_course(user, course):
         return True
     return False
 
-def has_access_to_course(user,course):
+def has_staff_access_to_course_id(user, course_id):
+    """Helper method that takes a course_id instead of a course name"""
+    loc = CourseDescriptor.id_to_location(course_id)
+    return has_staff_access_to_course(user, loc.course)
+
+
+def has_access_to_course(user, course):
+    '''course is the .course element of a location'''
     if course.metadata.get('ispublic'):
         return True
     return has_staff_access_to_course(user,course)
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 59fa5d69e1..02e6d00a58 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -28,7 +28,7 @@ from util.cache import cache, cache_if_anonymous
 from student.models import UserTestGroup, CourseEnrollment
 from courseware import grades
 from courseware.courses import (check_course, get_courses_by_university,
-                                has_staff_access_to_course)
+                                has_staff_access_to_course_id)
 
 
 log = logging.getLogger("mitx.courseware")
@@ -36,6 +36,9 @@ log = logging.getLogger("mitx.courseware")
 template_imports = {'urllib': urllib}
 
 def user_groups(user):
+    """
+    TODO (vshnayder): This is not used. When we have a new plan for groups, adjust appropriately.
+    """
     if not user.is_authenticated():
         return []
 
@@ -65,65 +68,6 @@ def courses(request):
     universities = get_courses_by_university(request.user)
     return render_to_response("courses.html", {'universities': universities})
 
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-def gradebook(request, course_id):
-    if 'course_admin' not in user_groups(request.user):
-        raise Http404
-    course = check_course(course_id)
-
-    enrolled_students = User.objects.filter(courseenrollment__course_id=course_id).order_by('username')
-
-    # TODO (vshnayder): implement pagination.
-    enrolled_students = enrolled_students[:1000]   # HACK!
-
-    student_info = [{'username': student.username,
-                     'id': student.id,
-                     'email': student.email,
-                     'grade_summary': grades.grade(student, request, course),
-                     'realname': UserProfile.objects.get(user=student).name
-                     }
-                     for student in enrolled_students]
-
-    return render_to_response('gradebook.html', {'students': student_info,
-                                                 'course': course, 'course_id': course_id})
-
-
-@login_required
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-def profile(request, course_id, student_id=None):
-    ''' User profile. Show username, location, etc, as well as grades .
-        We need to allow the user to change some of these settings .'''
-    course = check_course(course_id)
-
-    if student_id is None:
-        student = request.user
-    else:
-        if 'course_admin' not in user_groups(request.user):
-            raise Http404
-        student = User.objects.get(id=int(student_id))
-
-    user_info = UserProfile.objects.get(user=student)
-
-    student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(request.user, course)
-    course_module = get_module(request.user, request, course.location, student_module_cache)
-
-    courseware_summary = grades.progress_summary(student, course_module, course.grader, student_module_cache)
-    grade_summary = grades.grade(request.user, request, course, student_module_cache)
-
-    context = {'name': user_info.name,
-               'username': student.username,
-               'location': user_info.location,
-               'language': user_info.language,
-               'email': student.email,
-               'course': course,
-               'csrf': csrf(request)['csrf_token'],
-               'courseware_summary' : courseware_summary,
-               'grade_summary' : grade_summary
-               }
-    context.update()
-
-    return render_to_response('profile.html', context)
-
 
 def render_accordion(request, course, chapter, section):
     ''' Draws navigation bar. Takes current position in accordion as
@@ -298,3 +242,104 @@ def university_profile(request, org_id):
     template_file = "university_profile/{0}.html".format(org_id).lower()
 
     return render_to_response(template_file, context)
+
+
+@login_required
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def profile(request, course_id, student_id=None):
+    """ User profile. Show username, location, etc, as well as grades .
+        We need to allow the user to change some of these settings.
+
+    Course staff are allowed to see the profiles of students in their class.
+    """
+    course = check_course(course_id)
+
+    if student_id is None or student_id == request.user.id:
+        # always allowed to see your own profile
+        student = request.user
+    else:
+        # Requesting access to a different student's profile
+        if not has_staff_access_to_course_id(request.user, course_id):
+            raise Http404
+        student = User.objects.get(id=int(student_id))
+
+    user_info = UserProfile.objects.get(user=student)
+
+    student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(request.user, course)
+    course_module = get_module(request.user, request, course.location, student_module_cache)
+
+    courseware_summary = grades.progress_summary(student, course_module, course.grader, student_module_cache)
+    grade_summary = grades.grade(request.user, request, course, student_module_cache)
+
+    context = {'name': user_info.name,
+               'username': student.username,
+               'location': user_info.location,
+               'language': user_info.language,
+               'email': student.email,
+               'course': course,
+               'csrf': csrf(request)['csrf_token'],
+               'courseware_summary' : courseware_summary,
+               'grade_summary' : grade_summary
+               }
+    context.update()
+
+    return render_to_response('profile.html', context)
+
+
+
+# ======== Instructor views =============================================================================
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def gradebook(request, course_id):
+    """
+    Show the gradebook for this course:
+    - only displayed to course staff
+    - shows students who are enrolled.
+    """
+    if not has_staff_access_to_course_id(request.user, course_id):
+        raise Http404
+
+    course = check_course(course_id)
+
+    enrolled_students = User.objects.filter(courseenrollment__course_id=course_id).order_by('username')
+
+    # TODO (vshnayder): implement pagination.
+    enrolled_students = enrolled_students[:1000]   # HACK!
+
+    student_info = [{'username': student.username,
+                     'id': student.id,
+                     'email': student.email,
+                     'grade_summary': grades.grade(student, request, course),
+                     'realname': UserProfile.objects.get(user=student).name
+                     }
+                     for student in enrolled_students]
+
+    return render_to_response('gradebook.html', {'students': student_info,
+                                                 'course': course, 'course_id': course_id})
+
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def grade_summary(request, course_id):
+    """Display the grade summary for a course."""
+    if not has_staff_access_to_course_id(request.user, course_id):
+        raise Http404
+
+    course = check_course(course_id)
+
+    # For now, just a static page
+    context = {'course': course }
+    return render_to_response('grade_summary.html', context)
+
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def instructor_dashboard(request, course_id):
+    """Display the instructor dashboard for a course."""
+    if not has_staff_access_to_course_id(request.user, course_id):
+        raise Http404
+
+    course = check_course(course_id)
+
+    # For now, just a static page
+    context = {'course': course }
+    return render_to_response('instructor_dashboard.html', context)
+
diff --git a/lms/templates/course_navigation.html b/lms/templates/course_navigation.html
index 84b0c04ca0..62e6586a0d 100644
--- a/lms/templates/course_navigation.html
+++ b/lms/templates/course_navigation.html
@@ -7,6 +7,7 @@ def url_class(url):
   return ""
 %>
 <%! from django.core.urlresolvers import reverse %>
+<%! from courseware.courses import has_staff_access_to_course_id %>
 
 <nav class="${active_page} course-material">
   <div class="inner-wrapper">
@@ -16,10 +17,10 @@ def url_class(url):
 % if user.is_authenticated():
 % if settings.MITX_FEATURES.get('ENABLE_TEXTBOOK'):
       <li class="book"><a href="${reverse('book', args=[course.id])}" class="${url_class('book')}">Textbook</a></li>
-% endif 
+% endif
 % if settings.MITX_FEATURES.get('ENABLE_DISCUSSION'):
       <li class="discussion"><a href="${reverse('questions')}">Discussion</a></li>
-% endif 
+% endif
 % endif
 % if settings.WIKI_ENABLED:
       <li class="wiki"><a href="${reverse('wiki_root', args=[course.id])}" class="${url_class('wiki')}">Wiki</a></li>
@@ -27,6 +28,10 @@ def url_class(url):
 % if user.is_authenticated():
       <li class="profile"><a href="${reverse('profile', args=[course.id])}" class="${url_class('profile')}">Profile</a></li>
 % endif
+% if has_staff_access_to_course_id(user, course.id):
+      <li class="instructor"><a href="${reverse('instructor_dashboard', args=[course.id])}" class="${url_class('profile')}">Instructor</a></li>
+% endif
+
     </ol>
   </div>
 </nav>
diff --git a/lms/templates/grade_summary.html b/lms/templates/grade_summary.html
new file mode 100644
index 0000000000..3fdcd910ae
--- /dev/null
+++ b/lms/templates/grade_summary.html
@@ -0,0 +1,16 @@
+<%inherit file="main.html" />
+<%! from django.core.urlresolvers import reverse %>
+<%namespace name='static' file='static_content.html'/>
+
+<%include file="course_navigation.html" args="active_page=''" />
+
+<section class="container">
+<div class="gradebook-summary-wrapper">
+  <section class="gradebook-summary-content">
+    <h1>Grade summary</h1>
+
+    <p>Not implemented yet</p>
+
+  </section>
+</div>
+</section>
diff --git a/lms/templates/instructor_dashboard.html b/lms/templates/instructor_dashboard.html
new file mode 100644
index 0000000000..67f45ee64e
--- /dev/null
+++ b/lms/templates/instructor_dashboard.html
@@ -0,0 +1,24 @@
+<%inherit file="main.html" />
+<%! from django.core.urlresolvers import reverse %>
+<%namespace name='static' file='static_content.html'/>
+
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
+
+<%include file="course_navigation.html" args="active_page=''" />
+
+<section class="container">
+<div class="instructor-dashboard-wrapper">
+  <section class="instructor-dashboard-content">
+    <h1>Instructor Dashboard</h1>
+
+    <p>
+    <a href="${reverse('gradebook', kwargs={'course_id': course.id})}">Gradebook</a>
+
+    <p>
+    <a href="${reverse('grade_summary', kwargs={'course_id': course.id})}">Grade summary</a>
+
+  </section>
+</div>
+</section>
diff --git a/lms/urls.py b/lms/urls.py
index 8f4e251ade..4f1895e2c4 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -140,8 +140,13 @@ if settings.COURSEWARE_ENABLED:
             'courseware.views.profile', name="student_profile"),
 
         # For the instructor
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/instructor$',
+            'courseware.views.instructor_dashboard', name="instructor_dashboard"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/gradebook$',
-            'courseware.views.gradebook'),
+            'courseware.views.gradebook', name='gradebook'),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/grade_summary$',
+            'courseware.views.grade_summary', name='grade_summary'),
+
     )
 
     # Multicourse wiki

From 8e364e6d45d71150d62b4da92033f0010b1993db Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Thu, 9 Aug 2012 18:52:17 -0400
Subject: [PATCH 15/30] ensure float when computing module score

---
 lms/djangoapps/courseware/grades.py | 68 ++++++++++++++---------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index b0220670eb..d5042b25da 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -13,33 +13,33 @@ log = logging.getLogger("mitx.courseware")
 
 def yield_module_descendents(module):
     stack = module.get_display_items()
-    
+
     while len(stack) > 0:
         next_module = stack.pop()
         stack.extend( next_module.get_display_items() )
         yield next_module
-   
+
 def grade(student, request, course, student_module_cache=None):
     """
-    This grades a student as quickly as possible. It retuns the 
+    This grades a student as quickly as possible. It retuns the
     output from the course grader, augmented with the final letter
     grade. The keys in the output are:
-    
+
     - grade : A final letter grade.
     - percent : The final percent for the class (rounded up).
     - section_breakdown : A breakdown of each section that makes
         up the grade. (For display)
     - grade_breakdown : A breakdown of the major components that
         make up the final grade. (For display)
-    
+
     More information on the format is in the docstring for CourseGrader.
     """
-    
+
     grading_context = course.grading_context
-    
+
     if student_module_cache == None:
         student_module_cache = StudentModuleCache(student, grading_context['all_descriptors'])
-    
+
     totaled_scores = {}
     # This next complicated loop is just to collect the totaled_scores, which is
     # passed to the grader
@@ -48,91 +48,91 @@ def grade(student, request, course, student_module_cache=None):
         for section in sections:
             section_descriptor = section['section_descriptor']
             section_name = section_descriptor.metadata.get('display_name')
-            
+
             should_grade_section = False
             # If we haven't seen a single problem in the section, we don't have to grade it at all! We can assume 0%
             for moduledescriptor in section['xmoduledescriptors']:
                 if student_module_cache.lookup(moduledescriptor.category, moduledescriptor.location.url() ):
                     should_grade_section = True
                     break
-            
+
             if should_grade_section:
                 scores = []
                 # TODO: We need the request to pass into here. If we could forgo that, our arguments
                 # would be simpler
                 section_module = get_module(student, request, section_descriptor.location, student_module_cache)
-                
+
                 # TODO: We may be able to speed this up by only getting a list of children IDs from section_module
                 # Then, we may not need to instatiate any problems if they are already in the database
-                for module in yield_module_descendents(section_module):                    
+                for module in yield_module_descendents(section_module):
                     (correct, total) = get_score(student, module, student_module_cache)
                     if correct is None and total is None:
                         continue
-                    
+
                     if settings.GENERATE_PROFILE_SCORES:
                         if total > 1:
                             correct = random.randrange(max(total - 2, 1), total + 1)
                         else:
                             correct = total
-                    
+
                     graded = module.metadata.get("graded", False)
                     if not total > 0:
                         #We simply cannot grade a problem that is 12/0, because we might need it as a percentage
                         graded = False
-                    
+
                     scores.append(Score(correct, total, graded, module.metadata.get('display_name')))
-                    
+
                 section_total, graded_total = graders.aggregate_scores(scores, section_name)
             else:
                 section_total = Score(0.0, 1.0, False, section_name)
                 graded_total = Score(0.0, 1.0, True, section_name)
-                
+
             #Add the graded total to totaled_scores
             if graded_total.possible > 0:
                 format_scores.append(graded_total)
             else:
                 log.exception("Unable to grade a section with a total possible score of zero. " + str(section_descriptor.location))
-        
+
         totaled_scores[section_format] = format_scores
-    
+
     grade_summary = course.grader.grade(totaled_scores)
-    
+
     # We round the grade here, to make sure that the grade is an whole percentage and
     # doesn't get displayed differently than it gets grades
     grade_summary['percent'] = round(grade_summary['percent'] * 100 + 0.05) / 100
-    
+
     letter_grade = grade_for_percentage(course.grade_cutoffs, grade_summary['percent'])
     grade_summary['grade'] = letter_grade
-    
+
     return grade_summary
 
 def grade_for_percentage(grade_cutoffs, percentage):
     """
     Returns a letter grade 'A' 'B' 'C' or None.
-    
+
     Arguments
     - grade_cutoffs is a dictionary mapping a grade to the lowest
         possible percentage to earn that grade.
     - percentage is the final percent across all problems in a course
     """
-    
+
     letter_grade = None
     for possible_grade in ['A', 'B', 'C']:
         if percentage >= grade_cutoffs[possible_grade]:
             letter_grade = possible_grade
             break
-    
-    return letter_grade  
+
+    return letter_grade
 
 def progress_summary(student, course, grader, student_module_cache):
     """
     This pulls a summary of all problems in the course.
 
     Returns
-    - courseware_summary is a summary of all sections with problems in the course. 
-    It is organized as an array of chapters, each containing an array of sections, 
-    each containing an array of scores. This contains information for graded and 
-    ungraded problems, and is good for displaying a course summary with due dates, 
+    - courseware_summary is a summary of all sections with problems in the course.
+    It is organized as an array of chapters, each containing an array of sections,
+    each containing an array of scores. This contains information for graded and
+    ungraded problems, and is good for displaying a course summary with due dates,
     etc.
 
     Arguments:
@@ -152,7 +152,7 @@ def progress_summary(student, course, grader, student_module_cache):
                 if correct is None and total is None:
                     continue
 
-                scores.append(Score(correct, total, graded, 
+                scores.append(Score(correct, total, graded,
                     module.metadata.get('display_name')))
 
             section_total, graded_total = graders.aggregate_scores(
@@ -179,7 +179,7 @@ def progress_summary(student, course, grader, student_module_cache):
 
 def get_score(user, problem, student_module_cache):
     """
-    Return the score for a user on a problem
+    Return the score for a user on a problem, as a tuple (correct, total).
 
     user: a Student object
     problem: an XModule
@@ -188,7 +188,7 @@ def get_score(user, problem, student_module_cache):
     if not (problem.descriptor.stores_state and problem.descriptor.has_score):
         # These are not problems, and do not have a score
         return (None, None)
-    
+
     correct = 0.0
 
     # If the ID is not in the cache, add the item
@@ -219,7 +219,7 @@ def get_score(user, problem, student_module_cache):
             if total == 0:
                 log.exception("Cannot reweight a problem with zero weight. Problem: " + str(instance_module))
                 return (correct, total)
-            correct = correct * weight / total
+            correct = float(correct) * weight / total
             total = weight
 
     return (correct, total)

From c3814a81fdc0db3760eee41c38d0bf834f737e98 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Thu, 9 Aug 2012 18:53:43 -0400
Subject: [PATCH 16/30] In-progress auth tests

* need to actually return 404 codes to clients when DEBUG=False
* add option to make nose more verbose and drop to pdb on error
---
 lms/djangoapps/courseware/tests/tests.py | 106 ++++++++++++++++++++++-
 lms/envs/test.py                         |   1 +
 2 files changed, 104 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index e0369baf7b..072b509113 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse
 from mock import patch, Mock
 from override_settings import override_settings
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Group
 from student.models import Registration
 
 from xmodule.modulestore.django import modulestore
@@ -88,6 +88,13 @@ class ActivateLoginTestCase(TestCase):
         self.assertTrue(data['success'])
         return resp
 
+    def logout(self):
+        '''Logout, check that it worked.'''
+        resp = self.client.get(reverse('logout'), {})
+        # should redirect
+        self.assertEqual(resp.status_code, 302)
+        return resp
+
     def _create_account(self, username, email, pw):
         '''Try to create an account.  No error checking'''
         resp = self.client.post('/create_account', {
@@ -131,12 +138,16 @@ class ActivateLoginTestCase(TestCase):
         '''The setup function does all the work'''
         pass
 
+    def test_logout(self):
+        '''Setup function does login'''
+        self.logout()
+
 
 class PageLoader(ActivateLoginTestCase):
     ''' Base class that adds a function to load all pages in a modulestore '''
 
-
     def enroll(self, course):
+        """Enroll the currently logged-in user, and check that it worked."""
         resp = self.client.post('/change_enrollment', {
             'enrollment_action': 'enroll',
             'course_id': course.id,
@@ -193,7 +204,96 @@ class TestCoursesLoadTestCase(PageLoader):
         self.check_pages_load('full', TEST_DATA_DIR, modulestore())
 
 
-    # ========= TODO: check ajax interaction here too?
+@override_settings(MODULESTORE=TEST_DATA_MODULESTORE)
+class TestInstructorAuth(PageLoader):
+    """Check that authentication works properly"""
+
+    # NOTE: Originally tried putting the imports into a setUpClass() method,
+    # but that seemed to run before override_settings took effect.  Did not debug further.
+
+    def setUp(self):
+        xmodule.modulestore.django._MODULESTORES = {}
+        modulestore().collection.drop()
+        import_from_xml(modulestore(), TEST_DATA_DIR, ['toy'])
+        import_from_xml(modulestore(), TEST_DATA_DIR, ['full'])
+        courses = modulestore().get_courses()
+        # hack to get the two courses out
+        courses.sort(key=lambda c: c.location.course)
+        [self.full, self.toy] = courses
+
+        # Create two accounts
+        self.student = 'view@test.com'
+        self.instructor = 'view2@test.com'
+        self.password = 'foo'
+        self.create_account('u1', self.student, self.password)
+        self.create_account('u2', self.instructor, self.password)
+        self.activate_user(self.student)
+        self.activate_user(self.instructor)
+
+    def check_for_get_code(self, code, url):
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, code)
+
+    def test_instructor_page(self):
+        "Make sure only instructors can load it"
+
+        # First, try with an enrolled student
+        self.login(self.student, self.password)
+        # shouldn't work before enroll
+        self.check_for_get_code(302, reverse('courseware', kwargs={'course_id': self.toy.id}))
+        self.enroll(self.toy)
+        self.enroll(self.full)
+        # should work now
+        self.check_for_get_code(200, reverse('courseware', kwargs={'course_id': self.toy.id}))
+
+        # TODO: Disabled rest of test for now.  Fix once raising a 404 actually
+        # returns a 404 to the client
+        raise SkipTest
+
+        def instructor_urls(course):
+            urls = [reverse(name, kwargs={'course_id': course.id}) for name in (
+                'instructor_dashboard',
+                'gradebook',
+                'grade_summary',)]
+            urls += reverse(student_profile, kwargs={'course_id': course.id,
+                                                     'student_id': user(self.student).id})
+            return urls
+
+        # shouldn't be able to get to the instructor pages
+        for url in instructor_urls(self.toy) + instructor_urls(self.full):
+            print 'checking for 404 on {}'.format(url)
+            self.check_for_get_code(404, url)
+
+        # Make the instructor staff in the toy course
+        group_name = course_staff_group_name(self.toy)
+        g = Group.objects.create(name=group_name)
+        g.user_set.add(user(self.instructor))
+
+        self.logout()
+        self.login(self.instructor, self.password)
+
+        # Now should be able to get to the toy course, but not the full course
+        for url in instructor_urls(self.toy):
+            print 'checking for 200 on {}'.format(url)
+            self.check_for_get_code(200, url)
+
+        for url in instructor_urls(self.full):
+            print 'checking for 404 on {}'.format(url)
+            self.check_for_get_code(404, url)
+
+
+        # now also make the instructor staff
+        u = user(self.instructor)
+        u.is_staff = True
+        u.save()
+
+        # and now should be able to load both
+        for url in instructor_urls(self.toy) + instructor_urls(self.full):
+            print 'checking for 200 on {}'.format(url)
+            self.check_for_get_code(200, url)
+
+
+
 
 
 @override_settings(MODULESTORE=REAL_DATA_MODULESTORE)
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 7d38e1fbb9..ada87f0f80 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -25,6 +25,7 @@ SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead
 # Nose Test Runner
 INSTALLED_APPS += ('django_nose',)
 NOSE_ARGS = ['--cover-erase', '--with-xunit', '--with-xcoverage', '--cover-html',
+             # '-v', '--pdb',     # When really stuck, uncomment to start debugger on error
              '--cover-inclusive', '--cover-html-dir',
              os.environ.get('NOSE_COVER_HTML_DIR', 'cover_html')]
 for app in os.listdir(PROJECT_ROOT / 'djangoapps'):

From a6148856b20bf25ba5ca165e02ba2f538d4fd6d1 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Fri, 10 Aug 2012 10:03:18 -0400
Subject: [PATCH 17/30] make the tests work around the 404 bug

---
 lms/djangoapps/courseware/tests/tests.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index 072b509113..606d93f1d4 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -15,6 +15,7 @@ from override_settings import override_settings
 
 from django.contrib.auth.models import User, Group
 from student.models import Registration
+from courseware.courses import course_staff_group_name
 
 from xmodule.modulestore.django import modulestore
 import xmodule.modulestore.django
@@ -217,7 +218,7 @@ class TestInstructorAuth(PageLoader):
         import_from_xml(modulestore(), TEST_DATA_DIR, ['toy'])
         import_from_xml(modulestore(), TEST_DATA_DIR, ['full'])
         courses = modulestore().get_courses()
-        # hack to get the two courses out
+        # get the two courses sorted out
         courses.sort(key=lambda c: c.location.course)
         [self.full, self.toy] = courses
 
@@ -232,7 +233,13 @@ class TestInstructorAuth(PageLoader):
 
     def check_for_get_code(self, code, url):
         resp = self.client.get(url)
-        self.assertEqual(resp.status_code, code)
+        # HACK: workaround the bug that returns 200 instead of 404.
+        # TODO (vshnayder): once we're returning 404s, get rid of this if.
+        if code != 404:
+            self.assertEqual(resp.status_code, code)
+        else:
+            # look for "page not found" instead of the status code
+            self.assertTrue(resp.content.lower().find('page not found') != -1)
 
     def test_instructor_page(self):
         "Make sure only instructors can load it"
@@ -248,15 +255,14 @@ class TestInstructorAuth(PageLoader):
 
         # TODO: Disabled rest of test for now.  Fix once raising a 404 actually
         # returns a 404 to the client
-        raise SkipTest
 
         def instructor_urls(course):
             urls = [reverse(name, kwargs={'course_id': course.id}) for name in (
                 'instructor_dashboard',
                 'gradebook',
                 'grade_summary',)]
-            urls += reverse(student_profile, kwargs={'course_id': course.id,
-                                                     'student_id': user(self.student).id})
+            urls.append(reverse('student_profile', kwargs={'course_id': course.id,
+                                                     'student_id': user(self.student).id}))
             return urls
 
         # shouldn't be able to get to the instructor pages

From c6d5d4aaae638ecc03a76b50198454dee83a29d7 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Fri, 10 Aug 2012 10:45:32 -0400
Subject: [PATCH 18/30] fixed instructor tab active state

---
 lms/templates/course_navigation.html    | 4 ++--
 lms/templates/instructor_dashboard.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lms/templates/course_navigation.html b/lms/templates/course_navigation.html
index 62e6586a0d..ea889ce6c7 100644
--- a/lms/templates/course_navigation.html
+++ b/lms/templates/course_navigation.html
@@ -29,9 +29,9 @@ def url_class(url):
       <li class="profile"><a href="${reverse('profile', args=[course.id])}" class="${url_class('profile')}">Profile</a></li>
 % endif
 % if has_staff_access_to_course_id(user, course.id):
-      <li class="instructor"><a href="${reverse('instructor_dashboard', args=[course.id])}" class="${url_class('profile')}">Instructor</a></li>
+      <li class="instructor"><a href="${reverse('instructor_dashboard', args=[course.id])}" class="${url_class('instructor')}">Instructor</a></li>
 % endif
 
     </ol>
   </div>
-</nav>
+</nav>
\ No newline at end of file
diff --git a/lms/templates/instructor_dashboard.html b/lms/templates/instructor_dashboard.html
index 67f45ee64e..a5b333a809 100644
--- a/lms/templates/instructor_dashboard.html
+++ b/lms/templates/instructor_dashboard.html
@@ -6,7 +6,7 @@
   <%static:css group='course'/>
 </%block>
 
-<%include file="course_navigation.html" args="active_page=''" />
+<%include file="course_navigation.html" args="active_page='instructor'" />
 
 <section class="container">
 <div class="instructor-dashboard-wrapper">

From 6882b4b53d416205ead51f13779d755b26efae95 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Fri, 10 Aug 2012 11:40:41 -0400
Subject: [PATCH 19/30] responding to review comments on #383

---
 common/djangoapps/student/views.py       | 43 ++++++++++++------------
 lms/djangoapps/courseware/grades.py      |  5 ++-
 lms/djangoapps/courseware/tests/tests.py |  8 ++---
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index ac928a7bd4..8093a5a51a 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -287,15 +287,15 @@ def _do_create_account(post_vars):
 
     Note: this function is also used for creating test users.
     """
-    u = User(username=post_vars['username'],
+    user = User(username=post_vars['username'],
              email=post_vars['email'],
              is_active=False)
-    u.set_password(post_vars['password'])
-    r = Registration()
+    user.set_password(post_vars['password'])
+    registration = Registration()
     # TODO: Rearrange so that if part of the process fails, the whole process fails.
     # Right now, we can have e.g. no registration e-mail sent out and a zombie account
     try:
-        u.save()
+        user.save()
     except IntegrityError:
         # Figure out the cause of the integrity error
         if len(User.objects.filter(username=post_vars['username'])) > 0:
@@ -310,25 +310,25 @@ def _do_create_account(post_vars):
 
         raise
 
-    r.register(u)
+    registration.register(user)
 
-    up = UserProfile(user=u)
-    up.name = post_vars['name']
-    up.level_of_education = post_vars.get('level_of_education')
-    up.gender = post_vars.get('gender')
-    up.mailing_address = post_vars.get('mailing_address')
-    up.goals = post_vars.get('goals')
+    profile = UserProfile(user=user)
+    profile.name = post_vars['name']
+    profile.level_of_education = post_vars.get('level_of_education')
+    profile.gender = post_vars.get('gender')
+    profile.mailing_address = post_vars.get('mailing_address')
+    profile.goals = post_vars.get('goals')
 
     try:
-        up.year_of_birth = int(post_vars['year_of_birth'])
+        profile.year_of_birth = int(post_vars['year_of_birth'])
     except (ValueError, KeyError):
-        up.year_of_birth = None  # If they give us garbage, just ignore it instead
+        profile.year_of_birth = None  # If they give us garbage, just ignore it instead
                                 # of asking them to put an integer.
     try:
-        up.save()
+        profile.save()
     except Exception:
-        log.exception("UserProfile creation failed for user {0}.".format(u.id))
-    return (u, up, r)
+        log.exception("UserProfile creation failed for user {0}.".format(user.id))
+    return (user, profile, registration)
 
 
 @ensure_csrf_cookie
@@ -402,10 +402,10 @@ def create_account(request, post_override=None):
         return HttpResponse(json.dumps(js))
 
     # Ok, looks like everything is legit.  Create the account.
-    (u, up, r) = _do_create_account(post_vars)
+    (user, profile, registration) = _do_create_account(post_vars)
 
     d = {'name': post_vars['name'],
-         'key': r.activation_key,
+         'key': registration.activation_key,
          }
 
     # composes activation email
@@ -417,10 +417,11 @@ def create_account(request, post_override=None):
     try:
         if settings.MITX_FEATURES.get('REROUTE_ACTIVATION_EMAIL'):
             dest_addr = settings.MITX_FEATURES['REROUTE_ACTIVATION_EMAIL']
-            message = "Activation for %s (%s): %s\n" % (u, u.email, up.name) + '-' * 80 + '\n\n' + message
+            message = ("Activation for %s (%s): %s\n" % (user, user.email, profile.name) +
+                       '-' * 80 + '\n\n' + message)
             send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [dest_addr], fail_silently=False)
         elif not settings.GENERATE_RANDOM_USER_CREDENTIALS:
-            res = u.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
+            res = user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
     except:
         log.exception(sys.exc_info())
         js['value'] = 'Could not send activation e-mail.'
@@ -539,7 +540,7 @@ def reactivation_email(request):
     subject = ''.join(subject.splitlines())
     message = render_to_string('reactivation_email.txt', d)
 
-    res = u.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
+    res = user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
 
     return HttpResponse(json.dumps({'success': True}))
 
diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index d5042b25da..192794b6b3 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -1,3 +1,6 @@
+# Compute grades using real division, with no integer truncation
+from __future__ import division
+
 import random
 import logging
 
@@ -219,7 +222,7 @@ def get_score(user, problem, student_module_cache):
             if total == 0:
                 log.exception("Cannot reweight a problem with zero weight. Problem: " + str(instance_module))
                 return (correct, total)
-            correct = float(correct) * weight / total
+            correct = correct * weight / total
             total = weight
 
     return (correct, total)
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index 606d93f1d4..da0688be3d 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -209,8 +209,8 @@ class TestCoursesLoadTestCase(PageLoader):
 class TestInstructorAuth(PageLoader):
     """Check that authentication works properly"""
 
-    # NOTE: Originally tried putting the imports into a setUpClass() method,
-    # but that seemed to run before override_settings took effect.  Did not debug further.
+    # NOTE: setUpClass() runs before override_settings takes effect, so
+    # can't do imports there without manually hacking settings.
 
     def setUp(self):
         xmodule.modulestore.django._MODULESTORES = {}
@@ -253,10 +253,8 @@ class TestInstructorAuth(PageLoader):
         # should work now
         self.check_for_get_code(200, reverse('courseware', kwargs={'course_id': self.toy.id}))
 
-        # TODO: Disabled rest of test for now.  Fix once raising a 404 actually
-        # returns a 404 to the client
-
         def instructor_urls(course):
+            "list of urls that only instructors/staff should be able to see"
             urls = [reverse(name, kwargs={'course_id': course.id}) for name in (
                 'instructor_dashboard',
                 'gradebook',

From 538185173a1b2b5fa76076703111a91226d655fd Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Fri, 10 Aug 2012 11:48:07 -0400
Subject: [PATCH 20/30] added truncation for super long titles

---
 lms/static/sass/base/_extends.scss        | 13 -------------
 lms/static/sass/course/base/_extends.scss |  4 ++++
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/lms/static/sass/base/_extends.scss b/lms/static/sass/base/_extends.scss
index 0161610a28..2998e25dca 100644
--- a/lms/static/sass/base/_extends.scss
+++ b/lms/static/sass/base/_extends.scss
@@ -93,18 +93,5 @@
 .global {
   h2 {
     display: none;
-    float: left;
-    font-size: 0.9em;
-    font-weight: 600;
-    line-height: 40px;
-    letter-spacing: 0;
-    text-transform: none;
-    text-shadow: 0 1px 0 #fff;
-
-    .provider {
-      font: inherit;
-      font-weight: bold;
-      color: #6d6d6d;
-    }
   }
 }
\ No newline at end of file
diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss
index 418074ee01..7b3e1cba84 100644
--- a/lms/static/sass/course/base/_extends.scss
+++ b/lms/static/sass/course/base/_extends.scss
@@ -193,6 +193,7 @@ h1.top-header {
 
   h2 {
     display: block;
+    width: 700px;
     float: left;
     font-size: 0.9em;
     font-weight: 600;
@@ -200,6 +201,9 @@ h1.top-header {
     letter-spacing: 0;
     text-transform: none;
     text-shadow: 0 1px 0 #fff;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 
     .provider {
       font: inherit;

From 36091697a54ca27cce4faa32dc81af7a67810eb4 Mon Sep 17 00:00:00 2001
From: kimth <kimt@mit.edu>
Date: Fri, 10 Aug 2012 11:59:45 -0400
Subject: [PATCH 21/30] Student browser polls for queued submission result

---
 common/lib/capa/capa/inputtypes.py            | 26 +++++++++++++--
 common/lib/capa/capa/responsetypes.py         |  9 +++--
 .../capa/capa/templates/filesubmission.html   |  3 ++
 common/lib/capa/capa/templates/textbox.html   |  3 ++
 common/lib/capa/capa/xqueue_interface.py      |  3 +-
 .../xmodule/js/src/capa/display.coffee        | 33 ++++++++++++++++++-
 6 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 5092e5c378..ea60b3b7bd 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -307,7 +307,18 @@ def filesubmission(element, value, status, render_template, msg=''):
     Upload a single file (e.g. for programming assignments)
     '''
     eid = element.get('id')
-    context = { 'id': eid, 'state': status, 'msg': msg, 'value': value, }
+
+    # Check if problem has been queued
+    queued = '' 
+    queue_len = 0
+    if status == 'incomplete': # Flag indicating that the problem has been queued, 'msg' is length of queue
+        queued = 'true'
+        queue_len = msg
+        msg = 'Submitted to grader. (Queue length: %s)' % queue_len 
+
+    context = { 'id': eid, 'state': status, 'msg': msg, 'value': value, 
+                'queued': queued, 'queue_len': queue_len
+              }
     html = render_template("filesubmission.html", context)
     return etree.XML(html) 
 
@@ -329,10 +340,18 @@ def textbox(element, value, status, render_template, msg=''):
     hidden = element.get('hidden', '')	 # if specified, then textline is hidden and id is stored in div of name given by hidden
 
     if not value: value = element.text	 # if no student input yet, then use the default input given by the problem
+    
+    # Check if problem has been queued
+    queued = '' 
+    queue_len = 0
+    if status == 'incomplete': # Flag indicating that the problem has been queued, 'msg' is length of queue
+        queued = 'true'
+        queue_len = msg
+        msg = 'Submitted to grader. (Queue length: %s)' % queue_len 
 
     # For CodeMirror
-    mode = element.get('mode')	or 'python' # mode, eg "python" or "xml"
-    linenumbers = element.get('linenumbers','true')	 # for CodeMirror
+    mode = element.get('mode','python') 
+    linenumbers = element.get('linenumbers','true')
     tabsize = element.get('tabsize','4')
     tabsize = int(tabsize)
 
@@ -340,6 +359,7 @@ def textbox(element, value, status, render_template, msg=''):
                'mode': mode, 'linenumbers': linenumbers,
                'rows': rows, 'cols': cols,
                'hidden': hidden, 'tabsize': tabsize,
+               'queued': queued, 'queue_len': queue_len,
                }
     html = render_template("textbox.html", context)
     try:
diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index 66212f1e87..25b99fc00a 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -898,7 +898,7 @@ class CodeResponse(LoncapaResponse):
                     'processor': self.code,
                     }
         
-        # Submit request
+        # Submit request. When successful, 'msg' is the prior length of the queue
         if is_file(submission):
             contents.update({'edX_student_response': submission.name})
             (error, msg) = qinterface.send_to_queue(header=xheader,
@@ -914,8 +914,11 @@ class CodeResponse(LoncapaResponse):
             cmap.set(self.answer_id, queuekey=None,
                      msg='Unable to deliver your submission to grader. (Reason: %s.) Please try again later.' % msg)
         else:
-            # Non-null CorrectMap['queuekey'] indicates that the problem has been queued 
-            cmap.set(self.answer_id, queuekey=queuekey, msg='Submitted to grader. (Queue length: %s)' % msg)
+            # Queueing mechanism flags:
+            #   1) Backend: Non-null CorrectMap['queuekey'] indicates that the problem has been queued
+            #   2) Frontend: correctness='incomplete' eventually trickles down through inputtypes.textbox 
+            #       and .filesubmission to inform the browser to poll the LMS
+            cmap.set(self.answer_id, queuekey=queuekey, correctness='incomplete', msg=msg)
 
         return cmap
 
diff --git a/common/lib/capa/capa/templates/filesubmission.html b/common/lib/capa/capa/templates/filesubmission.html
index ff9fc992fd..09bc287923 100644
--- a/common/lib/capa/capa/templates/filesubmission.html
+++ b/common/lib/capa/capa/templates/filesubmission.html
@@ -9,6 +9,9 @@
     % elif state == 'incomplete':
     <span class="incorrect" id="status_${id}"></span>
     % endif
+    % if queued:
+    <span class="xqueue" id="${id}" >${queue_len}</span>
+    % endif
     <span class="debug">(${state})</span>
     <br/>
     <span class="message">${msg|n}</span>
diff --git a/common/lib/capa/capa/templates/textbox.html b/common/lib/capa/capa/templates/textbox.html
index f201bd6947..f31b98b580 100644
--- a/common/lib/capa/capa/templates/textbox.html
+++ b/common/lib/capa/capa/templates/textbox.html
@@ -19,6 +19,9 @@
   % if hidden:
       <div style="display:none;" name="${hidden}" inputid="input_${id}" />
   % endif
+  % if queued:
+    <span class="xqueue" id="${id}" >${queue_len}</span>
+  % endif
   <br/>
   <span class="debug">(${state})</span>
   <br/>
diff --git a/common/lib/capa/capa/xqueue_interface.py b/common/lib/capa/capa/xqueue_interface.py
index 70f086120e..6a38a88796 100644
--- a/common/lib/capa/capa/xqueue_interface.py
+++ b/common/lib/capa/capa/xqueue_interface.py
@@ -10,7 +10,8 @@ import time
 # TODO: Collection of parameters to be hooked into rest of edX system
 XQUEUE_LMS_AUTH = { 'username': 'LMS',
                     'password': 'PaloAltoCA' }
-XQUEUE_URL = 'http://xqueue.edx.org'
+#XQUEUE_URL = 'http://xqueue.edx.org'
+XQUEUE_URL = 'http://ec2-50-17-47-60.compute-1.amazonaws.com'
 
 log = logging.getLogger('mitx.' + __name__)
 
diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
index 18bec8a7d1..484acd5c85 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
@@ -4,6 +4,12 @@ class @Problem
     @id = @el.data('problem-id')
     @element_id = @el.attr('id')
     @url = @el.data('url')
+
+    # Destroy any existing polling threads on Problem change
+    if window.queuePollerID
+      window.clearTimeout(window.queuePollerID)
+      delete window.queuePollerID
+
     @render()
 
   $: (selector) ->
@@ -12,7 +18,10 @@ class @Problem
   bind: =>
     MathJax.Hub.Queue ["Typeset", MathJax.Hub]
     window.update_schematics()
-    @inputs = @$("[id^=input_#{@element_id.replace(/problem_/, '')}_]")
+
+    problem_prefix = @element_id.replace(/problem_/,'')
+    @inputs = @$("[id^=input_#{problem_prefix}_]")
+    
     @$('section.action input:button').click @refreshAnswers
     @$('section.action input.check').click @check_fd
     #@$('section.action input.check').click @check
@@ -26,15 +35,37 @@ class @Problem
         @el.attr progress: response.progress_status
         @el.trigger('progressChanged')
 
+  queueing: =>
+    @queued_items = @$(".xqueue")
+    if @queued_items.length > 0
+      if window.queuePollerID # Only one poller 'thread' per Problem
+        window.clearTimeout(window.queuePollerID)
+      window.queuePollerID = window.setTimeout(@poll, 100)
+
+  poll: =>
+    $.postWithPrefix "#{@url}/problem_get", (response) =>
+      @el.html(response.html)
+      @executeProblemScripts()
+      @bind()
+
+      @queued_items = @$(".xqueue")
+      if @queued_items.length == 0 
+        delete window.queuePollerID
+      else
+        # TODO: Dynamically adjust timeout interval based on @queued_items.value
+        window.queuePollerID = window.setTimeout(@poll, 1000)
+
   render: (content) ->
     if content
       @el.html(content)
       @bind()
+      @queueing()
     else
       $.postWithPrefix "#{@url}/problem_get", (response) =>
         @el.html(response.html)
         @executeProblemScripts()
         @bind()
+        @queueing()
 
   executeProblemScripts: ->
     @el.find(".script_placeholder").each (index, placeholder) ->

From 64eba4332cacd0f6b870b795ebf9153e99ed1c3e Mon Sep 17 00:00:00 2001
From: kimth <kimt@mit.edu>
Date: Fri, 10 Aug 2012 12:01:53 -0400
Subject: [PATCH 22/30] Remove temp xqueue url

---
 common/lib/capa/capa/xqueue_interface.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/lib/capa/capa/xqueue_interface.py b/common/lib/capa/capa/xqueue_interface.py
index 6a38a88796..70f086120e 100644
--- a/common/lib/capa/capa/xqueue_interface.py
+++ b/common/lib/capa/capa/xqueue_interface.py
@@ -10,8 +10,7 @@ import time
 # TODO: Collection of parameters to be hooked into rest of edX system
 XQUEUE_LMS_AUTH = { 'username': 'LMS',
                     'password': 'PaloAltoCA' }
-#XQUEUE_URL = 'http://xqueue.edx.org'
-XQUEUE_URL = 'http://ec2-50-17-47-60.compute-1.amazonaws.com'
+XQUEUE_URL = 'http://xqueue.edx.org'
 
 log = logging.getLogger('mitx.' + __name__)
 

From f6b2cabd836743e8e37cc0691e63f0d182d8b525 Mon Sep 17 00:00:00 2001
From: kimth <kimt@mit.edu>
Date: Fri, 10 Aug 2012 13:10:53 -0400
Subject: [PATCH 23/30] Position change in sequence kills polling thread,
 rather than new Problem creation

---
 common/lib/xmodule/xmodule/js/src/capa/display.coffee     | 6 ------
 common/lib/xmodule/xmodule/js/src/sequence/display.coffee | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
index 484acd5c85..ae589b8b04 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
@@ -4,12 +4,6 @@ class @Problem
     @id = @el.data('problem-id')
     @element_id = @el.attr('id')
     @url = @el.data('url')
-
-    # Destroy any existing polling threads on Problem change
-    if window.queuePollerID
-      window.clearTimeout(window.queuePollerID)
-      delete window.queuePollerID
-
     @render()
 
   $: (selector) ->
diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
index 0b17111d81..832a5ec7eb 100644
--- a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
@@ -91,6 +91,13 @@ class @Sequence
     event.preventDefault()
     new_position = $(event.target).data('element')
     Logger.log "seq_goto", old: @position, new: new_position, id: @id
+
+    # On Sequence chage, destroy any existing polling thread 
+    #   for queued submissions, see ../capa/display.coffee
+    if window.queuePollerID
+      window.clearTimeout(window.queuePollerID)
+      delete window.queuePollerID
+
     @render new_position
 
   next: (event) =>

From 67949f8a323ea06a2af6eecab01f7bb0bf201916 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Fri, 10 Aug 2012 13:14:58 -0400
Subject: [PATCH 24/30] Fix metadata inheritance

* with xml datastore, re-do all inheritance once the whole course is loaded
---
 .../lib/xmodule/xmodule/modulestore/mongo.py  |  3 +++
 common/lib/xmodule/xmodule/modulestore/xml.py |  6 +++++
 .../lib/xmodule/xmodule/tests/test_import.py  | 22 +++++++++++++++++++
 common/lib/xmodule/xmodule/x_module.py        | 19 ++++++++++++++++
 4 files changed, 50 insertions(+)

diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py
index 1cec6c7f87..b6101a6929 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo.py
@@ -55,6 +55,9 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
         if json_data is None:
             return self.modulestore.get_item(location)
         else:
+            # TODO (vshnayder): metadata inheritance is somewhat broken because mongo, doesn't
+            # always load an entire course.  We're punting on this until after launch, and then
+            # will build a proper course policy framework.
             return XModuleDescriptor.load_from_json(json_data, self, self.default_class)
 
 
diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py
index f9093f355a..2dc3b33323 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml.py
@@ -213,6 +213,12 @@ class XMLModuleStore(ModuleStoreBase):
             system = ImportSystem(self, org, course, course_dir, tracker)
 
             course_descriptor = system.process_xml(etree.tostring(course_data))
+            # NOTE: The descriptors end up loading somewhat bottom up, which
+            # breaks metadata inheritance via get_children().  Instead
+            # (actually, in addition to, for now), we do a final inheritance pass
+            # after we have the course descriptor.
+            XModuleDescriptor.compute_inherited_metadata(course_descriptor)
+
             log.debug('========> Done with course import from {0}'.format(course_dir))
             return course_descriptor
 
diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index 407057a4ab..1da618f6a4 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -8,8 +8,11 @@ from xmodule.x_module import XMLParsingSystem, XModuleDescriptor
 from xmodule.xml_module import is_pointer_tag
 from xmodule.errortracker import make_error_tracker
 from xmodule.modulestore import Location
+from xmodule.modulestore.xml import XMLModuleStore
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
+from .test_export import DATA_DIR
+
 ORG = 'test_org'
 COURSE = 'test_course'
 
@@ -185,3 +188,22 @@ class ImportTestCase(unittest.TestCase):
             chapter_xml = etree.fromstring(f.read())
         self.assertEqual(chapter_xml.tag, 'chapter')
         self.assertFalse('graceperiod' in chapter_xml.attrib)
+
+    def test_metadata_inherit(self):
+        """Make sure that metadata is inherited properly"""
+
+        print "Starting import"
+        initial_import = XMLModuleStore(DATA_DIR, eager=True, course_dirs=['toy'])
+
+        courses = initial_import.get_courses()
+        self.assertEquals(len(courses), 1)
+        course = courses[0]
+
+        def check_for_key(key, node):
+            "recursive check for presence of key"
+            print "Checking {}".format(node.location.url())
+            self.assertTrue(key in node.metadata)
+            for c in node.get_children():
+                check_for_key(key, c)
+
+        check_for_key('graceperiod', course)
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 72a8d32d1d..f196d32c31 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -403,6 +403,21 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
         return dict((k,v) for k,v in self.metadata.items()
                     if k not in self._inherited_metadata)
 
+    @staticmethod
+    def compute_inherited_metadata(course):
+        """Given a course descriptor, traverse the entire course tree and do
+        metadata inheritance.  Should be called after importing a course.
+
+        NOTE: This means that there is no such thing as lazy loading at the
+        moment--this accesses all the children."""
+        def do_inherit(node):
+            for c in node.get_children():
+                c.inherit_metadata(node.metadata)
+                do_inherit(c)
+
+        do_inherit(course)
+
+
     def inherit_metadata(self, metadata):
         """
         Updates this module with metadata inherited from a containing module.
@@ -415,6 +430,7 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
             if attr not in self.metadata and attr in metadata:
                 self._inherited_metadata.add(attr)
                 self.metadata[attr] = metadata[attr]
+        print "final self.metadata: {}".format(self.metadata)
 
     def get_children(self):
         """Returns a list of XModuleDescriptor instances for the children of
@@ -423,6 +439,9 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
             self._child_instances = []
             for child_loc in self.definition.get('children', []):
                 child = self.system.load_item(child_loc)
+                # TODO (vshnayder): this should go away once we have
+                # proper inheritance support in mongo.  The xml
+                # datastore does all inheritance on course load.
                 child.inherit_metadata(self.metadata)
                 self._child_instances.append(child)
 

From feba37cf78ec270c28ebe5ff06d3e0dcc71011da Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Fri, 10 Aug 2012 13:39:58 -0400
Subject: [PATCH 25/30] respond to comments on merge

---
 common/lib/xmodule/xmodule/x_module.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index f196d32c31..2cd51b9e6e 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -404,19 +404,16 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
                     if k not in self._inherited_metadata)
 
     @staticmethod
-    def compute_inherited_metadata(course):
-        """Given a course descriptor, traverse the entire course tree and do
-        metadata inheritance.  Should be called after importing a course.
+    def compute_inherited_metadata(node):
+        """Given a descriptor, traverse all of its descendants and do metadata
+        inheritance.  Should be called on a CourseDescriptor after importing a
+        course.
 
         NOTE: This means that there is no such thing as lazy loading at the
         moment--this accesses all the children."""
-        def do_inherit(node):
-            for c in node.get_children():
-                c.inherit_metadata(node.metadata)
-                do_inherit(c)
-
-        do_inherit(course)
-
+        for c in node.get_children():
+            c.inherit_metadata(node.metadata)
+            XModuleDescriptor.compute_inherited_metadata(c)
 
     def inherit_metadata(self, metadata):
         """
@@ -430,7 +427,6 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
             if attr not in self.metadata and attr in metadata:
                 self._inherited_metadata.add(attr)
                 self.metadata[attr] = metadata[attr]
-        print "final self.metadata: {}".format(self.metadata)
 
     def get_children(self):
         """Returns a list of XModuleDescriptor instances for the children of

From 185ab1f6157c4da3ece82ce5a203951284f0f12f Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Fri, 10 Aug 2012 14:22:34 -0400
Subject: [PATCH 26/30] added spinner class and image

---
 common/lib/xmodule/xmodule/css/capa/display.scss |  14 ++++++++++++++
 common/static/images/spinner.gif                 | Bin 0 -> 6942 bytes
 2 files changed, 14 insertions(+)
 create mode 100644 common/static/images/spinner.gif

diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index 2088e8baa3..2713ae995c 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -77,6 +77,20 @@ div {
     }
   }
 
+  &.processing {
+    p.status {
+      @include inline-block();
+      background: url('../images/spinner.gif') center center no-repeat;
+      height: 20px;
+      width: 20px;
+      text-indent: -9999px;
+    }
+
+    input {
+      border-color: #aaa;
+    }
+  }
+
   &.incorrect, &.ui-icon-close {
     p.status {
       @include inline-block();
diff --git a/common/static/images/spinner.gif b/common/static/images/spinner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b2f94cd12c351160f0a5ec8aa0a9b7f7f2e16d81
GIT binary patch
literal 6942
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

literal 0
HcmV?d00001


From 38a89e9f1a34664b7ab8cb1c06cc0528221e2fa3 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Fri, 10 Aug 2012 14:51:47 -0400
Subject: [PATCH 27/30] Make courseware navigation work again.

* bodyclass block got accidentally deleted
---
 lms/templates/courseware.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/templates/courseware.html b/lms/templates/courseware.html
index 8811509088..a14f35d154 100644
--- a/lms/templates/courseware.html
+++ b/lms/templates/courseware.html
@@ -1,5 +1,6 @@
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
+<%block name="bodyclass">courseware</%block>
 <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
 
 <%block name="headextra">

From f2012e1d2a2a368f392b6fa02b37392f503e2005 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Fri, 10 Aug 2012 15:07:08 -0400
Subject: [PATCH 28/30] additional processing class

---
 .../lib/xmodule/xmodule/css/capa/display.scss | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
index 2713ae995c..6b1c32ae65 100644
--- a/common/lib/xmodule/xmodule/css/capa/display.scss
+++ b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -49,6 +49,8 @@ padding-left: flex-gutter(9);
   }
 }
 
+
+
 div {
   p.status {
     text-indent: -9999px;
@@ -64,6 +66,16 @@ div {
     }
   }
 
+  &.processing {
+    p.status {
+      @include inline-block();
+      background: url('../images/spinner.gif') center center no-repeat;
+      height: 20px;
+      width: 20px;
+      text-indent: -9999px;
+    }
+  }
+
   &.correct, &.ui-icon-check {
     p.status {
       @include inline-block();
@@ -77,20 +89,6 @@ div {
     }
   }
 
-  &.processing {
-    p.status {
-      @include inline-block();
-      background: url('../images/spinner.gif') center center no-repeat;
-      height: 20px;
-      width: 20px;
-      text-indent: -9999px;
-    }
-
-    input {
-      border-color: #aaa;
-    }
-  }
-
   &.incorrect, &.ui-icon-close {
     p.status {
       @include inline-block();
@@ -148,6 +146,15 @@ div {
       width: 14px;
     }
 
+    &.processing, &.ui-icon-check {
+      @include inline-block();
+      background: url('../images/spinner.gif') center center no-repeat;
+      height: 20px;
+      position: relative;
+      top: 6px;
+      width: 25px;
+    }
+
     &.correct, &.ui-icon-check {
       @include inline-block();
       background: url('../images/correct-icon.png') center center no-repeat;

From 125bbbf934c202bbea27794ad8afdbb9b2d3e94f Mon Sep 17 00:00:00 2001
From: kimth <kimt@mit.edu>
Date: Fri, 10 Aug 2012 15:25:07 -0400
Subject: [PATCH 29/30] Spinner on waiting for queue

---
 common/lib/capa/capa/inputtypes.py                 | 10 ++++------
 common/lib/capa/capa/templates/filesubmission.html |  8 +++-----
 common/lib/capa/capa/templates/textbox.html        | 10 ++++------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index ea60b3b7bd..0c47892598 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -309,15 +309,14 @@ def filesubmission(element, value, status, render_template, msg=''):
     eid = element.get('id')
 
     # Check if problem has been queued
-    queued = '' 
     queue_len = 0
     if status == 'incomplete': # Flag indicating that the problem has been queued, 'msg' is length of queue
-        queued = 'true'
+        status = 'queued'
         queue_len = msg
         msg = 'Submitted to grader. (Queue length: %s)' % queue_len 
 
     context = { 'id': eid, 'state': status, 'msg': msg, 'value': value, 
-                'queued': queued, 'queue_len': queue_len
+                'queue_len': queue_len
               }
     html = render_template("filesubmission.html", context)
     return etree.XML(html) 
@@ -342,10 +341,9 @@ def textbox(element, value, status, render_template, msg=''):
     if not value: value = element.text	 # if no student input yet, then use the default input given by the problem
     
     # Check if problem has been queued
-    queued = '' 
     queue_len = 0
     if status == 'incomplete': # Flag indicating that the problem has been queued, 'msg' is length of queue
-        queued = 'true'
+        status = 'queued' 
         queue_len = msg
         msg = 'Submitted to grader. (Queue length: %s)' % queue_len 
 
@@ -359,7 +357,7 @@ def textbox(element, value, status, render_template, msg=''):
                'mode': mode, 'linenumbers': linenumbers,
                'rows': rows, 'cols': cols,
                'hidden': hidden, 'tabsize': tabsize,
-               'queued': queued, 'queue_len': queue_len,
+               'queue_len': queue_len,
                }
     html = render_template("textbox.html", context)
     try:
diff --git a/common/lib/capa/capa/templates/filesubmission.html b/common/lib/capa/capa/templates/filesubmission.html
index 09bc287923..d3d57ee318 100644
--- a/common/lib/capa/capa/templates/filesubmission.html
+++ b/common/lib/capa/capa/templates/filesubmission.html
@@ -6,11 +6,9 @@
     <span class="correct" id="status_${id}"></span>
     % elif state == 'incorrect':
     <span class="incorrect" id="status_${id}"></span>
-    % elif state == 'incomplete':
-    <span class="incorrect" id="status_${id}"></span>
-    % endif
-    % if queued:
-    <span class="xqueue" id="${id}" >${queue_len}</span>
+    % elif state == 'queued':
+    <span class="processing" id="status_${id}"></span>
+    <span style="display:none;" class="xqueue" id="${id}" >${queue_len}</span>
     % endif
     <span class="debug">(${state})</span>
     <br/>
diff --git a/common/lib/capa/capa/templates/textbox.html b/common/lib/capa/capa/templates/textbox.html
index f31b98b580..647f4fe4e8 100644
--- a/common/lib/capa/capa/templates/textbox.html
+++ b/common/lib/capa/capa/templates/textbox.html
@@ -13,14 +13,12 @@
   <span class="correct" id="status_${id}"></span>
   % elif state == 'incorrect':
   <span class="incorrect" id="status_${id}"></span>
-  % elif state == 'incomplete':
-  <span class="incorrect" id="status_${id}"></span>
+  % elif state == 'queued':
+  <span class="processing" id="status_${id}"></span>
+  <span style="display:none;" class="xqueue" id="${id}" >${queue_len}</span>
   % endif
   % if hidden:
-      <div style="display:none;" name="${hidden}" inputid="input_${id}" />
-  % endif
-  % if queued:
-    <span class="xqueue" id="${id}" >${queue_len}</span>
+  <div style="display:none;" name="${hidden}" inputid="input_${id}" />
   % endif
   <br/>
   <span class="debug">(${state})</span>

From 14bfbb06a562d5bbf15aaa110786f8f98c68a271 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Fri, 10 Aug 2012 21:22:12 -0400
Subject: [PATCH 30/30] If there is a missing static file, don't break the
 server, just leave a dead url

---
 .../pipeline_mako/templates/static_content.html           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/djangoapps/pipeline_mako/templates/static_content.html b/common/djangoapps/pipeline_mako/templates/static_content.html
index 1737153260..c153da22fe 100644
--- a/common/djangoapps/pipeline_mako/templates/static_content.html
+++ b/common/djangoapps/pipeline_mako/templates/static_content.html
@@ -3,7 +3,13 @@ from staticfiles.storage import staticfiles_storage
 from pipeline_mako import compressed_css, compressed_js
 %>
 
-<%def name='url(file)'>${staticfiles_storage.url(file)}</%def>
+<%def name='url(file)'>
+<%
+try:
+    url = staticfiles_storage.url(file)
+except:
+    url = file
+%>${url}</%def>
 
 <%def name='css(group)'>
   % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: