Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/messages/_course_show.html.erb

@@ -34,7 +34,11 @@
 <div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @topic.id%>').show();" onmouseout="$('#message_setting_<%= @topic.id%>').hide();">
   <div class="postThemeContainer">
     <div class="postDetailPortrait">
-      <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
+      <% if @topic.status == 1 %>
+          <%= image_tag("/images/trustie_logo1.png", width: "50px", height: "50px") %>
+      <% else %>
+          <%= link_to image_tag(url_to_avatar(@topic.author), :width => 50, :height => 50,:alt=>'图像' ), user_path(@topic.author) %>
+      <% end %>
     </div>
     <div class="postThemeWrap">
       <% if User.current.logged? %>
@@ -72,11 +76,15 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
+        <% if @topic.status == 1 %>
+            <span class="fontBlue2">确实团队</span>
+        <% else %>
             <% if @topic.try(:author).try(:realname) == ' ' %>
                 <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
             <% else %>
                 <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
             <% end %>
+        <% end %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>
       <div class="cl"></div>

app/views/users/_course_message.html.erb

@@ -1,16 +1,24 @@
 <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="homepagePostBrief">
     <div class="homepagePostPortrait">
+      <% if activity.status == 1 %>
+          <%= image_tag("/images/trustie_logo1.png", width: "50px", height: "50px") %>
+      <% else %>
           <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
           <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+      <% end %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
+        <% if activity.status == 1 %>
+            <span class="fontBlue2">确实团队</span>
+        <% else %>
             <% if activity.try(:author).try(:realname) == ' ' %>
                 <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
             <% else %>
                 <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
             <% end %>
+        <% end %>
         TO
         <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>