From aaa2f35336fb301f073420e473f5b6379917fad5 Mon Sep 17 00:00:00 2001
From: Greg Price <gprice@edx.org>
Date: Mon, 21 Jul 2014 17:35:03 -0400
Subject: [PATCH] Change endorsement UI for forum question threads

Responses to question threads can be "marked as answer" instead of
"endorsed".
---
 lms/static/images/answer-icon.png                | Bin 0 -> 631 bytes
 lms/static/sass/discussion/_discussion.scss      |   9 +++++++++
 .../discussion/_underscore_templates.html        |  15 ++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 lms/static/images/answer-icon.png

diff --git a/lms/static/images/answer-icon.png b/lms/static/images/answer-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4779a6f42fe886f8df433c00285f14dde379bccc
GIT binary patch
literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq000dD000;W1^@s6A@Fxp0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!8A(JzRCwBA{Qv(y10hgYSm+O=f`K@(
zzrX)4BOy&74ZOU(tGT(kSzo<+wd&u$e^D&NXpoSQU}a=vWB}qYpvFybn}7<MfYc74
z^~bPj00B)+%|{Ln4oP55Km|P_A|l1#zkmPo_3Kx6pu8v!4Q)W?OvZwOf=E$O(Pe^y
zf($_SGCX_s><cq9GdnH~AU@;IpFdsq?Af#U;lqdGAOVm@sQa;M00Aa8HnzR)?(S3N
z<>g<31(=xdY5=PN84h$#E3!rq(9+VvssRi@0RhEKfByWb*}8S>ivtG^JOuL7kmOJ>
zdgL+z{Zt8b;%gv#7OwcimLfnN!kbL6r3efS5|)bojQ=5N@A--Qgwvj+g`z*NEX!&^
z`9G{rPcp6g^XFd_UQI9!ayBfipm6^D<OjpkV@xqjFa?5o_Dw)+g{*;3mKCl61On|#
z9z8jH_XXG{pn@K8ea7OiFIm2Pefh^7C??7;$Ff?+8lk~iDeF<CcP=FD3F_KL%Go_$
zCZf*4@bCA3hQ|l~ePLw(&knZ%=z3>mga(iS%x@pwl6?C6joY)&H+UGC85#KH7}*3A
zn3-WVxG3iUHRPbCJuVLRz0LkDQ;ntk!AXdbl@StCAPq`6k1D*gF_RK33H|#0r?z5k
z)eGlI8vmUqYW(lmIu(?Z(y=8Yl(YxbSOd}s)j)jO`}_A_B{MS((jGv70RSd+Oxf4_
Rw}=1$002ovPDHLkV1ktM9J~Mk

literal 0
HcmV?d00001

diff --git a/lms/static/sass/discussion/_discussion.scss b/lms/static/sass/discussion/_discussion.scss
index d05e9b9674..1821797b1b 100644
--- a/lms/static/sass/discussion/_discussion.scss
+++ b/lms/static/sass/discussion/_discussion.scss
@@ -656,6 +656,10 @@ body.discussion {
       background: url(../images/endorse-icon.png) no-repeat;
     }
 
+    &.mark-answer .check-icon {
+      background: url(../images/answer-icon.png) no-repeat;
+    }
+
     &.is-endorsed {
       border: 1px solid #4697c1;
       @include linear-gradient(top, #6dccf1, #38a8e5);
@@ -664,6 +668,11 @@ body.discussion {
       .check-icon {
         background-position: 0 -12px;
       }
+
+      &.mark-answer {
+        @include linear-gradient(top, tint(#1d9348, 60%), tint(#1d9348, 20%));
+        border: 1px solid #1d9348;
+      }
     }
   }
 
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index a3aa6ab622..c801a6180b 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -153,7 +153,20 @@
 <script aria-hidden="true" type="text/template" id="thread-response-show-template">
     <header>
         <a href="#" class="vote-btn" role="button" aria-pressed="false"><!-- DiscussionContentView.renderVote() populates this --></a>
-        <a href="javascript:void(0)" class="endorse-btn action-endorse" style="cursor: default; display: none;" data-tooltip="${_('endorse') | h}"><span class="check-icon" style="pointer-events: none; "></span></a>
+        <%
+            tooltip_expr = u"<%- thread.get('thread_type') == 'question' ? '{mark_answer}' : '{endorse}' %>".format(
+                endorse=_("endorse"),
+                mark_answer=_("mark as answer")
+            )
+        %>
+        <a
+            href="javascript:void(0)"
+            class="endorse-btn action-endorse ${"<%= thread.get('thread_type') == 'question' ? 'mark-answer' : '' %>"}"
+            style="cursor: default; display: none;"
+            data-tooltip="${tooltip_expr}"
+        >
+            <span class="check-icon" style="pointer-events: none; "></span>
+        </a>
         ${"<% if (obj.username) { %>"}
         <a href="${'<%- user_url %>'}" class="posted-by">${'<%- username %>'}</a>
         ${"<% } else { %>"}