课程通知、回复、发布缺陷、回复合二为一

app/views/mailer/send_for_user_activities.html.erb

@@ -7,7 +7,7 @@
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#15bccf; "><%= l(:label_course_overview)%></h3>
       <!-- 课程通知 -->
-      <% unless @course_news.first.nil? %>
+      <% unless @course_news.first.nil? || @course_news_comments.first.nil? %>
           <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
               <%= l(:label_course_news) %>
@@ -33,23 +33,15 @@
                 </li>
             <% end %>
             <div class="cl"></div>
-          </ul><!--课程通知 end-->
+            <!--课程通知回复-->
-      <% end %>
-
-      <!-- 课程通知回复 -->
-      <% unless @course_news_comments.first.nil? %>
-          <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
-            <span class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-              <%= l(:label_course_mail_news_reply) %>
-            </span>
             <% @course_news_comments.each do |course_news_comment|%>
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
                   <% unless course_news_comment.commented.nil? %>
-                    <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value),
+                      <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value),
-                              :class=> "wmail_column",
+                                  :class=> "wmail_column",
-                              :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                                  :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <% end %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
 
@@ -65,7 +57,7 @@
                 </li>
             <% end %>
             <div class="cl"></div>
-          </ul><!--课程通知回复 end-->
+          </ul><!--课程通知 end-->
       <% end %>
 
       <!--课程作业-->
@@ -198,7 +190,7 @@
         @project_news_comments.first  %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#15BCCF; "><%= l(:label_project_overview_new)%></h3>
-      <% unless @issues.first.nil? %>
+      <% unless @issues.first.nil? || @issues_journals.first.nil? %>
           <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
               <%= l(:label_issue_tracking) %>
@@ -220,44 +212,32 @@
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(issue.created_on) %></span>
                 </li>
             <% end %>
-
+            <div class="cl"></div>
+            <% @issues_journals.each do |issues_journal| %>
+                <li style="clear: both; list-style: none;">
+                  <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
+                  <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
+                  <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value),
+                              :class=> "wmail_column",
+                              :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
+                  <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
+                              :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue) %></span>
+                  <% if issues_journal.notes.blank? || issues_journal.notes.nil? %>
+                      <%= link_to truncate(l(:label_isuue_mail_status),length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
+                                  :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <% else %>
+                      <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
+                                  :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                  <% end %>
+                  <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(issues_journal.created_on) %></span>
+                </li>
+            <% end %>
             <div class="cl"></div>
           </ul><!--问题跟踪 end-->
       <% end %>
 
-      <!-- issues回复 -->
-
-      <% unless @issues_journals.first.nil? %>
-        <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
-            <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
-              <%= l(:label_issue_tracking) %>
-            </span>
-          <% @issues_journals.each do |issues_journal| %>
-              <li style="clear: both; list-style: none;">
-                <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
-                <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
-                <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value),
-                            :class=> "wmail_column",
-                            :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
-                <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
-                            :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
-                <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue) %></span>
-                <% if issues_journal.notes.blank? || issues_journal.notes.nil? %>
-                    <%= link_to truncate(l(:label_isuue_mail_status),length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
-                                :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                <% else %>
-                    <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
-                                :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                <% end %>
-                <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(issues_journal.created_on) %></span>
-              </li>
-          <% end %>
-
-          <div class="cl"></div>
-        </ul><!--问题跟踪 end-->
-    <% end %>
-
       <!-- 讨论区 -->
       <% unless @project_messages.first.nil? %>
           <ul class="wmail_ul" style="margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
@@ -322,7 +302,7 @@
       <% end %>
 
       <!--项目新闻-->
-      <% unless @project_news.first.nil? %>
+      <% unless @project_news.first.nil? || @project_news_comments.first.nil? %>
           <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
             <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
               <%= l(:label_project_news) %>
@@ -347,23 +327,14 @@
                 </li>
             <% end %>
             <div class="cl"></div>
-          </ul><!-- 项目新闻end -->
-      <% end %>
-
-      <!-- 项目新闻回复 -->
-      <% unless @project_news_comments.first.nil? %>
-          <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:1020px; margin-bottom:15px;">
-            <span class="wmail_h4" style="color:#666; font-size:14px; margin-bottom:5px;" >
-              <%= l(:label_project_news) %>
-            </span>
             <% @project_news_comments.each do |project_news_comment|%>
                 <li style="clear: both; list-style: none;">
                   <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">[</span>
                   <% unless project_news_comment.commented.nil? %>
-                    <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value),
+                      <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value),
-                              :class=> "wmail_column",
+                                  :class=> "wmail_column",
-                              :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                                  :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <% end %>
                   <span class="wmail_b" style="color:#666; font-weight:bold; float:left;">]</span>
                   <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value), :class => "wmail_name",
@@ -377,7 +348,7 @@
                 </li>
             <% end %>
             <div class="cl"></div>
-          </ul><!-- 项目新闻回复end -->
+          </ul><!-- 项目新闻end -->
       <% end %>
 
       <!-- 项目上传资源 -->

config/locales/courses/zh.yml

@@ -20,7 +20,7 @@ zh:
   label_course_mail_news_reply: 课程通知回复
   label_main_teacher: 主讲教师
   label_course_term: 开课学期
-  label_isuue_mail_status: 更新了issue状态
+  label_isuue_mail_status: 更新了issue状态！
 
   label_join_course: 加入
   label_exit_course: 退出