{% if group_msgs %}
{% endblock %}
@@ -155,7 +152,7 @@ $('#user-profile').hover(
msg_bd.children('.reply').removeClass('hide');
return false;
});
-
+
$('.reply-form').each(function(){
$(this).submit(function(event) {
// prepare django csrf token
diff --git a/group/views.py b/group/views.py
index cdf593368a..0c6860ef72 100644
--- a/group/views.py
+++ b/group/views.py
@@ -251,6 +251,10 @@ def msg_reply_new(request):
for msg_id in grpmsg_reply_list:
try:
m = GroupMessage.objects.get(id=msg_id)
+ # get group name
+ group = ccnet_threaded_rpc.get_group(int(m.group_id))
+ m.group_name = group.group_name
+
# get message replies
reply_list = MessageReply.objects.filter(reply_to=m)
# get nickname
diff --git a/media/css/seahub.css b/media/css/seahub.css
index b367f0c99c..1399991342 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -329,6 +329,15 @@ p.path, p.access-notice { margin: 12px 0 6px 0; }
font-size: 0.9em;
color: red;
}
+.new-reply {
+ padding: 5px;
+ background-color: #FDF;
+}
+.new-reply a {
+ color: #000;
+ font-weight: normal;
+}
+
/*repo page*/
.latest-commit .more:hover {
text-decoration:none;
diff --git a/templates/myhome.html b/templates/myhome.html
index 673b2601c3..dd6aa4a823 100644
--- a/templates/myhome.html
+++ b/templates/myhome.html
@@ -14,6 +14,10 @@
{% endif %}
-
{% for msg in group_msgs %}
@@ -19,6 +16,7 @@
{{ msg.timestamp|date:"Y-m-d H:i" }}
{{ msg.from_email|email2nickname }}
+ 所在小组:{{ msg.group_name }}
{{ msg.message }}
@@ -50,7 +48,6 @@暂无
{% endif %} -