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

Conflicts:
	.rspec

.rspec

@@ -1 +1,2 @@
+--format documentation
 --color

app/controllers/forums_controller.rb

@@ -160,12 +160,15 @@ class ForumsController < ApplicationController
   def create
     @forum = Forum.new(params[:forum])
     @forum.creator_id = User.current.id
+    if @forum.save
+      respond_to do |format|
 
-    respond_to do |format|
-      if @forum.save
-        format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
-        format.json { render json: @forum, status: :created, location: @forum }
-      else
+          format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
+          format.json { render json: @forum, status: :created, location: @forum }
+      end
+
+    else
+      respond_to do |format|
         flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}"
         format.html { render action: "new" }
         format.json { render json: @forum.errors, status: :unprocessable_entity }

app/controllers/homework_attach_controller.rb

@@ -26,6 +26,7 @@ class HomeworkAttachController < ApplicationController
     get_not_batch_homework_list sort,direction, @bid.id
     @cur_page = params[:page] || 1
     @cur_type = 1
+    @cur_sort,@cur_direction =  params[:sort] || "s_socre", params[:direction] || "desc"
     @direction = direction == 'asc'? 'desc' : 'asc'
     respond_to do |format|
       format.js
@@ -433,7 +434,7 @@ class HomeworkAttachController < ApplicationController
   #添加留言
   def addjours
     @is_teacher,@is_anonymous_comments,@m_score = params[:is_teacher]=="true",params[:is_anonymous_comments]=="true",params[:stars_value]
-    @cur_page,@cur_type = params[:cur_page] || 1,params[:cur_type] || 5
+    @cur_page,@cur_type = params[:page] || 1,params[:cur_type] || 5
     @homework = HomeworkAttach.find(params[:homework_id])
     @stars_reates = @homework.rates(:quality)
     homework = @homework
@@ -479,7 +480,7 @@ class HomeworkAttachController < ApplicationController
 
     if @cur_type == "1" #如果当前是老师未批列表，需要刷新整个作业列表界面
       @bid = @homework.bid
-      get_not_batch_homework_list "s_socre","desc",@homework.bid_id
+      get_not_batch_homework_list params[:cur_sort] || "s_socre",params[:cur_direction] || "desc",@homework.bid_id
     elsif @cur_type == "2" #老师已批列表
       @result_homework = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
             (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,

app/controllers/poll_controller.rb

@@ -1,8 +1,8 @@
 class PollController < ApplicationController
-  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll]
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll,:poll_result]
   before_filter :find_container, :only => [:new,:create, :index]
-  before_filter :is_member_of_course, :only => [:index,:show]
-  before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll]
+  before_filter :is_member_of_course, :only => [:index,:show,:poll_result]
+  before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll]
   include PollHelper
   def index
     if @course
@@ -40,7 +40,7 @@ class PollController < ApplicationController
   def new
     if @course
       option = {
-          :polls_name => l(:label_poll_new),
+          :polls_name => "",
           :polls_type => @course.class.to_s,
           :polls_group_id => @course.id,
           :polls_status => 1,
@@ -187,7 +187,13 @@ class PollController < ApplicationController
     @poll.polls_status = 2
     @poll.published_at = Time.now
     if @poll.save
-      redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)
+      if params[:is_remote]
+        redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)
+      else
+        respond_to do |format|
+          format.js
+        end
+      end
     end
   end
 
@@ -311,6 +317,27 @@ class PollController < ApplicationController
     end
   end
 
+  #重新发布问卷
+  def republish_poll
+    @poll.poll_questions.each do |poll_question|
+      poll_question.poll_votes.destroy_all
+    end
+    @poll.poll_users.destroy_all
+    @poll.polls_status = 1
+    @poll.save
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #显示某个学生某份问卷的填写结果
+  def poll_result
+    @poll_questions = paginateHelper @poll.poll_questions,5
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+    end
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
@@ -337,7 +364,8 @@ class PollController < ApplicationController
   end
 
   def is_course_teacher
-    render_403 unless(@course && User.current.allowed_to?(:as_teacher,@course))
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    render_403 unless(@course && @is_teacher)
   end
 
   #获取未完成的题目

app/controllers/projects_controller.rb

@@ -35,7 +35,7 @@ class ProjectsController < ApplicationController
 # edit
   before_filter :authorize1, :only => [:show]
 #
-  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
+  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_project]
   # before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, 
   #               :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share,
   #               :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index]
