Merge pull request #9187 from edx/release

Release merge to master

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

@@ -17,6 +17,7 @@
 // * +Problem - Annotation
 // * +Problem - Choice Text Group
 // * +Problem - Image Input Overrides
+// * +Problem - Annotation Problem Overrides
 
 // +Variables - Capa
 // ====================
@@ -464,15 +465,6 @@ div.problem {
         background: url('../images/correct-icon.png') center center no-repeat;
       }
 
-      &.partially-correct {
-        display: inline-block;
-        position: relative;
-        top: 6px;
-        width: 25px;
-        height: 20px;
-        background: url('../images/partially-correct-icon.png') center center no-repeat;
-      }
-
       &.incomplete, &.ui-icon-close {
         display: inline-block;
         position: relative;
@@ -1378,10 +1370,44 @@ div.problem .imageinput.capa_inputtype {
     width: 25px;
     height: 20px;
   }
+
   .correct {
     background: url('../images/correct-icon.png') center center no-repeat;
   }
+
   .incorrect {
     background: url('../images/incorrect-icon.png') center center no-repeat;
   }
+
+  .partially-correct {
+    background: url('../images/partially-correct-icon.png') center center no-repeat;
+  }
 }
+
+// +Problem - Annotation Problem Overrides
+// ====================
+
+// NOTE: temporary override until annotation problem inputs use same base html structure as other common capa input types.
+div.problem .annotation-input {
+
+  .tag-status {
+    display: inline-block;
+    position: relative;
+    top: 3px;
+    width: 25px;
+    height: 20px;
+  }
+
+  .correct {
+    background: url('../images/correct-icon.png') center center no-repeat;
+  }
+
+  .incorrect {
+    background: url('../images/incorrect-icon.png') center center no-repeat;
+  }
+
+  .partially-correct {
+    background: url('../images/partially-correct-icon.png') center center no-repeat;
+  }
+}
+

common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee

@@ -224,6 +224,13 @@ describe "DiscussionThreadListView", ->
             checkThreadsOrdering(view, sort_order, type)
             expect(view.$el.find(".forum-nav-thread-comments-count:visible").length).toEqual(if type == "votes" then 0 else 4)
             expect(view.$el.find(".forum-nav-thread-votes-count:visible").length).toEqual(if type == "votes" then 4 else 0)
+            if type == "votes"
+                expect(
+                    _.map(
+                        view.$el.find(".forum-nav-thread-votes-count"),
+                        (element) -> $(element).text().trim()
+                    )
+                ).toEqual(["+25 votes", "+20 votes", "+42 votes", "+12 votes"])
 
         it "with sort preference date", ->
             checkRender(@threads, "date", ["Thread1", "Thread4", "Thread2", "Thread3"])

common/static/common/templates/discussion/thread-list-item.underscore

@@ -64,7 +64,7 @@
       );
       %>
       <span class="forum-nav-thread-votes-count">
-      +<%- interpolate(fmt, {
+      +<%= interpolate(fmt, {
                votes_count: votes['up_count'],
                span_start: '<span class="sr">',
                span_end: '</span>'