Merge pull request #375 from edx/giulio/peer-grading-style-release

Giulio/peer grading style release

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

@@ -52,6 +52,7 @@ section.legend-container {
     width: 20%;
   }
   margin-bottom: 5px;
+  display: none !important;
 }
 
 section.combined-open-ended-status {

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

@@ -2,7 +2,7 @@ nav.sequence-nav {
   // TODO (cpennington): This doesn't work anymore. XModules aren't able to
   // import from external sources.
   @extend .topbar;
-  margin: -4px 0 30px;
+  margin: -4px 30px 30px 30px;
   position: relative;
   border-bottom: none;
 
@@ -35,7 +35,7 @@ nav.sequence-nav {
     z-index: 99;
     border: 1px solid #ccc;
     height: 44px;
-    margin: 0 30px;
+    margin: 0;
     @include linear-gradient(top, #ddd, #eee);
     @include box-shadow(0 1px 3px rgba(0, 0, 0, .1) inset);
   }
@@ -259,9 +259,8 @@ nav.sequence-nav {
       }
 
       &.prev {
-        left: -10px;
+        left: -40px;
         border-radius: 35px 0 0 35px;
-
         a {
           background-image: url('../images/sequence-nav/previous-icon.png');
           background-position: center 15px;
@@ -269,7 +268,7 @@ nav.sequence-nav {
       }
 
       &.next {
-        right: -10px;
+        right: -40px;
         border-radius: 0 35px 35px 0;
 
         a {

common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee

@@ -152,10 +152,13 @@ class @CombinedOpenEnded
 
     @out_of_sync_message = 'The problem state got out of sync.  Try reloading the page.'
 
-    if @task_number>1
-      @prompt_hide()
-    else if @task_number==1 and @child_state!='initial'
-      @prompt_hide()
+#   force show the prompt
+    @prompt_show()
+
+#    if @task_number>1
+#      @prompt_hide()
+#    else if @task_number==1 and @child_state!='initial'
+#      @prompt_hide()
 
     @find_assessment_elements()
     @find_hint_elements()

common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee

@@ -344,7 +344,7 @@ class @PeerGradingProblem
     if response.success
       @is_calibrated_check()
       @grading_message.fadeIn()
-      @grading_message.html("<p>Successfully saved your feedback. Fetched the next essay.</p>")
+      @grading_message.html("<p>Successfully saved your feedback. Fetched the next essay.</p>").focus()
     else
       if response.error
         @render_error(response.error)
@@ -516,7 +516,7 @@ class @PeerGradingProblem
 
   gentle_alert: (msg) =>
     @grading_message.fadeIn()
-    @grading_message.html("<p>" + msg + "</p>")
+    @grading_message.html("<p>" + msg + "</p>").focus()
 
   collapse_question: () =>
     @prompt_container.slideToggle()

lms/djangoapps/courseware/tabs.py

@@ -168,7 +168,8 @@ def _peer_grading(tab, user, course, active_page):
 def _combined_open_ended_grading(tab, user, course, active_page):
     if user.is_authenticated():
         link = reverse('open_ended_notifications', args=[course.id])
-        tab_name = "Open Ended Panel"
+        # tab_name = "Open Ended Panel"
+        tab_name = "Grading Panel"
 
         notifications  = open_ended_notifications.combined_notifications(course, user)
         pending_grading = notifications['pending_grading']

lms/templates/courseware/course_navigation.html

@@ -17,6 +17,7 @@ def url_class(is_active):
   <div class="inner-wrapper">
     <ol class="course-tabs">
       % for tab in get_course_tabs(user, course, active_page):
+        % if tab.name != "Grading Panel" or staff_access:
           <li>
              <a href="${tab.link | h}" class="${url_class(tab.is_active)}">
                  ${tab.name | h}
@@ -28,6 +29,7 @@ def url_class(is_active):
                  %endif
              </a>
           </li>
+        % endif
       % endfor
     <%block name="extratabs" />
         % if masquerade is not UNDEFINED:

lms/templates/peer_grading/peer_grading_problem.html

@@ -27,6 +27,9 @@
     <section class="grading-wrapper">
     <h2>Student Response</h2>
 
+    <div class="grading-message">
+    </div>
+    
     <div class="grading-container">
         <div class="submission-wrapper">
             <h3></h3>
@@ -53,8 +56,6 @@
         </div>
 
     </div>
-    <div class="grading-message">
-    </div>
 
     </section>
     </section>