From fb5a969fd38b66017125184e965798a028255052 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 5 Aug 2016 16:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/_show_messages_list.html.erb      | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index c759ddeb7..a090741a4 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -141,26 +141,20 @@
                 <% content = '<span class="shadowbox_news_user">'+User.where("id=?", ma.applied_user_id).first.show_name+' </span>提交了申请：添加新的单位：'+"“"+ma.name+"”" %>
                 <%= link_to content.html_safe, unapplied_schools_path(:flag => 1, :applied_message_id => ma.id), :title => "#{User.where("id=?", ma.applied_user_id).first.show_name}提交了申请：添加新的单位“#{ma.name}”", :target => '_blank' %>
               </li>
-        <% elsif  ma.applied_type == "ApplyAddSchools" && ma.status == 1 %>
+        <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 1 %>
               <li>
-                <span class="shadowbox_news_user">系统提示</span>
-                <%= applied_school_tip(ma) %>
-                <%= link_to "“"+ma.name+"”" + "的申请，已通过审核。谢谢！",  { :controller=> "my",:action => "account",:flag => 1, :applied_message_id => ma.id }, :title => "“#{ma.name}”的申请，，已通过审核。谢谢！", :target => '_blank'%>
-                “<%= ma.name %>” 的申请，已通过审核。谢谢！
-                </a>
+                <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.name}”的申请，已通过审核。谢谢！" %>
+                <%= link_to content.html_safe, { :controller=> "my",:action => "account",:flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.name}”的申请，已通过审核。谢谢！", :target => '_blank'%>
               </li>
-        <% elsif  ma.applied_type == "ApplyAddSchools" && ma.status == 2 %>
+        <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 2 %>
               <li>
-                <span class="shadowbox_news_user">系统提示</span>
-                <%= applied_school_tip(ma) %>
-               <%= link_to "“"+ma.applied.name+"”"+"的申请，因名称不符合规范，系统已将其更改为"+"“"+ma.name+"”"+"。谢谢！",  { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "“#{ma.applied.name}”的申请，因名称不符合规范，系统已将其更改为“#{ma.name}”。谢谢！", :target => '_blank'%>
-                </a>
+                <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.applied.name}”的申请，因名称不符合规范，系统已将其更改为“#{ma.name}”。谢谢！" %>
+                <%= link_to content.html_safe, { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.applied.name}”的申请，因名称不符合规范，系统已将其更改为“#{ma.name}”。谢谢！", :target => '_blank'%>
               </li>
-        <% elsif  ma.applied_type == "ApplyAddSchools" && ma.status == 3 %>
+        <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 3 %>
               <li>
-                <span class="shadowbox_news_user">系统提示</span>
-                <%= applied_school_tip(ma) %>
-                <%= link_to "“"+ma.name+"”" + "的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！",  { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！", :target => '_blank'%>
+                <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！" %>
+                <%= link_to content.html_safe, { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！", :target => '_blank'%>
               </li>
         <% end %>
     <% end %>