Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/attachments_controller.rb

@@ -388,7 +388,7 @@ class AttachmentsController < ApplicationController
     end
   rescue NoMethodError
     @save_flag = false
-    @save_message = [] << l(:label_course_empty_select)
+    @save_message = [] << l(:label_project_empty_select)
     respond_to do |format|
       format.js
     end

app/views/mailer/send_for_user_activities.html.erb

@@ -420,7 +420,7 @@
 <!-- 用户留言 -->
 <% unless @user_journal_messages.first.nil? %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
-      <h3 class="wmail_h2" style="color:#15bccf; "><%= l(:label_activities) %></h3>
+      <h3 class="wmail_h2" style="color:#474646; "><%= l(:label_activities) %></h3>
 
       <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;" >
@@ -451,7 +451,7 @@
 <% end %>
 <% if @forums.first || @memos.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
-      <h3 class="wmail_h2" style="color:#15bccf; "><%= l(:lable_bar_active) %></h3>
+      <h3 class="wmail_h2" style="color:#474646; "><%= l(:lable_bar_active) %></h3>
       <% unless @forums.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:#474646; font-size:14px; margin-bottom:5px;" >

config/locales/zh.yml

@@ -1928,6 +1928,7 @@ zh:
   label_my_score: 我的评分
   field_open_anonymous_evaluation: 是否使用匿评
   label_course_empty_select: 尚未选择课程！
+  label_project_empty_select: 尚未选择项目！
   label_course_prompt: 课程：
   label_project_prompt: 项目：
   label_contain_resource: 已包含资源：