From 0fa0f2c8ae4d48f2327035d878d3b01eddc2eaac Mon Sep 17 00:00:00 2001
From: Rocky Duan <dementrock@gmail.com>
Date: Mon, 13 Aug 2012 21:15:04 -0700
Subject: [PATCH] add cancel button for new post

---
 lms/static/coffee/src/discussion/discussion.coffee | 6 ++----
 lms/static/coffee/src/discussion/templates.coffee  | 3 ++-
 lms/static/sass/_discussion.scss                   | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lms/static/coffee/src/discussion/discussion.coffee b/lms/static/coffee/src/discussion/discussion.coffee
index 9565a7193b..9888a97d5c 100644
--- a/lms/static/coffee/src/discussion/discussion.coffee
+++ b/lms/static/coffee/src/discussion/discussion.coffee
@@ -54,12 +54,10 @@ initializeFollowDiscussion = (discussion) ->
           Discussion.setContentInfo response.content['id'], 'editable', true
           Discussion.initializeContent($thread)
           Discussion.bindContentEvents($thread)
-          $(".new-post-form").hide()
-          $local(".discussion-new-post").show()
+          $(".new-post-form").addClass("collapsed")
 
     handleCancelNewPost = (elem) ->
-      $local(".new-post-form").hide()
-      $local(".discussion-new-post").show()
+      $(".new-post-form").addClass("collapsed")
 
     handleSimilarPost = (elem) ->
       $title = $local(".new-post-title")
diff --git a/lms/static/coffee/src/discussion/templates.coffee b/lms/static/coffee/src/discussion/templates.coffee
index e2869c8931..da144dcfb6 100644
--- a/lms/static/coffee/src/discussion/templates.coffee
+++ b/lms/static/coffee/src/discussion/templates.coffee
@@ -18,7 +18,8 @@ Discussion = @Discussion
         <input type="checkbox" class="discussion-auto-watch" id="discussion-autowatch-${discussion_id}" checked="">
         <label for="discussion-auto-watch-${discussion_id}">follow this thread</label>
       </div>
-      <div class="reply-post-control">        
+      <div class="new-post-control post-control">        
+        <a class="discussion-cancel-post" href="javascript:void(0)">Cancel</a>
         <a class="discussion-submit-post control-button" href="javascript:void(0)">Submit</a>
       </div>
     </form>
diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 84faede4d7..510c0ef2c0 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -656,8 +656,8 @@ $tag-text-color: #5b614f;
         height: 0;
       }
 
-      .reply-post-control {
-        height: 0;
+      .post-control {
+        display: none;
       }
 
       .tagsinput {
@@ -666,7 +666,7 @@ $tag-text-color: #5b614f;
     }
 
     .new-post-control {
-      margin-left: 80%;
+      margin-left: 75%;
       margin-top: 1%;
     }
 
@@ -775,7 +775,7 @@ $tag-text-color: #5b614f;
         }
       }
 
-      .reply-post-control {
+      .post-control {
         overflow: hidden;
       }
     }