From 60417b2db732b3d3f50596a2b5160c4945e065df Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 29 Jul 2016 19:30:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=82=80=E8=AF=B7=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/_user_message_applide_action.html.erb      | 12 ++++++------
 app/views/users/_user_message_applied.html.erb       |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/views/users/_user_message_applide_action.html.erb b/app/views/users/_user_message_applide_action.html.erb
index 24f2471b5..850f6d456 100644
--- a/app/views/users/_user_message_applide_action.html.erb
+++ b/app/views/users/_user_message_applide_action.html.erb
@@ -1,12 +1,12 @@
 <% if allow_to_show(ma) %>
-    ：<%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.applied.project,  :applied_message_id => ma.id), :remote => true, :method => :post %> |
-    <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.applied.project, :applied_message_id => ma.id), :remote => true, :method => :get %>
+    ：<%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.applied.project,  :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> |
+    <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.applied.project, :applied_message_id => ma.id), :remote => true, :method => :get, :class => "link-blue" %>
 <% elsif ma.status == 4 %>
-    被拒绝
+    <span class="fontGrey3">被拒绝</span>
 <% elsif ma.status == 5 %>
-    您已拒绝
+    <span class="fontGrey3">您已拒绝</span>
 <% elsif ma.status == 6 %>
-    已通过
+    <span class="fontGrey3">已通过</span>
 <% elsif ma.status == 7 %>
-    您已同意
+    <span class="fontGrey3">您已同意</span>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_applied.html.erb b/app/views/users/_user_message_applied.html.erb
index a2eff7189..d15d8aac7 100644
--- a/app/views/users/_user_message_applied.html.erb
+++ b/app/views/users/_user_message_applied.html.erb
@@ -22,13 +22,15 @@
           <li class="homepageNewsPubType fl">
             <%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
           </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+          <li class="homepageNewsContent fl" style="width:283px;"><a href="javascript:void(0);" class="newsGrey">
             以“<%= applied_project_message_type(ma.applied.role) %>”身份加入
             <%= link_to ma.applied.project, project_path(ma.applied.project), :class => "link-blue", :target => '_blank' %>
+          </a>
+          </li>
+          <li class="fl" style="width:71px; height:49px;">
             <span id="applied_project_<%= ma.id %>">
                 <%= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %>
             </span>
-          </a>
           </li>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>