From 8c6fca87c9a7a937dd9e5c9a4f47adeb2c75339e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 14 Jul 2016 13:57:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E9=97=BB=E6=B7=BB=E5=8A=A0=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E6=89=80=E6=9C=89=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_project_news.html.erb | 19 +++++++++++++++++++
 app/views/users/_project_message.html.erb |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 2d498e827..e751e16ae 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -32,6 +32,25 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
+      <% if User.current.logged? %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <% if User.current.logged? %>
+                    <ul class="homepagePostSettiongText">
+                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <li>
+                        <%= link_to(l(:button_edit), {:controller => 'news', :action => 'edit', :id => activity}, :class => 'postOptionLink') if activity.author == User.current %>
+                      </li>
+                      <li>
+                        <%= delete_link(news_path(activity), :data => {:confirm => l(:text_are_you_sure)}, :class => 'postOptionLink') if activity.author == User.current %>
+                      </li>
+                    </ul>
+                <% end %>
+              </li>
+            </ul>
+          </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index d1bb99296..00075dc8e 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -1,4 +1,4 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -46,7 +46,7 @@
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
       <% if User.current.logged? %>
-        <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
+        <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: block">
             <ul>
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">