Merge branch 'master' of github.com:MITx/mitx into mchang/acceptance-testing

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

 h2 {
   margin-top: 0;
   margin-bottom: 15px;
-  width: flex-grid(2, 9);
-  padding-right: flex-gutter(9);
-  border-right: 1px dashed #ddd;
-  @include box-sizing(border-box);
-  display: table-cell;
-  vertical-align: top;
 
   &.problem-header {
     section.staff {
@@ -15,12 +9,6 @@ h2 {
     }
   }
 
-  @media screen and (max-width:1120px) {
-    display: block;
-    width: auto;
-    border-right: 0;
-  }
-
   @media print {
     display: block;
     width: auto;
@@ -29,16 +17,6 @@ h2 {
 }
 
 section.problem {
-  display: table-cell;
-  width: flex-grid(7, 9);
-  padding-left: flex-gutter(9);
-
-  @media screen and (max-width:1120px) {
-    display: block;
-    width: auto;
-    padding: 0;
-  }
-
   @media print {
     display: block;
     width: auto;

lms/djangoapps/course_wiki/tests/tests.py

@@ -36,7 +36,7 @@ class WikiRedirectTestCase(PageLoader):
         """
         Test that requesting wiki URLs redirect properly to or out of classes.
         
-        An enrolled in student going from /courses/edX/toy/2012_Fall/profile 
+        An enrolled in student going from /courses/edX/toy/2012_Fall/progress 
         to /wiki/some/fake/wiki/page/ will redirect to 
         /courses/edX/toy/2012_Fall/wiki/some/fake/wiki/page/
         
@@ -48,10 +48,10 @@ class WikiRedirectTestCase(PageLoader):
         
         self.enroll(self.toy)
         
-        referer = reverse("profile", kwargs={ 'course_id' : self.toy.id })
+        referer = reverse("progress", kwargs={ 'course_id' : self.toy.id })
         destination = reverse("wiki:get", kwargs={'path': 'some/fake/wiki/page/'})
         
-        redirected_to = referer.replace("profile", "wiki/some/fake/wiki/page/")
+        redirected_to = referer.replace("progress", "wiki/some/fake/wiki/page/")
         
         resp = self.client.get( destination, HTTP_REFERER=referer)
         self.assertEqual(resp.status_code, 302 )
@@ -77,11 +77,11 @@ class WikiRedirectTestCase(PageLoader):
         """
         
         course_wiki_home = reverse('course_wiki', kwargs={'course_id' : course.id})
-        referer = reverse("profile", kwargs={ 'course_id' : self.toy.id })
+        referer = reverse("progress", kwargs={ 'course_id' : self.toy.id })
         
         resp = self.client.get(course_wiki_home, follow=True, HTTP_REFERER=referer)
                 
-        course_wiki_page = referer.replace('profile', 'wiki/' + self.toy.wiki_slug + "/")
+        course_wiki_page = referer.replace('progress', 'wiki/' + self.toy.wiki_slug + "/")
         
         ending_location = resp.redirect_chain[-1][0]
         ending_status = resp.redirect_chain[-1][1]

lms/djangoapps/courseware/tests/tests.py

@@ -303,7 +303,7 @@ class TestViewAuth(PageLoader):
                 'instructor_dashboard',
                 'gradebook',
                 'grade_summary',)]
-            urls.append(reverse('student_profile', kwargs={'course_id': course.id,
+            urls.append(reverse('student_progress', kwargs={'course_id': course.id,
                                                      'student_id': user(self.student).id}))
             return urls
 
@@ -388,7 +388,7 @@ class TestViewAuth(PageLoader):
             list of urls that students should be able to see only
             after launch, but staff should see before
             """
-            urls = reverse_urls(['info', 'courseware', 'profile'], course)
+            urls = reverse_urls(['info', 'courseware', 'progress'], course)
             urls.extend([
                 reverse('book', kwargs={'course_id': course.id, 'book_index': book.title})
                 for book in course.textbooks
@@ -411,7 +411,7 @@ class TestViewAuth(PageLoader):
             """list of urls that only instructors/staff should be able to see"""
             urls = reverse_urls(['instructor_dashboard','gradebook','grade_summary'],
                                 course)
-            urls.append(reverse('student_profile', kwargs={'course_id': course.id,
+            urls.append(reverse('student_progress', kwargs={'course_id': course.id,
                                                      'student_id': user(self.student).id}))
             return urls
 

lms/djangoapps/courseware/views.py

@@ -258,11 +258,10 @@ def university_profile(request, org_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.
+def progress(request, course_id, student_id=None):
+    """ User progress. We show the grade bar and every problem score.
 
-    Course staff are allowed to see the profiles of students in their class.
+    Course staff are allowed to see the progress of students in their class.
     """
     course = get_course_with_access(request.user, course_id, 'load')
     staff_access = has_access(request.user, course, 'staff')
@@ -276,28 +275,20 @@ def profile(request, course_id, student_id=None):
             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, course_id=course_id)
 
     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'],
+    context = {'course': course,
                'courseware_summary': courseware_summary,
                'grade_summary': grade_summary,
                'staff_access': staff_access,
                }
     context.update()
 
-    return render_to_response('profile.html', context)
+    return render_to_response('progress.html', context)
 
 
 

lms/static/sass/course/base/_base.scss

@@ -53,6 +53,18 @@ input[type="password"] {
   }
 }
 
+input[type="reset"],
+input[type="submit"],
+input[type="button"],
+button,
+.button {
+  @extend .gray-button;
+
+  form & {
+    @extend .gray-button;
+  }
+}
+
 
 img {
   max-width: 100%;

lms/static/sass/course/base/_extends.scss

@@ -6,28 +6,34 @@ h1.top-header {
   padding-bottom: lh();
 }
 
-.light-button, a.light-button {
-  border: 1px solid #ccc;
-  @include border-radius(3px);
-  @include box-shadow(inset 0 1px 0 #fff);
-  color: #666;
-  cursor: pointer;
-  font: 400 $body-font-size $body-font-family;
-  @include linear-gradient(#fff, lighten(#888, 40%));
-  padding: 4px 8px;
-  text-decoration: none;
-  text-shadow: none;
+.button-reset {
   text-transform: none;
   letter-spacing: 0;
-  -webkit-font-smoothing: antialiased;
 
-  &:hover, &:focus {
-    border: 1px solid #ccc;
-    @include linear-gradient(#fff, lighten(#888, 37%));
+  &:hover {
     text-decoration: none;
   }
 }
 
+.light-button, a.light-button, // only used in askbot as classes
+.gray-button {
+  @include button(simple, #eee);
+  @extend .button-reset;
+  font-size: em(13);
+}
+
+.blue-button {
+  @include button(simple, $blue);
+  @extend .button-reset;
+  font-size: em(13);
+}
+
+.pink-button {
+  @include button(simple, $pink);
+  @extend .button-reset;
+  font-size: em(13);
+}
+
 .content {
   @include box-sizing(border-box);
   display: table-cell;

lms/static/sass/course/discussion/_sidebar.scss

@@ -43,8 +43,8 @@ div.discussion-wrapper aside {
       width: 27%;
       float: right;
       text-align: center;
-      padding-left: 0;
-      padding-right: 0;
+      padding: 4px 0;
+      text-transform: capitalize;
     }
 
     input[type="text"] {
@@ -300,7 +300,7 @@ div.discussion-wrapper aside {
     border-top: 0;
 
     a {
-      @extend .light-button;
+      @extend .gray-button;
       @include box-sizing(border-box);
       display: block;
       text-align: center;

lms/templates/course_navigation.html

@@ -33,7 +33,7 @@ def url_class(url):
       <li class="wiki"><a href="${reverse('course_wiki', args=[course.id])}" class="${url_class('wiki')}">Wiki</a></li>
 % endif
 % if user.is_authenticated():
-      <li class="profile"><a href="${reverse('profile', args=[course.id])}" class="${url_class('profile')}">Profile</a></li>
+      <li class="profile"><a href="${reverse('progress', args=[course.id])}" class="${url_class('progress')}">Progress</a></li>
 % endif
 % if staff_access:
       <li class="instructor"><a href="${reverse('instructor_dashboard', args=[course.id])}" class="${url_class('instructor')}">Instructor</a></li>

lms/templates/gradebook.html

@@ -49,7 +49,7 @@
         %for student in students:
         <tr>
           <td>
-            <a href="${reverse('student_profile', kwargs=dict(course_id=course_id, student_id=student['id']))}">${student['username']}</a>
+            <a href="${reverse('student_progress', kwargs=dict(course_id=course_id, student_id=student['id']))}">${student['username']}</a>
           </td>
         </tr>
         %endfor

lms/templates/progress.html

+<%inherit file="main.html" />
+<%namespace name='static' file='static_content.html'/>
+
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
+
+<%namespace name="profile_graphs" file="profile_graphs.js"/>
+
+<%block name="title"><title>Progress - edX 6.002x</title></%block>
+
+<%!
+    from django.core.urlresolvers import reverse
+%>
+
+<%block name="js_extra">
+<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
+<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.stack.js')}"></script>
+<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.symbol.js')}"></script>
+<script>
+${profile_graphs.body(grade_summary, course.grade_cutoffs, "grade-detail-graph")}
+</script>
+</%block>
+
+<%include file="course_navigation.html" args="active_page='progress'" />
+
+<section class="container">
+  <div class="profile-wrapper">
+
+    <section class="course-info">
+      <header>
+        <h1>Course Progress</h1>
+      </header>
+
+      <div id="grade-detail-graph"></div>
+
+      <ol class="chapters">
+        %for chapter in courseware_summary:
+        %if not chapter['display_name'] == "hidden":
+        <li>
+          <h2>${ chapter['display_name'] }</h2>
+
+          <ol class="sections">
+            %for section in chapter['sections']:
+            <li>
+              <%
+              earned = section['section_total'].earned
+              total = section['section_total'].possible
+              percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 and total > 0 else ""
+              %>
+
+              <h3><a href="${reverse('courseware_section', kwargs=dict(course_id=course.id, chapter=chapter['url_name'], section=section['url_name']))}">
+                ${ section['display_name'] }</a><span> ${"({0:.3n}/{1:.3n}) {2}".format( float(earned), float(total), percentageString )}</span></h3>
+              <p>
+                ${section['format']}
+
+                %if 'due' in section and section['due']!="":
+                  <em>
+                  due ${section['due']}
+                  </em>
+                %endif
+              </p>
+
+              %if len(section['scores']) > 0:
+                <section class="scores">
+                  <h3> ${ "Problem Scores: " if section['graded'] else "Practice Scores: "} </h3>
+                  <ol>
+                    %for score in section['scores']:
+                    <li>${"{0:.3n}/{1:.3n}".format(float(score.earned),float(score.possible))}</li>
+                    %endfor
+                  </ol>
+                </section>
+              %endif
+
+            </li> <!--End section-->
+            %endfor
+          </ol> <!--End sections-->
+        </li> <!--End chapter-->
+        %endif
+        %endfor
+      </ol> <!--End chapters-->
+
+    </section>
+
+    <section aria-label="Profile Navigation" class="user-info">
+      
+    </section>
+  </div>
+</section>

lms/urls.py

@@ -138,11 +138,11 @@ if settings.COURSEWARE_ENABLED:
             '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>[^/]+/[^/]+/[^/]+)/progress$',
+            'courseware.views.progress', name="progress"),
         # 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', name="student_profile"),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/progress/(?P<student_id>[^/]*)/$',
+            'courseware.views.progress', name="student_progress"),
 
         # For the instructor
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/instructor$',