From a22dd5ebb71d78f13af7a823950cc5ce2605694c Mon Sep 17 00:00:00 2001
From: Your Name <kevinchugh@edx.org>
Date: Thu, 29 Nov 2012 17:31:40 -0500
Subject: [PATCH] flagging interface updates

---
 lms/static/sass/_discussion.scss                 | 16 ++++++++++++++--
 .../discussion/_underscore_templates.html        |  5 +----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 809c968fe6..6d84af186c 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -95,6 +95,7 @@
 
 
 body.discussion {
+  
   .new-post-form-errors {
     display: none;
     background: $error-red;
@@ -1261,8 +1262,8 @@ body.discussion {
   .discussion-article {
     position: relative;
     padding: 40px;
-    min-height: 468px;
-
+    min-height: 468px;         
+    
     a {
       word-wrap: break-word;
     }
@@ -1315,6 +1316,9 @@ body.discussion {
         background-position: 0 0;
       }
     }
+    
+    
+    
   }
 
   .discussion-post {
@@ -2412,3 +2416,11 @@ body.discussion {
 .discussion-user-threads {
   @extend .discussion-module
 }
+
+.flagdiv{
+      font-size: 12px;
+      color: #888;
+      align:right;
+      font-style: italic; 
+      
+    }   
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index b37f9acfa0..ccbcc55da2 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -3,6 +3,7 @@
 <script type="text/template" id="thread-template">
     <article class="discussion-article" data-id="${'<%- id %>'}">
         <div class="thread-content-wrapper"></div>
+        <div class = "flagdiv">Report Misuse</div>
         <ol class="responses">
             <li class="loading"><div class="loading-animation"></div></li>
         </ol>
@@ -28,10 +29,6 @@
       <header>
           <a href="#" class="vote-btn discussion-vote discussion-vote-up" data-role="discussion-vote" data-tooltip="vote">
             <span class="plus-icon">+</span> <span class='votes-count-number'>${'<%- votes["up_count"] %>'}</span></a>
-          <a href="#" class="abuse-btn discussion-flag-abuse" data-role="discussion-flag-abuse" data-tooltip="flag as abusive">
-            <span class="plus-icon">+</span> <span class='votes-count-number'>${'<%- abuse_flaggers.length%>'}</span></a>
-          <a href="#" class="abuse-btn discussion-flag-spoiler" data-role="discussion-flag-abuse" data-tooltip="flag as abusive">
-            <span class="plus-icon">+</span> <span class='votes-count-number'>${'<%- spoiler_flaggers.length%>'}</span></a>
           <h1>${'<%- title %>'}</h1>
           <p class="posted-details">
               ${"<% if (obj.username) { %>"}