@@ -558,6 +558,11 @@ class ProjectsController < ApplicationController
 
   # Show @project
   def show
+    if(@project && !@project.is_public && !User.current.member_of?(@project))
+      render_403
+      return
+    end
+
     @project_type = params[:project_type]
     
     # try to redirect to the requested menu item
@@ -912,6 +917,14 @@ class ProjectsController < ApplicationController
       end
     end
   end
+
+  #加入私有项目
+  def join_project
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def memberAccess

app/helpers/courses_helper.rb

@@ -111,6 +111,10 @@ module CoursesHelper
     #garble count
  # end
 
+  #获取课程所有成员
+  def course_all_member course
+    course.members
+  end
   # 学生人数计算
   # add by nwb
   def studentCount course

app/helpers/poll_helper.rb

@@ -73,5 +73,5 @@ module PollHelper
       "多行主观题"
     end
   end
-  
+
 end

app/models/forum.rb

@@ -18,7 +18,7 @@ class Forum < ActiveRecord::Base
   
   acts_as_taggable
   scope :by_join_date, order("created_at DESC")
-
+  after_create :send_email
   def reset_counters!
     self.class.reset_counters!(id)
   end
@@ -33,6 +33,11 @@ class Forum < ActiveRecord::Base
     self.creator == user || user.admin?
   end
 
+  def send_email
+    Thread.start do
+      Mailer.forum_add(self).deliver if Setting.notified_events.include?('forum_add')
+    end
+  end
   # Updates topic_count, memo_count and last_memo_id attributes for +board_id+
   def self.reset_counters!(forum_id)
     forum_id = forum_id.to_i

app/models/forum_observer.rb

@@ -0,0 +1,8 @@
+class ForumObserver < ActiveRecord::Observer
+  def after_create(forum)
+    Thread.start do
+      Mailer.forum_add(forum).deliver if Setting.notified_events.include?('forum_add')
+    end
+
+  end
+end

app/models/journals_for_message_observer.rb

@@ -1,7 +1,9 @@
 # Added by young
 class JournalsForMessageObserver < ActiveRecord::Observer
 	def after_create(journals_for_message)
+    thread1 = Thread.start do
 			Mailer.journals_for_message_add(User.current, journals_for_message).deliver
+    end
 	end
 end
 

app/models/mailer.rb

@@ -26,7 +26,37 @@ class Mailer < ActionMailer::Base
   def self.default_url_options
     { :host => Setting.host_name, :protocol => Setting.protocol }
   end
-  
+
+  # 贴吧新建贴吧发送邮件
+  # example Mailer.forum(forum).deliver
+  def forum_add(forum)
+
+    redmine_headers 'Forum' => forum.id
+    @forum = forum
+    @author = forum.creator
+    recipients = forum.creator.mail
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+
+    @forum_url = url_for(:controller => 'forums', :action => 'show', :id => forum.id)
+    mail :to => recipients,:subject => "[ #{l(:label_forum)} : #{forum.name} #{l(:notice_successful_create)}]"
+
+  end
+
+  def forum_message_added(memo)
+    @memo = memo
+    redmine_headers 'Memo' => memo.id
+    @forum = memo.forum
+    @author = memo.author
+    recipients ||= []
+    mems = memo.self_and_siblings
+    mems.each do |mem|
+      recipients << mem.author.mail unless recipients.include? mem.author.mail
+    end
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+
+    @memo_url = url_for(forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)))
+    mail :to => recipients,:subject => "[ #{l(:label_message_plural)} : #{memo.subject} #{l(:label_memo_create_succ)}]"
+  end
   # Builds a Mail::Message object used to email recipients of the added journals for message.
 
   # 留言分为直接留言，和对留言人留言的回复
@@ -62,13 +92,13 @@ class Mailer < ActionMailer::Base
       course =  journals_for_message.jour
       @author = journals_for_message.user
       #课程的教师
-      @teachers = searchTeacherAndAssistant journals_for_message.jour
+      @members = course_all_member journals_for_message.jour
       #收件人邮箱
       @recipients ||= []
-      @teachers.each do |teacher|
-        if teacher.user.notify_about? journals_for_message
+      @members.each do |teacher|
+
           @recipients << teacher.user.mail
-        end
+
 
       end
       mail :to => @recipients,
@@ -117,8 +147,10 @@ class Mailer < ActionMailer::Base
      @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
 
       @user_url = url_for(my_account_url(user,:token => @token.value))
