From 43cb2a0d181d98e6fe9abf1cceeaa9839fa4acf5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 27 Jul 2016 11:33:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=94=B3=E8=AF=B7=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_applied.html.erb | 18 ++++++++++++++++++
 app/views/users/user_messages.html.erb         |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 app/views/users/_user_message_applied.html.erb

diff --git a/app/views/users/_user_message_applied.html.erb b/app/views/users/_user_message_applied.html.erb
new file mode 100644
index 000000000..dc3e51b4d
--- /dev/null
+++ b/app/views/users/_user_message_applied.html.erb
@@ -0,0 +1,18 @@
+<% if ma.class == AppliedMessage %>
+    <!--申请加入项目-->
+    <% if ma.applied_type == "ApplyAddSchools" %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.user), :width => "30", :height => "30"), user_path(ma.user), :target => '_blank' %></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.user, user_path(ma.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">批准你加入项目：</span>
+          </li>
+          <li class="homepageNewsContent fl">
+            <a class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank'><%= ma.applied.name %></a>
+          </li>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 1ff8adc57..2baa9f2f2 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -34,6 +34,8 @@
 
                 <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
 
+                <%# 申请类消息 %>
+                <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
             <% end %>
             <ul class="wlist" style=" border:none; padding-top: 15px;">
               <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>