haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 13:50:07 +00:00
Code Issues Releases Wiki Activity

Mofigy group msg reply notification

Browse Source
This commit is contained in:
xiez
2012-06-27 19:56:11 +08:00
parent 8cd03c94cb
commit 1be271353e
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
group/templates/group/new_msg_reply.html
View File

@@ -4,10 +4,7 @@
{% block nav_group_class %}class="cur"{% endblock %} {% block nav_group_class %}class="cur"{% endblock %}
{% block main_panel %} {% block main_panel %}
<h2>新回复</h2>
<div class="main fleft"> <div class="main fleft">
<div id="group-reply">
{% if group_msgs %} {% if group_msgs %}
<ul class="msg-list"> <ul class="msg-list">
{% for msg in group_msgs %} {% for msg in group_msgs %}
@@ -19,6 +16,7 @@
<div class="msg-hd"> <div class="msg-hd">
<span class="time">{{ msg.timestamp|date:"Y-m-d H:i" }}</span> <span class="time">{{ msg.timestamp|date:"Y-m-d H:i" }}</span>
<a href="{{ SITE_ROOT }}profile/{{ msg.from_email }}/">{{ msg.from_email|email2nickname }}</a> <a href="{{ SITE_ROOT }}profile/{{ msg.from_email }}/">{{ msg.from_email|email2nickname }}</a>
所在小组：<a href="{{ SITE_ROOT }}group/{{ msg.group_id }}/">{{ msg.group_name }}</a>
</div> </div>
<div class="msg-bd"> <div class="msg-bd">
<p>{{ msg.message }}</p> <p>{{ msg.message }}</p>
@@ -50,7 +48,6 @@
<p>暂无</p> <p>暂无</p>
{% endif %} {% endif %}
</div>
</div> </div>
{% endblock %} {% endblock %}
@@ -155,7 +152,7 @@ $('#user-profile').hover(
msg_bd.children('.reply').removeClass('hide'); msg_bd.children('.reply').removeClass('hide');
return false; return false;
}); });
$('.reply-form').each(function(){ $('.reply-form').each(function(){
$(this).submit(function(event) { $(this).submit(function(event) {
// prepare django csrf token // prepare django csrf token

4
group/views.py
View File

@@ -251,6 +251,10 @@ def msg_reply_new(request):
for msg_id in grpmsg_reply_list: for msg_id in grpmsg_reply_list:
try: try:
m = GroupMessage.objects.get(id=msg_id) 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 # get message replies
reply_list = MessageReply.objects.filter(reply_to=m) reply_list = MessageReply.objects.filter(reply_to=m)
# get nickname # get nickname

9
media/css/seahub.css
View File

@@ -329,6 +329,15 @@ p.path, p.access-notice { margin: 12px 0 6px 0; }
font-size: 0.9em; font-size: 0.9em;
color: red; color: red;
} }
.new-reply {
padding: 5px;
background-color: #FDF;
}
.new-reply a {
color: #000;
font-weight: normal;
}
/*repo page*/ /*repo page*/
.latest-commit .more:hover { .latest-commit .more:hover {
text-decoration:none; text-decoration:none;

12
templates/myhome.html
View File

@@ -14,6 +14,10 @@
{% endif %} {% endif %}
</div> </div>
{% if has_grpmsg_reply %}
<span class="new-reply"><a href="{{ SITE_ROOT }}group/reply/new/">新回复</a></span>
{% endif %}
<h3>已用空间</h3> <h3>已用空间</h3>
<p>{{ quota_usage|filesizeformat }} / 2 GB</p> <p>{{ quota_usage|filesizeformat }} / 2 GB</p>
@@ -56,14 +60,6 @@
<p>暂无</p> <p>暂无</p>
{% endif %} {% endif %}
<h3>留言回复</h3>
{% if has_grpmsg_reply %}
<a class="op" href="{{ SITE_ROOT }}group/reply/new/">新回复</a>
{% else %}
</p>暂无</p>
{% endif %}
{% endblock %} {% endblock %}