-
-    cc = issue.watcher_recipients - issue.recipients
+    cc = nil
+    if recipients == issue.recipients[0]
+      cc = issue.watcher_recipients - issue.recipients
+    end
     subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
     mail(:to => recipients,
          :cc => cc,
@@ -167,8 +199,11 @@ class Mailer < ActionMailer::Base
 
 
     # Watchers in cc
+    cc = nil
+    if recipients == journal.recipients[0]
+      cc = journal.watcher_recipients - journal.recipients
+    end
 
-    cc = journal.watcher_recipients - journal.recipients
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
     s << issue.subject
@@ -282,7 +317,7 @@ class Mailer < ActionMailer::Base
         recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
       when 'Course'
         added_to_url = url_for(:controller => 'files', :action => 'index', :course_id => container)
-        added_to = "#{l(:label_course)}: #{container}"
+        added_to = "#{l(:label_course)}: #{container.name}"
         recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
       when 'Version'
         added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
@@ -323,13 +358,25 @@ class Mailer < ActionMailer::Base
   #   news_added(news) => Mail::Message object
   #   Mailer.news_added(news).deliver => sends an email to the news' project recipients
   def news_added(news)
-    redmine_headers 'Project' => news.project.identifier
-    @author = news.author
-    message_id news
-    @news = news
-    @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-    mail :to => news.recipients,
-      :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
+
+    if news.project
+      redmine_headers 'Project' => news.project.identifier
+      @author = news.author
+      message_id news
+      @news = news
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => news.recipients,
+        :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    elsif  news.course
+      redmine_headers 'Course' => news.course.id
+      @author = news.author
+      message_id news
+      @news = news
+      recipients = news.course.notified_users.select { |user| user.allowed_to?(:view_files, news.course) }.collect { |u| u.mail }
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => recipients,
+           :subject => "[#{news.course.name}] #{l(:label_news)}: #{news.title}"
+    end
   end
 
   # Builds a Mail::Message object used to email recipients of a news' project when a news comment is added.
@@ -339,15 +386,28 @@ class Mailer < ActionMailer::Base
   #   Mailer.news_comment_added(comment) => sends an email to the news' project recipients
   def news_comment_added(comment)
     news = comment.commented
-    redmine_headers 'Project' => news.project.identifier
-    @author = comment.author
-    message_id comment
-    @news = news
-    @comment = comment
-    @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-    mail :to => news.recipients,
-     :cc => news.watcher_recipients,
-     :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    if news.project
+      redmine_headers 'Project' => news.project.identifier
+      @author = comment.author
+      message_id comment
+      @news = news
+      @comment = comment
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => news.recipients,
+       :cc => news.watcher_recipients,
+       :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    elsif news.course
+      redmine_headers 'Course' => news.course.id
+      @author = comment.author
+      message_id comment
+      @news = news
+      @comment = comment
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      recipients = news.course.notified_users.select { |user| user.allowed_to?(:view_files, news.course) }.collect { |u| u.mail }
+
+      mail :to => recipients,
+           :subject => "[#{news.course.name}] #{l(:label_news)}: #{news.title}"
+    end
   end
 
   # Builds a Mail::Message object used to email the recipients of the specified message that was posted.
@@ -356,18 +416,33 @@ class Mailer < ActionMailer::Base
   #   message_posted(message) => Mail::Message object
   #   Mailer.message_posted(message).deliver => sends an email to the recipients
   def message_posted(message)
-    redmine_headers 'Project' => message.project.identifier,
-                    'Topic-Id' => (message.parent_id || message.id)
-    @author = message.author
-    message_id message
-    references message.parent unless message.parent.nil?
-    recipients = message.recipients
-    cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
-    @message = message
-    @message_url = url_for(message.event_url)
-    mail :to => recipients,
-      :cc => cc,
-      :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    if message.project
+      redmine_headers 'Project' => message.project.identifier,
+                      'Topic-Id' => (message.parent_id || message.id)
+      @author = message.author
+      message_id message
+      references message.parent unless message.parent.nil?
+      recipients = message.recipients
+      cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
+      @message = message
+      @message_url = url_for(message.event_url)
+      mail :to => recipients,
+        :cc => cc,
+        :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    elsif message.course
+      redmine_headers 'Course' => message.course.id,
+                      'Topic-Id' => (message.parent_id || message.id)
+      @author = message.author
+      message_id message
+      references message.parent unless message.parent.nil?
+      recipients = message.course.notified_users.select { |user| user.allowed_to?(:view_files, message.course) }.collect { |u| u.mail }
+      cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
+      @message = message
+      @message_url = url_for(message.event_url)
+      mail :to => recipients,
+           :cc => cc,
+           :subject => "[#{message.board.course.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    end
   end
 
   # Builds a Mail::Message object used to email the recipients of a project of the specified wiki content was added.

app/models/memo.rb

@@ -43,7 +43,7 @@ class Memo < ActiveRecord::Base
 					"parent_id",
 					"replies_count"
 
-	after_create :add_author_as_watcher, :reset_counters!#,:be_user_score -- 公共区发帖暂不计入得分
+	after_create :add_author_as_watcher, :reset_counters!, :sendmail#,:be_user_score -- 公共区发帖暂不计入得分
 	# after_update :update_memos_forum
 	after_destroy :reset_counters!#,:down_user_score  -- 公共区发帖暂不计入得分
 	# after_create :send_notification
@@ -54,6 +54,12 @@ class Memo < ActiveRecord::Base
 	# 	includes(:forum => ).where()
 	# }
 
+  def sendmail
+    thread1=Thread.new do
+      Mailer.forum_message_added(self).deliver if Setting.notified_events.include?('forum_message_added')
+    end
+  end
+
 	def cannot_reply_to_locked_topic
 		errors.add :base, l(:label_memo_locked) if root.locked? && self != root
 	end

app/models/memo_observer.rb

@@ -0,0 +1,8 @@
+class MemoObserver < ActiveRecord::Observer
+  def after_create(memo)
+
+    thread1=Thread.new do
+      Mailer.forum_message_added(memo).deliver if Setting.notified_events.include?('forum_message_added')
+    end
+  end
+end

app/views/bids/_bid_homework_show.html.erb

@@ -56,18 +56,30 @@
                   <%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %>
                 </span>
               </td>
-              <td style="width: 110px;">
+              <td style="width: 150px;">
                 <span style="float: right">
                   <% if User.current.logged? && is_cur_course_student(@course) %>
                      <% cur_user_homework = cur_user_homework_for_bid(bid) %>
+                      <span class="span_wping">
+                        <% if bid.open_anonymous_evaluation == 1 %>
+                           <% case bid.comment_status %>
+                          <% when 0 %>
+                            <a>未开启匿评</a>
+                          <% when 1 %>
+                            <a>&nbsp;&nbsp;匿评中..&nbsp;&nbsp;</a>
+                          <% when 2 %>
+                            <a>&nbsp;&nbsp;匿评结束&nbsp;&nbsp;</a>
+                          <% end %>
+                        <% end%>
+                     </span>
                       <% if cur_user_homework && cur_user_homework.empty? %>
                          <span class="span_wping">
                            <%= link_to l(:label_commit_homework),new_exercise_book_path(bid)  %>
                          </span>
                       <% else %>
-                          <span style="color: green; float: right">
-                            <%= l(:lable_has_commit_homework)%>
-                          </span>
+                          <span class="span_wping">
+                           <a>已&nbsp;提&nbsp;交</a>
+                         </span>
                       <% end %>
                   <% end %>
                   <% if (User.current.admin?||User.current.allowed_to?(:as_teacher,@course)) %>

app/views/courses/member.html.erb

@@ -56,7 +56,7 @@
 </script>
 <%= stylesheet_link_tag  'course_group', :media => 'all' %>
 <script type="text/javascript" src="javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js"></script>
-<div class="st_list">
+<div class="st_list" id="member_of_course">
   <div class="st_search" style="margin-left: 14px" >
     <span class="f_l"><%= @subPage_title %></span>
         <span id = "search_members">

app/views/homework_attach/_addjour.html.erb

@@ -31,7 +31,7 @@
              :url => {:controller => 'homework_attach',
                       :action => 'addjours',
                       :homework_id => homework_attach.id,
-                      :cur_page => cur_page,
+                      :page => cur_page,
                       :cur_type => cur_type,
                       :is_anonymous_comments => @is_anonymous_comments,
                       :is_teacher => @is_teacher

app/views/homework_attach/_homework.html.erb

@@ -19,7 +19,7 @@
   <% else %>
       <% homework_filename = homework.name %>
   <% end %>
-  <%= link_to homework_filename , homework_attach_path(homework,:cur_page => @cur_page,:cur_type => @cur_type), :title => homework_filename, :remote => true%>
+  <%= link_to homework_filename , homework_attach_path(homework,:cur_page => @cur_page,:cur_type => @cur_type,:cur_sort => @cur_sort, :cur_direction => @cur_direction), :title => homework_filename, :remote => true%>
   <span class="c_grey ">
     提交时间：
     <%= format_time homework.created_at%>
@@ -46,7 +46,7 @@
 <% if is_teacher %>
     <!-- 是老师，所有列表正常显示 -->
     <li class="wping">
-      <%= link_to l(:label_work_rating),homework_attach_path(homework,:cur_page => @cur_page,:cur_type => @cur_type),:remote => true  %>
+      <%= link_to l(:label_work_rating),homework_attach_path(homework,:cur_page => @cur_page,:cur_type => @cur_type,:cur_sort => @cur_sort, :cur_direction => @cur_direction),:remote => true  %>
       <% if Time.parse(bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
           <span class="c_red">&nbsp;&nbsp;迟交！</span>
       <% end %>

app/views/layouts/base_courses.html.erb

@@ -300,13 +300,22 @@
 
     <div class="user_underline"></div>
 
+    <style type="text/css">
+        .polls_btn{ height:33px;border-top:0 solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:224px; padding:7px 0 0 15px; }
+        .polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
+        .polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}
+        .polls_btn a{ float:left;}
+        .polls_n{float: left;background: #ff5d31;color: #fff;width: 12px;padding-left: 2px;height: 7px;padding-bottom: 5px;padding-top: 3px;margin-top: -4px;margin-left: 3px; }
+        .polls_n p{ margin-top:-4px;}
+        .cl{ clear:both; overflow:hidden; }
+    </style>
     <div class="polls_btn">
       <!--<a href="#">问卷调查<span >（12）</span></a>-->
-      <style type="text/css">
-          .polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:224px !important; padding:7px 0 0 15px; }
-          .polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
-      </style>
       <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id)%>
+      <div class="polls_n">
+        <p>N</p>
+      </div>
+      <div class="cl"></div>
     </div>
   </div>
 </div>

app/views/layouts/mailer.html.erb

@@ -10,37 +10,43 @@ body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; back
 div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ margin:0; padding:0;}
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;cellspacing:0; cellpadding:0;}
+.mail{ width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; }
 ol,ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
