diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html index a688874365..ffb46418cc 100644 --- a/group/templates/group/group_info.html +++ b/group/templates/group/group_info.html @@ -103,23 +103,19 @@ {{ msg.from_email|email2nickname }}
- {% if msg.attachment %} - (推荐) - {% endif %}

- {{ msg.message|linebreaksbr|seahub_urlize|find_at }} -

{% if msg.attachment %} - - 附件: + 推荐 {% if msg.attachment.attach_type == 'file' %} {% else %} {% endif %} - 查看 + {{ msg.attachment.file_path }} : - {% endif %} + {% endif %} + {{ msg.message|linebreaksbr|seahub_urlize|find_at }} +

{% if msg.reply_cnt == 0 %} 回复 {% else %} diff --git a/media/css/seahub.css b/media/css/seahub.css index d935c11a0a..dadfe30b36 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -564,7 +564,6 @@ p { #recommend-msg { width:260px; height:80px; - display:block; } #groups { width:260px; diff --git a/templates/snippets/group_recommend_form.html b/templates/snippets/group_recommend_form.html index 3747fdba90..5045cb6f62 100644 --- a/templates/snippets/group_recommend_form.html +++ b/templates/snippets/group_recommend_form.html @@ -1,15 +1,17 @@ {% load url from future %}
{% csrf_token %} -

推荐 +

推荐 {% for name, link in zipped %} {% if not forloop.last %} {{ name }} / {% else %} {{ name }} {% endif %} - {% endfor %} 到小组: -

- + {% endfor %} 到小组 +

+
+
+