Merge branch 'szzh' into api

Conflicts: Gemfile db/schema.rb
2015-01-23 16:51:40 +08:00 · 2015-01-23 16:51:40 +08:00 · db1cd8851c
parent b2396df68c 7ef6f8adfb
commit db1cd8851c
149 changed files with 3679 additions and 452 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,6 +4,7 @@
 /.bundle
 *.swp
 /config/database.yml
+/config/configuration.yml
 /files/*
 /log/*
 /tmp/*
@ -14,7 +15,6 @@
 /db/schema.rb
 /Gemfile.lock
 /lib/plugins/acts_as_versioned/test/debug.log
-/config/configuration.yml
 .rbenv-gemsets
 .DS_Store
 public/api_doc/
--- a/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox
+++ b/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox
@ -2,6 +2,7 @@
 <launchConfiguration type="com.aptana.js.debug.core.webbrowserLaunchConfigurationType">
 <booleanAttribute key="advancedRunEnabled" value="false"/>
 <booleanAttribute key="appendProjectName" value="true"/>
+<stringAttribute key="browserCmdLine" value=""/>
 <stringAttribute key="browserExecutable" value=""/>
 <stringAttribute key="browserNature" value="Firefox"/>
 <stringAttribute key="externalBaseUrl" value=""/>
--- a/.metadata/.plugins/org.eclipse.debug.core/.launches/Internet
+++ b/.metadata/.plugins/org.eclipse.debug.core/.launches/Internet
@ -2,6 +2,7 @@
 <launchConfiguration type="com.aptana.js.debug.core.webbrowserLaunchConfigurationType">
 <booleanAttribute key="advancedRunEnabled" value="false"/>
 <booleanAttribute key="appendProjectName" value="true"/>
+<stringAttribute key="browserCmdLine" value=""/>
 <stringAttribute key="browserExecutable" value="C:\Program Files (x86)\Internet Explorer\iexplore.exe"/>
 <stringAttribute key="browserNature" value="Internet Explorer"/>
 <stringAttribute key="externalBaseUrl" value=""/>
--- a/.rspec
+++ b/.rspec
@ -0,0 +1,2 @@
+--format documentation
+--color
--- a/22
+++ b/22
@ -1,4 +1,4 @@
-source 'http://ruby.taobao.org'
+source 'http://rubygems.org'
 #source 'http://ruby.sdutlinux.org/'

 unless RUBY_PLATFORM =~ /w32/
@ -20,6 +20,7 @@ gem "builder", "3.0.0"
 gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
+#gem 'email_verifier'

 group :development do
  gem 'grape-swagger'
@ -38,17 +39,18 @@ group :test do
  gem 'selenium-webdriver', '~> 2.42.0'


-  platforms :mri, :mingw do
-    group :rmagick do
-      # RMagick 2 supports ruby 1.9
-      # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
-      # different requirements for the same gem on different platforms
-      gem "rmagick", ">= 2.0.0"
-    end
-  end
+  # platforms :mri, :mingw do
+  #   group :rmagick do
+  #     # RMagick 2 supports ruby 1.9
+  #     # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
+  #     # different requirements for the same gem on different platforms
+  #     gem "rmagick", ">= 2.0.0"
+  #   end
+  #end
 end

-
+  gem 'rspec-rails' , '2.13.1'
+  gem 'guard-rspec','2.5.0'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -26,7 +26,7 @@ PATH
      rails

 GEM
-  remote: http://ruby.taobao.org/
+  remote: http://rubygems.org/
  remote: https://rubygems.org/
  specs:
    actionmailer (3.2.13)
@ -70,6 +70,8 @@ GEM
      rack (>= 1.0.0)
      rack-test (>= 0.5.4)
      xpath (~> 2.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
    childprocess (0.5.3)
      ffi (~> 1.0, >= 1.0.11)
    climate_control (0.0.3)
@ -88,6 +90,7 @@ GEM
    coffee-script-source (1.7.1)
    descendants_tracker (0.0.4)
      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
    equalizer (0.0.9)
    erubis (2.7.0)
    execjs (2.2.1)
@ -96,6 +99,7 @@ GEM
    fastercsv (1.5.5)
    ffi (1.9.3)
    ffi (1.9.3-x86-mingw32)
+    formatador (0.2.5)
    grape (0.9.0)
      activesupport
      builder
@ -112,8 +116,21 @@ GEM
    grape-swagger (0.8.0)
      grape
      grape-entity
+    guard (2.11.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-rspec (2.5.0)
+      guard (>= 1.1)
+      rspec (~> 2.11)
    hashie (3.3.1)
    hike (1.2.3)
+    hitimes (1.2.2-x86-mingw32)
    htmlentities (4.3.2)
    i18n (0.6.1)
    ice_nine (0.11.0)
@ -126,10 +143,16 @@ GEM
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
    libv8 (3.16.14.3)
+    listen (2.8.5)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
    mail (2.5.4)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
    metaclass (0.0.4)
+    method_source (0.8.2)
    mime-types (1.25.1)
    mini_portile (0.6.0)
    mocha (1.1.0)
@ -138,17 +161,26 @@ GEM
    multi_xml (0.5.5)
    mysql2 (0.3.11)
    mysql2 (0.3.11-x86-mingw32)
+    nenv (0.2.0)
    net-ldap (0.3.1)
    nokogiri (1.6.3)
      mini_portile (= 0.6.0)
    nokogiri (1.6.3-x86-mingw32)
      mini_portile (= 0.6.0)
+    notiffany (0.0.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
    paperclip (3.5.4)
      activemodel (>= 3.0.0)
      activesupport (>= 3.0.0)
      cocaine (~> 0.5.3)
      mime-types
    polyglot (0.3.5)
+    pry (0.9.12.6-x86-mingw32)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      win32console (~> 1.3)
    rack (1.4.5)
    rack-accept (0.4.5)
      rack (>= 0.4)
@ -181,6 +213,9 @@ GEM
      rdoc (~> 3.4)
      thor (>= 0.14.6, < 2.0)
    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
    rdoc (3.12.2)
      json (~> 1.4)
    ref (1.0.5)
@ -192,7 +227,21 @@ GEM
      rack-raw-upload
      rails (>= 3.2.0)
      sass-rails
-    rmagick (2.13.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
    ruby-ole (1.2.11.7)
    ruby-openid (2.1.8)
    rubyzip (1.1.6)
@ -206,12 +255,14 @@ GEM
      multi_json (~> 1.0)
      rubyzip (~> 1.0)
      websocket (~> 1.0.4)
+    shellany (0.0.1)
    shoulda (3.5.0)
      shoulda-context (~> 1.0, >= 1.0.1)
      shoulda-matchers (>= 1.4.1, < 3.0)
    shoulda-context (1.2.1)
    shoulda-matchers (2.6.1)
      activesupport (>= 3.0.0)
+    slop (3.6.0)
    spreadsheet (1.0.0)
      ruby-ole (>= 1.0)
    sprockets (2.2.2)
@ -225,6 +276,8 @@ GEM
    thor (0.19.1)
    thread_safe (0.3.4)
    tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
    treetop (1.4.15)
      polyglot
      polyglot (>= 0.3.1)
@ -238,6 +291,7 @@ GEM
      descendants_tracker (~> 0.0, >= 0.0.3)
      equalizer (~> 0.0, >= 0.0.9)
    websocket (1.0.7)
+    win32console (1.3.2-x86-mingw32)
    xpath (2.0.0)
      nokogiri (~> 1.3)

@ -260,6 +314,7 @@ DEPENDENCIES
  grape-entity
  grape-swagger
  grape-swagger-ui!
+  guard-rspec (= 2.5.0)
  htmlentities
  i18n (~> 0.6.0)
  jquery-rails (~> 2.0.2)
@ -273,7 +328,7 @@ DEPENDENCIES
  rack-openid
  rails (= 3.2.13)
  rich (= 1.4.6)
-  rmagick (>= 2.0.0)
+  rspec-rails (= 2.13.1)
  ruby-ole
  ruby-openid (~> 2.1.4)
  sass-rails (~> 3.2.3)
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@ -367,7 +367,10 @@ class AccountController < ApplicationController
    if user.save and token.save
      UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
      Mailer.register(token).deliver
+
+
      flash[:notice] = l(:notice_account_register_done)
+
      render action: 'email_valid', locals: {:mail => user.mail}
    else
      yield if block_given?
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -156,7 +156,16 @@ class ApplicationController < ActionController::Base
      user
    end
  end
+  def try_to_autologin1

+      # auto-login feature starts a new session
+      user = User.try_to_autologin(params[:token])
+      if user
+          start_user_session(user)
+      end
+      user
+
+  end
  # Sets the logged in user
  def logged_user=(user)
    reset_session
@ -248,7 +257,30 @@ class ApplicationController < ActionController::Base
      end
    end
  end
+  def authorize1(ctrl = params[:controller], action = params[:action],token = params[:token], global = false)

+    if(!User.current.logged? && !token.nil?)
+
+      User.current =try_to_autologin1
+    end
+    allowed  = authorize_allowed(params[:controller], params[:action],global)
+
+    if allowed
+      true
+    else
+      if @project && @project.archived?
+        render_403 :message => :notice_not_authorized_archived_project
+      else
+        deny_access
+      end
+    end
+  end
+  def auth_login1(token = params[:token])
+    if(!User.current.logged? && !token.nil?)
+
+      User.current =try_to_autologin1
+    end
+  end
  def authorize_allowed(ctrl = params[:controller], action = params[:action], global = false)
    #modify by NWB
    if  @project
@ -261,6 +293,7 @@ class ApplicationController < ActionController::Base
    allowed
  end
  def authorize_attachment_download(ctrl = params[:controller], action = params[:action], global = false)
+
    case @attachment.container_type
      when "Memo"
        allowed = User.current.allowed_to?(:memos_attachments_download,nil,:global => true)
@ -289,6 +322,37 @@ class ApplicationController < ActionController::Base
    end
  end

+  def authorize_attachment_download1(ctrl = params[:controller], action = params[:action],token = params[:token], global = false)
+    if(!User.current.logged? && !token.nil?)
+      User.current = try_to_autologin1
+    end
+    case @attachment.container_type
+      when "Memo"
+        allowed = User.current.allowed_to?(:memos_attachments_download,nil,:global => true)
+      when "Message"
+        if @project
+          allowed = User.current.allowed_to?(:projects_attachments_download,@project,:global => false)
+        elsif @course
+          allowed = User.current.allowed_to?(:course_attachments_download, @course, :global => false)
+        end
+      when "contest"
+        return true
+      when "Course"
+        allowed = User.current.allowed_to?(:course_attachments_download, @course, :global => false)
+      else
+        return true
+    end
+
+    if allowed
+      true
+    else
+      if @project && @project.archived?
+        render_403 :message => :notice_not_authorized_archived_project
+      else
+        deny_access
+      end
+    end
+  end
  def authorize_course(ctrl = params[:controller], action = params[:action], global = false)
    allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @course, :global => global)
    if allowed
@ -789,4 +853,29 @@ class ApplicationController < ActionController::Base
    @organizer = WebFooterOranizer.first
    @companies = WebFooterCompany.all
  end
+
+
+
+
+  def password_authentication
+    user, last_login_on = User.try_to_login(params[:user_name], params[:password])
+
+
+      successful_authentication(user, last_login_on)
+
+  end
+
+
+  def successful_authentication(user, last_login_on)
+    logger.info "Successful authentication for '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}"
+    # Valid user
+    self.logged_user = user
+    # generate a key and set cookie if autologin
+    if params[:autologin] && Setting.autologin?
+      set_autologin_cookie(user)
+    end
+    call_hook(:controller_account_success_authentication_after, {:user => user })
+
+
+  end
 end
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@ -17,11 +17,12 @@

 class AttachmentsController < ApplicationController
  layout "users_base"
+
  before_filter :find_project, :only => [:show, :download, :thumbnail, :destroy, :delete_homework]#, :except => [:upload, :autocomplete]
  before_filter :file_readable, :read_authorize, :only => [:show, :thumbnail]#Modified by young
  before_filter :delete_authorize, :only => :destroy
  before_filter :authorize_global, :only => :upload
-  before_filter :authorize_attachment_download, :only => :download
+  before_filter :authorize_attachment_download1, :only => :download
  #before_filter :login_without_softapplication, only: [:download]
  accept_api_auth :show, :download, :upload
  require 'iconv'
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@ -9,6 +9,8 @@ class BidsController < ApplicationController
  menu_item :homework_statistics, :only => :homework_statistics
  menu_item :edit, :only => :edit

+
+
  before_filter :can_show_course,only: []
  before_filter :can_show_contest,only: []
  #Ended by young
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -323,6 +323,7 @@ class CoursesController < ApplicationController

    if valid_attr.eql?('name')
      faker.name = valid_value
+      faker.course_id =  params[:course_id]
      faker.valid?
      req[:valid] = faker.errors[:name].blank?
      req[:message] = faker.errors[:name]
@ -572,8 +573,7 @@ class CoursesController < ApplicationController
    # end
  end

-  def
-  course
+  def course
     @school_id = params[:school_id]
    per_page_option = 10
    if @school_id == "0" or @school_id.nil?
@ -882,9 +882,9 @@ class CoursesController < ApplicationController
    # modify by nwb
    # 添加私密性判断
    if User.current.member_of_course?(@course)|| User.current.admin?
-      events = @activity.events(@date_from, @date_to)
+      events = @activity.events(@days, @course.created_at)
    else
-      events = @activity.events(@date_from, @date_to, :is_public => 1)
+      events = @activity.events(@days, @course.created_at, :is_public => 1)
    end

    # 无新动态时，显示老动态
--- a/app/controllers/forums_controller.rb
+++ b/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
-
-    respond_to do |format|
    if @forum.save
+      respond_to do |format|
+
          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 }
--- a/app/controllers/homework_attach_controller.rb
+++ b/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,
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -19,10 +19,13 @@ class IssuesController < ApplicationController
  layout 'base_projects'#Added by young
  default_search_scope :issues

+  before_filter :authorize1, :only => [:show]
  before_filter :find_issue, :only => [:show, :edit, :update]
  before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
  before_filter :find_project, :only => [:new, :create, :update_form]
+  #before_filter :authorize, :except => [:index, :show]
  before_filter :authorize, :except => [:index]
+
  before_filter :find_optional_project, :only => [:index]
  before_filter :check_for_default_issue_status, :only => [:new, :create]
  before_filter :build_new_issue_from_params, :only => [:new, :create, :update_form]
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@ -17,6 +17,9 @@

 class MyController < ApplicationController
  layout "users_base"
+  # edit
+  before_filter :auth_login1, :only => [:account]
+  #
  before_filter :require_login

  helper :issues
--- a/app/controllers/poll_answer_controller.rb
+++ b/app/controllers/poll_answer_controller.rb
@ -1,2 +0,0 @@
-class PollAnswerController < ApplicationController
-end
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@ -1,2 +1,420 @@
 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,:republish_poll,:poll_result]
+  before_filter :find_container, :only => [:new,:create, :index]
+  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
+      @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+      if @is_teacher
+        polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
+      else
+        polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id} and polls_status = 2")
+      end
+      @polls = paginateHelper polls,20 #分页
+      respond_to do |format|
+        format.html{render :layout => 'base_courses'}
+      end
+    elsif @project
+      #项目的问卷调查相关代码
+    end
+  end
+
+  def show
+    @poll = Poll.find params[:id]
+    #已提交问卷的用户不能再访问该界面
+    if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?)
+      render_403
+    else
+      @can_edit_poll = (!has_commit_poll?(@poll.id,User.current.id)) || User.current.admin?
+      @percent = get_percent(@poll,User.current)
+      poll_questions = @poll.poll_questions
+      @poll_questions = paginateHelper poll_questions,5 #分页
+      respond_to do |format|
+        format.html {render :layout => 'base_courses'}
+      end
+    end
+  end
+
+  def new
+    if @course
+      option = {
+          :polls_name => "",
+          :polls_type => @course.class.to_s,
+          :polls_group_id => @course.id,
+          :polls_status => 1,
+          :user_id => User.current.id,
+          :published_at => Time.now,
+          :closed_at => Time.now,
+          :show_result => 1,
+          :polls_description => ""
+      }
+      @poll = Poll.create option
+      if @poll
+        redirect_to edit_poll_url @poll.id
+      end
+    elsif @project
+      #项目的问卷调查相关代码
+    end
+  end
+
+  def create
+
+  end
+
+  def edit
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+    end
+  end
+
+  def update
+    @poll.polls_name = params[:polls_name]
+    @poll.polls_description = params[:polls_description]
+    if @poll.save
+      respond_to do |format|
+        format.js
+      end
+    else
+      render_404
+    end
+  end
+
+  def destroy
+    if @poll && @poll.destroy
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  def statistics_result
+    @poll = Poll.find(params[:id])
+    poll_questions = @poll.poll_questions 
+    @poll_questions = paginateHelper poll_questions, 5
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+    end
+  end
+  
+   def get_poll_totalcount poll_question
+    @total_questions_count = poll_question.poll_votes.count
+  end
+  
+  def get_poll_everycount  poll_answer
+    @every_answer_count =  poll_answer.poll_votes.count
+  end
+  
+
+  #添加题目
+  def create_poll_question
+    question_title = params[:poll_questions_title].nil? || params[:poll_questions_title].empty? ? l(:label_enter_single_title) : params[:poll_questions_title]
+    option = {
+        :is_necessary => (params[:is_necessary]=="true" ? 1 : 0),
+        :question_title => question_title,
+        :question_type => params[:question_type] || 1,
+        :question_number => @poll.poll_questions.count + 1
+    }
+    @poll_questions = @poll.poll_questions.new option
+    if params[:question_answer]
+      for i in 1..params[:question_answer].count
+        answer = (params[:question_answer].values[i-1].nil? || params[:question_answer].values[i-1].empty?) ? l(:label_new_answer) : params[:question_answer].values[i-1]
+        question_option = {
+            :answer_position => i,
+            :answer_text => answer
+        }
+        @poll_questions.poll_answers.new question_option
+      end
+    end
+    if @poll_questions.save
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  #修改题目
+  def update_poll_question
+    @poll_question = PollQuestion.find params[:poll_question]
+    #@poll = @poll_question.poll
+    @poll_question.is_necessary = params[:is_necessary]=="true" ? 1 : 0
+    @poll_question.question_title = params[:poll_questions_title].nil? || params[:poll_questions_title].empty? ? l(:label_enter_single_title) : params[:poll_questions_title]
+    ################处理选项
+    if params[:question_answer]
+      @poll_question.poll_answers.each do |answer|
+        answer.destroy unless params[:question_answer].keys.include? answer.id.to_s
+      end
+      for i in 1..params[:question_answer].count
+        question = @poll_question.poll_answers.find_by_id params[:question_answer].keys[i-1]
+        answer = (params[:question_answer].values[i-1].nil? || params[:question_answer].values[i-1].empty?) ? l(:label_new_answer) : params[:question_answer].values[i-1]
+        if question
+          question.answer_position = i
+          question.answer_text = answer
+          question.save
+        else
+          question_option = {
+              :answer_position => i,
+              :answer_text => answer
+          }
+          @poll_question.poll_answers.new question_option
+        end
+      end
+    end
+    @poll_question.save
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #删除题目
+  def delete_poll_question
+    @poll_question = PollQuestion.find params[:poll_question]
+    @poll = @poll_question.poll
+    poll_questions = @poll.poll_questions.where("question_number > #{@poll_question.question_number}")
+    poll_questions.each do |question|
+      question.question_number -= 1
+      question.save
+    end
+    if @poll_question && @poll_question.destroy
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  #发布问卷
+  def publish_poll
+    @poll.polls_status = 2
+    @poll.published_at = Time.now
+    if @poll.save
+      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
+
+  #提交答案
+  def commit_answer
+    pq = PollQuestion.find(params[:poll_question_id])
+    if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?)
+      render :json => {:text => "failure"}
+      return
+    end
+    if pq.question_type == 1
+      #单选题
+      pv = PollVote.find_by_poll_question_id_and_user_id(params[:poll_question_id],User.current.id)
+      if pv.nil?
+        #尚未答该题，添加答案
+        pv = PollVote.new
+        pv.user_id = User.current.id
+        pv.poll_question_id = params[:poll_question_id]
+      end
+      #修改该题对应答案
+      pv.poll_answer_id = params[:poll_answer_id]
+      if pv.save
+        #保存成功返回成功信息及当前以答题百分比
+        @percent = get_percent(@poll,User.current)
+        render :json => {:text => "ok" ,:percent => format("%.2f" ,@percent)}
+      else
+        #返回失败信息
+        render :json => {:text => "failure"}
+      end
+    elsif pq.question_type == 2
+      #多选题
+      pv = PollVote.find_by_poll_answer_id_and_user_id(params[:poll_answer_id],User.current.id)
+      if pv.nil?
+        #尚未答该题，添加答案
+        pv = PollVote.new
+        pv.user_id = User.current.id
+        pv.poll_question_id = params[:poll_question_id]
+        pv.poll_answer_id = params[:poll_answer_id]
+        if pv.save
+          @percent = get_percent(@poll,User.current)
+          render :json => {:text => "true",:percent => format("%.2f" ,@percent)}
+        else
+          render :json => {:text => "failure"}
+        end
+      else
+        #pv不为空，则当前选项之前已被选择，再次点击则是不再选择该项，故删除该答案
+        if pv.delete
+          @percent = get_percent(@poll,User.current)
+          render :json => {:text => "false" ,:percent => format("%.2f" ,@percent)}
+        else
+          render :json => {:text => "failure"}
+        end
+      end
+    elsif pq.question_type == 3 || pq.question_type == 4
+      #单行文本，多行文本题
+      pv = PollVote.find_by_poll_question_id_and_user_id(params[:poll_question_id],User.current.id)
+      if pv.nil?
+        #pv为空之前尚未答题，添加答案
+        if params[:vote_text].nil? || params[:vote_text].blank?
+          #用户提交空答案，视作不作答
+          @percent = get_percent(@poll,User.current)
+          render :json => {:text => pv.vote_text,:percent => format("%.2f" ,@percent)}
+        else
+          #添加答案
+          pv = PollVote.new
+          pv.user_id = User.current.id
+          pv.poll_question_id = params[:poll_question_id]
+          pv.vote_text = params[:vote_text]
+          if pv.save
+            @percent = get_percent(@poll,User.current)
+            render :json => {:text => pv.vote_text,:percent => format("%.2f" ,@percent)}
+          else
+            render :json => {:text => "failure"}
+          end
+        end
+      else
+        #pv不为空说明用户之前已作答
+        if params[:vote_text].nil? || params[:vote_text].blank?
+          #用户提交空答案，视为删除答案
+          if pv.delete
+            @percent = get_percent(@poll,User.current)
+            render :json => {:text => pv.vote_text,:percent => format("%.2f" ,@percent)}
+          else
+            render :json => {:text => "failure"}
+          end
+        else
+          #用户修改答案
+          pv.vote_text = params[:vote_text]
+          if pv.save
+            @percent = get_percent(@poll,User.current)
+            render :json => {:text => pv.vote_text,:percent => format("%.2f" ,@percent)}
+          else
+            render :json => {:text => "failure"}
+          end
+        end
+      end
+
+    else
+      render :json => {:text => "failure"}
+    end
+  end
+
+  #提交问卷
+  def commit_poll
+    @uncomplete_question = get_uncomplete_question(@poll,User.current)
+    if @uncomplete_question.count < 1
+      pu = get_poll_user(@poll.id,User.current.id)
+      pu.user_id = User.current.id
+      pu.poll_id = @poll.id
+      if pu.save
+        #redirect_to poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course')
+        @status = 0 #提交成功
+      else
+        @status = 2 #未知错误
+      end
+    else
+        @status = 1 #有未做得必答题
+    end
+    respond_to do |format|
+      format.js
+    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]
+    @course = Course.find @poll.polls_group_id
+  rescue Exception => e
+    render_404
+  end
+
+  def find_container
+    if params[:polls_type] && params[:polls_group_id]
+      case params[:polls_type]
+        when "Course"
+          @course = Course.find_by_id params[:polls_group_id]
+        when "Project"
+          @project = Project.find_by_id params[:polls_group_id]
+      end
+    else
+      render_404
+    end
+  end
+
+  def is_member_of_course
+    render_403 unless(@course && User.current.member_of_course?(@course))
+  end
+
+  def is_course_teacher
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    render_403 unless(@course && @is_teacher)
+  end
+
+  #获取未完成的题目
+  def get_uncomplete_question poll,user
+    necessary_questions = poll.poll_questions.where("#{PollQuestion.table_name}.is_necessary = 1")
+    uncomplete_question = []
+    necessary_questions.each do |question|
+      answers = get_user_answer(question,user)
+      if answers.nil? || answers.count < 1
+        uncomplete_question << question
+      end
+    end
+    uncomplete_question
+  end
+
+  #获取用户对某个问题的答案
+  def get_user_answer(question,user)
+    user_answer = question.poll_votes.where("#{PollVote.table_name}.user_id = #{user.id}")
+    user_answer
+  end
+
+  def get_complete_question(poll,user)
+    questions = poll.poll_questions
+    complete_question = []
+    questions.each do |question|
+      answers = get_user_answer(question,user)
+      if !(answers.nil? || answers.count < 1)
+        complete_question << question
+      end
+    end
+    complete_question
+  end
+
+  def get_percent poll,user
+    complete_count = get_complete_question(poll,user).count
+    if poll.poll_questions.count == 0
+      return 0
+    else
+      return (complete_count.to_f / poll.poll_questions.count.to_f)*100
+    end
+  end
+
+  #PollUser记录用户是否已提交问卷有对应的记录则已提交，没有则新建一个
+  def get_poll_user poll_id,user_id
+    pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id)
+    if pu.nil?
+      pu = PollUser.new
+    end
+    pu
+  end
 end
--- a/app/controllers/poll_question_controller.rb
+++ b/app/controllers/poll_question_controller.rb
@ -1,2 +0,0 @@
-class PollQuestionController < ApplicationController
-end
--- a/app/controllers/poll_user_controller.rb
+++ b/app/controllers/poll_user_controller.rb
@ -1,2 +0,0 @@
-class PollUserController < ApplicationController
-end
--- a/app/controllers/poll_vote_controller.rb
+++ b/app/controllers/poll_vote_controller.rb
@ -1,2 +0,0 @@
-class PollVoteController < ApplicationController
-end
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -32,13 +32,15 @@ class ProjectsController < ApplicationController
  menu_item l(:label_course_file), :only => :index
  menu_item l(:label_course_news), :only => :index

-
-  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
+# 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,: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]
  #此条勿删 课程相关权限  ,:new_homework,:homework,:feedback,,:member
-  before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
+  before_filter :authorize, :only => [:settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
  before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
  before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
  before_filter :file, :statistics, :watcherlist
@ -116,8 +118,8 @@ class ProjectsController < ApplicationController
                      joins("LEFT JOIN #{ProjectStatus.table_name} ON #{Project.table_name}.id = #{ProjectStatus.table_name}.project_id").joins("LEFT JOIN #{ProjectScore.table_name} ON #{Project.table_name}.id = #{ProjectScore.table_name}.project_id").
                      where("#{Project.table_name}.project_type = ? ", Project::ProjectType_project)

-    @project_count = @projects_all.count
-    @project_pages = Paginator.new @project_count, per_page_option, params['page']
+    @poll_questions_count = @projects_all.count
+    @poll_questions_pages = Paginator.new @project_count, per_page_option, params['page']

 #gcm activity count

@ -556,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
@ -597,8 +604,8 @@ class ProjectsController < ApplicationController
      "show_wiki_edits"=>true,
      "show_journals_for_messages" => true
    }
-    @date_to ||= Date.today + 1
-    @date_from = @date_to - @days-1.years
+
+
    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
    @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
    # 决定显示所用用户或单个用户活动
@ -612,9 +619,9 @@ class ProjectsController < ApplicationController
    # modify by nwb
    # 添加私密性判断
    if User.current.member_of?(@project)|| User.current.admin?
-      events = @activity.events(@date_from, @date_to)
+      events = @activity.events(@days)
    else
-      events = @activity.events(@date_from, @date_to, :is_public => 1)
+      events = @activity.events(@days,nil, :is_public => 1)
    end

    @offset, @limit = api_offset_and_limit({:limit => 10})
@ -910,6 +917,14 @@ class ProjectsController < ApplicationController
      end
    end
  end
+
+  #加入私有项目
+  def join_project
+    respond_to do |format|
+      format.js
+    end
+  end
+
  private

  def memberAccess
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -15,8 +15,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class UsersController < ApplicationController
+
  layout :setting_layout
  #Added by young
+  before_filter :auth_login1, :only => [:show, :user_activities]
  menu_item :activity
  menu_item :user_information, :only => :info
  menu_item :user_course, :only => :user_courses
@ -29,6 +31,9 @@ class UsersController < ApplicationController
 
  #Ended by young

+  # edit
+
+  #
  before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
  before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :tag_saveEx,:user_projects, :user_newfeedback, :user_comments, :watch_bids, :watch_contests, :info,
    :user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects, :show_score, :topic_score_index, :project_score_index,
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@ -7,17 +7,6 @@ class ZipdownController < ApplicationController
  SAVE_FOLDER = "#{Rails.root}/files"
  OUTPUT_FOLDER = "#{Rails.root}/tmp/archiveZip"

-  #通过作业Id找到项目（课程）
-  def find_project_by_bid_id
-    obj_class = params[:obj_class]
-    obj_id = params[:obj_id]
-    obj = obj_class.constantize.find(obj_id)
-    case obj.class.to_s.to_sym
-      when :Bid
-        @project = obj.courses[0]
-    end
-  end
-
  def assort
    if params[:obj_class] == "Bid"
      bid = Bid.find params[:obj_id]
@ -33,8 +22,8 @@ class ZipdownController < ApplicationController
    end
    send_file zipfile, :filename => bid.name + ".zip", :type => detect_content_type(zipfile) if zipfile

-  rescue Exception => e
-    render file: 'public/no_file_found.html'
+  #rescue Exception => e
+  #  render file: 'public/no_file_found.html'
  end

  #下载某一学生的作业的所有文件
@ -56,12 +45,23 @@ class ZipdownController < ApplicationController
    else
      render_403
    end
-  rescue => e
-    render file: 'public/file_not_found.html'
+  #rescue => e
+  #  render file: 'public/file_not_found.html'
  end

  private

+  #通过作业Id找到项目（课程）
+  def find_project_by_bid_id
+    obj_class = params[:obj_class]
+    obj_id = params[:obj_id]
+    obj = obj_class.constantize.find(obj_id)
+    case obj.class.to_s.to_sym
+      when :Bid
+        @project = obj.courses[0]
+    end
+  end
+
  def zip_bid(bid)
    # Todo: User Access Controll
    bid_homework_path = []
@ -101,10 +101,20 @@ class ZipdownController < ApplicationController

    Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
      input_filename.each do |filename|
+        flag = true
+        index = 1
        rename_file = ic.iconv( (File.basename(filename)) ).to_s
        rename_file = ic.iconv( filename_to_real( File.basename(filename))).to_s if is_attachment

+        begin
          zipfile.add(rename_file, filename)
+          flag = false
+        rescue Exception => e
+          zipfile.get_output_stream('FILE_NOTICE.txt') do |os|
+            os.write l(:label_file_exist)
+          end
+          next
+        end
      end
      unless not_exist_file.empty?
        zipfile.get_output_stream('FILE_LOST.txt') do |os|
@ -113,9 +123,9 @@ class ZipdownController < ApplicationController
      end
    end
    zipfile_name
-  rescue Errno => e
-    logger.error "[zipdown#zipping] ===> #{e}"
-    @error = e
+  #rescue Errno => e
+  #  logger.error "[zipdown#zipping] ===> #{e}"
+  #  @error = e
  end
  def detect_content_type(name)
    content_type = Redmine::MimeType.of(name)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -140,10 +140,12 @@ module ApplicationHelper
  # * :text - Link text (default to attachment filename)
  # * :download - Force download (default: false)
  def link_to_attachment(attachment, options={})
+    token = options[:token] if options[:token]
    text = options.delete(:text) || attachment.filename
    route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
    html_options = options.slice!(:only_path)
    url = send(route_method, attachment, attachment.filename, options)
+     url << "?token=#{token}" unless token.nil?
    link_to text, url, html_options
  end

@ -492,7 +494,7 @@ module ApplicationHelper
  def principals_check_box_tags_ex(name, principals)
    s = ''
    principals.each do |principal|
-      s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h principal.userInfo }</label>\n"
+      s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id)}</label>\n"
    end
    s.html_safe
  end
--- a/app/helpers/courses_helper.rb
+++ b/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
@ -561,12 +565,13 @@ module CoursesHelper
  def course_in_current_or_next_term course
    is_current_term = false
    is_next_term = false
-    if course.time == Time.now.year && course.term == cur_course_term
+    year_now = Time.now.month < 3 ? Time.now.year - 1:Time.now.year
+    if course.time == year_now && course.term == cur_course_term
      is_current_term = true
    end
-    if cur_course_term == "秋季学期" && course.time == (Time.now.year + 1) && course.term == "春季学期"
+    if cur_course_term == "秋季学期" && course.time == (year_now + 1) && course.term == "春季学期"
      is_next_term = true
-    elsif cur_course_term == "春季学期" && course.time == Time.now.year && course.term == "秋季学期"
+    elsif cur_course_term == "春季学期" && course.time == year_now && course.term == "秋季学期"
      is_next_term = true
    end
    is_current_term || is_next_term
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@ -224,6 +224,7 @@ module IssuesHelper
  # as an array of strings
  def details_to_strings(details, no_html=false, options={})
    options[:only_path] = (options[:only_path] == false ? false : true)
+    options[:token] = options[:token] if options[:token]
    strings = []
    values_by_field = {}
    details.each do |detail|
@ -312,7 +313,11 @@ module IssuesHelper
      old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank?
      if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
        # Link to the attachment if it has not been removed
+        if options[:token].nil?
          value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
+        else
+          value = link_to_attachment(atta, :download => true, :only_path => options[:only_path], :token => options[:token])
+        end
        if options[:only_path] != false && atta.is_text?
          value += link_to(
                       image_tag('magnifier.png'),
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@ -0,0 +1,77 @@
+# encoding: utf-8
+#
+# Redmine - project management software
+# Copyright (C) 2006-2013  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+module PollHelper
+  #判断选项是否被选中
+  def answer_be_selected?(answer,user)
+     pv = answer.poll_votes.where("#{PollVote.table_name}.user_id = #{user.id} ")
+    if !pv.nil? && pv.count > 0
+      true
+    else
+      false
+    end
+  end
+  
+  #获取文本题答案
+  def get_anwser_vote_text(question_id,user_id)
+    pv = PollVote.find_by_poll_question_id_and_user_id(question_id,user_id)
+    if pv.nil?
+      ''
+    else
+      pv.vote_text
+    end
+  end
+
+  #判断用户是否已经提交了问卷
+  def has_commit_poll?(poll_id,user_id)
+    pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id)
+    if pu.nil?
+      false
+    else
+      true
+    end
+  end
+  
+  #统计答题百分比，统计结果保留两位小数
+  def statistics_result_percentage(e, t)
+    e = e.to_f
+    t = t.to_f
+    t == 0 ? 0 : format("%.2f", e*100/t)
+  end
+  
+  #多选的时候查询去重
+  def total_answer id
+    total = PollVote.find_by_sql("SELECT distinct(user_id) FROM `poll_votes` where poll_question_id = #{id}").count
+  end
+  
+  #页面体型显示
+  def options_show pq
+    case pq
+    when 1
+      "单选题"
+    when 2
+      "多选题"
+    when 3
+      "单行主观题"
+    else
+      "多行主观题"
+    end
+  end
+
+end
--- a/app/models/contest.rb
+++ b/app/models/contest.rb
@ -17,6 +17,7 @@ class Contest < ActiveRecord::Base



+
  acts_as_attachable

  NAME_LENGTH_LIMIT = 60
--- a/app/models/course_group.rb
+++ b/app/models/course_group.rb
@ -12,11 +12,20 @@ class CourseGroup < ActiveRecord::Base
  before_destroy :set_member_nil

  attr_accessible :name
-  validates :name, :presence => true, :length => {:maximum => 20},
-            :uniqueness => {case_sensitive: false}
+  validates :name, :presence => true, :length => {:maximum => 20}
+  validate :unique_name_and_course
+
+
+
  def set_member_nil
    if self.members && self.members.count > 0
       self.members.update_all("course_group_id = 0")
    end
  end
+  private
+  def unique_name_and_course
+    if CourseGroup.where("name=? and course_id=?", name, course_id).first
+      errors.add(:name, :groupname_repeat)
+    end
+  end
 end
--- a/app/models/forum.rb
+++ b/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
--- a/app/models/forum_observer.rb
+++ b/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
--- a/app/models/issue_observer.rb
+++ b/app/models/issue_observer.rb
@ -18,8 +18,13 @@
 class IssueObserver < ActiveRecord::Observer
 
  def after_create(issue)
-    thread1=Thread.new do
-       Mailer.issue_add(issue).deliver if Setting.notified_events.include?('issue_added')
+    Thread.start do
+      # 将跟踪者与本项目的其他成员都设为收件方，并去重，不在进行抄送，
+      recipients = issue.recipients - issue.watcher_recipients + issue.watcher_recipients
+      recipients.each do |rec|
+        Mailer.issue_add(issue,rec).deliver if Setting.notified_events.include?('issue_added')
      end
    end
+
+  end
 end
--- a/app/models/issue_overdue.rb
+++ b/app/models/issue_overdue.rb
@ -20,7 +20,11 @@ class IssueOverdue < ActiveRecord::Base
            #发邮件
            #puts "11" + issue.id.to_s
            #Mailer.issue_expire(issue).deliver
-            Mailer.issue_add(issue).deliver
+            recipients = issue.recipients
+            recipients.each do |rec|
+
+              Mailer.issue_edit(issue,rec).deliver
+            end
            break
          end
        end
--- a/app/models/journal_observer.rb
+++ b/app/models/journal_observer.rb
@ -23,8 +23,13 @@ class JournalObserver < ActiveRecord::Observer
        (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) ||
        (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?)
        )
-      Thread.new do
-        Mailer.issue_edit(journal).deliver
+      Thread.start do
+        # 将跟踪者与本项目的其他成员都设为收件方，并去重，不在进行抄送，
+        recipients = journal.recipients - journal.watcher_recipients + journal.watcher_recipients
+        recipients.each do |rec|
+
+          Mailer.issue_edit(journal,rec).deliver
+        end
      end
    end
  end
--- a/app/models/journals_for_message_observer.rb
+++ b/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

--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@ -27,6 +27,38 @@ class Mailer < ActionMailer::Base
    { :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
+    @issue_author_url = url_for(user_activities_url(@author))
+    @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
+    @forum_url = url_for(:controller => 'forums', :action => 'show', :id => @forum.id)
+    @issue_author_url = url_for(user_activities_url(@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.

  # 留言分为直接留言，和对留言人留言的回复
@ -39,7 +71,7 @@ class Mailer < ActionMailer::Base
    @mail = journals_for_message.at_user if journals_for_message.at_user
    @message = journals_for_message.notes
    @title = "#@user #{t(:label_leave_your_message, :locale => 'zh')}"
-
+    @issue_author_url = url_for(user_activities_url(@user))
    @url = case journals_for_message.jour.class.to_s.to_sym # 判断留言的对象所属类型
             when :Bid
               course_for_bid_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
@ -62,13 +94,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,
@ -95,29 +127,50 @@ class Mailer < ActionMailer::Base
  # Example:
  #   issue_add(issue) => Mail::Message object
  #   Mailer.issue_add(issue).deliver => sends an email to issue recipients
-  def issue_add(issue)
+  def issue_add(issue, recipients)
    issue_id = issue.project_index
    redmine_headers 'Project' => issue.project.identifier,
                    'Issue-Id' => issue_id,
                    'Issue-Author' => issue.author.login
    redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
    message_id issue
+
    @author = issue.author
    @issue = issue
-    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
-    recipients = issue.recipients
-    cc = issue.watcher_recipients - recipients
-    mail :to => recipients,
-      :cc => cc,
-      :subject => "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
+    user = User.find_by_mail(recipients)
+
+    token = Token.new(:user =>user , :action => 'autologin')
+    token.save
+     @token = token
+     @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value)
+
+ # edit
+     @issue_author_url = url_for(user_activities_url(@author,:token => @token.value))
+     @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))
+
+
+    subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
+    mail(:to => recipients,
+
+         :subject => subject)
  end
+    # issue.attachments.each do |attach|
+    #   attachments["#{attach.filename}"] = File.read("#{attach.disk_filename}")
+    # end
+   # cc = issue.watcher_recipients - recipients
+    #mail.attachments['test'] = File.read("#{RAILS.root}/files/2015/01/150114094010_libegl.dll")
+
+   
+

  # Builds a Mail::Message object used to email recipients of the edited issue.
  #
  # Example:
  #   issue_edit(journal) => Mail::Message object
  #   Mailer.issue_edit(journal).deliver => sends an email to issue recipients
-  def issue_edit(journal)
+  def issue_edit(journal,recipients)
    issue = journal.journalized.reload
    issue_id = issue.project_index
    redmine_headers 'Project' => issue.project.identifier,
@ -127,18 +180,41 @@ class Mailer < ActionMailer::Base
    message_id journal
    references issue
    @author = journal.user
-    recipients = journal.recipients
-    # Watchers in cc
-    cc = journal.watcher_recipients - recipients
+
+    user = User.find_by_mail(recipients)
+
+    token = Token.new(:user =>user , :action => 'autologin')
+    token.save
+    @token = token
+
+
+    # edit
+    @issue_author_url = url_for(:controller  => 'users', :action => 'show', :id => issue.author_id,  :token => @token.value)
+    @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))
+
+      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value)
+
+
+
+
+
+
    s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
    s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
    s << issue.subject
    @issue = issue
    @journal = journal
-    @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
-    mail :to => recipients,
+   # @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
+    mail(:to => recipients,
+
+         :subject => s)
+  end
+
+  def self.deliver_mailer(to,cc, subject)
+    mail :to => to,
         :cc => cc,
-      :subject => s
+         :subject => subject
  end

  # 用户申请加入项目邮件通知
@ -215,6 +291,7 @@ class Mailer < ActionMailer::Base
    redmine_headers 'Project' => document.project.identifier
    @author = User.current
    @document = document
+    @issue_author_url = url_for(user_activities_url(@author))
    @document_url = url_for(:controller => 'documents', :action => 'show', :id => document)
    mail :to => document.recipients,
      :subject => "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
@ -230,6 +307,7 @@ class Mailer < ActionMailer::Base
    added_to = ''
    added_to_url = ''
    @author = attachments.first.author
+    @issue_author_url = url_for(user_activities_url(@author))
    case container.class.name
      when 'Project'
        added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
@ -237,7 +315,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)
@ -278,13 +356,27 @@ 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)
+
+    if news.project
      redmine_headers 'Project' => news.project.identifier
      @author = news.author
+      @issue_author_url = url_for(user_activities_url(@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
+      @issue_author_url = url_for(user_activities_url(@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.
@ -294,8 +386,10 @@ 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
+    if news.project
      redmine_headers 'Project' => news.project.identifier
      @author = comment.author
+      @issue_author_url = url_for(user_activities_url(@author))
      message_id comment
      @news = news
      @comment = comment
@ -303,6 +397,19 @@ class Mailer < ActionMailer::Base
      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
+      @issue_author_url = url_for(user_activities_url(@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.
@ -311,9 +418,11 @@ 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)
+    if message.project
      redmine_headers 'Project' => message.project.identifier,
                      'Topic-Id' => (message.parent_id || message.id)
      @author = message.author
+      @issue_author_url = url_for(user_activities_url(@author))
      message_id message
      references message.parent unless message.parent.nil?
      recipients = message.recipients
@ -323,6 +432,21 @@ class Mailer < ActionMailer::Base
      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
+      @issue_author_url = url_for(user_activities_url(@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.
@ -615,5 +739,15 @@ class Mailer < ActionMailer::Base
    Rails.logger
  end

-
+  def add_attachments(obj)
+    if email.attachments && email.attachments.any?
+      email.attachments.each do |attachment|
+        obj.attachments << Attachment.create(:container => obj,
+                                             :file => attachment.decoded,
+                                             :filename => attachment.filename,
+                                             :author => user,
+                                             :content_type => attachment.mime_type)
+      end
+    end
+  end
 end
--- a/app/models/memo.rb
+++ b/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
--- a/app/models/memo_observer.rb
+++ b/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
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@ -3,7 +3,7 @@ class Poll < ActiveRecord::Base
  include Redmine::SafeAttributes
  
  belongs_to :user
-  has_many :poll_questions, :dependent => :destroy
+  has_many :poll_questions, :dependent => :destroy,:order => "#{PollQuestion.table_name}.question_number"
  has_many :poll_users, :dependent => :destroy
  has_many :users, :through => :poll_users #该文件被哪些用户提交答案过
 end
--- a/app/models/poll_question.rb
+++ b/app/models/poll_question.rb
@ -3,6 +3,6 @@ class PollQuestion < ActiveRecord::Base
  include Redmine::SafeAttributes

  belongs_to :poll
-  has_many :poll_answers, :dependent => :destroy
+  has_many :poll_answers, :order => "#{PollAnswer.table_name}.answer_position",:dependent => :destroy
  has_many :poll_votes, :dependent => :destroy
 end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -188,7 +188,7 @@ class User < Principal
  validates_confirmation_of :password, :allow_nil => true
  validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
  validate :validate_password_length
-
+  #validates_email_realness_of :mail
  before_create :set_mail_notification
  before_save   :update_hashed_password
  before_destroy :remove_references_before_destroy
@ -380,7 +380,7 @@ class User < Principal
    raise text
  end

-  # Returns the user who matches the given autologin +key+ or nil
+
  def self.try_to_autologin(key)
    user = Token.find_active_user('autologin', key, Setting.autologin.to_i)
    if user
@ -466,7 +466,11 @@ class User < Principal
      User.hash_password("#{salt}#{User.hash_password clear_password}") == hashed_password
    end
  end
+  def check_password1?(clear_password)

+      clear_password == hashed_password
+
+  end
  # Generates a random salt and computes hashed_password for +clear_password+
  # The hashed password is stored in the following form: SHA1(salt + SHA1(password))
  def salt_password(clear_password)
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@ -56,17 +56,29 @@
                  <%= 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 class="span_wping">
+                           <a>已&nbsp;提&nbsp;交</a>
                         </span>
                      <% end %>
                  <% end %>
--- a/app/views/bids/_homework.html.erb
+++ b/app/views/bids/_homework.html.erb
@ -36,6 +36,7 @@
                    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_attach/praise_alert') %>');
                    showModal('ajax-modal', '480px');
                    $('#ajax-modal').css('height','240px');
+                    $('#ajax-modal').siblings().remove();
                    $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
                            "<a href='#' onclick='hiddent_alert_model();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
                    $('#ajax-modal').parent().css("top","").css("left","").css("width","511");
--- a/app/views/courses/_course_form.html.erb
+++ b/app/views/courses/_course_form.html.erb
@ -29,7 +29,7 @@
    <%= l(:label_tags_course_name) %>
    <span class="required">*&nbsp;&nbsp;</span>
  </label>
-  <input id="course_name" type="text" value="<%= @course.name %>" style="width:490px;size:60;" name = "course[name]" maxlength="100">
+  <input id="course_name" type="text" value="<%= @course.name %>" style="width:490px; size:60;" name = "course[name]" maxlength="100">
 </p>

 <%= f.fields_for @course do |m| %>
@ -38,7 +38,7 @@
            <table>
              <tr>
                <td>
-                  <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px">
+                  <span class="info" align="right" style="width: 90px; font-weight: bold ; margin-left:19px">
                    <%= l(:label_class_period) %>
                    <span class="required"> *&nbsp;&nbsp;</span>
                  </span>
@ -118,7 +118,7 @@
        </label>
        <input id="course_course_password" type="text" style="width:488px;margin-left: 10px;" value="<%= @course.password %>" size="60" name="course[password]"/>
      </p>
-      <em class="info" style="margin-left:95px;">
+      <em class="info" style="margin-left:95px; padding-left: 5px;">
        <%= l(:text_command) %>
      </em>
 <% end %>
@ -127,9 +127,7 @@
    <%= l(:label_new_course_description) %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
  </label>
  <span class="jstEditor">
-      <textarea id="course_description" class="wiki-edit" style="font-size:small;width:490px;margin-left:10px;" rows="8" name="course[description]" cols="40">
-        <%= @course.description %>
-      </textarea>
+      <textarea id="course_description" class="wiki-edit" style="font-size:small;width:490px;margin-left:10px;" rows="8" name="course[description]" cols="40"><%= @course.description %></textarea>
  </span>
 </p>
 <p style="margin-left:-10px;">
--- a/app/views/courses/_member_list.html.erb
+++ b/app/views/courses/_member_list.html.erb
@ -56,24 +56,36 @@
                </a>
                <ul style="margin-left: 15px">
                  <% if @canShowCode %>
+                      <% if member.user.show_name == '' && member.user.user_extensions.student_id == '' %>
+                          <li>
+                            <%= l(:label_username)%>
+                            <%= link_to(member.user.name, user_path(member.user)) %>
+                          </li>
+                      <% else %>
+                          <% unless member.user.show_name == ''%>
                              <li>
                                <%= l(:label_bidding_user_studentname) %> :
                                <%= link_to member.user.show_name, user_path(member.user) %>
                              </li>
                              </br>
-                      <%#= content_tag "li", "#{l(:label_bidding_user_studentname)}#{' : '}"link_to(member.user.show_name, user_path(member.user)) %>
-                  <% else %>
-                      <%= content_tag "li", link_to(member.user.name, user_path(member.user)) %>
                          <% end %>
-                  <!--teacher's code disapeared  moified by huang-->
-
-                  <% if @canShowCode  %>
+                          <% unless member.user.user_extensions.student_id == '' %>
                              <li>
                                <%= l(:label_bidding_user_studentcode) %> :
                                <%= link_to member.user.user_extensions.student_id, user_path(member.user) %>
                              </li>
-                      <%#= content_tag "li", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :style=> "color:#1c9ec7;" %>
                          <% end %>
+                      <% end %>
+                      <%#= content_tag "li", "#{l(:label_bidding_user_studentname)}#{' : '}"link_to(member.user.show_name, user_path(member.user)) %>
+                  <% else %>
+                      <li>
+                        <%= l(:label_username)%>
+                        <%= link_to(member.user.name, user_path(member.user)) %>
+                      </li>
+                <% end %>
+                  <!--teacher's code disapeared  moified by huang-->
+
+
                </ul>
                <% if @subPage_title == l(:label_student_list) %>
                    <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
--- a/app/views/courses/_member_list_detail.html.erb
+++ b/app/views/courses/_member_list_detail.html.erb
@ -7,24 +7,36 @@
      <a href="#" class="st_img" style="float:left;"> <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 40, :height => 40))  %></a>
      <ul style="margin-left: 15px">
        <% if @canShowCode %>
+            <% if member.user.show_name == '' && member.user.user_extensions.student_id == '' %>
+                <li>
+                  <%= l(:label_username)%>
+                  <%= link_to(member.user.name, user_path(member.user)) %>
+                </li>
+            <% else %>
+                <% unless member.user.show_name == ''%>
                    <li>
                      <%= l(:label_bidding_user_studentname) %> :
                      <%= link_to member.user.show_name, user_path(member.user) %>
-
-            </li> </br>
-            <%#= content_tag "li", "#{l(:label_bidding_user_studentname)}#{' : '}"link_to(member.user.show_name, user_path(member.user)) %>
-        <% else %>
-            <%= content_tag "li", link_to(member.user.name, user_path(member.user)) %>
+                    </li>
+                    </br>
                <% end %>
-        <!--teacher's code disapeared  moified by huang-->
-
-        <% if @canShowCode  %>
+                <% unless member.user.user_extensions.student_id == '' %>
                    <li>
                      <%= l(:label_bidding_user_studentcode) %> :
                      <%= link_to member.user.user_extensions.student_id, user_path(member.user) %>
                    </li>
-            <%#= content_tag "li", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :style=> "color:#1c9ec7;" %>
                <% end %>
+            <% end %>
+            <%#= content_tag "li", "#{l(:label_bidding_user_studentname)}#{' : '}"link_to(member.user.show_name, user_path(member.user)) %>
+        <% else %>
+            <li>
+              <%= l(:label_username)%>
+              <%= link_to(member.user.name, user_path(member.user)) %>
+            </li>
+        <% end %>
+        <!--teacher's code disapeared  moified by huang-->
+
+
      </ul>
      <% if @subPage_title == l(:label_student_list) %>
          <%= link_to format("%0.2f",member.score.to_s), {
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@ -6,7 +6,8 @@
               $.get(
               '<%=valid_ajax_course_path%>',
               { valid: "name",
-                   value: document.getElementById('group_name').value },
+                   value: document.getElementById('group_name').value,
+                    course_id: <%= @course.id %> },
               function (data) {
                   if (!data.valid) {
                       alert(data.message);
@ -56,7 +57,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">
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@ -6,7 +6,7 @@
 <%= labelled_form_for @course do |f| %>
    <div class="box tabular">
     <%= render :partial => 'course_form', :locals => { :f => f } %>
-      <span style="padding-left: 60px">
+      <span style="padding-left: 60px; margin-left: 36px">
        <%= submit_tag l(:button_create), :class => "enterprise"%>
      </span>
      <!-- <%#= submit_tag l(:button_create_and_continue), :name => 'course_continue' %> -->
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@ -22,7 +22,7 @@
 </span>
 </div>

-<button name="button" class="f_l ml10" onclick="_file.click()" onmouseover="this.focus()" type="button" style="width:80px; height:26px;">上传文件</button>
+<button name="button" class="f_l ml10" onclick="_file.click()" onmouseover="this.focus()" type="button" style="width:20%; height:26%;"><%= l(:label_browse)%></button>
 <%= file_field_tag 'attachments[dummy][file]',
                   :id => '_file',
                   :class => 'file_selector',
--- a/app/views/files/_upload_show.html.erb
+++ b/app/views/files/_upload_show.html.erb
@ -1,15 +1,15 @@
 <div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
  <div class="upload_con">
-    <h2>上传资源</h2>
+    <h2><%= l(:label_upload_files)%></h2>
    <div class="upload_box">
      <%= error_messages_for 'attachment' %>
-      <div id="network_issue" style="color: red; display: none;">上传出现错误，请您检查您的网络环境，并刷新页面重新上传。</div>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
      <%= form_tag(course_files_path(course), :multipart => true,:remote => true,:method => :post,:name=>"upload_form") do %>
-          <label style="margin-top:3px;">文件浏览：</label>
+          <label style="margin-top:3px;"><%= l(:label_file_upload)%></label>
          <%= render :partial => 'attachement_list',:locals => {:course => course} %>
          <div class="cl"></div>
-          <a id="submit_resource" href="javascript:void(0);" class="upload_btn" onclick="submit_resource();">确&nbsp;&nbsp;认</a>
-          <a href="javascript:void(0);" class="upload_btn upload_btn_grey" onclick="closeModal();">取&nbsp;&nbsp;消</a>
+          <a id="submit_resource" href="javascript:void(0);" class="upload_btn" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+          <a href="javascript:void(0);" class="upload_btn upload_btn_grey" onclick="closeModal();"><%= l(:button_cancel)%></a>
      <% end %>
    </div>

--- a/app/views/homework_attach/_addjour.html.erb
+++ b/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
--- a/app/views/homework_attach/_homework.html.erb
+++ b/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 %>
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@ -1,49 +1,122 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>意见反馈浮窗</title>
+<style type="text/css">
+	#scrollsidebar{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+    #scrollsidebar div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ }
+    #scrollsidebar div,img,tr,td,table{ border:0;}
+    #scrollsidebar ol,ul,li{ list-style-type:none}
+    #scrollsidebar .cl{ clear:both; overflow:hidden; }
+    #scrollsidebar a{ text-decoration:none;}

+html{ overflow-x:hidden;}
+.custom_service p img {display: inline; margin-top:-5px; vertical-align:middle;}
+.scrollsidebar{position:absolute; z-index:999; top:150px;}
+.side_content{width:154px; height:auto; overflow:hidden; float:left; }
+.side_content .side_list {width:154px;overflow:hidden;}
+.show_btn{ width:0; height:112px; overflow:hidden; margin-top:50px; float:left; cursor:pointer;}
+.show_btn span { display:none;}
+.close_btn{width:24px;height:24px;cursor:pointer;}
+.side_title,.side_bottom,.close_btn,.show_btn {background:url(/images/sidebar_bg.png) no-repeat;}
+.side_title {height:46px;}
+.side_bottom { height:8px;}
+.side_center {font-family:Verdana, Geneva, sans-serif; padding:5px 12px; font-size:12px;}
+.close_btn { float:right; display:block; width:21px; height:16px; margin:16px 10px 0 0; _margin:16px 5px 0 0;}
+.close_btn span { display:none;}
+.side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
+.msgserver { margin:10px 0 4px 4px;}
+.msgserver a { background:url(/images/sidebar_bg.png) no-repeat -119px -115px; padding-left:22px;}
+.opnionText{ width:120px; height:180px; border-color:#cecece; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; color:#999; padding:3px;}
+a.opnionButton{ display:block; font-weight: bold; margin:-25px auto 0; text-align:center;}
+a:hover.opnionButton{ text-decoration:underline;}
+
+
+/* blue skin as the default skin */
+.side_title {background-position:-195px 0;}
+.side_center {background:url(/images/blue_line.png) repeat-y center;}
+.side_bottom {background-position:-195px -50px;}
+ .close_btn {background-position:-44px 0;}
+ .close_btn:hover {background-position:-66px 0;}
+.show_btn {background-position:-119px 0;}
+ .msgserver a {color:#15bccf; }
+ .msgserver a:hover { text-decoration:underline; }
+</style>
 <script>
-function mypostion(o){
-	var width=$(window).width();
-	var height=$(window).height();
-	var divW=$(o).outerWidth();
-	var divH=$(o).outerHeight();
-	var left=(width-divW)/2+$(window).scrollLeft();
-	var top=(height-divH)/2+$(window).scrollTop();
-	return {"left":left,"top":top};
-};
+	/* =================================================
+//
+// jQuery Fixed Plugins 1.3.1
+// author :
+// Url:
+// Data : 2012-03-30
+//
+// ???? : float --> ????[left or right]
+//		  minStatue --> ??С???????show_btn
+//		  skin      --> ???????
+//		  durationTime --> ??????
+//????  :
+		  $("#scrollsidebar2").fix({
+		  	float : 'right',	//default.left or right
+			minStatue : true,	//default.false or true
+			skin : 'green',		//default.gray or yellow ??blue ??green ??orange ??white
+		  	durationTime : 1000 //
+		  });
+//
+// =================================================*/

-function myTips(msg,status){
-	if(status!="success" && status!="error"){status="error";};
-	if (status=="success") {
-		$("body").append('<div class="ui-mask" id="ui-mask"></div><div class="change_success" id="change_success"><!--span class="send_close" onclick="$(this).parent().remove();$("#ui-mask").remove();"></span--><i></i>'+msg+'</div>');
-		var my=mypostion("#change_success");
-		$("#change_success").css({"position":"absolute","z-index":"9999999","top":my.top+"px","left":my.left+"px"});
-		$("#ui-mask").show();
-		$("#change_success").show();
-		setTimeout(function(){
-			$("#change_success,#ui-mask").fadeOut("slow",function(){
-				$("#ui-mask").remove();
-				$("#change_success").remove();
-			});
-		},2500);
+(function($){
+    $.fn.fix = function(options){
+        var defaults = {
+            float : 'left',
+			minStatue : false,
+			skin : 'blue',
+			durationTime : 1000
        }
-	else{
-	$("body").append('<div class="ui-mask" id="ui-mask"></div><div class="change_error" id="change_error"><!--span class="send_close" onclick="$(this).parent().remove();$("#ui-mask").remove();"></span--><i></i>'+msg+'</div>');
-		var my=mypostion("#change_error");
-		$("#change_error").css({"position":"absolute","z-index":"9999999","top":my.top+"px","left":my.left+"px"});
-		$("#ui-mask").show();
-		$("#change_error").show();
-		setTimeout(function(){
-			$("#change_error,#ui-mask").fadeOut("slow",function(){
-				$("#ui-mask").remove();
-				$("#change_error").remove();
+        var options = $.extend(defaults, options);
+
+        this.each(function(){
+            //???????
+			var thisBox = $(this),
+				closeBtn = thisBox.find('.close_btn' ),
+				show_btn = thisBox.find('.show_btn' ),
+				sideContent = thisBox.find('.side_content'),
+				sideList = thisBox.find('.side_list')
+				;
+			var defaultTop = thisBox.offset().top;	//????????top
+
+			thisBox.css(options.float, 0);
+			if(options.minStatue){
+				$(".show_btn").css("float", options.float);
+				sideContent.css('width', 0);
+				show_btn.css('width', 25);
+
+			}
+			//???????
+			if(options.skin) thisBox.addClass('side_'+options.skin);
+
+
+			//????scroll???
+			$(window).bind("scroll",function(){
+				var offsetTop = defaultTop + $(window).scrollTop() + "px";
+	            thisBox.animate({
+	                top: offsetTop
+	            },
+	            {
+	                duration: options.durationTime,
+	                queue: false    //???????????????????
 	            });
-		},1000);
+			});
+			//close???
+			closeBtn.bind("click",function(){
+				sideContent.animate({width: '0px'},"fast");
+            	show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
+			});
+			//show???
+			 show_btn.click(function() {
+	            $(this).animate({width: '0px'},"fast");
+	            sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast");
+	        });
+
+        });	//end this.each
+
    };
-};
+})(jQuery);


 $(function(){
@ -59,92 +132,51 @@ function f_submit()
 }
 </script>

-<style type="text/css">
-/*浮窗*/ 
-body{ height:3000px; font-family:'微软雅黑';} 
-div,ul,li,body,h3,p{margin:0; padding:0;} 
-a{ text-decoration:none;}
-#roll{ background:url(/images/f_opnion.jpg) 0 0 no-repeat;width:157px; height:332px; position:absolute;}
-.opnionBox{ width: 130px; height:146px; margin:76px auto 20px; } 
-.opnionText{  width: 120px !important; height:130px; outline:none; border:none !important;padding: 0 5px !important; color: #03a8bb;line-height:1.5; font-size:12px; }
-a.opnionButton{  width:40px; height:20px; display:block;  margin:0 auto;font-size:14px; color:#fd6e2a; font-weight: bold;    }
-a:hover.opnionButton{ text-decoration:underline;}
-.opnionCall{ color:#03a8bb; font-size:12px;  width:105px;  margin:0 auto;}
-.opnionCall .tectitle{ font-size:14px; alignment-adjust: central; color:#03a8bb; margin-bottom:8px,}
-/*提示框*/ 
-.ui-mask{background-color:#000;opacity:0.5;filter:alpha(opacity=50);width:100%;height:100%;position:fixed;_position:absolute;left:0;top:0;z-index:9999998;display:none;}
-.change_success{
-	display:block;
-	height:60px;
-	width:300px;
-	line-height:1.9;
-	font-size:14px;
-	font-weight:500;
-	background:#fff;
-	color:#1395a4;
-	border:5px solid #1395a4;
-	font-size:14px;
-	padding:30px 20px;
-	position: absolute;
-	_position: absolute;
-	left:0;
-	top:0;
-	z-index:9999999;
-}
-</style>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>意见反馈</title>
+
 </head>
-
-<body>
-<div id="roll">
-<div  class="opnionBox">	
-	
+<body style="height:auto">
+<!-- ?ú?? ???? -->
+<div class="scrollsidebar" id="scrollsidebar">
+    <div class="side_content">
+        <div class="side_list">
+            <div class="side_title"><a title="意见反馈" class="close_btn"><span><%= l(:label_feedback) %></span></a></div>
+            <div class="side_center">
+                <div class="custom_service">
                  <% get_memo %>
 				  <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-	<div class="actions" style="max-width:680px">
-		<p>
         		    <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
-        </p>
-        <p>
          			<%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
-        </p>
 		  			 <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
-          <a href="javascript:void(0);" class="opnionButton" id="" onclick="f_submit();">提&nbsp;&nbsp;交</a>
+          			<a href="javascript:void(0);" class="opnionButton" style=" color:#fd6e2a;" id="" onclick="f_submit();">提&nbsp;&nbsp;交</a>          			
 				  <% end %>   			   			                
                </div>                               
-	
-
-    </form>
-    <div class="clear"></div>
-</div>
-
-<div class="opnionCall">
-	<div class="tectitle">技术支持：</div>
-    <p ><%= l(:label_course_adcolick) %><a href="http://user.trustie.net/users/12/user_newfeedback">黄井泉</a><br>
-    	<%= l(:label_course_adcolick) %><a href="http://user.trustie.net/users/34/user_newfeedback">白羽</a></p>
-</div>
-
+                <div class="msgserver">
+                    <p>
+                   	<a href="http://user.trustie.net/users/12/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>黄井泉</a></br>
+                    <a href="http://user.trustie.net/users/34/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
+                    </p>
+                </div>
+            </div>
+            <div class="side_bottom"></div>
+        </div>
+    </div>
+    <div class="show_btn"><span>提交</span></div>
 </div>
+<!-- ?ú?? ?á?? -->
+<script type="text/javascript">
+$(function() {
+	$("#scrollsidebar").fix({
+		float : 'right',	//default.left or right
+		//minStatue : true,
+		skin : 'green',	//default.gray or blue
+		durationTime : 600
+	});
+});
+</script>

 </body>
 </html>
-<script>
-	var roll=document.getElementById('roll'), 
-	initX=0, 
-	initY, 
-	compY, 
-	sp=15, 
-	//可调整时间间隔，步进值不宜过大，不然IE下有点闪屏； 
-	timeGap=5, 
-	doc=document.documentElement, 
-	docBody=document.body; 
-	compY=initY=100; 
-	roll.style.right=initX+"px"; 
-	;(function(){ 
-	var curScrollTop=(doc.scrollTop||docBody.scrollTop||0)-(doc.clientTop||docBody.clientTop||0); 
-	//每次comP的值都不一样；直到roll.style.top===doc.scrollTop+initY； 
-	compY+=(curScrollTop+initY-compY)/sp; 
-	roll.style.top=Math.ceil(compY)+"px"; 
-	setTimeout(arguments.callee,timeGap); 
-	})(); 
-</script>
-
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@ -47,12 +47,36 @@
      </td>
      <td rowspan="2" width="250px">
        <div class="top-content-search">
+          <script type="text/javascript">
+              function regexName()
+              {
+                  var name = $.trim($("#name").val());
+                  if(name.length == 0)
+                  {
+                      $("#project_name_span").text("<%= l(:label_search_conditions_not_null) %>");
+                      $("#project_name_span").css('color','#ff0000');
+                      $("#project_name_span").focus();
+                      return false;
+                  }
+                  else
+                  {
+                      $("#project_name_span").text("");
+                      return true;
+                  }
+              }

+              function submitSerch()
+              {
+                  if(regexName()){$("#course_search_form").submit();}
+              }
+          </script>
          <%= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get) do %>
              <%= text_field_tag 'name', params[:name], :size => 20, :style => "float:left" %>
-              <a href="#" onclick="$('#course_search_form').submit();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
+              <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
                <%= l(:label_search)%>
              </a>
+              <br />
+              <span id="project_name_span" style="float: left"></span>
              <%#= submit_tag l(:label_search), :class => "ButtonColor m3p10", :name => nil, :style => "float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" %>
          <% end %>
        </div>
@ -275,6 +299,24 @@
    </div>

    <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: 32px;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>-->
+      <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id)%>
+      <div class="polls_n">
+        <p>NEW</p>
+      </div>
+      <div class="cl"></div>
+    </div>
  </div>
 </div>
 <div id="content">
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@ -70,7 +70,7 @@
                                                <%= l(:label_search)%>
                                              </a>
                                                <br />
-                                              <span id="contest_name_span_head"></span>
+                                              <span id="contest_name_span_head" style="float: left"></span>
                                            <% end %>
                                        </div>
                                    </td>
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@ -71,7 +71,7 @@
                                                    <%= l(:label_search)%>
                                                </a>
                                                <br />
-                                                <span id="project_name_span"></span>
+                                                <span id="project_name_span" style="float: left"></span>
 											<% end %>
 										</div>
 									</td>
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@ -1,33 +1,52 @@
 <html>
 <head>
+<title>Trustie项目邮件</title>
+
+
+
+
 <style>
-body {
-  font-family: Verdana, sans-serif;
-  font-size: 0.8em;
-  color:#484848;
-}
-h1, h3, h3 { font-family: "Trebuchet MS", Verdana, sans-serif; margin: 0px; }
-h1 { font-size: 1.2em; }
-h3, h3 { font-size: 1.1em; }
-a, a:link, a:visited { color: #2A5685;}
-a:hover, a:active { color: #c61a1a; }
-a.wiki-anchor { display: none; }
-hr {
-  width: 100%;
-  height: 1px;
-  background: #ccc;
-  border: 0;
-}
-.footer {
-  /*font-size: 0.8em;*/
-  /*font-style: italic;*/
-}
+body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+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; margin-top: 30px;}
+.mail_box,ul,li{ list-style-type:none}
+.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;}
+.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>
-<span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span>
-<%= yield %>
-<hr />
-<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span>
+
+<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" style="margin:0; padding:0;"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span><!--mail_foot end-->
+    </div>
+ </div>
 </body>
 </html>
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@ -1,15 +1,50 @@
-<h1><%= link_to(h("#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}"), issue_url) %></h1>
+<!-- <h1><%#= link_to(h("#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}"), issue_url) %></h1> -->
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+        <%= link_to(h("#{@author.login}(#{@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; margin:0; padding:0;">

-<ul>
-<li><%=l(:field_author)%>: <%=h issue.author %></li>
-<li><%=l(:field_status)%>: <%=h issue.status %></li>
-<li><%=l(:field_priority)%>: <%=h issue.priority %></li>
-<li><%=l(:field_assigned_to)%>: <%=h issue.assigned_to %></li>
-<li><%=l(:field_category)%>: <%=h issue.category %></li>
-<li><%=l(:field_fixed_version)%>: <%=h issue.fixed_version %></li>
-<% issue.custom_field_values.each do |c| %>
-  <li><%=h c.custom_field.name %>: <%=h show_value(c) %></li>
-<% end %>
+      <% 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 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>
 </ul>
+  <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>

-<%= textilizable(issue, :description, :only_path => false) %>
+<li><%#=l(:field_status)%>: <%#=h issue.status %></li>
+<li><%#=l(:field_priority)%>: <%#=h issue.priority %></li>
+<li><%#=l(:field_assigned_to)%>: <%#=h issue.assigned_to %></li>
+<li><%#=l(:field_category)%>: <%#=h issue.category %></li>
+<li><%#=l(:field_fixed_version)%>: <%#=h issue.fixed_version %></li>
+-->
+<%# issue.custom_field_values.each do |c| %>
+<!--  <li><%#=h c.custom_field.name %>: <%#=h show_value(c) %></li>
+<%#end %>
+-->
--- a/app/views/mailer/_issue.text.erb
+++ b/app/views/mailer/_issue.text.erb
@ -1,13 +1,23 @@
-<%= "#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}" %>
-<%= issue_url %>

-* <%=l(:field_author)%>: <%= issue.author %>
-* <%=l(:field_status)%>: <%= issue.status %>
-* <%=l(:field_priority)%>: <%= issue.priority %>
-* <%=l(:field_assigned_to)%>: <%= issue.assigned_to %>
-* <%=l(:field_category)%>: <%= issue.category %>
-* <%=l(:field_fixed_version)%>: <%= issue.fixed_version %>
-<% issue.custom_field_values.each do |c| %>* <%= c.custom_field.name %>: <%= show_value(c) %>
-<% end -%>
----------------------------------------
-<%= issue.description %>
+        <%= link_to(h("#{@author.login}(#{@author.show_name})"), @issue_author_url) %>
+     <%= 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| %>
+                <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %><%= l(:label_added) %>
+            <% end %>
+        <% end %>
+
+
+ <%= link_to( l(:mail_issue_reply), issue_url) %>
--- a/app/views/mailer/forum_add.html.erb
+++ b/app/views/mailer/forum_add.html.erb
@ -0,0 +1,29 @@
+
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+        <%= link_to(h("#{@forum.creator.login}(#{@forum.creator.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+
+     </span><%= l(:label_forum_new)%>
+  <%= link_to(h(@forum.name), @forum_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+  </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(h(@forum.name), @forum_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_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<%= @forum.description.html_safe %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @forum_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>
+
+
+
--- a/app/views/mailer/forum_add.text.erb
+++ b/app/views/mailer/forum_add.text.erb
@ -0,0 +1,4 @@
+<%= @forum_url %>
+<%= @author.name %>
+
+<%= @forum.description %>
--- a/app/views/mailer/forum_message_added.html.erb
+++ b/app/views/mailer/forum_message_added.html.erb
@ -0,0 +1,32 @@
+
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+        <%= link_to(h("#{@author.login}(#{@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(@forum.name), @forum_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(h(@memo.subject), @memo_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>
+      <%= link_to(h(@forum.name), @forum_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+    </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">
+        	<%= @memo.content.html_safe %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @memo_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>
+
+
+
--- a/app/views/mailer/forum_message_added.text.erb
+++ b/app/views/mailer/forum_message_added.text.erb
@ -0,0 +1,5 @@
+<%= @memo_url %>
+<%= @author.name %>
+
+<%= @memo.subject %>
+<%= @memo.content %>
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@ -1,3 +1,9 @@
-<%= l(:text_issue_added, :id => "##{@issue.project_index}", :author => h(@issue.author)) %>
-<hr />
-<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<div class="mail_content" style="margin-top:30px; margin:0; padding:0; border:0;">
+
+
+         <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+
+
+</div>
+<div class="mail_foot" style="margin:0; padding:0; border:0;"><%= link_to( l(:mail_issue_footer), @user_url , :style=>'font-size:12px; font-weight:normal; color:#1b55a7;')  %> </div>
+
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@ -1,4 +1,3 @@
-<%= l(:text_issue_added, :id => "##{@issue.project_index}", :author => @issue.author) %>

----------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<%= link_to( l(:mail_issue_footer), @user_url)  %>
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@ -1,11 +1,11 @@
-<%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
+<div>
+  <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>

-<ul>
-<% details_to_strings(@journal.details, false, :only_path => false).each do |string| %>
-  <li><%= string %></li>
-<% end %>
-</ul>
  
-<%= textilizable(@journal, :notes, :only_path => false) %>
-<hr />
+</div>
+<div class="cl" style="margin-top: 15px; clear:both; overflow:hidden;"></div>
+<hr/>
+
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url, :style=>'font-size:12px; font-weight:normal; color:#1b55a7;')  %> </div>
+
--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@ -1,12 +1,8 @@
 <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => @journal.user) %>

-<% details_to_strings(@journal.details, true).each do |string| -%>
-<%= string %>
-<% end -%>

-<% if @journal.notes? -%>
-<%= @journal.notes %>

-<% end -%>
----------------------------------------
+--------------------------------------------------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+
+<%= link_to( l(:mail_issue_footer), @user_url)  %>
--- a/app/views/mailer/journals_for_message_add.html.erb
+++ b/app/views/mailer/journals_for_message_add.html.erb
@ -1,5 +1,25 @@
-<em>尊敬的用户，<%= @user %>给你留言了:</em>
-<div><%= @message %></div>
-<h1>点击链接查看最新回复<%= link_to(@url, @url) %></h1>
-&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<h4><%= link_to(l(:lable_not_receive_mail),"http://" + Setting.host_name + "/my/account")%></h4>
+
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+
+        <%= link_to(h("#{@user.login}(#{@user.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+     </span>给你留言了
+  </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_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<%= @message %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @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>
+

--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@ -1,4 +1,38 @@
-<h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
-<em><%=h @message.author %></em>

-<%= textilizable(@message, :content, :only_path => false) %>
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+          <%= link_to(h("#{@message.author.login}(#{@message.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;">
+     <% if @message.project %>
+      <%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+  <% elsif @message.course %>
+             <%=h @message.board.course.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+      <% end %>
+  </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(h(@message.subject), @message_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>
+      <% if @message.project %>
+      <span style="float: left; width: 526px"><%=h @message.board.project.name %> - <%=h @message.board.name %></span>
+      <% elsif @message.course %>
+          <span style="float: left; width: 526px"><%=h @message.board.course.name %> - <%=h @message.board.name %></span>
+        <% end %>
+    </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">
+        	<%= @message.content %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @message_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>
+
+
--- a/app/views/mailer/news_added.html.erb
+++ b/app/views/mailer/news_added.html.erb
@ -1,4 +1,41 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
-<em><%=h @news.author.name %></em>

-<%= textilizable(@news, :description, :only_path => false) %>
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+
+        <%= link_to(h("#{@news.author.login}(#{@news.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;">
+     <% if @news.project %>
+      <%=h @news.project.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+  <% elsif @news.course %>
+             <%=h @news.course.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+      <% end %>
+  </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(h(@news.title), @news_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>
+      <% if @news.project %>
+          <span style="float: left; width: 526px"><%=h @news.project.name %></span>
+      <% elsif @news.course %>
+          <span style="float: left; width: 526px"><%=h @news.course.name %></span>
+      <% end %>
+    </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">
+        	<%= @news.description %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @news_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>
+
+
+
--- a/app/views/mailer/news_comment_added.html.erb
+++ b/app/views/mailer/news_comment_added.html.erb
@ -1,5 +1,40 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>

-<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+          <%= link_to(h("#{@comment.author.login}(#{@comment.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;">
+     <% if @news.project %>
+      <%=h @news.project.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+  <% elsif @news.course %>
+             <%=h @news.course.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+      <% end %>
+  </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(h(@news.title), @news_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>
+      <% if @news.project %>
+          <span style="float: left; width: 526px"><%=h @news.project.name %></span>
+      <% elsif @news.course %>
+          <span style="float: left; width: 526px"><%=h @news.course.name %></span>
+      <% end %>
+    </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">
+        	<%= @news.description %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @news_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>
+
+

-<%= textilizable @comment, :comments, :only_path => false %>
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@ -123,10 +123,10 @@
      <br/>
    </p>

-    <p style="width:400px;padding-left: 52px;">
-      <label style="margin-right: 1px;">
-        <%= l(:label_identity) %><span style="color: #bb0000;"> *</span></label>
-      <select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location" style="margin: 0px;">
+    <p style="width:400px;padding-left: 53px;">
+      <label for="userIdentity">
+        <%= l(:label_identity) %><span class="required"> *</span></label>
+      <select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location" style="margin: -4px;">
        <option value="">
          <%= l(:label_account_identity_choose) %>
        </option>
@ -187,19 +187,19 @@
      <!-- added by bai  增加账户里的性别-->
        <span id='gender' style='display:none'>
        <% if @user.user_extensions.nil? %>
-            <p style="width:400px;padding-left: 54px;">
-              <%= l(:label_gender) %>&nbsp;&nbsp;
+            <p style="width:400px;padding-left: 53px;">
+              <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
              <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
            </p>
        <% else %>
            <% if @user.user_extensions.gender == 0 %><!-- label_gender_male -->
-              <p style="width:400px;padding-left: 54px;">
-                <%= l(:label_gender) %>&nbsp;&nbsp;
+              <p style="width:400px;padding-left: 53px;">
+                <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
                <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
              </p>
            <% else %>
                <p style="width:400px;padding-left: 54px;">
-                  <%= l(:label_gender) %>&nbsp;&nbsp;
+                  <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
                  <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1' selected='selected'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
                </p>
            <% end %>
@ -212,9 +212,9 @@


      <!-- added by Wen -->
-      <p id="occupation_detail" style="padding-left: 24px; display: none">
+      <p id="occupation_detail" style="padding-left: 25px; display: none">

-            <%= l(:field_occupation) %>
+            <label for="occupation_name"><%= l(:field_occupation) %></label>
            <span class="required">&nbsp;</span>
        <% if User.current.user_extensions.nil? %>
            <input id="province" name="province" style="display: none" type="text" value="请单击选择省份及学校" readonly>
@ -242,7 +242,7 @@

      <div id="WOpenWindow">
        <a class="modal_close" href="#"></a>
-        <h2><%= l(:lable_school_list)%></h2>
+        <h2 style="margin: 10px"><%= l(:lable_school_list)%></h2>
        &nbsp;&nbsp;
        <div class="pcontent">
          <ul id="provincelist" class="school_list">
@ -318,7 +318,7 @@
          });
      </script>

-      <p style="width:400px;padding-left: 57px;"><label style="margin-right: 5px;"><%= l(:label_location) %></label>
+      <p style="width:400px;padding-left: 55px;"><label style="margin-right: 5px;" for="userProvince"><%= l(:label_location) %></label>
        <select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince" class="location">
          <option value="">--请选择省份--</option>
          <option value="北京">北京</option>
@ -382,7 +382,7 @@
      <legend onclick="toggleFieldset(this);">
        <%= l(:field_mail_notification) %>
      </legend>
-      <div style="padding-left: 26px;"> <!-- modified by ming -->
+      <div style="padding-left: 3px;"> <!-- modified by ming -->
        <p style="width:380px;">
          <%= render :partial => 'users/mail_notifications' %>
        </p></div>
--- a/app/views/poll/_choice_show.html.erb
+++ b/app/views/poll/_choice_show.html.erb
@ -0,0 +1,28 @@
+<div class="ur_table_result">
+  <table  border="0" cellspacing="0" cellpadding="0" >
+    <tbody>
+      <tr class="table_bluebg">
+        <td class="td327"><%= l(:label_poll_options) %> </td>
+        <td class="td42"><%= l(:label_poll_subtotal) %> </td>
+        <td class="td287"><%= l(:label_poll_proportion) %> </td>
+      </tr>
+      <% poll_question.poll_answers.each do |poll_answer| %>
+      <tr>
+        <td class="td327"><%= poll_answer.answer_text %> </td>
+        <td class="td42"><%= poll_answer.poll_votes.count %> </td>
+        <td class="td287">
+          <div class="Bar">
+            <span style="width:<%= statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)) %>%;" id="choice_percentage_<%= poll_answer.id %>"></span>
+    	  </div>
+          <%= statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)) %>%</td>
+      </tr>
+      <% end %>
+        <tr class="table_bluebg">
+          <td class="td327"><%= l(:label_poll_valid_commit) %> </td>
+          <td class="td42"><%= total_answer(poll_question.id) %></td>
+          <td class="td287">&nbsp; </td>
+        </tr>
+     </tbody>
+   </table>
+</div>
+
--- a/app/views/poll/_commit_alert.html.erb
+++ b/app/views/poll/_commit_alert.html.erb
@ -0,0 +1,12 @@
+<div id="popbox" style="text-align: center;margin-top: 25px">
+  <% if status == 0 %>
+    <h3 style="font-weight: normal;color: green">提交成功!</h3>
+    <%= link_to "确定", poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course'),:class => 'commit'%>
+  <% elsif status == 1 %>
+    <h3 style="font-weight: normal;color: red">您还有尚未作答的必答题目请完成后再提交!</h3>
+    <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
+  <% else %>
+    <h3 style="font-weight: normal;color: red">发生未知错误，请检查您的网络。</h3>
+      <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
+  <% end %>
+</div>
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@ -0,0 +1,48 @@
+<%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
+    <!--编辑单选start-->
+    <script type="text/javascript">
+      function resetQuestion<%=poll_question.id%>()
+      {
+          $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+          $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+          $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %>" +
+              "<li class='ur_item'>" +
+              "<label>选项<span class='ur_index'></span>：</label>" +
+              "<input type='text'  maxlength='200' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value='<%= poll_answer.answer_text%>'/>" +
+              "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+              "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+              "</li>" +
+              "<div class='cl'></div>" +
+            "<% end%>");
+      }
+    </script>
+
+    <div class="ur_editor radio">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+        <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+        <input type="checkbox" name="is_necessary" id="is_necessary_<%=poll_question.id%>" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+        <label>必答</label>
+      </div>
+      <div class="ur_editor_content">
+        <ul id="poll_answers_<%=poll_question.id%>">
+          <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
+              <li class='ur_item'>
+                <label>选项<span class='ur_index'></span>：</label>
+                <input type='text'  maxlength="200" name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
+                <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+                <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+              </li>
+              <div class='cl'></div>
+          <% end%>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <!--编辑单选 end-->
+<% end%>
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@ -0,0 +1,44 @@
+<%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%><!--编辑多选start-->
+    <script type="text/javascript">
+        function resetQuestion<%=poll_question.id%>()
+        {
+            $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+            $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+            $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %>" +
+                    "<li class='ur_item'>" +
+                    "<label>选项<span class='ur_index'></span>：</label>" +
+                    "<input type='text'  maxlength='200' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value='<%= poll_answer.answer_text%>'/>" +
+                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "</li>" +
+                    "<div class='cl'></div>" +
+                    "<% end%>");
+        }
+    </script>
+  <div class="ur_editor checkbox">
+    <div class="ur_editor_title">
+      <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+      <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多选题标题" value="<%= poll_question.question_title%>"/>
+      <input type="checkbox" name="is_necessary" id="is_necessary_<%=poll_question.id%>" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+      <label>必答</label>
+    </div>
+    <div class="ur_editor_content">
+      <ul id="poll_answers_<%=poll_question.id%>">
+        <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
+            <li class='ur_item'>
+              <label>选项<span class='ur_index'></span>：</label>
+              <input  maxlength="200" type='text' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
+              <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+              <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+            </li>
+            <div class='cl'></div>
+        <% end%>
+      </ul>
+    </div>
+    <div class="ur_editor_footer">
+      <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+    </div>
+    <div class="cl"></div>
+  </div><!--编辑多选 end-->
+<% end%>
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@ -0,0 +1,15 @@
+<%= form_for @poll,:remote => true do |f|%>
+    <div class="ur_editor ur_title_editor"> <!--编辑头部start-->
+      <div class="ur_title_editor_title">
+        <input type="text" maxlength="100" name="polls_name" id="polls_title" value="<%= @poll.polls_name %>" class="input_title" placeholder="问卷标题"/>
+      </div>
+      <div class="ur_title_editor_prefix">
+        <textarea name="polls_description" maxlength="300" id="polls_description" class="textarea_editor"><%= @poll.polls_description%></textarea>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn_submit" data-button="ok" onclick="pollsSubmit($(this));">确定</a>
+        <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">取消</a>
+      </div>
+      <div class="cl"></div>
+    </div><!--编辑头部 end-->
+<% end%>
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@ -0,0 +1,28 @@
+<%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
+<script type="text/javascript">
+    function resetQuestion<%=poll_question.id%>()
+    {
+        $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+        $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+    }
+</script>
+<div class="ur_editor textarea"> <!--编辑多行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+    <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多行主观标题" value="<%= poll_question.question_title%>"/>
+    <input type="checkbox" id="is_necessary_<%=poll_question.id%>" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+    <label for="ur_question_require">必答</label>
+  </div>
+  <div class="ur_editor_toolbar">
+    <!--<label>尺寸：</label>-->
+    <!--<label>宽 <input name="cols" type="number" min="1" value="60"> 字</label>,-->
+    <!--<label>高 <input name="rows" type="number" min="1" value="5"> 行</label>-->
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑多行文字end-->
+<% end%>
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@ -0,0 +1,24 @@
+<%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
+<script type="text/javascript">
+    function resetQuestion<%=poll_question.id%>()
+    {
+        $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+        $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+    }
+</script>
+<div class="ur_editor text "> <!--编辑单行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+    <input  maxlength="250" id="poll_questions_title_<%=poll_question.id%>" class="ur_question_title" contenteditable="true" type="text"
+           name="poll_questions_title"  placeholder="请输入单行主观标题" value="<%= poll_question.question_title%>"/>
+    <input type="checkbox" id="is_necessary_<%=poll_question.id%>" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+    <label for="ur_question_require">必答</label>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑单行文字end-->
+<% end%>
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@ -0,0 +1,43 @@
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+    <!--新建单选start-->
+    <div class="ur_editor radio">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input type="hidden" name="question_type" value="1"/>
+        <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入单选题标题"/>
+        <input type="checkbox" name="is_necessary" value="true" checked/>
+        <label>必答</label>
+      </div>
+      <div class="ur_editor_content">
+        <ul>
+          <li class='ur_item'>
+            <label>选项<span class='ur_index'></span>：</label>
+            <input maxlength="200" type='text' name='question_answer[0]' placeholder='新建选项'/>
+            <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+            <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+          </li>
+          <div class='cl'></div>
+          <li class='ur_item'>
+            <label>选项<span class='ur_index'></span>：</label>
+            <input maxlength="200" type='text' name='question_answer[1]' placeholder='新建选项'/>
+            <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+            <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+          </li>
+          <div class='cl'></div>
+          <li class='ur_item'>
+            <label>选项<span class='ur_index'></span>：</label>
+            <input maxlength="200" type='text' name='question_answer[2]' placeholder='新建选项'/>
+            <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+            <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+          </li>
+          <div class='cl'></div>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <!--编辑单选 end-->
+<% end%>
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@ -0,0 +1,41 @@
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%><!--新建多选start-->
+  <div class="ur_editor checkbox">
+    <div class="ur_editor_title">
+      <label>问题：&nbsp;&nbsp;</label>
+      <input type="hidden" name="question_type" value="2"/>
+      <input maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题标题"/>
+      <input type="checkbox" name="is_necessary" value="true" checked/>
+      <label>必答</label>
+    </div>
+    <div class="ur_editor_content">
+      <ul>
+        <li class='ur_item'>
+          <label>选项<span class='ur_index'></span>：</label>
+          <input maxlength="200" type='text' name='question_answer[0]' placeholder='新建选项'/>
+          <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+          <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+        </li>
+        <div class='cl'></div>
+        <li class='ur_item'>
+          <label>选项<span class='ur_index'></span>：</label>
+          <input maxlength="200" type='text' name='question_answer[1]' placeholder='新建选项'/>
+          <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+          <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+        </li>
+        <div class='cl'></div>
+        <li class='ur_item'>
+          <label>选项<span class='ur_index'></span>：</label>
+          <input maxlength="200" type='text' name='question_answer[2]' placeholder='新建选项'/>
+          <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+          <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+        </li>
+        <div class='cl'></div>
+      </ul>
+    </div>
+    <div class="ur_editor_footer">
+      <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+<% end%><!--编辑多选 end-->
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@ -0,0 +1,21 @@
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+<div class="ur_editor textarea"> <!--编辑多行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input type="hidden" name="question_type" value="4"/>
+    <input maxlength="250" id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行主观标题"/>
+    <input type="checkbox" name="is_necessary" value="true" checked/>
+    <label>必答</label>
+  </div>
+  <div class="ur_editor_toolbar">
+    <!--<label>尺寸：</label>-->
+    <!--<label>宽 <input name="cols" type="number" min="1" value="60"> 字</label>,-->
+    <!--<label>高 <input name="rows" type="number" min="1" value="5"> 行</label>-->
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+    <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑多行文字end-->
+<% end%>
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@ -0,0 +1,16 @@
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+    <div class="ur_editor text "> <!--编辑单行文字start-->
+      <div class="ur_editor_title">
+        <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+        <input type="hidden" name="question_type" value="3"/>
+        <input maxlength="250" id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行主观标题"/>
+        <input type="checkbox" name="is_necessary" value="true" checked/>
+        <label for="ur_question_require">必答</label>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+        <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
+      </div>
+      <div class="cl"></div>
+    </div><!--编辑单行文字end-->
+<% end%>
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@ -0,0 +1,68 @@
+<% has_commit = has_commit_poll?(poll.id ,User.current)%>
+<% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
+<li title="<%= poll.polls_name %>">
+  <% if @is_teacher %>
+      <% if has_commit %>
+          <sapn class="polls_title fl">
+            <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
+          </sapn>
+      <% else %>
+          <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl" %>
+      <% end %>
+  <% else %>
+      <% if has_commit && poll.polls_status == 2 %>
+          <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 500px;width: auto;" %>
+      <% elsif !has_commit && poll.polls_status == 2 %>
+          <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
+      <% end %>
+  <% end %>
+</li>
+<% if !@is_teacher && has_commit && poll.polls_status == 2%>
+    <li class="pollsbtn_tip fl ml5">已答</li>
+<% end %>
+
+<%if @is_teacher%>
+    <% if poll.polls_status == 1 %>
+        <li class="pollsbtn fl ml10 pollsbtn_grey">统计结果</li>
+    <% elsif poll.polls_status == 2%>
+        <li>
+          <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
+        </li>
+    <% end%>
+<% end%>
+
+<li>
+  <%if @is_teacher %>
+    <% if poll.polls_status == 1 %>
+      <a href="#" class="pollsbtn btn_pu fl ml5" onclick="poll_submit(<%= poll.id%>,<%= poll.polls_name.length %>);">发布问卷</a>
+    <% elsif poll.polls_status == 2%>
+      <a href="#" class="pollsbtn btn_de fl ml5" onclick="republish_poll(<%= poll.id%>);">取消发布</a>
+    <% end%>
+  <% end%>
+</li>
+<li>
+  <% if @is_teacher %>
+      <!--新建状态的问卷可删除-->
+      <%= link_to(l(:button_delete), poll,
+                  method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml20 mr10")  %>
+  <% end%>
+</li>
+<li>
+  <% if @is_teacher%>
+      <% if poll.polls_status == 1 %>
+          <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
+      <% elsif poll.polls_status == 2%>
+        <li class="polls_de_grey fr ml20">编辑</li>
+      <% end%>
+  <% end%>
+</li>
+<!--<li>-->
+  <!--<% if @is_teacher && poll.polls_status == 2%>-->
+    <!--<a class="polls_de fr ml20" onclick="republish_poll(<%= poll.id%>);">-->
+      <!--取消发布-->
+    <!--</a>-->
+  <!--<% end %>-->
+<!--</li>-->
+<li class="polls_date fr mr10">
+  <%= format_time poll.created_at%>
+</li>
--- a/app/views/poll/_poll_content.html.erb
+++ b/app/views/poll/_poll_content.html.erb
@ -0,0 +1,26 @@
+<% poll.poll_questions.each do |poll_question|%>
+    <div id="poll_questions_<%= poll_question.id%>">
+      <div id="show_poll_questions_<%= poll_question.id %>">
+        <% if poll_question.question_type == 1%>
+            <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
+        <% elsif poll_question.question_type == 2%>
+            <%= render :partial => 'show_MCQ', :locals => {:poll_question => poll_question} %>
+        <% elsif poll_question.question_type == 3%>
+            <%= render :partial => 'show_single', :locals => {:poll_question => poll_question} %>
+        <% elsif poll_question.question_type == 4%>
+            <%= render :partial => 'show_mulit', :locals => {:poll_question => poll_question} %>
+        <% end%>
+      </div>
+      <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
+        <% if poll_question.question_type == 1%>
+            <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
+        <% elsif poll_question.question_type == 2%>
+            <%= render :partial => 'edit_MCQ', :locals => {:poll_question => poll_question} %>
+        <% elsif poll_question.question_type == 3%>
+            <%= render :partial => 'edit_single', :locals => {:poll_question => poll_question} %>
+        <% elsif poll_question.question_type == 4%>
+            <%= render :partial => 'edit_mulit', :locals => {:poll_question => poll_question} %>
+        <% end%>
+      </div>
+    </div>
+<% end %>
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@ -0,0 +1,139 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>问卷调查_问卷编辑</title>
+  <%= stylesheet_link_tag  'polls', :media => 'all' %>
+  <%#= javascript_include_tag "polls" %>
+
+  <script type="text/javascript">
+      function add_MC(){
+          $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC') %>");
+          $("#poll_questions_title").focus();
+      }
+      function add_MCQ(){
+          $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ') %>");
+          $("#poll_questions_title").focus();
+      }
+      function add_single(){
+          $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single') %>");
+          $("#poll_questions_title").focus();
+      }
+      function add_mulit(){
+          $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_mulit') %>");
+          $("#poll_questions_title").focus();
+      }
+      //问卷头
+      function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+      function pollsSubmit(doc){
+          var title = $.trim($("#polls_title").val());
+          if(title.length == 0){alert("问卷标题不能为空");}else{doc.parent().parent().parent().submit();}
+      }
+      function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
+      //
+      function pollQuestionCancel(question_id){
+          $("#show_poll_questions_"+question_id).show();
+          $("#edit_poll_questions_"+question_id).hide();
+      }
+      function pollQuestionEdit(question_id){
+          $("#show_poll_questions_"+question_id).hide();
+          $("#edit_poll_questions_"+question_id).show();
+          $("#poll_questions_title_"+question_id).focus();
+      }
+      //单选题
+      function add_single_answer(doc)
+      {
+          doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='新建选项'/>" +
+              "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
+              "</li><div class='cl'></div>");
+      }
+      function remove_single_answer(doc)
+      {
+          if(doc.parent().siblings("li").length == 0)
+          {
+              alert("选择题至少有一个选项");
+          }
+          else
+          {
+              doc.parent().remove();
+          }
+      }
+
+      function poll_submit()
+      {
+          var title = $.trim($("#polls_name_h").html());
+          if(title.length == 0)
+          {
+              alert("问卷标题不能为空");
+          }
+          else{
+              $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
+              showModal('ajax-modal', '310px');
+              $('#ajax-modal').css('height','115px');
+              $('#ajax-modal').siblings().remove();
+              $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                      "<a href='#' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+              $('#ajax-modal').parent().removeClass("alert_praise");
+              $('#ajax-modal').parent().css("top","").css("left","");
+              $('#ajax-modal').parent().addClass("popbox_polls");
+          }
+      }
+  </script>
+</head>
+
+<body>
+<div class=" polls_content polls_edit" id="polls">
+
+  <!-- 头部 -->
+  <div id="polls_head_show"  style="display: none;">
+    <%= render :partial => 'show_head', :locals => {:poll => @poll}%>
+  </div>
+  <div id="polls_head_edit">
+    <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
+  </div>
+
+  <!-- 问题 -->
+  <div id="poll_content">
+    <%= render :partial => 'poll_content', :locals => {:poll => @poll}%>
+  </div>
+
+  <div class="tabs_1">
+    <ul class="tabs_list">
+      <li class="tab_item02 "  >
+        <a title="<%=  l(:label_MC) %>" class="tab_icon icon_radio" onclick="add_MC();">
+          <%=  l(:label_MC) %>
+        </a>
+      </li>
+      <li class="tab_item02 " >
+        <a title="<%=  l(:label_MCQ) %>" class=" tab_icon icon_checkbox" onclick="add_MCQ();">
+          <%=  l(:label_MCQ) %>
+        </a>
+      </li>
+      <li class="tab_item02 " >
+        <a title="<%= l(:label_single) %>" class="tab_icon icon_text" onclick="add_single();">
+          <%= l(:label_single) %>
+        </a>
+      </li>
+      <li class="tab_item02 " >
+        <a title="<%= l(:label_mulit)%>" class="tab_icon icon_textarea" onclick="add_mulit();">
+          <%= l(:label_mulit)%>
+        </a>
+      </li>
+    </ul>
+    <div class="cl"></div>
+  </div><!--选项 end-->
+
+  <!-- 新增问题 -->
+  <div id="new_poll_question">
+  </div>
+
+  <div class="ur_buttons">
+    <a class="ur_button_submit" onclick="poll_submit();">
+      <%= l(:label_memo_create)%>
+    </a>
+  </div>
+  <div class="cl"></div>
+
+</div><!--编辑end-->
+</body>
+</html>
--- a/app/views/poll/_poll_question.html.erb
+++ b/app/views/poll/_poll_question.html.erb
@ -0,0 +1,12 @@
+<tbody>
+<% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
+    <tr>
+      <td>
+        <label>
+          <input class="ur_radio" type="radio" name="<%= poll_question  %>" value="<%= poll_answer.answer_text%>" >
+          <%= poll_answer.answer_text%>
+        </label>
+      </td>
+    </tr>
+<% end %>
+</tbody>
--- a/app/views/poll/_poll_republish.html.erb
+++ b/app/views/poll/_poll_republish.html.erb
@ -0,0 +1,32 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <script type="text/javascript">
+      function clickCanel(){hideModal("#popbox02");}
+  </script>
+</head>
+
+<body>
+<div id="popbox02">
+  <div class="upload_con">
+    <div class="upload_box">
+      <p class="polls_box_p">
+        问卷取消发布后学生提交的问卷答案将会被清空，
+        <br />
+        是否确定取消发布该问卷？
+      </p>
+      <div class="polls_btn_box">
+        <%= link_to "确    定",republish_poll_poll_path(poll.id), :class => "upload_btn", :onclick => "clickCanel();" %>
+        <a class="upload_btn upload_btn_grey" onclick="clickCanel();">
+          取&nbsp;&nbsp;消
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+
+  </div>
+
+</div>
+</body>
+</html>
+
--- a/app/views/poll/_poll_submit.html.erb
+++ b/app/views/poll/_poll_submit.html.erb
@ -0,0 +1,29 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <script type="text/javascript">
+      function clickCanel(){hideModal("#popbox02");}
+  </script>
+</head>
+
+<body>
+<div id="popbox02">
+  <div class="upload_con">
+    <div class="upload_box">
+      <p class="polls_box_p">问卷发布后将不能对问卷进行修改，
+        <br />
+        是否确定发布该问卷？
+      </p>
+      <div class="polls_btn_box">
+        <%= link_to "确    定",publish_poll_poll_path(poll.id,:is_remote => is_remote), :class => "upload_btn", :onclick => "clickCanel();" %>
+        <a class="upload_btn upload_btn_grey" onclick="clickCanel();">
+          取&nbsp;&nbsp;消
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
+</body>
+</html>
+
--- a/app/views/poll/_quiz_answers.html.erb
+++ b/app/views/poll/_quiz_answers.html.erb
@ -0,0 +1,18 @@
+<div class="ur_table_result">
+  <table  border="0" cellspacing="0" cellpadding="0" >
+    <tbody>
+      <tr class="table_bluebg">
+        <td class="td327" ><%= l(:label_answer) %> </td>
+      </tr>
+      <% poll_question.poll_votes.each do |poll_vote| %>
+      	<tr>     		
+          <td class="td111"><%= poll_vote.vote_text.html_safe %> </td>
+      	</tr>     
+      <% end %>
+        <tr class="table_bluebg">
+          <td class="td327"><%= l(:label_poll_answer_valid_result) %> <%= l(:label_answer_total) %><%= poll_question.poll_votes.count %></td>
+        </tr>
+     </tbody>
+   </table>
+</div>
+
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@ -0,0 +1,32 @@
+<div class="ur_question_item radio ur_editor02">
+  <div class="ur_title">
+    <span class="title_index">
+      第<%= poll_question.question_number%>题：
+    </span>
+    <%= poll_question.question_title %>
+    <span class="title_index">[单选题]</span>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+  </div>
+  <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table" >
+      <tbody>
+      <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
+          <tr>
+            <td>
+              <label>
+                <input class="ur_radio" type="radio" name="<%= poll_question  %>" value="<%= poll_answer.answer_text%>" >
+                <%= poll_answer.answer_text%>
+              </label>
+            </td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
+</div><!--单选题显示 end-->
--- a/app/views/poll/_show_MCQ.html.erb
+++ b/app/views/poll/_show_MCQ.html.erb
@ -0,0 +1,32 @@
+<div  class="ur_question_item checkbox ur_editor02">
+  <div class="ur_title">
+    <span class="title_index">
+      第<%= poll_question.question_number%>题：
+    </span>
+    <%= poll_question.question_title %>
+    <span class="title_index">[多选题]</span>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+  </div>
+  <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table">
+      <tbody>
+      <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
+          <tr>
+            <td>
+              <label>
+                <input class="ur_radio" type="checkbox" name="<%= poll_question  %>" value="<%= poll_answer.answer_text%>" >
+                <%= poll_answer.answer_text%>
+              </label>
+            </td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
+</div><!--多选题显示 end-->
--- a/app/views/poll/_show_MCQ_result.html.erb
+++ b/app/views/poll/_show_MCQ_result.html.erb
@ -0,0 +1,26 @@
+<li  class="ur_question_item checkbox">
+  <div class="ur_title">
+    <span class="title_index">
+      第<%= poll_question.question_number%>题：
+    </span>
+    <%= poll_question.question_title %>
+    <span class="title_index">[多选题]</span>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+  </div>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table">
+      <tbody>
+      <% poll_question.poll_votes.where("user_id = #{User.current.id}").each do |answer|%>
+          <tr>
+            <td>
+              <%= answer.poll_answer.answer_text  %>
+            </td>
+          </tr>
+      <% end%>
+      </tbody>
+    </table>
+  </div>
+</li><!--多选题 end-->
--- a/app/views/poll/_show_MC_result.html.erb
+++ b/app/views/poll/_show_MC_result.html.erb
@ -0,0 +1,27 @@
+<li class="ur_question_item radio">
+  <div class="ur_title">
+    <span class="title_index">
+      第<%= poll_question.question_number%>题：
+    </span>
+    <%= poll_question.question_title %>
+    <span class="title_index">[单选题]</span>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+  </div>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table" >
+      <tbody>
+      <% poll_question.poll_votes.where("user_id = #{User.current.id}").each do |answer|%>
+          <tr>
+            <td>
+              <%= answer.poll_answer.answer_text  %>
+            </td>
+          </tr>
+      <% end%>
+
+      </tbody>
+    </table>
+  </div>
+</li><!--单选题 end-->
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@ -0,0 +1,10 @@
+<div class="ur_page_head ur_editor02"><!--头部显示 start-->
+  <a href="#" class="ur_icon_edit" title="编辑" onclick="pollsEdit();"></a>
+  <h1 class="ur_page_title" id="polls_name_h">
+    <%= poll.polls_name%>
+  </h1>
+  <p class="ur_prefix_content" id="polls_description_p">
+    <%= @poll.polls_description%>
+  </p>
+  <div class="cl"></div>
+</div><!--头部显示 end-->
--- a/app/views/poll/_show_mulit.html.erb
+++ b/app/views/poll/_show_mulit.html.erb
@ -0,0 +1,21 @@
+<div class="ur_question_item textarea ur_editor02">
+  <div class="ur_preview">
+    <div class="ur_title">
+      <span class="title_index">
+        第<%= poll_question.question_number%>题：
+      </span>
+      <%= poll_question.question_title %>
+      <span class="title_index">[多行主观]</span>
+      <%if poll_question.is_necessary == 1%>
+          <span class="ur_required" title="必答">*</span>
+      <%end%>
+    </div>
+    <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
+                method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+    <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+    <div class="cl"></div>
+    <div class="ur_inputs">
+      <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
+    </div>
+  </div>
+</div><!--多行展示 end-->
--- a/app/views/poll/_show_mulit_result.html.erb
+++ b/app/views/poll/_show_mulit_result.html.erb
@ -0,0 +1,20 @@
+<li class="ur_question_item textarea">
+  <div class="ur_preview">
+    <div class="ur_title">
+      <span class="title_index">
+        第<%= poll_question.question_number%>题：
+      </span>
+      <%= poll_question.question_title %>
+      <span class="title_index">[多行主观]</span>
+      <%if poll_question.is_necessary == 1%>
+          <span class="ur_required" title="必答">*</span>
+      <%end%>
+    </div>
+    <div class="cl"></div>
+    <div class="ur_inputs">
+      <p>
+        <%= get_anwser_vote_text(poll_question.id,User.current.id).html_safe%>
+      </p>
+    </div>
+  </div>
+</li><!--多行输入 end-->
--- a/app/views/poll/_show_single.html.erb
+++ b/app/views/poll/_show_single.html.erb
@ -0,0 +1,19 @@
+<div  class="ur_question_item text ur_editor02 ">
+  <div class="ur_title">
+    <span class="title_index">
+      第<%= poll_question.question_number%>题：
+    </span>
+    <%= poll_question.question_title %>
+    <span class="title_index">[单行主观]</span>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+  </div>
+  <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
+  </div>
+</div><!--单行文字展示 end-->
--- a/app/views/poll/_show_single_result.html.erb
+++ b/app/views/poll/_show_single_result.html.erb
@ -0,0 +1,18 @@
+<li  class="ur_question_item text">
+  <div class="ur_title">
+    <span class="title_index">
+        第<%= poll_question.question_number%>题：
+      </span>
+    <%= poll_question.question_title %>
+    <span class="title_index">[单行主观]</span>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+  </div>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <p>
+      <%= get_anwser_vote_text poll_question.id,User.current.id%>
+    </p>
+  </div>
+</li><!--当行输入 end-->
--- a/app/views/poll/add_answer.html.erb
+++ b/app/views/poll/add_answer.html.erb
--- a/Show More
+++ b/Show More