Merge branch 'szzh' into dev_hjq

Conflicts:
	app/views/projects/settings/_join_org.html.erb

app/views/forums/_show_topics.html.erb

@@ -13,10 +13,10 @@
               </div>
               <% author = topic.last_reply.try(:author)%>
               <% if author%>
-                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.name%></a></div>
+                  <div class="postDetailCreater">最后回复:<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.name%></a></div>
                   <div class="postDetailDate"><%= format_date(topic.last_reply.created_at)%></div>
               <% end%>
-
+              <div class=" fr" style="color: #888888;font-size: 12px">最后更新:<%= format_date(topic.updated_at)%></div>
             </div>
             <div class="postDetailReply">
               <a href="<%= forum_memo_path(topic.forum, topic)%>" class="postReplyIcon mr5" target="_blank"></a>

app/views/memos/show.html.erb

@@ -79,6 +79,7 @@
             <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>
         <% end %>
       </div>
+      <div class=" fr" style="color: #888888;font-size: 12px">最后更新:<%= format_date(@memo.updated_at)%></div>
     </div>
     <div class="cl"></div>
   </div>

app/views/users/_user_message_course.html.erb

@@ -126,7 +126,7 @@
                 </ul>
             <% end %>
           </div>
-          <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
+          <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了.</li>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
@@ -158,7 +158,7 @@
               <li>匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
             </ul>
             <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>
-              <p>请您尽早完成匿评！如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。</p>
+              <p>请您尽早完成匿评,如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。</p>
               <p>例如，您缺评了两份作品，则您的最终成绩将被扣除 <%= ma.course_message.homework_detail_manual.absence_penalty %> * 2 = <%= ma.course_message.homework_detail_manual.absence_penalty * 2 %>分</p>
             <% end%>
           </div>
@@ -209,7 +209,7 @@
           <div style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败！
+              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败.
 
             </p>
             <ul class="ul_normal_color">
@@ -315,7 +315,7 @@
                     <% end %>
                   </ul>
                   <p>
-                    本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。  期待您取得更大的进步！
+                    本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59结束匿评，到时您将可以看到所有其他同学的作品啦.大家可以进一步互相学习。  期待您取得更大的进步.
                   </p>
                 </div>
             <% end %>
@@ -404,14 +404,16 @@
             </ul>
             <p>如需获得最终成绩，请您联系主讲老师对您的作品进行单独评分!</p>
           </div>
-          <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp;您迟交了作品！</li>
+          <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp;您迟交了作品</li>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
     <!-- 创建课程消息 -->
     <% if ma.course_message_type == "Course" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
+          </li>
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您成功创建了课程：</span>
@@ -443,7 +445,9 @@
     <% end %>
     <% if ma.course_message_type == "JoinCourseRequest" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
+          </li>
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的课程成员申请：</span>
@@ -482,7 +486,9 @@
     <% end %>
     <% if ma.course_message_type == "CourseRequestDealResult" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
+          </li>
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
@@ -548,7 +554,7 @@
     <% if ma.course_message_type == "JoinCourse" and ma.status == 1 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"></a>
+            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
           </li>
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>