From e89f2ff67a698a79cabf11590084f223fd9dd005 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Mon, 13 Aug 2012 15:14:49 +0800
Subject: [PATCH] modified recommend

---
 group/templates/group/group_info.html        | 14 +++++---------
 media/css/seahub.css                         |  1 -
 templates/snippets/group_recommend_form.html | 10 ++++++----
 3 files changed, 11 insertions(+), 14 deletions(-)

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 @@
                 <a href="{{ SITE_ROOT }}profile/{{ msg.from_email }}/" title="{{ msg.from_email }}">{{ msg.from_email|email2nickname }}</a>
             </div>
             <div class="msg-bd">
-                {% if msg.attachment %}
-                <span class="recommend">（推荐)</span>
-                {% endif %}
                 <p>
-                  {{ msg.message|linebreaksbr|seahub_urlize|find_at }}
-                </p>
                 {% if msg.attachment %}
-                <span>
-                  附件:
+                <span class="recommend">推荐
                   {% if msg.attachment.attach_type == 'file' %}
                   <a href="{% url 'repo_view_file' msg.attachment.repo_id %}?p={{ msg.attachment.path }}" target="_blank">
                   {% else %}
                   <a href="{% url 'repo' msg.attachment.repo_id %}?p={{ msg.attachment.path }}" target="_blank">
                   {% endif %}
-                  查看</a>
+                  {{ msg.attachment.file_path }}</a> :
                 </span>
-                {% endif %}                
+                {% endif %}
+                {{ msg.message|linebreaksbr|seahub_urlize|find_at }}
+                </p>
                 {% if msg.reply_cnt == 0 %}
                 <a class="reply op" href="#" data="{{ msg.id }}">回复</a>
                 {% 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 %}
     <form action="{% url 'group_recommend' %}" method="post" id="recommend-form" class="hide">{% csrf_token %}
-        <p>推荐
+        <h3>推荐
         {% for name, link in zipped %}
             {% if not forloop.last %}
                {{ name }} /               
             {% else %}
                 {{ name }}
             {% endif %}
-        {% endfor %} 到小组:
-        </p>
-        <input type="input" name="groups" id="groups" value="" />
+        {% endfor %} 到小组
+        </h3>
+        <label>小组名称：</label><br />
+        <input type="input" name="groups" id="groups" value="" /><br />
+        <label>推荐语：</label><br />
         <textarea name="message" id="recommend-msg"></textarea><br />
         <input type="hidden" name="repo_id" value="{{ repo.id }}" />
         <input type="hidden" name="path" value="{{ path }}" />