-a{ text-decoration:none; }
-a:hover{ text-decoration:underline; }
+.cl{ clear:both; overflow:hidden; margin-top: 30px;}
 .mail_box,ul,li{ list-style-type:none}
-.mail{ width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; }
 .mail a{color:#1b55a7; font-weight: bold; }
 .mail_content{ margin-top:30px;}
 .c_blue{ color:#1b55a7;}
 .mail_box{ border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;}
 .mail_box_p{  float:left; display: block; width:527px;}
-a.mail_reply{ display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px;}
-a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
 .mail_fujian{ float:left; width:527px; display: block; }
 .mail_fujian a{ font-weight:normal; font-size:12px;}
 .mail_foot a{ font-size:12px; font-weight:normal;}
 
+a{ text-decoration:none; }
+a:hover{ text-decoration:underline; }
+a.mail_reply{ display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px;}
+a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
+
+
+
+
+
 
 
 </style>
 </head>
-<body>
- <div class="container">
-	<div class="mail">
-    	<div class="mail_head">
-        	<p>亲爱的Trustie用户，您好！</p>
+
+<body style="font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal; margin:0; padding:0; border:0;">
+ <div class="container" style="margin:0; padding:0; border:0;">
+	<div class="mail" style="width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; margin:0; padding:0; border:0;">
+    	<div class="mail_head" style="margin:0; padding:0; border:0;">
+        	<p><%= l(:mail_issue_greetings)%></p>
         </div><!--mail_head end-->
         <%= yield %>
         <hr />
-      <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span><!--mail_foot end-->
+      <span class="footer" style="margin:0; padding:0;"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span><!--mail_foot end-->
     </div>
-  </div>
+ </div>
 </body>
 </html>

app/views/mailer/_issue.html.erb

@@ -1,32 +1,40 @@
 <!-- <h1><%#= link_to(h("#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}"), issue_url) %></h1> -->
 <p>
-      <span class="c_blue">
-        <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
-     </span>在
-  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span>中有了一个与您相关的最新活动，请您关注！</p>
-<div class="mail_box">
-<ul>
-	<li style="list-style-type:none"><span style="float: left"><strong>标题：</strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong>来源：</strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b>项目<%= issue.tracker.name%></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong >内容：</strong></span><span style="float: left; width: 500px">
-                    	<%= issue.description %></span>
+      <span class="c_blue" style="color:#1b55a7;">
+        <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+     </span><%= l(:mail_issue_title_userin)%>
+  <span class="c_blue" style="color:#1b55a7;"><%= link_to(h("#{@issue.project.name}"), @project_url, :style=>'color:#1b55a7; font-weight:bold;') %></span><%= l(:mail_issue_title_active)%></p>
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+<ul style="list-style-type:none; margin:0; padding:0;">
+	<li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 526px"><%= link_to(issue.subject, issue_url, :style=>'color:#1b55a7; font-weight:bold;') %></span></li>
+	<li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 526px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
+	<li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<% if @journal.nil? %>
+                 <%= issue.description %>
+            <% else %>
+            	<%= @journal.notes %>
+           <% end%>
+        </span>
     </li>
-  <li style="list-style-type:none">
+    <li style="list-style-type:none; margin:0; padding:0;">
 
-    <% unless @issue.attachments.nil? %>
-     <span style="float: left"> <strong>附件：</strong>
-            </span><span style="float: left; width: 500px">
+      <% unless @issue.attachments.nil? %>
+        <span style="float: left"> <strong><%= l(:mail_issue_attachments)%></strong></span>
+        <span style="float: left; width: 526px; margin:0; padding:0;">
           <% @issue.attachments.each do |attach| %>
-          <p><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %></p>
-      <% end %></span>
-    <% end %>
+          <p style="float: left; width: 526px; margin:0; padding:0;"><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false, :style=>'color:#1b55a7; font-weight:bold;')%></p>
+        <% end %></span>
+      <% end %>
 
 
-  </li>
+    </li>
 </ul>
-  <div class="cl"></div>
-  <label  class="mail_reply"><%= link_to( "我要回复", issue_url,  :class => "mail_reply") %></label>
-  <div class="cl"></div>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+  	<%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+  	</label>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
 </div>
 <!-- <li><%#=l(:field_author)%>: <%#=h issue.author %></li>
 

app/views/mailer/_issue.text.erb

@@ -1,13 +1,17 @@
 
         <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
-     在
- <%= link_to(h("#{@issue.project.name}"),@project_url) %>中有了一个与您相关的最新活动，请您关注！
-标题：<%= link_to(issue.subject, issue_url) %>
-  来源：<%= issue.project.name %>|&nbsp;项目缺陷<
- 内容：
+     <%= l(:mail_issue_title_userin)%>
+ <%= link_to(h("#{@issue.project.name}"),@project_url) %><%= l(:mail_issue_title_active)%>
+<%= l(:mail_issue_subject)%><%= link_to(issue.subject, issue_url) %>
+<%= l(:mail_issue_sent_from)%>|&nbsp;<%= l(:mail_issue_from_project)%>
+<%= l(:mail_issue_content)%>
+	<% if @journal.nil? %>
      <%= issue.description %>
+    <% else %>
+    	<%= @journal.notes %>
+    <% end%>
         <% unless @issue.attachments.nil? %>
- 附件：
+<%= l(:mail_issue_attachments)%>
 
 
             <% @issue.attachments.each do |attach| %>
@@ -16,4 +20,4 @@
         <% end %>
 
 
- <%= link_to( "我要回复", issue_url) %>
+ <%= link_to( l(:mail_issue_reply), issue_url) %>

app/views/mailer/forum_add.html.erb

@@ -0,0 +1,4 @@
+<h1><%= link_to(h(@forum.name), @forum_url) %></h1>
+<em><%=h @forum.creator.name %></em>
+
+<%= @forum.description.html_safe %>

app/views/mailer/forum_add.text.erb

@@ -0,0 +1,4 @@
+<%= @forum_url %>
+<%= @author.name %>
+
+<%= @forum.description %>

app/views/mailer/forum_message_added.html.erb

@@ -0,0 +1,4 @@
+<h1><%= link_to(h(@memo.subject), @memo_url) %></h1>
+<em><%=h @memo.author.name %></em>
+
+<%= @memo.content.html_safe %>