From faba380ebe1c1f560a8c6ccb0353ef4f1f4f17f8 Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Thu, 18 Oct 2012 13:22:38 +0800
Subject: [PATCH] Modify msg delete button

---
 group/templates/group/group_info.html   | 2 +-
 group/templates/group/msg_reply_js.html | 2 +-
 media/css/seahub.css                    | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html
index 9c9f5e2e4b..27397ee0bb 100644
--- a/group/templates/group/group_info.html
+++ b/group/templates/group/group_info.html
@@ -125,7 +125,6 @@
             <div class="msg-hd">
                 <span class="time">{{ msg.timestamp|translate_commit_time }}</span>
                 <a href="{{ SITE_ROOT }}profile/{{ msg.from_email }}/" title="{{ msg.from_email }}">{{ msg.from_email|email2nickname }}</a>
-                <a class="msg-delete" href="#" data="{% url 'group_message_remove' group.id msg.id %}">删除</a>
             </div>
             <div class="msg-bd">
                 <p>
@@ -150,6 +149,7 @@
                 </p>
                 <button class="reply op" data="{% url 'msg_reply' msg.id %}"><span class="reply-cnt">{% if msg.reply_cnt != 0 %}{{ msg.reply_cnt }} {% endif %}</span>回复</button>
                 <button class="replyclose op hide">收起回复</button>
+                <button class="msg-delete op" href="#" data="{% url 'group_message_remove' group.id msg.id %}">删除</button>
                 <div class="reply-bd"></div>
             </div>
         </div>
diff --git a/group/templates/group/msg_reply_js.html b/group/templates/group/msg_reply_js.html
index 99d91562c9..03167c1ae3 100644
--- a/group/templates/group/msg_reply_js.html
+++ b/group/templates/group/msg_reply_js.html
@@ -71,7 +71,7 @@ $('.reply').click(function() {
 });
 
 $('.replyclose').click(function() {
-    $(this).next().addClass('hide'); // hide 'reply-bd'
+    $(this).next().next().addClass('hide'); // hide 'reply-bd'
     $(this).addClass('hide');
     $(this).prev().removeClass('hide'); // show 'reply'
 });
diff --git a/media/css/seahub.css b/media/css/seahub.css
index 94ea2aef5d..4be72a5f02 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -1136,9 +1136,6 @@ ul.with-bg li {
 .msg-hd .group {
     margin-left:30px;
 }
-.msg-hd .msg-delete {
-    float: right;
-}
 .msg-bd a {
     font-weight: normal;
 }