Merge branch 'lj_msg_reply'

base/templatetags/seahub_tags.py

@@ -129,7 +129,7 @@ at_pattern = re.compile(r'(\s|^)(@\w+)', flags=re.U)
 
 @register.filter(name='find_at')
 def find_at(text):
-    return at_pattern.sub(r'\1<span class="at-in-msg">\2</span>', text)
+    return at_pattern.sub(r'\1<span class="at">\2</span>', text)
 find_at.is_safe=True
 
 @register.filter(name='short_email')

group/templates/group/group_reply_list.html

@@ -1,10 +1,13 @@
-{% load seahub_tags %}
+{% load seahub_tags avatar_tags %}
 
 <ul>
 {% for reply in replies %}
-<li>
-  {{ reply.message|seahub_urlize|find_at }} -- <a href="{% url user_profile reply.from_email %}">{{ reply.nickname }}</a>
-  <a href="javascript:void(0);" class="" onclick="reply_at('@{{ reply.nickname }} ', {{ msg.id }})">回复</a>
+<li class="w100 ovhd">
+<a href="{% url user_profile reply.from_email %}" class="pic fleft">{% avatar reply.from_email 28 %}</a>
+<div class="txt fright">
+<a href="{% url user_profile reply.from_email %}">{{ reply.nickname }}</a> : {{ reply.message|seahub_urlize|find_at }} -- 
+<a href="javascript:void(0);" class="" onclick="reply_at('@{{ reply.nickname }} ', {{ msg.id }})">回复</a>
+</div>
 </li>
 {% endfor %}
 </ul>

media/css/seahub.css

@@ -690,26 +690,28 @@ p {
 .msg-bd .op:hover {
     text-decoration:none;
 }
-.msg-bd p a {
-    color: #666666;
+.msg-bd a {
     font-weight: normal;
 }
+.msg-bd .at {
+    color:#808;
+}
 .reply-list {
     color:#444;
     width:90%;
-    padding:2px 0 2px 0;
+}
+.reply-list li {
+    margin:5px 0;
+}
+.reply-list .txt {
+    width: 93%;
 }
 .reply-list a {
-    color:#666;
-    font-weight:normal;
     font-size:12px;
 }
 .reply-form .text-input {
     width:82%;
 }
-.at-in-msg {
-    color:#e83;
-}
 
 /*file upload*/
 .upload-file-panel {